summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--code/fe310/eos/eve.c316
-rw-r--r--code/fe310/eos/eve.h20
-rw-r--r--code/fe310/eos/eve_text.c48
-rw-r--r--code/fe310/eos/eve_text.h23
-rw-r--r--code/fe310/eos/event.c3
-rw-r--r--code/fe310/eos/evt_def.h3
-rw-r--r--code/fe310/eos/interrupt.c3
-rw-r--r--code/fe310/eos/irq_def.h4
8 files changed, 326 insertions, 94 deletions
diff --git a/code/fe310/eos/eve.c b/code/fe310/eos/eve.c
index 9d902b2..bd94be2 100644
--- a/code/fe310/eos/eve.c
+++ b/code/fe310/eos/eve.c
@@ -1,15 +1,31 @@
+#include <stdlib.h>
#include <stdarg.h>
+#include <stdio.h>
+
+#include "encoding.h"
+#include "platform.h"
#include "eos.h"
-#include "spi.h"
+#include "interrupt.h"
+#include "event.h"
#include "timer.h"
+#include "spi.h"
#include "eve.h"
+#include "irq_def.h"
+
+#define MEM_WRITE 0x800000
-#define MEM_WRITE 0x800000
+#define EVE_PIN_INT 0
-static char cmd_burst;
-static uint16_t cmd_offset;
-static uint16_t dl_offset;
+static char eve_cmd_burst;
+static uint16_t eve_cmd_offset;
+static uint32_t eve_dl_addr;
+
+static int eve_int_mask = EVE_INT_TAG | EVE_INT_TOUCH;
+static int eve_multitouch = 0;
+static uint8_t eve_tag0;
+EVETag eve_tag[5];
+static eos_eve_fptr_t eve_renderer;
void eos_eve_command(uint8_t command, uint8_t parameter) {
eos_spi_cs_set();
@@ -72,37 +88,20 @@ void eos_eve_active(void) {
eos_eve_command(EVE_ACTIVE, 0);
}
-void eos_eve_standby(void) {
- eos_eve_command(EVE_STANDBY, 0);
-}
-
-void eos_eve_sleep(void) {
- eos_eve_command(EVE_SLEEP, 0);
-}
-
-void eos_eve_pwrdown(void) {
- eos_eve_command(EVE_PWRDOWN, 0);
-}
-
-void eos_eve_reset(void) {
- eos_eve_command(EVE_RST_PULSE, 0);
-}
-
void eos_eve_brightness(uint8_t b) {
eos_eve_write8(REG_PWM_DUTY, b);
}
-static void _dl_inc(uint16_t i) {
- dl_offset += i;
+static void _dl_inc(uint32_t i) {
+ eve_dl_addr += i;
}
-void eos_eve_dl_start(uint16_t offset) {
- dl_offset = offset;
+void eos_eve_dl_start(uint32_t addr) {
+ eve_dl_addr = addr;
}
void eos_eve_dl_write(uint32_t dl) {
- uint32_t addr = EVE_RAM_DL + dl_offset;
- eos_eve_write32(addr, dl);
+ eos_eve_write32(eve_dl_addr, dl);
_dl_inc(4);
}
@@ -110,22 +109,22 @@ void eos_eve_dl_swap(void) {
eos_eve_write8(REG_DLSWAP, EVE_DLSWAP_FRAME);
}
-uint16_t eos_eve_dl_offset(void) {
- return dl_offset;
+uint32_t eos_eve_dl_addr(void) {
+ return eve_dl_addr;
}
static void _cmd_inc(uint16_t i) {
- cmd_offset += i;
- cmd_offset &= 0x0fff;
+ eve_cmd_offset += i;
+ eve_cmd_offset &= 0x0fff;
}
static void _cmd_begin(uint32_t command) {
uint8_t flags = 0;
- if (cmd_burst) {
+ if (eve_cmd_burst) {
flags = EOS_SPI_FLAG_TX;
} else {
- uint32_t addr = EVE_RAM_CMD + cmd_offset;
+ uint32_t addr = EVE_RAM_CMD + eve_cmd_offset;
eos_spi_cs_set();
eos_spi_xchg24(addr | MEM_WRITE, 0);
}
@@ -134,7 +133,7 @@ static void _cmd_begin(uint32_t command) {
}
static void _cmd_end(void) {
- if (!cmd_burst) eos_spi_cs_clear();
+ if (!eve_cmd_burst) eos_spi_cs_clear();
}
static void _cmd_string(const char *s, uint8_t flags) {
@@ -156,8 +155,26 @@ static void _cmd_string(const char *s, uint8_t flags) {
_cmd_inc(i);
}
+static void _cmd_buffer(const char *b, int size, uint8_t flags) {
+ int i = 0, p = 0;
+
+ for (i=0; i<size; i++) {
+ eos_spi_xchg8(b[i], EOS_SPI_FLAG_BSWAP | flags);
+ }
+ /* padding */
+ p = i & 3; /* 0, 1, 2 or 3 */
+ p = 4 - p; /* 4, 3, 2 or 1 */
+ i += p;
+
+ while(p > 0) {
+ eos_spi_xchg8(0, EOS_SPI_FLAG_BSWAP | flags);
+ p--;
+ }
+ _cmd_inc(i);
+}
+
void eos_eve_cmd(uint32_t cmd, const char *fmt, ...) {
- uint8_t flags = cmd_burst ? EOS_SPI_FLAG_TX : 0;
+ uint8_t flags = eve_cmd_burst ? EOS_SPI_FLAG_TX : 0;
va_list argv;
uint16_t *p;
int i = 0;
@@ -180,13 +197,16 @@ void eos_eve_cmd(uint32_t cmd, const char *fmt, ...) {
break;
case 'W':
p = va_arg(argv, uint16_t *);
- *p = cmd_offset;
+ *p = eve_cmd_offset;
eos_spi_xchg32(0, EOS_SPI_FLAG_BSWAP | flags);
_cmd_inc(4);
break;
case 's':
_cmd_string(va_arg(argv, const char *), flags);
break;
+ case 'p':
+ _cmd_buffer(va_arg(argv, const char *), va_arg(argv, int), flags);
+ break;
}
i++;
}
@@ -206,7 +226,7 @@ void eos_eve_cmd_dl(uint32_t dl) {
int eos_eve_cmd_done(void) {
uint16_t r = eos_eve_read16(REG_CMD_READ);
if (r == 0xfff) {
- cmd_offset = 0;
+ eve_cmd_offset = 0;
eos_eve_write8(REG_CPURESET, 1);
eos_eve_write16(REG_CMD_READ, 0);
eos_eve_write16(REG_CMD_WRITE, 0);
@@ -214,11 +234,11 @@ int eos_eve_cmd_done(void) {
eos_eve_write8(REG_CPURESET, 0);
return -1;
}
- return (r == cmd_offset);
+ return (r == eve_cmd_offset);
}
int eos_eve_cmd_exec(int w) {
- eos_eve_write16(REG_CMD_WRITE, cmd_offset);
+ eos_eve_write16(REG_CMD_WRITE, eve_cmd_offset);
if (w) {
int r;
do {
@@ -230,33 +250,179 @@ int eos_eve_cmd_exec(int w) {
}
void eos_eve_cmd_burst_start(void) {
- uint32_t addr = EVE_RAM_CMD + cmd_offset;
+ uint32_t addr = EVE_RAM_CMD + eve_cmd_offset;
eos_spi_cs_set();
eos_spi_xchg24(addr | MEM_WRITE, EOS_SPI_FLAG_TX);
- cmd_burst = 1;
+ eve_cmd_burst = 1;
}
void eos_eve_cmd_burst_end(void) {
eos_spi_cs_clear();
- cmd_burst = 0;
+ eve_cmd_burst = 0;
+}
+
+static void eve_handler_int(void) {
+ GPIO_REG(GPIO_LOW_IE) &= ~(1 << EVE_PIN_INT);
+ eos_evtq_push_isr(EOS_EVT_UI, NULL, 0);
+ return;
+}
+
+static void eve_handler_evt(unsigned char type, unsigned char *buffer, uint16_t len) {
+ char render = 0;
+ int touch_tag_idx = -1;
+ uint8_t flags = eos_eve_read8(REG_INT_FLAGS) & eve_int_mask;
+ uint8_t touch_tag;
+ uint32_t touch_xy;
+ EVETag *tag;
+
+ if (!eve_multitouch) {
+ if (flags & EVE_INT_TAG) {
+ touch_tag = eos_eve_read8(REG_TOUCH_TAG);
+ eve_tag[0].value_prev = eve_tag[0].value;
+ eve_tag[0].value = touch_tag;
+ touch_tag_idx = 0;
+ if (touch_tag) eve_tag0 = touch_tag;
+ }
+ touch_xy = eos_eve_read32(REG_CTOUCH_TOUCH0_XY);
+ if (touch_xy == 0x80008000) {
+ eve_tag[0].t = 0;
+ } else {
+ eve_tag[0].t = 1;
+ eve_tag[0].x = touch_xy >> 16;
+ eve_tag[0].y = touch_xy & 0xffff;
+ if (flags & EVE_INT_TOUCH) {
+ eve_multitouch = 1;
+ eve_int_mask |= EVE_INT_CONVCOMPLETE;
+ eos_eve_write8(REG_INT_MASK, eve_int_mask);
+ }
+ }
+ } else if (flags & EVE_INT_CONVCOMPLETE) {
+ tag = &eve_tag[0];
+ touch_xy = eos_eve_read32(REG_CTOUCH_TOUCH0_XY);
+ if (touch_xy == 0x80008000) {
+ touch_tag = 0;
+ tag->t = 0;
+ } else {
+ touch_tag = eos_eve_read8(REG_TOUCH_TAG);
+ tag->t = 1;
+ tag->x = touch_xy >> 16;
+ tag->y = touch_xy & 0xffff;
+ }
+ if (touch_tag != tag->value) {
+ tag->value_prev = tag->value;
+ tag->value = touch_tag;
+ touch_tag_idx = 0;
+ }
+
+ tag = &eve_tag[1];
+ touch_xy = eos_eve_read32(REG_CTOUCH_TOUCH1_XY);
+ if (touch_xy == 0x80008000) {
+ touch_tag = 0;
+ tag->t = 0;
+ } else {
+ touch_tag = eos_eve_read8(REG_TOUCH_TAG1);
+ tag->t = 1;
+ tag->x = touch_xy >> 16;
+ tag->y = touch_xy & 0xffff;
+ }
+ if (touch_tag != tag->value) {
+ tag->value_prev = tag->value;
+ tag->value = touch_tag;
+ touch_tag_idx = 1;
+ }
+
+ tag = &eve_tag[2];
+ touch_xy = eos_eve_read32(REG_CTOUCH_TOUCH2_XY);
+ if (touch_xy == 0x80008000) {
+ touch_tag = 0;
+ tag->t = 0;
+ } else {
+ touch_tag = eos_eve_read8(REG_TOUCH_TAG2);
+ tag->t = 1;
+ tag->x = touch_xy >> 16;
+ tag->y = touch_xy & 0xffff;
+ }
+ if (touch_tag != tag->value) {
+ tag->value_prev = tag->value;
+ tag->value = touch_tag;
+ touch_tag_idx = 2;
+ }
+
+ tag = &eve_tag[3];
+ touch_xy = eos_eve_read32(REG_CTOUCH_TOUCH3_XY);
+ if (touch_xy == 0x80008000) {
+ touch_tag = 0;
+ tag->t = 0;
+ } else {
+ touch_tag = eos_eve_read8(REG_TOUCH_TAG3);
+ tag->t = 1;
+ tag->x = touch_xy >> 16;
+ tag->y = touch_xy & 0xffff;
+ }
+ if (touch_tag != tag->value) {
+ tag->value_prev = tag->value;
+ tag->value = touch_tag;
+ touch_tag_idx = 3;
+ }
+
+ tag = &eve_tag[4];
+ touch_xy = ((uint32_t)eos_eve_read16(REG_CTOUCH_TOUCH4_X) << 16) | eos_eve_read16(REG_CTOUCH_TOUCH4_Y);
+ if (touch_xy == 0x80008000) {
+ touch_tag = 0;
+ tag->t = 0;
+ } else {
+ touch_tag = eos_eve_read8(REG_TOUCH_TAG4);
+ tag->t = 1;
+ tag->x = touch_xy >> 16;
+ tag->y = touch_xy & 0xffff;
+ }
+ if (touch_tag != tag->value) {
+ tag->value_prev = tag->value;
+ tag->value = touch_tag;
+ touch_tag_idx = 4;
+ }
+
+ if (!eve_tag[1].t && !eve_tag[2].t && !eve_tag[3].t && !eve_tag[4].t) {
+ eve_multitouch = 0;
+ eve_int_mask &= ~EVE_INT_CONVCOMPLETE;
+ eos_eve_write8(REG_INT_MASK, eve_int_mask);
+ }
+ }
+
+ if (touch_tag_idx != -1) render = 1;
+ if (render) eve_renderer(eve_tag0, touch_tag_idx);
+
+ /*
+ uint32_t track = eos_eve_read32(REG_TRACKER);
+ printf("F:%x TAG:%x %x %x %x %x %x\n", flags, eve_tag0, eve_tag[0].value, eve_tag[1].value, eve_tag[2].value, eve_tag[3].value, eve_tag[4].value);
+ if (flags & 0x04) {
+ track_tag = track & 0xffff;
+ track_val = track >> 16;
+ }
+ */
+
+ GPIO_REG(GPIO_LOW_IP) = (1 << EVE_PIN_INT);
+ GPIO_REG(GPIO_LOW_IE) |= (1 << EVE_PIN_INT);
+ return;
}
int eos_eve_init(void) {
uint8_t chipid = 0;
uint16_t timeout = 0;
+ uint32_t touch_transform[6] = {0xfa46,0xfffffcf6,0x422fe,0xffffff38,0x10002,0xf3cb0};
- eos_eve_reset();
+ eos_eve_command(EVE_RST_PULSE, 0);
eos_eve_command(EVE_CLKEXT, 0);
- eos_eve_active(); /* start EVE */
+ eos_eve_command(EVE_ACTIVE, 0); /* start EVE */
- while(chipid != 0x7C) { /* if chipid is not 0x7c, continue to read it until it is, EVE needs a moment for it's power on self-test and configuration */
+ while(chipid != 0x7C) { /* if chipid is not 0x7c, continue to read it until it is, EVE needs a moment for it's power on self-test and configuration */
eos_timer_sleep(1);
chipid = eos_eve_read8(REG_ID);
timeout++;
if (timeout > 400) return EOS_ERR;
}
- eos_eve_brightness(0);
+ eos_eve_write8(REG_PWM_DUTY, 0);
/* Initialize Display */
eos_eve_write16(REG_HCYCLE, EVE_HCYCLE); /* total number of clocks per line, incl front/back porch */
@@ -285,7 +451,7 @@ int eos_eve_init(void) {
eos_eve_write16(REG_SOUND, 0x6000); /* set synthesizer to mute */
/* write a basic display-list to get things started */
- eos_eve_dl_start(0);
+ eos_eve_dl_start(EVE_RAM_DL);
eos_eve_dl_write(CLEAR_COLOR_RGB(0,0,0));
eos_eve_dl_write(CLEAR(1,1,1));
eos_eve_dl_write(DISPLAY());
@@ -295,9 +461,63 @@ int eos_eve_init(void) {
eos_eve_write8(REG_GPIO, 0x80); /* enable the DISP signal to the LCD panel, it is set to output in REG_GPIO_DIR by default */
eos_eve_write8(REG_PCLK, EVE_PCLK); /* now start clocking data to the LCD panel */
+ eos_eve_write8(REG_INT_EN, 0x01);
+ eos_eve_write8(REG_INT_MASK, eve_int_mask);
+ while(eos_eve_read8(REG_INT_FLAGS));
+
+ eos_evtq_set_handler(EOS_EVT_UI, eve_handler_evt);
+
+ GPIO_REG(GPIO_INPUT_EN) |= (1 << EVE_PIN_INT);
+ GPIO_REG(GPIO_OUTPUT_EN) &= ~(1 << EVE_PIN_INT);
+ GPIO_REG(GPIO_PULLUP_EN) &= ~(1 << EVE_PIN_INT);
+ GPIO_REG(GPIO_OUTPUT_XOR) &= ~(1 << EVE_PIN_INT);
+
+ GPIO_REG(GPIO_LOW_IE) |= (1 << EVE_PIN_INT);
+ eos_intr_set(INT_GPIO_BASE + EVE_PIN_INT, IRQ_PRIORITY_UI, eve_handler_int);
+
+ /*
+ // eos_eve_cmd_burst_start();
+ eos_eve_cmd_dl(CMD_DLSTART);
+ eos_eve_cmd_dl(CLEAR_COLOR_RGB(0,0,0));
+ eos_eve_cmd_dl(CLEAR(1,1,1));
+ eos_eve_cmd(CMD_TEXT, "hhhhs", EVE_HSIZE/2, EVE_VSIZE/2, 27, EVE_OPT_CENTER, "Please tap on the dot.");
+ eos_eve_cmd(CMD_CALIBRATE, "w", 0);
+ eos_eve_cmd_dl(DISPLAY());
+ eos_eve_cmd_dl(CMD_SWAP);
+ // eos_eve_cmd_burst_end();
+ eos_eve_cmd_exec(1);
+
+ uint32_t touch_transform[0] = eos_eve_read32(REG_TOUCH_TRANSFORM_A);
+ uint32_t touch_transform[1] = eos_eve_read32(REG_TOUCH_TRANSFORM_B);
+ uint32_t touch_transform[2] = eos_eve_read32(REG_TOUCH_TRANSFORM_C);
+ uint32_t touch_transform[3] = eos_eve_read32(REG_TOUCH_TRANSFORM_D);
+ uint32_t touch_transform[4] = eos_eve_read32(REG_TOUCH_TRANSFORM_E);
+ uint32_t touch_transform[5] = eos_eve_read32(REG_TOUCH_TRANSFORM_F);
+
+ printf("TOUCH TRANSFORM:{0x%x,0x%x,0x%x,0x%x,0x%x,0x%x}\n", touch_transform[0], touch_transform[1], touch_transform[2], touch_transform[3], touch_transform[4], touch_transform[5]);
+ */
+
+ eos_eve_write32(REG_TOUCH_TRANSFORM_A, touch_transform[0]);
+ eos_eve_write32(REG_TOUCH_TRANSFORM_B, touch_transform[1]);
+ eos_eve_write32(REG_TOUCH_TRANSFORM_C, touch_transform[2]);
+ eos_eve_write32(REG_TOUCH_TRANSFORM_D, touch_transform[3]);
+ eos_eve_write32(REG_TOUCH_TRANSFORM_E, touch_transform[4]);
+ eos_eve_write32(REG_TOUCH_TRANSFORM_F, touch_transform[5]);
+ eos_eve_write32(REG_CTOUCH_EXTENDED, 0x00);
+
+ eos_eve_cmd(CMD_SETROTATE, "w", 2);
+ eos_eve_cmd_exec(1);
+
eos_timer_sleep(500);
- eos_eve_standby();
+ eos_eve_command(EVE_STANDBY, 0);
return EOS_OK;
}
+void eos_eve_set_renderer(eos_eve_fptr_t renderer) {
+ eve_renderer = renderer;
+}
+
+EVETag *eos_eve_tag(void) {
+ return eve_tag;
+}
diff --git a/code/fe310/eos/eve.h b/code/fe310/eos/eve.h
index 1c837f5..bf6c4e8 100644
--- a/code/fe310/eos/eve.h
+++ b/code/fe310/eos/eve.h
@@ -2,6 +2,16 @@
#include "eve_def.h"
+typedef struct EVETag {
+ uint16_t x;
+ uint16_t y;
+ uint8_t value;
+ uint8_t value_prev;
+ char t;
+} EVETag;
+
+typedef void (*eos_eve_fptr_t) (uint8_t, int);
+
void eos_eve_command(uint8_t command, uint8_t parameter);
uint8_t eos_eve_read8(uint32_t addr);
@@ -12,15 +22,12 @@ void eos_eve_write16(uint32_t addr, uint16_t data);
void eos_eve_write32(uint32_t addr, uint32_t data);
void eos_eve_active(void);
-void eos_eve_standby(void);
-void eos_eve_sleep(void);
-void eos_eve_reset(void);
void eos_eve_brightness(uint8_t b);
-void eos_eve_dl_start(uint16_t offset);
+void eos_eve_dl_start(uint32_t addr);
void eos_eve_dl_write(uint32_t dl);
void eos_eve_dl_swap(void);
-uint16_t eos_eve_dl_offset(void);
+uint32_t eos_eve_dl_addr(void);
void eos_eve_cmd(uint32_t cmd, const char *fmt, ...);
uint32_t eos_eve_cmd_result(uint16_t offset);
@@ -31,4 +38,5 @@ void eos_eve_cmd_burst_start(void);
void eos_eve_cmd_burst_end(void);
int eos_eve_init(void);
-
+void eos_eve_set_renderer(eos_eve_fptr_t renderer);
+EVETag *eos_eve_tag(void); \ No newline at end of file
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) {
diff --git a/code/fe310/eos/eve_text.h b/code/fe310/eos/eve_text.h
index e882195..350be45 100644
--- a/code/fe310/eos/eve_text.h
+++ b/code/fe310/eos/eve_text.h
@@ -1,20 +1,19 @@
#include <stdint.h>
-typedef struct EVETextBox {
- uint16_t buf_addr;
- int buf_line_h;
- int w;
- int h;
+typedef struct EVEText {
int x;
int y;
+ int w;
+ int h;
+ uint32_t buf_addr;
+ int buf_line_h;
int buf_idx;
int line_idx;
- uint16_t dl_offset;
uint8_t bitmap_handle;
-} EVETextBox;
+} EVEText;
-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);
-void eos_eve_text_update(EVETextBox *box);
-void eos_eve_text_draw(EVETextBox *box);
-void eos_eve_text_putc(EVETextBox *box, int c);
-void eos_eve_text_newline(EVETextBox *box); \ No newline at end of file
+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);
+void eos_eve_text_draw(EVEText *box);
+void eos_eve_text_update(EVEText *box);
+void eos_eve_text_putc(EVEText *box, int c);
+void eos_eve_text_newline(EVEText *box);
diff --git a/code/fe310/eos/event.c b/code/fe310/eos/event.c
index ed313fb..df75ad4 100644
--- a/code/fe310/eos/event.c
+++ b/code/fe310/eos/event.c
@@ -1,6 +1,7 @@
#include <stdlib.h>
#include <stdint.h>
#include <unistd.h>
+#include <stdio.h>
#include "encoding.h"
#include "platform.h"
@@ -43,7 +44,7 @@ void eos_evtq_pop(unsigned char *type, unsigned char **buffer, uint16_t *len) {
}
void eos_evtq_bad_handler(unsigned char type, unsigned char *buffer, uint16_t len) {
- write(1, "error\n", 6);
+ printf("evt bad handler:%d\n", type);
}
static void evtq_handler_wrapper(unsigned char type, unsigned char *buffer, uint16_t len) {
diff --git a/code/fe310/eos/evt_def.h b/code/fe310/eos/evt_def.h
index 0cd63bb..028dd3e 100644
--- a/code/fe310/eos/evt_def.h
+++ b/code/fe310/eos/evt_def.h
@@ -3,7 +3,8 @@
#define EOS_EVT_NET 0x30
#define EOS_EVT_SPI 0x40
#define EOS_EVT_UART 0x50
-#define EOS_EVT_USER 0x60
+#define EOS_EVT_UI 0x60
+#define EOS_EVT_USER 0x70
#define EOS_EVT_MAX_EVT 8
#define EOS_EVT_MASK 0xF0
diff --git a/code/fe310/eos/interrupt.c b/code/fe310/eos/interrupt.c
index cb513a0..b9b289b 100644
--- a/code/fe310/eos/interrupt.c
+++ b/code/fe310/eos/interrupt.c
@@ -1,6 +1,7 @@
#include <stdlib.h>
#include <stdint.h>
#include <unistd.h>
+#include <stdio.h>
#include "encoding.h"
#include "platform.h"
@@ -18,7 +19,7 @@ uintptr_t eos_intr_handle(uintptr_t int_num) {
if ((int_num >=1) && (int_num <= PLIC_NUM_INTERRUPTS) && (ext_interrupt_handler[int_num-1])) {
ext_interrupt_handler[int_num-1]();
} else {
- write(1, "error\n", 6);
+ printf("error:%d\n", int_num);
exit(int_num);
}
return int_num;
diff --git a/code/fe310/eos/irq_def.h b/code/fe310/eos/irq_def.h
index b6a9dbb..5d9fb1e 100644
--- a/code/fe310/eos/irq_def.h
+++ b/code/fe310/eos/irq_def.h
@@ -6,4 +6,6 @@
#define IRQ_PRIORITY_NET_CTS 4
#define IRQ_PRIORITY_NET_RTS 4
-#define IRQ_PRIORITY_UART 1 \ No newline at end of file
+#define IRQ_PRIORITY_UART 1
+
+#define IRQ_PRIORITY_UI 5
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-20 11:53:43 +0000