|
 |
1b1995d |
From 6177c3610b6416a7200ae6c6985f01fccdbdc7e5 Mon Sep 17 00:00:00 2001
|
|
|
1b1995d |
From: Hans de Goede <hdegoede@redhat.com>
|
|
|
1b1995d |
Date: Thu, 1 Mar 2012 23:11:13 +0100
|
|
|
1b1995d |
Subject: [PATCH 134/140] usb-ehci: Remove dead nakcnt code
|
|
|
1b1995d |
|
|
|
1b1995d |
This patch removes 2 bits of dead nakcnt code:
|
|
|
1b1995d |
|
|
|
1b1995d |
1) usb_ehci_execute calls ehci_qh_do_overlay which does:
|
|
|
1b1995d |
nakcnt = reload;
|
|
|
1b1995d |
and then has a block of code which is conditional on:
|
|
|
1b1995d |
if (reload && !nakcnt) {
|
|
|
1b1995d |
which ofcourse is never true now as nakcnt == reload.
|
|
|
1b1995d |
|
|
|
1b1995d |
2) ehci_state_fetchqh does:
|
|
|
1b1995d |
nakcnt = reload;
|
|
|
1b1995d |
but before nakcnt is ever used ehci_state_fetchqh is always followed
|
|
|
1b1995d |
by a ehci_qh_do_overlay call which also does:
|
|
|
1b1995d |
nakcnt = reload;
|
|
|
1b1995d |
So doing this from ehci_state_fetchqh is redundant.
|
|
|
1b1995d |
|
|
|
1b1995d |
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
|
|
|
1b1995d |
---
|
|
|
1b1995d |
hw/usb-ehci.c | 20 --------------------
|
|
|
1b1995d |
1 file changed, 20 deletions(-)
|
|
|
1b1995d |
|
|
|
1b1995d |
diff --git a/hw/usb-ehci.c b/hw/usb-ehci.c
|
|
|
1b1995d |
index a3d5c11..92cdf2a 100644
|
|
|
1b1995d |
--- a/hw/usb-ehci.c
|
|
|
1b1995d |
+++ b/hw/usb-ehci.c
|
|
|
1b1995d |
@@ -1643,7 +1643,6 @@ static EHCIQueue *ehci_state_fetchqh(EHCIState *ehci, int async)
|
|
|
1b1995d |
{
|
|
|
1b1995d |
uint32_t entry;
|
|
|
1b1995d |
EHCIQueue *q;
|
|
|
1b1995d |
- int reload;
|
|
|
1b1995d |
|
|
|
1b1995d |
entry = ehci_get_fetch_addr(ehci, async);
|
|
|
1b1995d |
q = ehci_find_queue_by_qh(ehci, entry, async);
|
|
|
1b1995d |
@@ -1701,11 +1700,6 @@ static EHCIQueue *ehci_state_fetchqh(EHCIState *ehci, int async)
|
|
|
1b1995d |
}
|
|
|
1b1995d |
#endif
|
|
|
1b1995d |
|
|
|
1b1995d |
- reload = get_field(q->qh.epchar, QH_EPCHAR_RL);
|
|
|
1b1995d |
- if (reload) {
|
|
|
1b1995d |
- set_field(&q->qh.altnext_qtd, reload, QH_ALTNEXT_NAKCNT);
|
|
|
1b1995d |
- }
|
|
|
1b1995d |
-
|
|
|
1b1995d |
if (q->qh.token & QTD_TOKEN_HALT) {
|
|
|
1b1995d |
ehci_set_state(ehci, async, EST_HORIZONTALQH);
|
|
|
1b1995d |
|
|
|
1b1995d |
@@ -1865,25 +1859,11 @@ static void ehci_flush_qh(EHCIQueue *q)
|
|
|
1b1995d |
static int ehci_state_execute(EHCIQueue *q, int async)
|
|
|
1b1995d |
{
|
|
|
1b1995d |
int again = 0;
|
|
|
1b1995d |
- int reload, nakcnt;
|
|
|
1b1995d |
- int smask;
|
|
|
1b1995d |
|
|
|
1b1995d |
if (ehci_qh_do_overlay(q) != 0) {
|
|
|
1b1995d |
return -1;
|
|
|
1b1995d |
}
|
|
|
1b1995d |
|
|
|
1b1995d |
- smask = get_field(q->qh.epcap, QH_EPCAP_SMASK);
|
|
|
1b1995d |
-
|
|
|
1b1995d |
- if (!smask) {
|
|
|
1b1995d |
- reload = get_field(q->qh.epchar, QH_EPCHAR_RL);
|
|
|
1b1995d |
- nakcnt = get_field(q->qh.altnext_qtd, QH_ALTNEXT_NAKCNT);
|
|
|
1b1995d |
- if (reload && !nakcnt) {
|
|
|
1b1995d |
- ehci_set_state(q->ehci, async, EST_HORIZONTALQH);
|
|
|
1b1995d |
- again = 1;
|
|
|
1b1995d |
- goto out;
|
|
|
1b1995d |
- }
|
|
|
1b1995d |
- }
|
|
|
1b1995d |
-
|
|
|
1b1995d |
// TODO verify enough time remains in the uframe as in 4.4.1.1
|
|
|
1b1995d |
// TODO write back ptr to async list when done or out of time
|
|
|
1b1995d |
// TODO Windows does not seem to ever set the MULT field
|
|
|
1b1995d |
--
|
|
|
1b1995d |
1.7.9.3
|
|
|
1b1995d |
|