diff options
| author | Gerd Hoffmann <kraxel@redhat.com> | 2012-03-07 15:06:32 +0100 |
|---|---|---|
| committer | Gerd Hoffmann <kraxel@redhat.com> | 2012-03-13 10:15:32 +0100 |
| commit | afb9a60ecb391cbccfd38e6bf400ebfcf40c5d0c (patch) | |
| tree | 85c52e53dc2c751c84db838d3ccdae5be00258b4 /hw/mips_fulong2e.c | |
| parent | f1ae32a1ecda8aaff7a355c9030c0d8c363f3a70 (diff) | |
| download | qemu-afb9a60ecb391cbccfd38e6bf400ebfcf40c5d0c.zip qemu-afb9a60ecb391cbccfd38e6bf400ebfcf40c5d0c.tar.gz qemu-afb9a60ecb391cbccfd38e6bf400ebfcf40c5d0c.tar.bz2 | |
usb: zap hw/ush-{ohic,uhci}.h + init wrappers
Remove the uhci and ohci init wrappers, which all wrapped a
pci_create_simple() one-liner. Switch callsites to call
pci_create_simple directly. Remove the header files where
the wrappers where declared.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Diffstat (limited to 'hw/mips_fulong2e.c')
| -rw-r--r-- | hw/mips_fulong2e.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/hw/mips_fulong2e.c b/hw/mips_fulong2e.c index e3ba9dd..efdfdc2 100644 --- a/hw/mips_fulong2e.c +++ b/hw/mips_fulong2e.c @@ -29,7 +29,6 @@ #include "mips.h" #include "mips_cpudevs.h" #include "pci.h" -#include "usb-uhci.h" #include "qemu-char.h" #include "sysemu.h" #include "audio/audio.h" @@ -355,8 +354,10 @@ static void mips_fulong2e_init(ram_addr_t ram_size, const char *boot_device, isa_bus_irqs(isa_bus, i8259); vt82c686b_ide_init(pci_bus, hd, PCI_DEVFN(FULONG2E_VIA_SLOT, 1)); - usb_uhci_vt82c686b_init(pci_bus, PCI_DEVFN(FULONG2E_VIA_SLOT, 2)); - usb_uhci_vt82c686b_init(pci_bus, PCI_DEVFN(FULONG2E_VIA_SLOT, 3)); + pci_create_simple(pci_bus, PCI_DEVFN(FULONG2E_VIA_SLOT, 2), + "vt82c686b-usb-uhci"); + pci_create_simple(pci_bus, PCI_DEVFN(FULONG2E_VIA_SLOT, 3), + "vt82c686b-usb-uhci"); smbus = vt82c686b_pm_init(pci_bus, PCI_DEVFN(FULONG2E_VIA_SLOT, 4), 0xeee1, NULL); |