serial load/save VM support (Vincent Pelletier)

[qemu] / hw / pc.c

diff --git a/hw/pc.c b/hw/pc.c
index dac125c..324f536 100644 (file)
--- a/hw/pc.c
+++ b/hw/pc.c
@@ -41,6 +41,7 @@ int dummy_refresh_clock;
 static fdctrl_t *floppy_controller;
 static RTCState *rtc_state;
 static PITState *pit;
+static IOAPICState *ioapic;
 
 static void ioport80_write(void *opaque, uint32_t addr, uint32_t data)
 {
@@ -65,6 +66,31 @@ uint64_t cpu_get_tsc(CPUX86State *env)
     return qemu_get_clock(vm_clock);
 }
 
+/* IRQ handling */
+int cpu_get_pic_interrupt(CPUState *env)
+{
+    int intno;
+
+    intno = apic_get_interrupt(env);
+    if (intno >= 0) {
+        /* set irq request if a PIC irq is still pending */
+        /* XXX: improve that */
+        pic_update_irq(isa_pic); 
+        return intno;
+    }
+    /* read the irq from the PIC */
+    intno = pic_read_irq(isa_pic);
+    return intno;
+}
+
+static void pic_irq_request(void *opaque, int level)
+{
+    if (level)
+        cpu_interrupt(cpu_single_env, CPU_INTERRUPT_HARD);
+    else
+        cpu_reset_interrupt(cpu_single_env, CPU_INTERRUPT_HARD);
+}
+
 /* PC cmos mappings */
 
 #define REG_EQUIPMENT_BYTE          0x14
@@ -390,7 +416,7 @@ static void pc_init1(int ram_size, int vga_ram_size, int boot_device,
     unsigned long bios_offset, vga_bios_offset;
     int bios_size, isa_bios_size;
     PCIBus *pci_bus;
-    
+
     linux_boot = (kernel_filename != NULL);
 
     /* allocate RAM */
@@ -520,7 +546,7 @@ static void pc_init1(int ram_size, int vga_ram_size, int boot_device,
         }
     } else {
         vga_initialize(pci_bus, ds, phys_ram_base + ram_size, ram_size, 
-                       vga_ram_size);
+                       vga_ram_size, 0, 0);
     }
 
     rtc_state = rtc_init(0x70, 8);
@@ -530,10 +556,15 @@ static void pc_init1(int ram_size, int vga_ram_size, int boot_device,
     register_ioport_read(0x92, 1, 1, ioport92_read, NULL);
     register_ioport_write(0x92, 1, 1, ioport92_write, NULL);
 
-    if (pci_enabled)
+    if (pci_enabled) {
         apic_init(cpu_single_env);
-    pic_init();
+        ioapic = ioapic_init();
+    }
+    isa_pic = pic_init(pic_irq_request, cpu_single_env);
     pit = pit_init(0x40, 0);
+    if (pci_enabled) {
+        pic_set_alt_irq_func(isa_pic, ioapic_set_irq, ioapic);
+    }
 
     for(i = 0; i < MAX_SERIAL_PORTS; i++) {
         if (serial_hds[i]) {
@@ -570,25 +601,58 @@ static void pc_init1(int ram_size, int vga_ram_size, int boot_device,
     DMA_init(0);
 
     if (audio_enabled) {
-        AUD_init();
-#ifdef USE_SB16
-        if (sb16_enabled)
-            SB16_init ();
-#endif
+        AudioState *audio;
+
+        audio = AUD_init();
+        if (audio) {
+            if (sb16_enabled)
+                SB16_init (audio);
 #ifdef CONFIG_ADLIB
-        if (adlib_enabled)
-            Adlib_init ();
+            if (adlib_enabled)
+                Adlib_init (audio);
 #endif
-#ifdef USE_GUS
-        if (gus_enabled)
-            GUS_init ();
+#ifdef CONFIG_GUS
+            if (gus_enabled)
+                GUS_init (audio);
 #endif
+            if (pci_enabled && es1370_enabled)
+                es1370_init (pci_bus, audio);
+        }
     }
 
     floppy_controller = fdctrl_init(6, 2, 0, 0x3f0, fd_table);
 
     cmos_init(ram_size, boot_device, bs_table);
 
+    if (pci_enabled && usb_enabled) {
+        USBPort *usb_root_ports[2];
+        USBDevice *usb_dev;
+        usb_uhci_init(pci_bus, usb_root_ports);
+#if 0
+        {
+            USBPort *usb_hub1_ports[4];
+            USBPort *usb_hub2_ports[2];
+            /* test: we simulate a USB hub */
+            usb_dev = usb_hub_init(usb_hub1_ports, 4);
+            usb_attach(usb_root_ports[0], usb_dev);
+            
+            /* test: we simulate a USB hub */
+            usb_dev = usb_hub_init(usb_hub2_ports, 2);
+            usb_attach(usb_hub1_ports[0], usb_dev);
+        }
+#endif
+#if 0
+        /* USB mouse */
+        usb_dev = usb_mouse_init();
+        usb_attach(usb_root_ports[0], usb_dev);
+#endif
+#if 1
+        /* simulated hub with the host USB devices connected to it */
+        usb_dev = usb_host_hub_init();
+        usb_attach(usb_root_ports[0], usb_dev);
+#endif
+    }
+
     /* must be done after all PCI devices are instanciated */
     /* XXX: should be done in the Bochs BIOS */
     if (pci_enabled) {