115 lines
3.9 KiB
Diff
115 lines
3.9 KiB
Diff
From 0e6cd6e6da3d0648204526e8ebd79047f48d009a Mon Sep 17 00:00:00 2001
|
|
From: Hans de Goede <hdegoede@redhat.com>
|
|
Date: Fri, 2 Mar 2012 00:36:50 +0100
|
|
Subject: [PATCH 136/140] usb-ehci: Remove dead isoch_pause code
|
|
|
|
I see no value in keeping this around, so lets delete it.
|
|
|
|
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
|
|
---
|
|
hw/usb-ehci.c | 60 +++++++++++++++------------------------------------------
|
|
1 file changed, 15 insertions(+), 45 deletions(-)
|
|
|
|
diff --git a/hw/usb-ehci.c b/hw/usb-ehci.c
|
|
index aa6fae5..72c3f2a 100644
|
|
--- a/hw/usb-ehci.c
|
|
+++ b/hw/usb-ehci.c
|
|
@@ -419,7 +419,6 @@ struct EHCIState {
|
|
|
|
USBPacket ipacket;
|
|
QEMUSGList isgl;
|
|
- int isoch_pause;
|
|
|
|
uint64_t last_run_ns;
|
|
};
|
|
@@ -886,7 +885,6 @@ static void ehci_reset(void *opaque)
|
|
|
|
s->astate = EST_INACTIVE;
|
|
s->pstate = EST_INACTIVE;
|
|
- s->isoch_pause = -1;
|
|
s->attach_poll_counter = 0;
|
|
|
|
for(i = 0; i < NB_PORTS; i++) {
|
|
@@ -1468,46 +1466,7 @@ static int ehci_process_itd(EHCIState *ehci,
|
|
usb_packet_unmap(&ehci->ipacket);
|
|
qemu_sglist_destroy(&ehci->isgl);
|
|
|
|
-#if 0
|
|
- /* In isoch, there is no facility to indicate a NAK so let's
|
|
- * instead just complete a zero-byte transaction. Setting
|
|
- * DBERR seems too draconian.
|
|
- */
|
|
-
|
|
- if (ret == USB_RET_NAK) {
|
|
- if (ehci->isoch_pause > 0) {
|
|
- DPRINTF("ISOCH: received a NAK but paused so returning\n");
|
|
- ehci->isoch_pause--;
|
|
- return 0;
|
|
- } else if (ehci->isoch_pause == -1) {
|
|
- DPRINTF("ISOCH: recv NAK & isoch pause inactive, setting\n");
|
|
- // Pause frindex for up to 50 msec waiting for data from
|
|
- // remote
|
|
- ehci->isoch_pause = 50;
|
|
- return 0;
|
|
- } else {
|
|
- DPRINTF("ISOCH: isoch pause timeout! return 0\n");
|
|
- ret = 0;
|
|
- }
|
|
- } else {
|
|
- DPRINTF("ISOCH: received ACK, clearing pause\n");
|
|
- ehci->isoch_pause = -1;
|
|
- }
|
|
-#else
|
|
- if (ret == USB_RET_NAK) {
|
|
- ret = 0;
|
|
- }
|
|
-#endif
|
|
-
|
|
- if (ret >= 0) {
|
|
- if (!dir) {
|
|
- /* OUT */
|
|
- set_field(&itd->transact[i], len - ret, ITD_XACT_LENGTH);
|
|
- } else {
|
|
- /* IN */
|
|
- set_field(&itd->transact[i], ret, ITD_XACT_LENGTH);
|
|
- }
|
|
- } else {
|
|
+ if (ret < 0) {
|
|
switch (ret) {
|
|
default:
|
|
fprintf(stderr, "Unexpected iso usb result: %d\n", ret);
|
|
@@ -1523,6 +1482,19 @@ static int ehci_process_itd(EHCIState *ehci,
|
|
itd->transact[i] |= ITD_XACT_BABBLE;
|
|
ehci_record_interrupt(ehci, USBSTS_ERRINT);
|
|
break;
|
|
+ case USB_RET_NAK:
|
|
+ /* no data for us, so do a zero-length transfer */
|
|
+ ret = 0;
|
|
+ break;
|
|
+ }
|
|
+ }
|
|
+ if (ret >= 0) {
|
|
+ if (!dir) {
|
|
+ /* OUT */
|
|
+ set_field(&itd->transact[i], len - ret, ITD_XACT_LENGTH);
|
|
+ } else {
|
|
+ /* IN */
|
|
+ set_field(&itd->transact[i], ret, ITD_XACT_LENGTH);
|
|
}
|
|
}
|
|
if (itd->transact[i] & ITD_XACT_IOC) {
|
|
@@ -2176,9 +2148,7 @@ static void ehci_frame_timer(void *opaque)
|
|
|
|
for (i = 0; i < frames; i++) {
|
|
if ( !(ehci->usbsts & USBSTS_HALT)) {
|
|
- if (ehci->isoch_pause <= 0) {
|
|
- ehci->frindex += 8;
|
|
- }
|
|
+ ehci->frindex += 8;
|
|
|
|
if (ehci->frindex > 0x00001fff) {
|
|
ehci->frindex = 0;
|
|
--
|
|
1.7.9.3
|
|
|