diff options
| author |   pbrook <pbrook@c046a42c-6fe2-441c-8c8c-71466251a162> | 2006-05-13 16:11:23 +0000 |
|---|---|---|
| committer | pbrook <pbrook@c046a42c-6fe2-441c-8c8c-71466251a162> | 2006-05-13 16:11:23 +0000 |
| commit | 502a53952d574717bdb626b651b16cadacab46f4 (patch) | |
| tree | 100d2c38f587f82fd2d683a4544960ab422f8038 /hw/usb-uhci.c | |
| parent | Allow parallel make. (diff) | |
| download | qemu-kvm-502a53952d574717bdb626b651b16cadacab46f4.tar.gz qemu-kvm-502a53952d574717bdb626b651b16cadacab46f4.tar.bz2 qemu-kvm-502a53952d574717bdb626b651b16cadacab46f4.zip | |
Rearrange PCI host emulation code.
Add ARM PCI emulation.
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@1916 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'hw/usb-uhci.c')
| -rw-r--r-- | hw/usb-uhci.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/hw/usb-uhci.c b/hw/usb-uhci.c index 23964f36a..a18833da8 100644 --- a/hw/usb-uhci.c +++ b/hw/usb-uhci.c @@ -638,7 +638,7 @@ static void uhci_map(PCIDevice *pci_dev, int region_num, register_ioport_read(addr, 32, 1, uhci_ioport_readb, s); } -void usb_uhci_init(PCIBus *bus, USBPort **usb_ports) +void usb_uhci_init(PCIBus *bus, USBPort **usb_ports, int devfn) { UHCIState *s; uint8_t *pci_conf; @@ -647,8 +647,7 @@ void usb_uhci_init(PCIBus *bus, USBPort **usb_ports) s = (UHCIState *)pci_register_device(bus, "USB-UHCI", sizeof(UHCIState), - ((PCIDevice *)piix3_state)->devfn + 2, - NULL, NULL); + devfn, NULL, NULL); pci_conf = s->dev.config; pci_conf[0x00] = 0x86; pci_conf[0x01] = 0x80; |