mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xhci: add xhci_alloc_epctx

Browse Source 
Factor out endpoint context allocation to a separate function.
xhci live migration will need that too, in post_load.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
Gerd Hoffmann 2013-04-24 09:33:35 +02:00
parent 4034e6938a
commit 492b21f63f
1 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1198,6 +1198,26 @@ static void xhci_ep_kick_timer(void *opaque)
xhci_kick_ep(epctx->xhci, epctx->slotid, epctx->epid, 0); xhci_kick_ep(epctx->xhci, epctx->slotid, epctx->epid, 0);
} }
static XHCIEPContext *xhci_alloc_epctx(XHCIState *xhci,
unsigned int slotid,
unsigned int epid)
{
XHCIEPContext *epctx;
int i;
epctx = g_new0(XHCIEPContext, 1);
epctx->xhci = xhci;
epctx->slotid = slotid;
epctx->epid = epid;
for (i = 0; i < ARRAY_SIZE(epctx->transfers); i++) {
usb_packet_init(&epctx->transfers[i].packet);
}
epctx->kick_timer = qemu_new_timer_ns(vm_clock, xhci_ep_kick_timer, epctx);
return epctx;
}
static TRBCCode xhci_enable_ep(XHCIState *xhci, unsigned int slotid, static TRBCCode xhci_enable_ep(XHCIState *xhci, unsigned int slotid,
unsigned int epid, dma_addr_t pctx, unsigned int epid, dma_addr_t pctx,
uint32_t *ctx) uint32_t *ctx)
@ -1205,7 +1225,6 @@ static TRBCCode xhci_enable_ep(XHCIState *xhci, unsigned int slotid,
XHCISlot *slot; XHCISlot *slot;
XHCIEPContext *epctx; XHCIEPContext *epctx;
dma_addr_t dequeue; dma_addr_t dequeue;
int i;
trace_usb_xhci_ep_enable(slotid, epid); trace_usb_xhci_ep_enable(slotid, epid);
assert(slotid >= 1 && slotid <= xhci->numslots); assert(slotid >= 1 && slotid <= xhci->numslots);
@ -1216,12 +1235,7 @@ static TRBCCode xhci_enable_ep(XHCIState *xhci, unsigned int slotid,
xhci_disable_ep(xhci, slotid, epid); xhci_disable_ep(xhci, slotid, epid);
} }
epctx = g_malloc(sizeof(XHCIEPContext)); epctx = xhci_alloc_epctx(xhci, slotid, epid);
memset(epctx, 0, sizeof(XHCIEPContext));
epctx->xhci = xhci;
epctx->slotid = slotid;
epctx->epid = epid;
slot->eps[epid-1] = epctx; slot->eps[epid-1] = epctx;
dequeue = xhci_addr64(ctx[2] & ~0xf, ctx[3]); dequeue = xhci_addr64(ctx[2] & ~0xf, ctx[3]);
@ -1241,13 +1255,9 @@ static TRBCCode xhci_enable_ep(XHCIState *xhci, unsigned int slotid,
xhci_ring_init(xhci, &epctx->ring, dequeue); xhci_ring_init(xhci, &epctx->ring, dequeue);
epctx->ring.ccs = ctx[2] & 1; epctx->ring.ccs = ctx[2] & 1;
} }
for (i = 0; i < ARRAY_SIZE(epctx->transfers); i++) {
usb_packet_init(&epctx->transfers[i].packet);
}
epctx->interval = 1 << (ctx[0] >> 16) & 0xff; epctx->interval = 1 << (ctx[0] >> 16) & 0xff;
epctx->mfindex_last = 0; epctx->mfindex_last = 0;
epctx->kick_timer = qemu_new_timer_ns(vm_clock, xhci_ep_kick_timer, epctx);
epctx->state = EP_RUNNING; epctx->state = EP_RUNNING;
ctx[0] &= ~EP_STATE_MASK; ctx[0] &= ~EP_STATE_MASK;