motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-07 17:53:56 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

usb: Set USBEndpoint in usb_packet_setup().

Browse source 
With the separation of the device lookup (via usb_find_device) and
packet processing we can lookup device and endpoint before setting up
the usb packet.  So we can initialize USBPacket->ep early and keep it
valid for the whole lifecycle of the USBPacket.  Also the devaddr and
devep fields are not needed any more.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
Gerd Hoffmann 2012-01-12 13:23:01 +01:00
parent 63095ab54c
commit 079d0b7f1e
19 changed files with 91 additions and 86 deletions
Download patch file Download diff file Expand all files Collapse all files

27
hw/usb-xhci.c
View file

@ -1336,15 +1336,17 @@ static int xhci_hle_control(XHCIState *xhci, XHCITransfer *xfer,
}
#endif
static int xhci_setup_packet(XHCITransfer *xfer, XHCIPort *port, int ep)
static int xhci_setup_packet(XHCITransfer *xfer, XHCIPort *port, USBDevice *dev)
{
usb_packet_setup(&xfer->packet,
xfer->in_xfer ? USB_TOKEN_IN : USB_TOKEN_OUT,
xfer->xhci->slots[xfer->slotid-1].devaddr,
ep & 0x7f);
USBEndpoint *ep;
int dir;
dir = xfer->in_xfer ? USB_TOKEN_IN : USB_TOKEN_OUT;
ep = usb_ep_get(dev, dir, xfer->epid >> 1);
usb_packet_setup(&xfer->packet, dir, ep);
usb_packet_addbuf(&xfer->packet, xfer->data, xfer->data_length);
DPRINTF("xhci: setup packet pid 0x%x addr %d ep %d\n",
xfer->packet.pid, xfer->packet.devaddr, xfer->packet.devep);
xfer->packet.pid, dev->addr, ep->nr);
return 0;
}
@ -1462,7 +1464,7 @@ static int xhci_fire_ctl_transfer(XHCIState *xhci, XHCITransfer *xfer)
xfer->in_xfer = bmRequestType & USB_DIR_IN;
xfer->iso_xfer = false;
xhci_setup_packet(xfer, port, 0);
xhci_setup_packet(xfer, port, dev);
if (!xfer->in_xfer) {
xhci_xfer_data(xfer, xfer->data, wLength, 0, 1, 0);
}
@ -1484,12 +1486,8 @@ static int xhci_submit(XHCIState *xhci, XHCITransfer *xfer, XHCIEPContext *epctx
int ret;
DPRINTF("xhci_submit(slotid=%d,epid=%d)\n", xfer->slotid, xfer->epid);
uint8_t ep = xfer->epid>>1;
xfer->in_xfer = epctx->type>>2;
if (xfer->in_xfer) {
ep |= 0x80;
}
if (xfer->data && xfer->data_alloced < xfer->data_length) {
xfer->data_alloced = 0;
@ -1517,7 +1515,7 @@ static int xhci_submit(XHCIState *xhci, XHCITransfer *xfer, XHCIEPContext *epctx
return -1;
}
xhci_setup_packet(xfer, port, ep);
xhci_setup_packet(xfer, port, dev);
switch(epctx->type) {
case ET_INTR_OUT:
@ -1530,8 +1528,9 @@ static int xhci_submit(XHCIState *xhci, XHCITransfer *xfer, XHCIEPContext *epctx
FIXME();
break;
default:
fprintf(stderr, "xhci: unknown or unhandled EP type %d (ep %02x)\n",
epctx->type, ep);
fprintf(stderr, "xhci: unknown or unhandled EP "
"(type %d, in %d, ep %02x)\n",
epctx->type, xfer->in_xfer, xfer->epid);
return -1;
}