Commit afb9a60e authored by Gerd Hoffmann's avatar Gerd Hoffmann
Browse files

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: default avatarGerd Hoffmann <kraxel@redhat.com>
parent f1ae32a1

hw/alpha_sys.h

+0 −1
Original line number Diff line number Diff line
@@ -8,7 +8,6 @@ 
#include "ide.h"

#include "net.h"

#include "pc.h"

#include "usb-ohci.h"

#include "irq.h"

hw/mips_fulong2e.c

+4 −3
Original line number Diff line number Diff line
@@ -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);

hw/mips_malta.c

+1 −2
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ 
#include "mips.h"

#include "mips_cpudevs.h"

#include "pci.h"

#include "usb-uhci.h"

#include "vmware_vga.h"

#include "qemu-char.h"

#include "sysemu.h"
@@ -965,7 +964,7 @@ void mips_malta_init (ram_addr_t ram_size, 


    isa_bus_irqs(isa_bus, s->i8259);

    pci_piix4_ide_init(pci_bus, hd, piix4_devfn + 1);

    usb_uhci_piix4_init(pci_bus, piix4_devfn + 2);

    pci_create_simple(pci_bus, piix4_devfn + 2, "piix4-usb-uhci");

    smbus = piix4_pm_init(pci_bus, piix4_devfn + 3, 0x1100,

                          isa_get_irq(NULL, 9), NULL, 0);

    /* TODO: Populate SPD eeprom data.  */

hw/pc_piix.c

+1 −3
Original line number Diff line number Diff line
@@ -28,8 +28,6 @@ 
#include "pc.h"

#include "apic.h"

#include "pci.h"

#include "usb-uhci.h"

#include "usb-ohci.h"

#include "net.h"

#include "boards.h"

#include "ide.h"
@@ -284,7 +282,7 @@ static void pc_init1(MemoryRegion *system_memory, 
                 floppy, idebus[0], idebus[1], rtc_state);



    if (pci_enabled && usb_enabled) {

        usb_uhci_piix3_init(pci_bus, piix3_devfn + 2);

        pci_create_simple(pci_bus, piix3_devfn + 2, "piix3-usb-uhci");

    }



    if (pci_enabled && acpi_enabled) {

hw/ppc_newworld.c

+1 −2
Original line number Diff line number Diff line
@@ -54,7 +54,6 @@ 
#include "nvram.h"

#include "pc.h"

#include "pci.h"

#include "usb-ohci.h"

#include "net.h"

#include "sysemu.h"

#include "boards.h"
@@ -352,7 +351,7 @@ static void ppc_core99_init (ram_addr_t ram_size, 
               dbdma_mem, cuda_mem, NULL, 3, ide_mem, escc_bar);



    if (usb_enabled) {

        usb_ohci_init_pci(pci_bus, -1);

        pci_create_simple(pci_bus, -1, "pci-ohci");

    }



    /* U3 needs to use USB for input because Linux doesn't support via-cuda