OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

xhci: drop XHCITransfer->{slotid,epid}

Browse Source 
We can use XHCITransfer->epctx->{slotid,epid} instead.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Message-id: 1474965172-30321-8-git-send-email-kraxel@redhat.com
This commit is contained in:
Gerd Hoffmann 2016-09-27 10:32:51 +02:00
parent 3a533ee8fd
commit d6fcb2936f
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
hw/usb/hcd-xhci.c
View File

@ -352,8 +352,6 @@ typedef struct XHCITransfer {
bool complete; bool complete;
bool int_req; bool int_req;
unsigned int iso_pkts; unsigned int iso_pkts;
unsigned int slotid;
unsigned int epid;
unsigned int streamid; unsigned int streamid;
bool in_xfer; bool in_xfer;
bool iso_xfer; bool iso_xfer;
@ -1450,8 +1448,6 @@ static XHCITransfer *xhci_ep_alloc_xfer(XHCIEPContext *epctx,
xfer = g_new0(XHCITransfer, 1); xfer = g_new0(XHCITransfer, 1);
xfer->epctx = epctx; xfer->epctx = epctx;
xfer->slotid = epctx->slotid;
xfer->epid = epctx->epid;
xfer->trbs = g_new(XHCITRB, length); xfer->trbs = g_new(XHCITRB, length);
xfer->trb_count = length; xfer->trb_count = length;
usb_packet_init(&xfer->packet); usb_packet_init(&xfer->packet);
@ -1816,8 +1812,8 @@ static void xhci_xfer_report(XHCITransfer *xfer)
if (!reported && ((trb->control & TRB_TR_IOC) || if (!reported && ((trb->control & TRB_TR_IOC) ||
(shortpkt && (trb->control & TRB_TR_ISP)) || (shortpkt && (trb->control & TRB_TR_ISP)) ||
(xfer->status != CC_SUCCESS && left == 0))) { (xfer->status != CC_SUCCESS && left == 0))) {
event.slotid = xfer->slotid; event.slotid = xfer->epctx->slotid;
event.epid = xfer->epid; event.epid = xfer->epctx->epid;
event.length = (trb->status & 0x1ffff) - chunk; event.length = (trb->status & 0x1ffff) - chunk;
event.flags = 0; event.flags = 0;
event.ptr = trb->addr; event.ptr = trb->addr;
@ -1886,7 +1882,7 @@ static int xhci_setup_packet(XHCITransfer *xfer)
if (xfer->packet.ep) { if (xfer->packet.ep) {
ep = xfer->packet.ep; ep = xfer->packet.ep;
} else { } else {
ep = xhci_epid_to_usbep(xhci, xfer->slotid, xfer->epid); ep = xhci_epid_to_usbep(xhci, xfer->epctx->slotid, xfer->epctx->epid);
if (!ep) { if (!ep) {
DPRINTF("xhci: slot %d has no device\n", DPRINTF("xhci: slot %d has no device\n",
xfer->slotid); xfer->slotid);
@ -1966,7 +1962,8 @@ static int xhci_fire_ctl_transfer(XHCIState *xhci, XHCITransfer *xfer)
trb_setup = &xfer->trbs[0]; trb_setup = &xfer->trbs[0];
trb_status = &xfer->trbs[xfer->trb_count-1]; trb_status = &xfer->trbs[xfer->trb_count-1];
trace_usb_xhci_xfer_start(xfer, xfer->slotid, xfer->epid, xfer->streamid); trace_usb_xhci_xfer_start(xfer, xfer->epctx->slotid,
xfer->epctx->epid, xfer->streamid);
/* at most one Event Data TRB allowed after STATUS */ /* at most one Event Data TRB allowed after STATUS */
if (TRB_TYPE(*trb_status) == TR_EVDATA && xfer->trb_count > 2) { if (TRB_TYPE(*trb_status) == TR_EVDATA && xfer->trb_count > 2) {
@ -2120,7 +2117,8 @@ static int xhci_submit(XHCIState *xhci, XHCITransfer *xfer, XHCIEPContext *epctx
static int xhci_fire_transfer(XHCIState *xhci, XHCITransfer *xfer, XHCIEPContext *epctx) static int xhci_fire_transfer(XHCIState *xhci, XHCITransfer *xfer, XHCIEPContext *epctx)
{ {
trace_usb_xhci_xfer_start(xfer, xfer->slotid, xfer->epid, xfer->streamid); trace_usb_xhci_xfer_start(xfer, xfer->epctx->slotid,
xfer->epctx->epid, xfer->streamid);
return xhci_submit(xhci, xfer, epctx); return xhci_submit(xhci, xfer, epctx);
} }