Commit f04308e45274d0e74546870ea7b02aaef07b077e
1 parent
59ae540c
same PCI parameters as PIIX3
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@1600 c046a42c-6fe2-441c-8c8c-71466251a162
Showing
1 changed file
with
3 additions
and
3 deletions
hw/usb-uhci.c
... | ... | @@ -106,7 +106,7 @@ static void uhci_update_irq(UHCIState *s) |
106 | 106 | } else { |
107 | 107 | level = 0; |
108 | 108 | } |
109 | - pci_set_irq(&s->dev, 0, level); | |
109 | + pci_set_irq(&s->dev, 3, level); | |
110 | 110 | } |
111 | 111 | |
112 | 112 | static void uhci_reset(UHCIState *s) |
... | ... | @@ -642,7 +642,7 @@ void usb_uhci_init(PCIBus *bus, USBPort **usb_ports) |
642 | 642 | |
643 | 643 | s = (UHCIState *)pci_register_device(bus, |
644 | 644 | "USB-UHCI", sizeof(UHCIState), |
645 | - -1, | |
645 | + ((PCIDevice *)piix3_state)->devfn + 2, | |
646 | 646 | NULL, NULL); |
647 | 647 | pci_conf = s->dev.config; |
648 | 648 | pci_conf[0x00] = 0x86; |
... | ... | @@ -654,7 +654,7 @@ void usb_uhci_init(PCIBus *bus, USBPort **usb_ports) |
654 | 654 | pci_conf[0x0a] = 0x03; |
655 | 655 | pci_conf[0x0b] = 0x0c; |
656 | 656 | pci_conf[0x0e] = 0x00; // header_type |
657 | - pci_conf[0x3d] = 1; // interrupt pin 0 | |
657 | + pci_conf[0x3d] = 4; // interrupt pin 3 | |
658 | 658 | |
659 | 659 | for(i = 0; i < NB_PORTS; i++) { |
660 | 660 | port = &s->ports[i]; | ... | ... |