summary refs log tree commit diff stats
path: root/hw/usb-uhci.c
diff options
context:
space:
mode:
authorbellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162>2005-11-05 17:22:48 +0000
committerbellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162>2005-11-05 17:22:48 +0000
commitf04308e45274d0e74546870ea7b02aaef07b077e (patch)
tree6a5fccc4fc218e1b447cc467df000fdc74ea5e9f /hw/usb-uhci.c
parent59ae540c3dbd1ab3fb004e85eaf3aa4f3520a308 (diff)
downloadfocaccia-qemu-f04308e45274d0e74546870ea7b02aaef07b077e.tar.gz
focaccia-qemu-f04308e45274d0e74546870ea7b02aaef07b077e.zip
same PCI parameters as PIIX3
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@1600 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'hw/usb-uhci.c')
-rw-r--r--hw/usb-uhci.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/hw/usb-uhci.c b/hw/usb-uhci.c
index 42417fedae..4dd0c63815 100644
--- a/hw/usb-uhci.c
+++ b/hw/usb-uhci.c
@@ -106,7 +106,7 @@ static void uhci_update_irq(UHCIState *s)
     } else {
         level = 0;
     }
-    pci_set_irq(&s->dev, 0, level);
+    pci_set_irq(&s->dev, 3, level);
 }
 
 static void uhci_reset(UHCIState *s)
@@ -642,7 +642,7 @@ void usb_uhci_init(PCIBus *bus, USBPort **usb_ports)
 
     s = (UHCIState *)pci_register_device(bus,
                                         "USB-UHCI", sizeof(UHCIState),
-                                        -1, 
+                                        ((PCIDevice *)piix3_state)->devfn + 2, 
                                         NULL, NULL);
     pci_conf = s->dev.config;
     pci_conf[0x00] = 0x86;
@@ -654,7 +654,7 @@ void usb_uhci_init(PCIBus *bus, USBPort **usb_ports)
     pci_conf[0x0a] = 0x03;
     pci_conf[0x0b] = 0x0c;
     pci_conf[0x0e] = 0x00; // header_type
-    pci_conf[0x3d] = 1; // interrupt pin 0
+    pci_conf[0x3d] = 4; // interrupt pin 3
     
     for(i = 0; i < NB_PORTS; i++) {
         port = &s->ports[i];