diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2013-02-21 09:39:17 -0600 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2013-02-21 09:39:17 -0600 |
| commit | 70aa41b56ce3f34fceac44e828ba2d8cc19523ee (patch) | |
| tree | 360b9559d0ed7faa747da79e5ae2958e933cb785 /hw/usb/hcd-musb.c | |
| parent | 259dc0c1ce8eef14e5e0c349bc68ba05c9d5d82f (diff) | |
| parent | 89a453d4a5c195e6d0a3c3d4fcaacb447447115f (diff) | |
| download | qemu-70aa41b56ce3f34fceac44e828ba2d8cc19523ee.zip qemu-70aa41b56ce3f34fceac44e828ba2d8cc19523ee.tar.gz qemu-70aa41b56ce3f34fceac44e828ba2d8cc19523ee.tar.bz2 | |
Merge remote-tracking branch 'kraxel/usb.78' into staging
# By Gerd Hoffmann
# Via Gerd Hoffmann
* kraxel/usb.78:
uas-uas: usb3 streams
usb-xhci: usb3 streams
usb-core: usb3 streams
usb: fix endpoint descriptor ordering
usb-redir: simplify packet copy
usb: make usb_packet_copy operate on combined packets
usb: add usb_ep_set_halted
usb-host: remove usb_host_device_close
usb-host: move legacy cmd line bits
usb-storage: use scsi_req_enqueue return value
allow disabling usb smartcard support
make usb devices configurable
fix scripts/make_device_config.sh
usb: Makefile cleanup
Diffstat (limited to 'hw/usb/hcd-musb.c')
| -rw-r--r-- | hw/usb/hcd-musb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/usb/hcd-musb.c b/hw/usb/hcd-musb.c index 64e9e83..7968e17 100644 --- a/hw/usb/hcd-musb.c +++ b/hw/usb/hcd-musb.c @@ -625,7 +625,7 @@ static void musb_packet(MUSBState *s, MUSBEndPoint *ep, /* A wild guess on the FADDR semantics... */ dev = usb_find_device(&s->port, ep->faddr[idx]); uep = usb_ep_get(dev, pid, ep->type[idx] & 0xf); - usb_packet_setup(&ep->packey[dir].p, pid, uep, + usb_packet_setup(&ep->packey[dir].p, pid, uep, 0, (dev->addr << 16) | (uep->nr << 8) | pid, false, true); usb_packet_addbuf(&ep->packey[dir].p, ep->buf[idx], len); ep->packey[dir].ep = ep; |