mirrors
/
qemu
mirror of https://gitlab.com/qemu-project/qemu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ehci: tweak queue initialization 

Little tweak for the queue initialization, set the QH address in the
allocation function.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
Gerd Hoffmann 2012-05-11 08:56:49 +02:00
parent 773dc9cdfd
commit 8f6d5e26b1
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -692,13 +692,14 @@ static void ehci_free_packet(EHCIPacket *p)
/* queue management */ /* queue management */
static EHCIQueue *ehci_alloc_queue(EHCIState *ehci, int async) static EHCIQueue *ehci_alloc_queue(EHCIState *ehci, uint32_t addr, int async)
{ {
EHCIQueueHead *head = async ? &ehci->aqueues : &ehci->pqueues; EHCIQueueHead *head = async ? &ehci->aqueues : &ehci->pqueues;
EHCIQueue *q; EHCIQueue *q;
q = g_malloc0(sizeof(*q)); q = g_malloc0(sizeof(*q));
q->ehci = ehci; q->ehci = ehci;
q->qhaddr = addr;
QTAILQ_INIT(&q->packets); QTAILQ_INIT(&q->packets);
QTAILQ_INSERT_HEAD(head, q, next); QTAILQ_INSERT_HEAD(head, q, next);
trace_usb_ehci_queue_action(q, "alloc"); trace_usb_ehci_queue_action(q, "alloc");
@ -1672,12 +1673,11 @@ static EHCIQueue *ehci_state_fetchqh(EHCIState *ehci, int async)
entry = ehci_get_fetch_addr(ehci, async); entry = ehci_get_fetch_addr(ehci, async);
q = ehci_find_queue_by_qh(ehci, entry, async); q = ehci_find_queue_by_qh(ehci, entry, async);
if (NULL == q) { if (NULL == q) {
q = ehci_alloc_queue(ehci, async); q = ehci_alloc_queue(ehci, entry, async);
} }
p = QTAILQ_FIRST(&q->packets); p = QTAILQ_FIRST(&q->packets);
q->qhaddr = entry;
q->seen++;
q->seen++;
if (q->seen > 1) { if (q->seen > 1) {
/* we are going in circles -- stop processing */ /* we are going in circles -- stop processing */
ehci_set_state(ehci, async, EST_ACTIVE); ehci_set_state(ehci, async, EST_ACTIVE);