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

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



- xhci improvements and fixes.
- uhci bugfix.
- cleanups.

# gpg: Signature made Tue 18 Feb 2014 15:48:10 GMT using RSA key ID D3E87138
# 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>"

* remotes/kraxel/tags/pull-usb-3:
  xhci: use DPRINTF() instead of fprintf(stderr, ...)
  xhci: switch debug printf to tracepoint
  xhci iso: allow for some latency
  xhci iso: fix time calculation
  uhci: invalidate queue on device address changes
  xhci: fix overflow in usb_xhci_post_load
  usb: Remove magic constants from device bmAttributes

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 3d2bb5cc d6bb65fc

hw/usb/desc.c

+1 −1
Original line number Diff line number Diff line
@@ -759,7 +759,7 @@ int usb_desc_handle_control(USBDevice *dev, USBPacket *p, 
         * We return the same value that a configured device would return if

         * it used the first configuration.

         */

        if (config->bmAttributes & 0x40) {

        if (config->bmAttributes & USB_CFG_ATT_SELFPOWER) {

            data[0] |= 1 << USB_DEVICE_SELF_POWERED;

        }

        if (dev->remote_wakeup) {

hw/usb/dev-audio.c

+1 −1
Original line number Diff line number Diff line
@@ -224,7 +224,7 @@ static const USBDescDevice desc_device = { 
            .bNumInterfaces        = 2,

            .bConfigurationValue   = DEV_CONFIG_VALUE,

            .iConfiguration        = STRING_CONFIG,

            .bmAttributes          = 0xc0,

            .bmAttributes          = USB_CFG_ATT_ONE | USB_CFG_ATT_SELFPOWER,

            .bMaxPower             = 0x32,

            .nif = ARRAY_SIZE(desc_iface),

            .ifs = desc_iface,

hw/usb/dev-bluetooth.c

+1 −1
Original line number Diff line number Diff line
@@ -229,7 +229,7 @@ static const USBDescDevice desc_device_bluetooth = { 
        {

            .bNumInterfaces        = 2,

            .bConfigurationValue   = 1,

            .bmAttributes          = 0xc0,

            .bmAttributes          = USB_CFG_ATT_ONE | USB_CFG_ATT_SELFPOWER,

            .bMaxPower             = 0,

            .nif = ARRAY_SIZE(desc_iface_bluetooth),

            .ifs = desc_iface_bluetooth,

hw/usb/dev-hid.c

+4 −4
Original line number Diff line number Diff line
@@ -202,7 +202,7 @@ static const USBDescDevice desc_device_mouse = { 
            .bNumInterfaces        = 1,

            .bConfigurationValue   = 1,

            .iConfiguration        = STR_CONFIG_MOUSE,

            .bmAttributes          = 0xa0,

            .bmAttributes          = USB_CFG_ATT_ONE | USB_CFG_ATT_WAKEUP,

            .bMaxPower             = 50,

            .nif = 1,

            .ifs = &desc_iface_mouse,
@@ -219,7 +219,7 @@ static const USBDescDevice desc_device_tablet = { 
            .bNumInterfaces        = 1,

            .bConfigurationValue   = 1,

            .iConfiguration        = STR_CONFIG_TABLET,

            .bmAttributes          = 0xa0,

            .bmAttributes          = USB_CFG_ATT_ONE | USB_CFG_ATT_WAKEUP,

            .bMaxPower             = 50,

            .nif = 1,

            .ifs = &desc_iface_tablet,
@@ -236,7 +236,7 @@ static const USBDescDevice desc_device_tablet2 = { 
            .bNumInterfaces        = 1,

            .bConfigurationValue   = 1,

            .iConfiguration        = STR_CONFIG_TABLET,

            .bmAttributes          = 0xa0,

            .bmAttributes          = USB_CFG_ATT_ONE | USB_CFG_ATT_WAKEUP,

            .bMaxPower             = 50,

            .nif = 1,

            .ifs = &desc_iface_tablet2,
@@ -253,7 +253,7 @@ static const USBDescDevice desc_device_keyboard = { 
            .bNumInterfaces        = 1,

            .bConfigurationValue   = 1,

            .iConfiguration        = STR_CONFIG_KEYBOARD,

            .bmAttributes          = 0xa0,

            .bmAttributes          = USB_CFG_ATT_ONE | USB_CFG_ATT_WAKEUP,

            .bMaxPower             = 50,

            .nif = 1,

            .ifs = &desc_iface_keyboard,

hw/usb/dev-hub.c

+2 −1
Original line number Diff line number Diff line
@@ -119,7 +119,8 @@ static const USBDescDevice desc_device_hub = { 
        {

            .bNumInterfaces        = 1,

            .bConfigurationValue   = 1,

            .bmAttributes          = 0xe0,

            .bmAttributes          = USB_CFG_ATT_ONE | USB_CFG_ATT_SELFPOWER |

                                     USB_CFG_ATT_WAKEUP,

            .nif = 1,

            .ifs = &desc_iface_hub,

        },