PC parallel port support (Mark Jonckheere)

[qemu] / hw / pc.c

diff --git a/hw/pc.c b/hw/pc.c
index 74b3b8d..5deb445 100644 (file)
--- a/hw/pc.c
+++ b/hw/pc.c
@@ -215,25 +215,29 @@ static void cmos_init(int ram_size, int boot_device, BlockDriverState **hd_table
         cmos_init_hd(0x1a, 0x24, hd_table[1]);
 
     val = 0;
-    for (i = 0; i < 4; i++)
+    for (i = 0; i < 4; i++) {
         if (hd_table[i]) {
-            int cylinders, heads, sectors;
-            uint8_t translation;
-            
-            bdrv_get_geometry_hint(hd_table[i], &cylinders, &heads, &sectors);
-            if (cylinders <= 1024 && heads <= 16 && sectors <= 63) {
-                /* No translation. */
-                translation = 0;
-            } else if (cylinders * heads > 131072) {
-                /* LBA translation. */
-                translation = 1;
+            int cylinders, heads, sectors, translation;
+            /* NOTE: bdrv_get_geometry_hint() returns the physical
+                geometry.  It is always such that: 1 <= sects <= 63, 1
+                <= heads <= 16, 1 <= cylinders <= 16383. The BIOS
+                geometry can be different if a translation is done. */
+            translation = bdrv_get_translation_hint(hd_table[i]);
+            if (translation == BIOS_ATA_TRANSLATION_AUTO) {
+                bdrv_get_geometry_hint(hd_table[i], &cylinders, &heads, &sectors);
+                if (cylinders <= 1024 && heads <= 16 && sectors <= 63) {
+                    /* No translation. */
+                    translation = 0;
+                } else {
+                    /* LBA translation. */
+                    translation = 1;
+                }
             } else {
-                /* LARGE translation. */
-                translation = 2;
+                translation--;
             }
-
             val |= translation << (i * 2);
         }
+    }
     rtc_set_memory(s, 0x39, val);
 
     /* Disable check of 0x55AA signature on the last two bytes of
@@ -372,6 +376,9 @@ static int ne2000_irq[NE2000_NB_MAX] = { 9, 10, 11, 3, 4, 5 };
 static int serial_io[MAX_SERIAL_PORTS] = { 0x3f8, 0x2f8, 0x3e8, 0x2e8 };
 static int serial_irq[MAX_SERIAL_PORTS] = { 4, 3, 4, 3 };
 
+static int parallel_io[MAX_PARALLEL_PORTS] = { 0x378, 0x278, 0x3bc };
+static int parallel_irq[MAX_PARALLEL_PORTS] = { 7, 7, 7 };
+
 /* PC hardware initialisation */
 void pc_init(int ram_size, int vga_ram_size, int boot_device,
              DisplayState *ds, const char **fd_filename, int snapshot,
@@ -523,6 +530,8 @@ void pc_init(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)
+        apic_init(cpu_single_env);
     pic_init();
     pit = pit_init(0x40, 0);
 
@@ -532,6 +541,12 @@ void pc_init(int ram_size, int vga_ram_size, int boot_device,
         }
     }
 
+    for(i = 0; i < MAX_PARALLEL_PORTS; i++) {
+        if (parallel_hds[i]) {
+            parallel_init(parallel_io[i], parallel_irq[i], parallel_hds[i]);
+        }
+    }
+
     if (pci_enabled) {
         for(i = 0; i < nb_nics; i++) {
             pci_ne2000_init(pci_bus, &nd_table[i]);
@@ -554,13 +569,21 @@ void pc_init(int ram_size, int vga_ram_size, int boot_device,
     kbd_init();
     DMA_init(0);
 
-#ifndef _WIN32
     if (audio_enabled) {
-        /* no audio supported yet for win32 */
         AUD_init();
-        SB16_init();
-    }
+#ifdef USE_SB16
+        if (sb16_enabled)
+            SB16_init ();
+#endif
+#ifdef CONFIG_ADLIB
+        if (adlib_enabled)
+            Adlib_init ();
 #endif
+#ifdef USE_GUS
+        if (gus_enabled)
+            GUS_init ();
+#endif
+    }
 
     floppy_controller = fdctrl_init(6, 2, 0, 0x3f0, fd_table);