david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

uhci: Move checks to continue queuing to uhci_fill_queue()

Browse Source 
Rather then having a special check to start queuing after the first packet,
and then another check for the other packets in uhci_fill_queue(), simply
check the previous packet beforehand in uhci_fill_queue()

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
Hans de Goede 2012-10-24 18:13:58 +02:00 committed by Gerd Hoffmann
parent 00a0770de3
commit 7c2eaca4ef
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
hw/usb/hcd-uhci.c
View File

@ -991,7 +991,8 @@ static void uhci_fill_queue(UHCIState *s, UHCI_TD *td)
UHCI_TD ptd; UHCI_TD ptd;
int ret; int ret;
while (is_valid(plink)) { ptd.ctrl = td->ctrl;
while (is_valid(plink) && !(ptd.ctrl & TD_CTRL_SPD)) {
pci_dma_read(&s->dev, plink & ~0xf, &ptd, sizeof(ptd)); pci_dma_read(&s->dev, plink & ~0xf, &ptd, sizeof(ptd));
le32_to_cpus(&ptd.link); le32_to_cpus(&ptd.link);
le32_to_cpus(&ptd.ctrl); le32_to_cpus(&ptd.ctrl);
@ -1010,9 +1011,6 @@ static void uhci_fill_queue(UHCIState *s, UHCI_TD *td)
} }
assert(ret == TD_RESULT_ASYNC_START); assert(ret == TD_RESULT_ASYNC_START);
assert(int_mask == 0); assert(int_mask == 0);
if (ptd.ctrl & TD_CTRL_SPD) {
break;
}
plink = ptd.link; plink = ptd.link;
} }
} }
@ -1110,9 +1108,7 @@ static void uhci_process_frame(UHCIState *s)
case TD_RESULT_ASYNC_START: case TD_RESULT_ASYNC_START:
trace_usb_uhci_td_async(curr_qh & ~0xf, link & ~0xf); trace_usb_uhci_td_async(curr_qh & ~0xf, link & ~0xf);
if (is_valid(td.link) && !(td.ctrl & TD_CTRL_SPD)) { uhci_fill_queue(s, &td);
uhci_fill_queue(s, &td);
}
link = curr_qh ? qh.link : td.link; link = curr_qh ? qh.link : td.link;
continue; continue;