Changeset 3c30832 in buchla-emu for emu/ser.c

Timestamp:

07/23/2017 08:57:53 PM (7 years ago)

Author:

Thomas Lopatic <thomas@…>

Branches:

master

Children:

375f7fb

Parents:

8e1b163

Message:

Interrupt handling. Serial console shows ROMP.

File:

• emu/ser.c (modified) (8 diffs)

emu/ser.c

@@ -31 +31 @@
 #define CON_FONT "ttf/vera-sans-mono.ttf"
 
+#define REG_IER_ISR 0
+#define REG_CFR_SR  1
+#define REG_CDR_TBR 2
+#define REG_TDR_RDR 3
+
+typedef struct {
+        bool irq;
+        uint8_t rdr;
+} state_t;
+
 int32_t ser_verbose = 0;
+
+static state_t state[] = {
+        { .irq = false, .rdr = 0x00 },
+        { .irq = false, .rdr = 0x00 }
+};
 
 static uint8_t mem[CON_H][CON_W + 1];
@@ -42 +57 @@
 
 static int32_t cur_x = 0, cur_y = 0;
+
+static void out(int32_t un, uint8_t c)
+{
+        state[un].irq = true;
+        state[un].rdr = c;
+}
 
 static void update(void)
@@ -173 +194 @@
         switch (ev->keysym.sym) {
         case SDLK_BACKSPACE:
-                echo('\b');
+                out(1, '\b');
                 break;
 
         case SDLK_RETURN:
-                echo('\r');
-                echo('\n');
+                out(1, '\r');
                 break;
 
@@ -184 +204 @@
                 if ((ev->keysym.mod & KMOD_CTRL) != 0 &&
                                 ev->keysym.sym >= SDLK_a && ev->keysym.sym <= SDLK_z) {
-                        echo((uint8_t)(ev->keysym.sym - SDLK_a + 1));
+                        out(1, (uint8_t)(ev->keysym.sym - SDLK_a + 1));
                 }
 
@@ -194 +214 @@
 {
         for (int32_t i = 0; ev->text[i] != 0; ++i) {
-                echo((uint8_t)ev->text[i]);
+                out(1, (uint8_t)ev->text[i]);
         }
 }
@@ -248 +268 @@
 }
 
-void ser_exec(void)
+bool ser_exec(void)
 {
         ver3("ser exec");
+        return state[0].irq || state[1].irq;
 }
 
@@ -256 +277 @@
 {
         ver2("ser rd %u:%d", off, sz * 8);
-        return 0;
+
+        if (sz != 1 || off > 7) {
+                fail("invalid ser rd %u:%d", off, sz * 8);
+        }
+
+        int32_t rg = (int32_t)(off % 4);
+        int32_t un = (int32_t)(off / 4);
+
+        uint32_t rv;
+
+        switch (rg) {
+        case REG_IER_ISR:
+                rv = (uint32_t)(0xc0 | (state[un].irq ? 0x01 : 0x00));
+                ver2("ISR[%d] 0x%02x", un, rv);
+                break;
+
+        case REG_TDR_RDR:
+                rv = state[un].rdr;
+                state[un].irq = false;
+                ver2("RDR[%d] 0x%02x", un, rv);
+                break;
+
+        default:
+                rv = 0x00;
+                break;
+        }
+
+        return rv;
 }
 
@@ -262 +310 @@
 {
         ver2("ser wr %u:%d 0x%0*x", off, sz * 8, sz * 2, val);
-}
+
+        if (sz != 1 || off > 7) {
+                fail("invalid ser wr %u:%d", off, sz * 8);
+        }
+
+        int32_t rg = (int32_t)(off % 4);
+        int32_t un = (int32_t)(off / 4);
+
+        switch (rg) {
+        case REG_TDR_RDR:
+                ver2("TDR[%d] 0x%02x", un, val);
+                echo((uint8_t)val);
+                break;
+
+        default:
+                break;
+        }
+}