1 files changed, 24 insertions, 24 deletions

diff --git a/code/fe310/eos/eve_text.c b/code/fe310/eos/eve_text.c
index 73fcb65..4e343a0 100644
--- a/code/fe310/eos/eve_text.c
+++ b/code/fe310/eos/eve_text.c
@@ -1,7 +1,7 @@
 #include "eve.h"
 #include "eve_text.h"
 
-static int _line_diff(EVETextBox *box, int line) {
+static int _line_diff(EVEText *box, int line) {
     if (line > box->line_idx) {
         return line - box->line_idx;
     } else {
@@ -9,37 +9,39 @@ static int _line_diff(EVETextBox *box, int line) {
     }
 }
 
-static void _line_scroll(EVETextBox *box) {
+static void _line_scroll(EVEText *box) {
     box->line_idx = (box->line_idx + 1) % box->buf_line_h;
-    eos_eve_cmd(CMD_MEMSET, "www", EVE_RAM_G + box->buf_addr + box->buf_idx, 0x0, box->w * 2);
+    eos_eve_cmd(CMD_MEMSET, "www", box->buf_addr + box->buf_idx, 0x0, box->w * 2);
     eos_eve_cmd_exec(1);
-    eos_eve_dl_start(box->dl_offset);
     eos_eve_text_update(box);
-    eos_eve_dl_swap();
 }
 
-void eos_eve_text_init(EVETextBox *box, uint16_t buf_addr, int buf_line_h, int w, int h, int x, int y, uint8_t bitmap_handle) {
-    box->buf_addr = buf_addr;
-    box->buf_line_h = buf_line_h;
-    box->w = w;
-    box->h = h;
+void eos_eve_text_init(EVEText *box, int x, int y, int w, int h, uint8_t bitmap_handle, uint32_t mem_addr, int buf_line_h, uint32_t *mem_next) {
     box->x = x;
     box->y = y;
+    box->w = w;
+    box->h = h;
+    box->bitmap_handle = bitmap_handle;
+    box->buf_addr = mem_addr;
+    box->buf_line_h = buf_line_h;
     box->buf_idx = 0;
     box->line_idx = 0;
-    box->dl_offset = 0;
-    box->bitmap_handle = bitmap_handle;
 
-    eos_eve_cmd(CMD_MEMSET, "www", EVE_RAM_G + buf_addr, 0x0, w * 2 * buf_line_h);
+    eos_eve_cmd(CMD_MEMSET, "www", mem_addr, 0x0, w * 2 * buf_line_h);
     eos_eve_cmd_exec(1);
+
+    eos_eve_text_update(box);
+    *mem_next = box->buf_addr + box->w * 2 * box->buf_line_h + 12 * 4;
 }
 
-void eos_eve_text_update(EVETextBox *box) {
+void eos_eve_text_draw(EVEText *box) {
+    eos_eve_cmd(CMD_APPEND, "ww", box->buf_addr + box->w * 2 * box->buf_line_h, 12 * 4);
+}
+
+void eos_eve_text_update(EVEText *box) {
     int text_h1;
     int text_h2;
 
-    eos_eve_dl_write(BITMAP_HANDLE(box->bitmap_handle));
-    eos_eve_dl_write(BITMAP_SOURCE(box->buf_addr + box->line_idx * box->w * 2));
     if (box->line_idx + box->h > box->buf_line_h) {
         text_h1 = box->buf_line_h - box->line_idx;
         text_h2 = box->h - text_h1;
@@ -47,6 +49,9 @@ void eos_eve_text_update(EVETextBox *box) {
         text_h1 = box->h;
         text_h2 = 0;
     }
+    eos_eve_dl_start(box->buf_addr + box->w * 2 * box->buf_line_h);
+    eos_eve_dl_write(BITMAP_HANDLE(box->bitmap_handle));
+    eos_eve_dl_write(BITMAP_SOURCE(box->buf_addr + box->line_idx * box->w * 2));
     eos_eve_dl_write(BITMAP_LAYOUT(EVE_TEXTVGA, box->w * 2, text_h1));
     eos_eve_dl_write(BITMAP_SIZE(EVE_NEAREST, EVE_BORDER, EVE_BORDER, box->w * 8, text_h1 * 16));
 
@@ -72,17 +77,12 @@ void eos_eve_text_update(EVETextBox *box) {
     eos_eve_dl_write(END());
 }
 
-void eos_eve_text_draw(EVETextBox *box) {
-    box->dl_offset = eos_eve_dl_offset();
-    eos_eve_text_update(box);
-}
-
-void eos_eve_text_putc(EVETextBox *box, int c) {
+void eos_eve_text_putc(EVEText *box, int c) {
     int line_c, line_n;
 
     line_c = box->buf_idx / 2 / box->w;
 
-    eos_eve_write16(EVE_RAM_G + box->buf_addr + box->buf_idx, 0x0A00 | (c & 0xff));
+    eos_eve_write16(box->buf_addr + box->buf_idx, 0x0A00 | (c & 0xff));
     box->buf_idx = (box->buf_idx + 2) % (box->buf_line_h * box->w * 2);
 
     line_n = box->buf_idx / 2 / box->w;
@@ -91,7 +91,7 @@ void eos_eve_text_putc(EVETextBox *box, int c) {
     }
 }
 
-void eos_eve_text_newline(EVETextBox *box) {
+void eos_eve_text_newline(EVEText *box) {
     int line = (box->buf_idx / 2 / box->w + 1) % box->buf_line_h;
     box->buf_idx = line * box->w * 2;
     if (_line_diff(box, line) == box->h) {