diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2015-10-20 10:52:56 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2015-10-20 10:52:56 +0100 |
| commit | c14e42d7a4495ecbad7bf8b3d603272e3a8992a1 (patch) | |
| tree | 66a8c6ae440d391bae215e5e18c32eb094fee61d | |
| parent | f52dd72dc1a679529e13e51a7b57e787455f92f0 (diff) | |
| parent | 37bc43f7fbfb38003550b327002e59d21b80a3e4 (diff) | |
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: Peter Maydell <peter.maydell@linaro.org>
| -rw-r--r-- | hw/usb/bus.c | 9 | ||||
| -rw-r--r-- | hw/usb/dev-audio.c | 2 | ||||
| -rw-r--r-- | hw/usb/host-libusb.c | 1 |
3 files changed, 8 insertions, 4 deletions
diff --git a/hw/usb/bus.c b/hw/usb/bus.c index 5f39e1e3ac..ee6b43abc6 100644 --- a/hw/usb/bus.c +++ b/hw/usb/bus.c @@ -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 ?: ""); } } } diff --git a/hw/usb/dev-audio.c b/hw/usb/dev-audio.c index f092bb8496..02fb1103c6 100644 --- a/hw/usb/dev-audio.c +++ b/hw/usb/dev-audio.c @@ -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(), }; diff --git a/hw/usb/host-libusb.c b/hw/usb/host-libusb.c index 5e492fda0f..7695a97143 100644 --- a/hw/usb/host-libusb.c +++ b/hw/usb/host-libusb.c @@ -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); } |