SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ehci: add ehci_cancel_queue()

Browse Source 
Factor out function to cancel all packets of a queue.
No behavior change.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
Gerd Hoffmann 2012-08-21 13:58:40 +02:00
parent 574ef17191
commit c7cdca3b85
1 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
hw/usb/hcd-ehci.c
View File

@ -766,15 +766,27 @@ static EHCIQueue *ehci_alloc_queue(EHCIState *ehci, uint32_t addr, int async)
return q; return q;
} }
static void ehci_cancel_queue(EHCIQueue *q)
{
EHCIPacket *p;
p = QTAILQ_FIRST(&q->packets);
if (p == NULL) {
return;
}
trace_usb_ehci_queue_action(q, "cancel");
do {
ehci_free_packet(p);
} while ((p = QTAILQ_FIRST(&q->packets)) != NULL);
}
static void ehci_free_queue(EHCIQueue *q) static void ehci_free_queue(EHCIQueue *q)
{ {
EHCIQueueHead *head = q->async ? &q->ehci->aqueues : &q->ehci->pqueues; EHCIQueueHead *head = q->async ? &q->ehci->aqueues : &q->ehci->pqueues;
EHCIPacket *p;
trace_usb_ehci_queue_action(q, "free"); trace_usb_ehci_queue_action(q, "free");
while ((p = QTAILQ_FIRST(&q->packets)) != NULL) { ehci_cancel_queue(q);
ehci_free_packet(p);
}
QTAILQ_REMOVE(head, q, next); QTAILQ_REMOVE(head, q, next);
g_free(q); g_free(q);
} }
@ -1796,9 +1808,7 @@ static EHCIQueue *ehci_state_fetchqh(EHCIState *ehci, int async)
if (q->dev != NULL && q->dev->addr != devaddr) { if (q->dev != NULL && q->dev->addr != devaddr) {
if (!QTAILQ_EMPTY(&q->packets)) { if (!QTAILQ_EMPTY(&q->packets)) {
/* should not happen (guest bug) */ /* should not happen (guest bug) */
while ((p = QTAILQ_FIRST(&q->packets)) != NULL) { ehci_cancel_queue(q);
ehci_free_packet(p);
}
} }
q->dev = NULL; q->dev = NULL;
} }
@ -1959,10 +1969,10 @@ static int ehci_state_fetchqtd(EHCIQueue *q)
ehci_trace_qtd(q, NLPTR_GET(q->qtdaddr), &qtd); ehci_trace_qtd(q, NLPTR_GET(q->qtdaddr), &qtd);
p = QTAILQ_FIRST(&q->packets); p = QTAILQ_FIRST(&q->packets);
while (p != NULL && p->qtdaddr != q->qtdaddr) { if (p != NULL && p->qtdaddr != q->qtdaddr) {
/* should not happen (guest bug) */ /* should not happen (guest bug) */
ehci_free_packet(p); ehci_cancel_queue(q);
p = QTAILQ_FIRST(&q->packets); p = NULL;
} }
if (p != NULL) { if (p != NULL) {
ehci_qh_do_overlay(q); ehci_qh_do_overlay(q);