[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 05/11] xhci: drop XHCITransfer->xhci
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PULL 05/11] xhci: drop XHCITransfer->xhci |
Date: |
Wed, 12 Oct 2016 14:58:12 +0200 |
Use XHCITransfer->epctx->xhci instead.
Signed-off-by: Gerd Hoffmann <address@hidden>
Message-id: address@hidden
---
hw/usb/hcd-xhci.c | 22 +++++++++-------------
1 file changed, 9 insertions(+), 13 deletions(-)
diff --git a/hw/usb/hcd-xhci.c b/hw/usb/hcd-xhci.c
index e14c2a8..20f46c4 100644
--- a/hw/usb/hcd-xhci.c
+++ b/hw/usb/hcd-xhci.c
@@ -344,7 +344,6 @@ typedef struct XHCIPort {
} XHCIPort;
typedef struct XHCITransfer {
- XHCIState *xhci;
XHCIEPContext *epctx;
USBPacket packet;
QEMUSGList sgl;
@@ -1449,7 +1448,6 @@ static XHCITransfer *xhci_ep_alloc_xfer(XHCIEPContext
*epctx,
}
xfer = g_new0(XHCITransfer, 1);
- xfer->xhci = epctx->xhci;
xfer->epctx = epctx;
xfer->slotid = epctx->slotid;
xfer->epid = epctx->epid;
@@ -1488,10 +1486,9 @@ static int xhci_ep_nuke_one_xfer(XHCITransfer *t,
TRBCCode report)
killed = 1;
}
if (t->running_retry) {
- XHCIEPContext *epctx = t->xhci->slots[t->slotid-1].eps[t->epid-1];
- if (epctx) {
- epctx->retry = NULL;
- timer_del(epctx->kick_timer);
+ if (t->epctx) {
+ t->epctx->retry = NULL;
+ timer_del(t->epctx->kick_timer);
}
t->running_retry = 0;
killed = 1;
@@ -1721,7 +1718,7 @@ static TRBCCode xhci_set_ep_dequeue(XHCIState *xhci,
unsigned int slotid,
static int xhci_xfer_create_sgl(XHCITransfer *xfer, int in_xfer)
{
- XHCIState *xhci = xfer->xhci;
+ XHCIState *xhci = xfer->epctx->xhci;
int i;
xfer->int_req = false;
@@ -1780,7 +1777,7 @@ static void xhci_xfer_report(XHCITransfer *xfer)
bool reported = 0;
bool shortpkt = 0;
XHCIEvent event = {ER_TRANSFER, CC_SUCCESS};
- XHCIState *xhci = xfer->xhci;
+ XHCIState *xhci = xfer->epctx->xhci;
int i;
left = xfer->packet.actual_length;
@@ -1854,9 +1851,8 @@ static void xhci_xfer_report(XHCITransfer *xfer)
static void xhci_stall_ep(XHCITransfer *xfer)
{
- XHCIState *xhci = xfer->xhci;
- XHCISlot *slot = &xhci->slots[xfer->slotid-1];
- XHCIEPContext *epctx = slot->eps[xfer->epid-1];
+ XHCIEPContext *epctx = xfer->epctx;
+ XHCIState *xhci = epctx->xhci;
uint32_t err;
XHCIStreamContext *sctx;
@@ -1880,7 +1876,7 @@ static int xhci_submit(XHCIState *xhci, XHCITransfer
*xfer,
static int xhci_setup_packet(XHCITransfer *xfer)
{
- XHCIState *xhci = xfer->xhci;
+ XHCIState *xhci = xfer->epctx->xhci;
USBEndpoint *ep;
int dir;
@@ -3490,7 +3486,7 @@ static void xhci_complete(USBPort *port, USBPacket
*packet)
return;
}
xhci_complete_packet(xfer);
- xhci_kick_ep(xfer->xhci, xfer->slotid, xfer->epid, xfer->streamid);
+ xhci_kick_ep(xfer->epctx->xhci, xfer->slotid, xfer->epid, xfer->streamid);
if (xfer->complete) {
xhci_ep_free_xfer(xfer);
}
--
1.8.3.1
- [Qemu-devel] [PULL 00/11] usb patch queue, Gerd Hoffmann, 2016/10/12
- [Qemu-devel] [PULL 05/11] xhci: drop XHCITransfer->xhci,
Gerd Hoffmann <=
- [Qemu-devel] [PULL 07/11] xhci: drop XHCITransfer->{slotid,epid}, Gerd Hoffmann, 2016/10/12
- [Qemu-devel] [PULL 08/11] xhci: make xhci_epid_to_usbep accept XHCIEPContext, Gerd Hoffmann, 2016/10/12
- [Qemu-devel] [PULL 10/11] usb: Fix incorrect default DMA offset., Gerd Hoffmann, 2016/10/12
- [Qemu-devel] [PULL 02/11] xhci: decouple EV_QUEUE from TD_QUEUE, Gerd Hoffmann, 2016/10/12
- [Qemu-devel] [PULL 04/11] xhci: use linked list for transfers, Gerd Hoffmann, 2016/10/12
- [Qemu-devel] [PULL 11/11] usb-redir: allocate buffers before waking up the host adapter, Gerd Hoffmann, 2016/10/12
- [Qemu-devel] [PULL 06/11] xhci: add & use xhci_kick_epctx(), Gerd Hoffmann, 2016/10/12
- [Qemu-devel] [PULL 03/11] xhci: drop unused comp_xfer field, Gerd Hoffmann, 2016/10/12
- [Qemu-devel] [PULL 01/11] xhci: limit the number of link trbs we are willing to process, Gerd Hoffmann, 2016/10/12
- [Qemu-devel] [PULL 09/11] usb: fix serial generator, Gerd Hoffmann, 2016/10/12