ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

usb: misc small tweaks. 

-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
 iQIcBAABAgAGBQJWJewZAAoJEEy22O7T6HE4rQQQAL7xe3UNO7OWjQdNg7NoHG2U
 /L79vAhGPYh+uQUK29Box7zDRA+v277rOOTffkwPaNj00WVMVvm6lsjDh4RQMjRk
 PpJCJnO/e5SOPXUCLU+ZJCDtnQYPOWc6MUsDYnKNw+Nl94xEZ9vS0PZunbZ2wa6M
 w8VVDyYxvI/go/TKoqq8JfglYcfGV8sI1Pa5U9pBTEpwm3fXCReyfP6V2yDKIsG/
 A2eO9cfURMXoqliCGcLB7gpsviAOvSOk0z0ojFxxuuwIn8QZhj//J+R3Yp08dD81
 OWXQ6jEWDDyRgUYlFc+JRgnSxXXndsk4zCsjaktXhtg+jUKhX7OAMcWWgbfeTQmC
 zoNNU7BAOJlQ0kKFoZ0D4dFpiB3N9pTgDOKPlSSBFSIO1RwEC3+RKWTjgvSmw+7a
 vGuYZc0oPbWxTDjBNNUSvrnukBlVtEJtQySC/tHb6Yt0cl7a/C/t3KHfUrMH4lOP
 FatMcQhFllzLABKomjkUM0LdHeFX6kE4an0DbtZi/a69B1vhu61NwSumSnVN4S8z
 88qRWfhuYGIN7RkHof4jDRvs6R4GkTJeJl4cXAMK0OL3PMdAr3rMsGo5fhRfRamY
 /unu/UqugzBHbOu4M/0LTDq1UJDbwi/cAy+fkcAn3loEb7PV4Q3nTCH42qX29w2c
 OSKXO8MXj8oSSb1xmJEy
 =tnpP
 -----END PGP SIGNATURE-----

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>
This commit is contained in:
Peter Maydell 2015-10-20 10:52:56 +01:00
parent f52dd72dc1 37bc43f7fb
commit c14e42d7a4
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
hw/usb/bus.c
View File

@ -655,9 +655,12 @@ void hmp_info_usb(Monitor *mon, const QDict *qdict)
dev = port->dev; dev = port->dev;
if (!dev) if (!dev)
continue; continue;
monitor_printf(mon, " Device %d.%d, Port %s, Speed %s Mb/s, Product %s\n", monitor_printf(mon, " Device %d.%d, Port %s, Speed %s Mb/s, "
bus->busnr, dev->addr, port->path, usb_speed(dev->speed), "Product %s%s%s\n",
dev->product_desc); bus->busnr, dev->addr, port->path,
usb_speed(dev->speed), dev->product_desc,
dev->qdev.id ? ", ID: " : "",
dev->qdev.id ?: "");
} }
} }
} }

2
hw/usb/dev-audio.c
View File

@ -664,7 +664,7 @@ static const VMStateDescription vmstate_usb_audio = {
static Property usb_audio_properties[] = { static Property usb_audio_properties[] = {
DEFINE_PROP_UINT32("debug", USBAudioState, debug, 0), DEFINE_PROP_UINT32("debug", USBAudioState, debug, 0),
DEFINE_PROP_UINT32("buffer", USBAudioState, buffer, DEFINE_PROP_UINT32("buffer", USBAudioState, buffer,
8 * USBAUDIO_PACKET_SIZE), 32 * USBAUDIO_PACKET_SIZE),
DEFINE_PROP_END_OF_LIST(), DEFINE_PROP_END_OF_LIST(),
}; };

1
hw/usb/host-libusb.c
View File

@ -451,6 +451,7 @@ static void usb_host_req_complete_iso(struct libusb_transfer *transfer)
} }
if (xfer->ring->ep->pid == USB_TOKEN_IN) { if (xfer->ring->ep->pid == USB_TOKEN_IN) {
QTAILQ_INSERT_TAIL(&xfer->ring->copy, xfer, next); QTAILQ_INSERT_TAIL(&xfer->ring->copy, xfer, next);
usb_wakeup(xfer->ring->ep, 0);
} else { } else {
QTAILQ_INSERT_TAIL(&xfer->ring->unused, xfer, next); QTAILQ_INSERT_TAIL(&xfer->ring->unused, xfer, next);
} }