Changeset 375f7fb in buchla-emu

Timestamp:

07/29/2017 10:24:03 PM (7 years ago)

Author:

Thomas Lopatic <thomas@…>

Branches:

master

Children:

0726522

Parents:

3c30832

Message:

Better interrupt emulation.

File:

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

emu/ser.c

@@ -37 +37 @@
 
 typedef struct {
-        bool irq;
+        bool irq_r;
+        bool irq_t;
+        bool rdr_ok;
         uint8_t rdr;
 } state_t;
@@ -44 +46 @@
 
 static state_t state[] = {
-        { .irq = false, .rdr = 0x00 },
-        { .irq = false, .rdr = 0x00 }
+        { .irq_r = false, .irq_t = false, .rdr_ok = false, .rdr = 0x00 },
+        { .irq_r = false, .irq_t = false, .rdr_ok = false, .rdr = 0x00 }
 };
 
@@ -60 +62 @@
 static void out(int32_t un, uint8_t c)
 {
-        state[un].irq = true;
         state[un].rdr = c;
+        state[un].rdr_ok = true;
+        state[un].irq_r = true;
 }
 
@@ -271 +274 @@
 {
         ver3("ser exec");
-        return state[0].irq || state[1].irq;
+        return state[0].irq_r || state[0].irq_t || state[1].irq_r || state[1].irq_t;
 }
 
@@ -289 +292 @@
         switch (rg) {
         case REG_IER_ISR:
-                rv = (uint32_t)(0xc0 | (state[un].irq ? 0x01 : 0x00));
+                rv = (uint32_t)(0xc0 | (state[un].rdr_ok ? 0x01 : 0x00));
+                state[un].irq_r = false;
+                state[un].irq_t = false;
                 ver2("ISR[%d] 0x%02x", un, rv);
                 break;
@@ -295 +300 @@
         case REG_TDR_RDR:
                 rv = state[un].rdr;
-                state[un].irq = false;
+                state[un].rdr_ok = false;
                 ver2("RDR[%d] 0x%02x", un, rv);
                 break;
@@ -322 +327 @@
                 ver2("TDR[%d] 0x%02x", un, val);
                 echo((uint8_t)val);
+                state[un].irq_t = true;
                 break;