diff options
| author | Gerd Hoffmann <kraxel@redhat.com> | 2012-08-23 13:30:13 +0200 |
|---|---|---|
| committer | Gerd Hoffmann <kraxel@redhat.com> | 2012-08-31 11:57:23 +0200 |
| commit | e983395d30d1d5bfa0ed3ae9c028c130f7c498cc (patch) | |
| tree | 6377ecd839a30655f4a78eee1db5aec531804da7 /hw/usb/hcd-musb.c | |
| parent | 0132b4b6595423c92f54d7e0b172b5d73aaa8375 (diff) | |
| download | qemu-e983395d30d1d5bfa0ed3ae9c028c130f7c498cc.tar.gz | |
usb: unique packet ids
This patch adds IDs to usb packets. Those IDs are (a) supposed to be
unique for the lifecycle of a packet (from packet setup until the packet
is either completed or canceled) and (b) stable across migration.
uhci, ohci, ehci and xhci use the guest physical address of the transfer
descriptor for this.
musb needs a different approach because there is no transfer descriptor.
But musb also doesn't support pipelining, so we have never more than one
packet per endpoint in flight. So we go create an ID based on endpoint
and device address.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Diffstat (limited to 'hw/usb/hcd-musb.c')
| -rw-r--r-- | hw/usb/hcd-musb.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/hw/usb/hcd-musb.c b/hw/usb/hcd-musb.c index fa9385ee49..0bb5c7b19e 100644 --- a/hw/usb/hcd-musb.c +++ b/hw/usb/hcd-musb.c @@ -626,7 +626,8 @@ 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, + (dev->addr << 16) | (uep->nr << 8) | pid); usb_packet_addbuf(&ep->packey[dir].p, ep->buf[idx], len); ep->packey[dir].ep = ep; ep->packey[dir].dir = dir; |