From: Alan Cox <alan@linux.intel.com>
Date: Sat, 9 Jun 2018 15:57:11 +0000 (+0100)
Subject: trs80m1: first bits to deal with model III interrupt differences
X-Git-Url: https://git.ndcode.org/public/gitweb.cgi?a=commitdiff_plain;h=461c32e0cd5e55d6a381e2f66566b5051f55f749;p=FUZIX.git

trs80m1: first bits to deal with model III interrupt differences
---

diff --git a/Kernel/platform-trs80m1/main.c b/Kernel/platform-trs80m1/main.c
index 668e3267..95877c51 100644
--- a/Kernel/platform-trs80m1/main.c
+++ b/Kernel/platform-trs80m1/main.c
@@ -35,22 +35,40 @@ uint8_t sdcc_bug_2753(uint8_t v) __z88dk_fastcall
   return v;
 }
 
-/* We assign these to dummy to deal with what I think is an SDCC bug */
+__sfr __at 0xE0 irqstat3;
+__sfr __at 0xEC irqack3;
+
+/* We assign these to dummy to deal with an sdcc bug (should be fixed in next
+   SDCC) */
 void platform_interrupt(void)
 {
-  uint8_t irq = *((volatile uint8_t *)0x37E0);
   uint8_t dummy;
-
-  tty_interrupt();
-  kbd_interrupt();
-
-  /* FIXME: do we care about floppy interrupts */
-
-  if (irq & 0x40)
-    dummy = sdcc_bug_2753(*((volatile uint8_t *)0x37EC));
-  if (irq & 0x80) {	/* FIXME??? */
-    timer_interrupt();
-    dummy = sdcc_bug_2753(*((volatile uint8_t *)0x37E0));	/* Ack the timer */
+  if (trs_model != TRS80_MODEL3) {
+    uint8_t irq = *((volatile uint8_t *)0x37E0);
+
+    tty_interrupt();
+    kbd_interrupt();
+
+    /* FIXME: do we care about floppy interrupts */
+
+    if (irq & 0x40)
+      dummy = sdcc_bug_2753(*((volatile uint8_t *)0x37EC));
+    if (irq & 0x80) {	/* FIXME??? */
+      timer_interrupt();
+      dummy = sdcc_bug_2753(*((volatile uint8_t *)0x37E0));	/* Ack the timer */
+    }
+  } else {
+    /* The Model III IRQ handling has to be different... */
+    uint8_t irq = ~irqstat3;
+    /* Serial port ? */
+    if (irq & 0x70)
+      tty_interrupt();
+    /* We don't handle IOBUS */
+    if (irq & 0x04)
+      kbd_interrupt();
+      timer_interrupt();
+      dummy = irqack3;
+    }
   }
 }