PS2 mouse and keyboard separation (Paul Brook)

[qemu] / hw / mips_r4k.c

diff --git a/hw/mips_r4k.c b/hw/mips_r4k.c
index 44f1ba4..b1c708c 100644 (file)
--- a/hw/mips_r4k.c
+++ b/hw/mips_r4k.c
@@ -1,77 +1,24 @@
 #include "vl.h"
 
-#define DEBUG_IRQ_COUNT
-
 #define BIOS_FILENAME "mips_bios.bin"
 //#define BIOS_FILENAME "system.bin"
 #define KERNEL_LOAD_ADDR 0x80010000
 #define INITRD_LOAD_ADDR 0x80800000
 
-/* MIPS R4K IRQ controler */
-#if defined(DEBUG_IRQ_COUNT)
-static uint64_t irq_count[16];
-#endif
-
 extern FILE *logfile;
 
-void mips_set_irq (int n_IRQ, int level)
-{
-    uint32_t mask;
+static PITState *pit;
 
-    if (n_IRQ < 0 || n_IRQ >= 8)
-        return;
-    mask = 0x100 << n_IRQ;
-    if (level != 0) {
-#if 1
-        if (logfile) {
-            fprintf(logfile, "%s n %d l %d mask %08x %08x\n",
-                    __func__, n_IRQ, level, mask, cpu_single_env->CP0_Status);
-        }
-#endif
-        cpu_single_env->CP0_Cause |= mask;
-        if ((cpu_single_env->CP0_Status & 0x00000001) &&
-            (cpu_single_env->CP0_Status & mask)) {
-#if defined(DEBUG_IRQ_COUNT)
-            irq_count[n_IRQ]++;
-#endif
-#if 1
-            if (logfile)
-                fprintf(logfile, "%s raise IRQ\n", __func__);
-#endif
-            cpu_interrupt(cpu_single_env, CPU_INTERRUPT_HARD);
-        }
-    } else {
-        cpu_single_env->CP0_Cause &= ~mask;
-    }
-}
-
-void pic_set_irq (int n_IRQ, int level)
-{
-    mips_set_irq(n_IRQ + 2, level);
-}
-
-void pic_info (void)
-{
-    term_printf("IRQ asserted: %02x mask: %02x\n",
-                (cpu_single_env->CP0_Cause >> 8) & 0xFF,
-                (cpu_single_env->CP0_Status >> 8) & 0xFF);
-}
-
-void irq_info (void)
+static void pic_irq_request(void *opaque, int level)
 {
-#if !defined(DEBUG_IRQ_COUNT)
-    term_printf("irq statistic code not compiled.\n");
-#else
-    int i;
-    int64_t count;
-
-    term_printf("IRQ statistics:\n");
-    for (i = 0; i < 8; i++) {
-        count = irq_count[i];
-        if (count > 0)
-            term_printf("%2d: %lld\n", i, count);
+    CPUState *env = first_cpu;
+    if (level) {
+        env->CP0_Cause |= 0x00000400;
+        cpu_interrupt(env, CPU_INTERRUPT_HARD);
+    } else {
+       env->CP0_Cause &= ~0x00000400;
+        cpu_reset_interrupt(env, CPU_INTERRUPT_HARD);
     }
-#endif
 }
 
 void cpu_mips_irqctrl_init (void)
@@ -128,7 +75,8 @@ void cpu_mips_store_count (CPUState *env, uint32_t value)
 void cpu_mips_store_compare (CPUState *env, uint32_t value)
 {
     cpu_mips_update_count(env, cpu_mips_get_count(env), value);
-    pic_set_irq(5, 0);
+    env->CP0_Cause &= ~0x00008000;
+    cpu_reset_interrupt(env, CPU_INTERRUPT_HARD);
 }
 
 static void mips_timer_cb (void *opaque)
@@ -142,7 +90,8 @@ static void mips_timer_cb (void *opaque)
     }
 #endif
     cpu_mips_update_count(env, cpu_mips_get_count(env), env->CP0_Compare);
-    pic_set_irq(5, 1);
+    env->CP0_Cause |= 0x00008000;
+    cpu_interrupt(env, CPU_INTERRUPT_HARD);
 }
 
 void cpu_mips_clock_init (CPUState *env)
@@ -233,9 +182,14 @@ void mips_r4k_init (int ram_size, int vga_ram_size, int boot_device,
     int io_memory;
     int linux_boot;
     int ret;
+    CPUState *env;
 
     printf("%s: start\n", __func__);
     linux_boot = (kernel_filename != NULL);
+
+    env = cpu_init();
+    register_savevm("cpu", 0, 3, cpu_save, cpu_load, env);
+
     /* allocate RAM */
     cpu_register_physical_memory(0, ram_size, IO_MEM_RAM);
     bios_offset = ram_size + vga_ram_size;
@@ -250,9 +204,9 @@ void mips_r4k_init (int ram_size, int vga_ram_size, int boot_device,
                                  BIOS_SIZE, bios_offset | IO_MEM_ROM);
 #if 0
     memcpy(phys_ram_base + 0x10000, phys_ram_base + bios_offset, BIOS_SIZE);
-    cpu_single_env->PC = 0x80010004;
+    env->PC = 0x80010004;
 #else
-    cpu_single_env->PC = 0xBFC00004;
+    env->PC = 0xBFC00004;
 #endif
     if (linux_boot) {
         kernel_base = KERNEL_LOAD_ADDR;
@@ -278,7 +232,7 @@ void mips_r4k_init (int ram_size, int vga_ram_size, int boot_device,
             initrd_base = 0;
             initrd_size = 0;
         }
-        cpu_single_env->PC = KERNEL_LOAD_ADDR;
+        env->PC = KERNEL_LOAD_ADDR;
     } else {
         kernel_base = 0;
         kernel_size = 0;
@@ -287,7 +241,7 @@ void mips_r4k_init (int ram_size, int vga_ram_size, int boot_device,
     }
 
     /* Init internal devices */
-    cpu_mips_clock_init(cpu_single_env);
+    cpu_mips_clock_init(env);
     cpu_mips_irqctrl_init();
 
     /* Register 64 KB of ISA IO space at 0x14000000 */
@@ -295,9 +249,11 @@ void mips_r4k_init (int ram_size, int vga_ram_size, int boot_device,
     cpu_register_physical_memory(0x14000000, 0x00010000, io_memory);
     isa_mem_base = 0x10000000;
 
-    serial_init(0x3f8, 4, serial_hds[0]);
+    isa_pic = pic_init(pic_irq_request, env);
+    pit = pit_init(0x40, 0);
+    serial_init(&pic_set_irq_new, isa_pic, 0x3f8, 4, serial_hds[0]);
     vga_initialize(NULL, ds, phys_ram_base + ram_size, ram_size, 
-                   vga_ram_size);
+                   vga_ram_size, 0, 0);
 
     isa_ne2000_init(0x300, 9, &nd_table[0]);
 }