Commit 2c96c379 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/kraxel/tags/pull-usb-20160613-1' into staging 



usb: misc fixes.

# gpg: Signature made Mon 13 Jun 2016 14:09:15 BST
# gpg:                using RSA key 0x4CB6D8EED3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>"
# gpg:                 aka "Gerd Hoffmann <gerd@kraxel.org>"
# gpg:                 aka "Gerd Hoffmann (private) <kraxel@gmail.com>"
# Primary key fingerprint: A032 8CFF B93A 17A7 9901  FE7D 4CB6 D8EE D3E8 7138

* remotes/kraxel/tags/pull-usb-20160613-1:
  vl: Eliminate usb_enabled()
  pxa2xx: Unconditionally enable USB controller
  hw/usb/dev-network.c: Use ldl_le_p() and stl_le_p()
  usb-host: add special case for bus+addr

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 55e5c3a2 4bcbe0b6

hw/arm/nseries.c

+1 −1
Original line number Diff line number Diff line
@@ -1351,7 +1351,7 @@ static void n8x0_init(MachineState *machine, 
    n8x0_dss_setup(s);

    n8x0_cbus_setup(s);

    n8x0_uart_setup(s);

    if (usb_enabled()) {

    if (machine_usb(machine)) {

        n8x0_usb_setup(s);

    }

hw/arm/pxa2xx.c

+4 −8
Original line number Diff line number Diff line
@@ -2165,10 +2165,8 @@ PXA2xxState *pxa270_init(MemoryRegion *address_space, 
        s->ssp[i] = (SSIBus *)qdev_get_child_bus(dev, "ssi");

    }



    if (usb_enabled()) {

    sysbus_create_simple("sysbus-ohci", 0x4c000000,

                         qdev_get_gpio_in(s->pic, PXA2XX_PIC_USBH1));

    }



    s->pcmcia[0] = pxa2xx_pcmcia_init(address_space, 0x20000000);

    s->pcmcia[1] = pxa2xx_pcmcia_init(address_space, 0x30000000);
@@ -2298,10 +2296,8 @@ PXA2xxState *pxa255_init(MemoryRegion *address_space, unsigned int sdram_size) 
        s->ssp[i] = (SSIBus *)qdev_get_child_bus(dev, "ssi");

    }



    if (usb_enabled()) {

    sysbus_create_simple("sysbus-ohci", 0x4c000000,

                         qdev_get_gpio_in(s->pic, PXA2XX_PIC_USBH1));

    }



    s->pcmcia[0] = pxa2xx_pcmcia_init(address_space, 0x20000000);

    s->pcmcia[1] = pxa2xx_pcmcia_init(address_space, 0x30000000);

hw/arm/realview.c

+1 −1
Original line number Diff line number Diff line
@@ -254,7 +254,7 @@ static void realview_init(MachineState *machine, 
        sysbus_connect_irq(busdev, 2, pic[50]);

        sysbus_connect_irq(busdev, 3, pic[51]);

        pci_bus = (PCIBus *)qdev_get_child_bus(dev, "pci");

        if (usb_enabled()) {

        if (machine_usb(machine)) {

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

        }

        n = drive_get_max_bus(IF_SCSI);

hw/arm/versatilepb.c

+1 −1
Original line number Diff line number Diff line
@@ -276,7 +276,7 @@ static void versatile_init(MachineState *machine, int board_id) 
            pci_nic_init_nofail(nd, pci_bus, "rtl8139", NULL);

        }

    }

    if (usb_enabled()) {

    if (machine_usb(machine)) {

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

    }

    n = drive_get_max_bus(IF_SCSI);

hw/i386/pc_piix.c

+1 −1
Original line number Diff line number Diff line
@@ -262,7 +262,7 @@ static void pc_init1(MachineState *machine, 


    pc_cmos_init(pcms, idebus[0], idebus[1], rtc_state);



    if (pcmc->pci_enabled && usb_enabled()) {

    if (pcmc->pci_enabled && machine_usb(machine)) {

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

    }