[haiku-commits] haiku: hrev43408 - src/add-ons/kernel/busses/usb
- From: mmlr@xxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Mon, 5 Dec 2011 01:42:42 +0100 (CET)
hrev43408 adds 1 changeset to branch 'master'
old head: 30fc876c38311e105d5fb731f0beae06c2f28c1d
new head: ef2eaedc2ec5332905a4784a38283a2d83234f3a
----------------------------------------------------------------------------
ef2eaed: Account for full-/lowspeed errors and ensure an error is set.
For full- and lowspeed devices the unused ping status bit works as an
additional error bit (albeit it's so generic that it isn't really
useful). Include that bit when the error counter counts down to zero.
Also ensure that an error is returned if the error counter reaches
zero, but print a warning if none of the describing bits are set.
[ Michael Lotz <mmlr@xxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev43408
Commit: ef2eaedc2ec5332905a4784a38283a2d83234f3a
URL: http://cgit.haiku-os.org/haiku/commit/?id=ef2eaed
Author: Michael Lotz <mmlr@xxxxxxxx>
Date: Mon Dec 5 00:36:26 2011 UTC
----------------------------------------------------------------------------
2 files changed, 16 insertions(+), 0 deletions(-)
src/add-ons/kernel/busses/usb/ehci.cpp | 15 +++++++++++++++
src/add-ons/kernel/busses/usb/ehci_hardware.h | 1 +
----------------------------------------------------------------------------
diff --git a/src/add-ons/kernel/busses/usb/ehci.cpp
b/src/add-ons/kernel/busses/usb/ehci.cpp
index 5aa2723..70ea5b1 100644
--- a/src/add-ons/kernel/busses/usb/ehci.cpp
+++ b/src/add-ons/kernel/busses/usb/ehci.cpp
@@ -1500,9 +1500,24 @@ EHCI::FinishTransfers()
callbackStatus =
B_DEV_CRC_ERROR;
reasons++;
}
+ if
((transfer->queue_head->endpoint_chars
+ &
EHCI_QH_CHARS_EPS_HIGH) == 0) {
+ // For full-/lowspeed
endpoints the unused ping
+ // state bit is used as
another error bit, it is
+ // unspecific however.
+ if ((status &
EHCI_QTD_STATUS_LS_ERR) != 0) {
+ callbackStatus
= B_DEV_STALLED;
+ reasons++;
+ }
+ }
if (reasons > 1)
callbackStatus =
B_DEV_MULTIPLE_ERRORS;
+ else if (reasons == 0) {
+ TRACE_ERROR("error
counter counted down to zero "
+ "but none of
the error bits are set\n");
+ callbackStatus =
B_DEV_STALLED;
+ }
} else if (status &
EHCI_QTD_STATUS_BABBLE) {
// there is a babble condition
callbackStatus =
transfer->incoming ? B_DEV_FIFO_OVERRUN : B_DEV_FIFO_UNDERRUN;
diff --git a/src/add-ons/kernel/busses/usb/ehci_hardware.h
b/src/add-ons/kernel/busses/usb/ehci_hardware.h
index 5344332..876414d 100644
--- a/src/add-ons/kernel/busses/usb/ehci_hardware.h
+++ b/src/add-ons/kernel/busses/usb/ehci_hardware.h
@@ -237,6 +237,7 @@ typedef struct ehci_qtd {
#define EHCI_QTD_STATUS_MISSED (1 << 2) // Missed Micro-Frame
#define EHCI_QTD_STATUS_SPLIT (1 << 1) // Split Transaction State
#define EHCI_QTD_STATUS_PING (1 << 0) // Ping State
+#define EHCI_QTD_STATUS_LS_ERR (1 << 0) // Full-/Lowspeed Error
#define EHCI_QTD_PAGE_MASK 0xfffff000
Other related posts:
- » [haiku-commits] haiku: hrev43408 - src/add-ons/kernel/busses/usb - mmlr
