Changeset ebf59e4 in mainline

Timestamp:

2011-03-18T22:31:02Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

13b9cb5

Parents:

d3991b2

Message:

Reverse error priorities

STALL should be reported only if there is no other error
otherwise it is the only reported

File:

• uspace/drv/uhci-hcd/uhci_struct/transfer_descriptor.c (modified) (1 diff)

uspace/drv/uhci-hcd/uhci_struct/transfer_descriptor.c

@@ -114 +114 @@
         assert(instance);
 
-        if ((instance->status & TD_STATUS_ERROR_STALLED) != 0)
-                return ESTALL;
+        /* this is hc internal error it should never be reported */
+        if ((instance->status & TD_STATUS_ERROR_BIT_STUFF) != 0)
+                return EAGAIN;
 
+        /* CRC or timeout error, like device not present or bad data,
+         * it won't be reported unless err count reached zero */
         if ((instance->status & TD_STATUS_ERROR_CRC) != 0)
                 return EBADCHECKSUM;
 
-        if ((instance->status & TD_STATUS_ERROR_BUFFER) != 0)
+        /* hc does not end transaction on these, it should never be reported */
+        if ((instance->status & TD_STATUS_ERROR_NAK) != 0)
                 return EAGAIN;
 
+        /* buffer overrun or underrun */
+        if ((instance->status & TD_STATUS_ERROR_BUFFER) != 0)
+                return ERANGE;
+
+        /* device babble is something serious */
         if ((instance->status & TD_STATUS_ERROR_BABBLE) != 0)
                 return EIO;
 
-        if ((instance->status & TD_STATUS_ERROR_NAK) != 0)
-                return EAGAIN;
-
-        if ((instance->status & TD_STATUS_ERROR_BIT_STUFF) != 0)
-                return EAGAIN;
+        /* stall might represent err count reaching zero or stall response from
+         * the device, is err count reached zero, one of the above is reported*/
+        if ((instance->status & TD_STATUS_ERROR_STALLED) != 0)
+                return ESTALL;
 
         return EOK;