GPIO/IRQ improvements from Claude

diff --git a/emulator.c b/emulator.c
index 24523f351cd7bce709385ac29934efd004ce7106..7dc17075b73ea46da73bb7b40f5916a414747034 100644 (file)
--- a/emulator.c
+++ b/emulator.c
@@ -50,6 +50,33 @@ extern volatile uint16_t srdata;
 int mem_fd, mouse_fd = -1, keyboard_fd = -1;
 int mem_fd_gpclk;
 int gayle_emulation_enabled = 1;
+int irq;
+int gayleirq;
+
+void *iplThread(void *args) {
+  printf("IPL thread running\n");
+
+  while (1) {
+    if (!gpio_get_irq()) {
+      irq = 1;
+      m68k_end_timeslice();
+    }
+    else
+      irq = 0;
+
+    if (gayle_emulation_enabled) {
+      if ((gayle_int & 0x80) && get_ide(0)->drive->intrq) {
+        gayleirq = 1;
+        m68k_end_timeslice();
+      }
+      else
+        gayleirq = 0;
+    }
+    usleep(0);
+  }
+  return args;
+}
+
 
 // Configurable emulator options
 unsigned int cpu_type = M68K_CPU_TYPE_68000;
@@ -193,6 +220,14 @@ int main(int argc, char *argv[]) {
 
   char c = 0;
 
+  pthread_t id;
+  int err;
+  err = pthread_create(&id, NULL, &iplThread, NULL);
+  if (err != 0)
+    printf("can't create IPL thread :[%s]", strerror(err));
+  else
+    printf("IPL Thread created successfully\n");
+
   m68k_pulse_reset();
   while (42) {
     if (mouse_hook_enabled) {
@@ -204,6 +239,20 @@ int main(int argc, char *argv[]) {
     if (cpu_emulation_running)
       m68k_execute(loop_cycles);
     
+    if (irq) {
+      unsigned int status = read_reg();
+      m68k_set_irq((status & 0xe000) >> 13);
+    }
+    else if (gayleirq) {
+      write16(0xdff09c, 0x8000 | (1 << 3));
+      //PAULA_SET_IRQ(3); // IRQ 3 = INT2
+      m68k_set_irq(2);
+    }
+    else {
+        m68k_set_irq(0);
+    }
+
+  //usleep(0);
     // FIXME: Rework this to use keyboard events instead.
     /*while (get_key_char(&c)) {
       if (c == cfg->keyboard_toggle_key && !kb_hook_enabled) {
@@ -237,7 +286,7 @@ int main(int argc, char *argv[]) {
     }*/
 
     //gpio_handle_irq();
-    GPIO_HANDLE_IRQ;
+    //GPIO_HANDLE_IRQ;
   }
 
   stop_cpu_emulation:;

diff --git a/gpio/gpio.c b/gpio/gpio.c
index fbdd3dd87922b426b5e163eac1e85b31f973c9ba..87ca48d81838dceeb0ab57792ba821868f7f0ecc 100644 (file)
--- a/gpio/gpio.c
+++ b/gpio/gpio.c
@@ -317,6 +317,12 @@ inline void gpio_handle_irq() {
   };
 }
 
+inline int gpio_get_irq() {
+  return (GET_GPIO(1));
+}
+
+
+/*
 void *iplThread(void *args) {
   printf("IPL thread running/n");
 
@@ -331,5 +337,5 @@ void *iplThread(void *args) {
     };
     usleep(1);
   }
-
-}
\ No newline at end of file
+}
+*/

diff --git a/gpio/gpio.h b/gpio/gpio.h
index 8110083dcb3d73eceedd42251f7d1a48d0d204f3..3dc09edc11de7fc8ca3e970d87bc1ca23d730847 100644 (file)
--- a/gpio/gpio.h
+++ b/gpio/gpio.h
@@ -88,6 +88,8 @@ void setup_io();
 void gpio_enable_200mhz();
 void gpio_handle_irq();
 
+int gpio_get_irq();
+
 uint32_t read8(uint32_t address);
 void write8(uint32_t address, uint32_t data);