Commit c14e42d7 authored by Peter Maydell's avatar Peter Maydell
Browse files

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



usb: misc small tweaks.

# gpg: Signature made Tue 20 Oct 2015 08:24:09 BST 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-20151020-1:
  usb-audio: increate default buffer size
  usb: print device id in "info usb" monitor command
  usb-host: add wakeup call for iso xfers

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents f52dd72d 37bc43f7

hw/usb/bus.c

+6 −3
Original line number Diff line number Diff line
@@ -655,9 +655,12 @@ void hmp_info_usb(Monitor *mon, const QDict *qdict) 
            dev = port->dev;

            if (!dev)

                continue;

            monitor_printf(mon, "  Device %d.%d, Port %s, Speed %s Mb/s, Product %s\n",

                           bus->busnr, dev->addr, port->path, usb_speed(dev->speed),

                           dev->product_desc);

            monitor_printf(mon, "  Device %d.%d, Port %s, Speed %s Mb/s, "

                           "Product %s%s%s\n",

                           bus->busnr, dev->addr, port->path,

                           usb_speed(dev->speed), dev->product_desc,

                           dev->qdev.id ? ", ID: " : "",

                           dev->qdev.id ?: "");

        }

    }

}

hw/usb/dev-audio.c

+1 −1
Original line number Diff line number Diff line
@@ -664,7 +664,7 @@ static const VMStateDescription vmstate_usb_audio = { 
static Property usb_audio_properties[] = {

    DEFINE_PROP_UINT32("debug", USBAudioState, debug, 0),

    DEFINE_PROP_UINT32("buffer", USBAudioState, buffer,

                       8 * USBAUDIO_PACKET_SIZE),

                       32 * USBAUDIO_PACKET_SIZE),

    DEFINE_PROP_END_OF_LIST(),

};

hw/usb/host-libusb.c

+1 −0
Original line number Diff line number Diff line
@@ -451,6 +451,7 @@ static void usb_host_req_complete_iso(struct libusb_transfer *transfer) 
    }

    if (xfer->ring->ep->pid == USB_TOKEN_IN) {

        QTAILQ_INSERT_TAIL(&xfer->ring->copy, xfer, next);

        usb_wakeup(xfer->ring->ep, 0);

    } else {

        QTAILQ_INSERT_TAIL(&xfer->ring->unused, xfer, next);

    }