Changeset b01995b in mainline for uspace/drv/uhci-hcd/hw_struct

Timestamp:

2011-03-21T23:42:08Z (15 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

11dd29b, 62f4212

Parents:

31b568e (diff), 87644b4 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Fixes selecting a new USB address when max address has been reached.

Whitespace and code-style fixes, renames

Location:

uspace/drv/uhci-hcd/hw_struct

Files:

• link_pointer.h (moved) (moved from uspace/drv/uhci-hcd/uhci_struct/link_pointer.h ) (1 diff)
• queue_head.h (moved) (moved from uspace/drv/uhci-hcd/uhci_struct/queue_head.h ) (3 diffs)
• transfer_descriptor.c (moved) (moved from uspace/drv/uhci-hcd/uhci_struct/transfer_descriptor.c ) (3 diffs)
• transfer_descriptor.h (moved) (moved from uspace/drv/uhci-hcd/uhci_struct/transfer_descriptor.h )

uspace/drv/uhci-hcd/hw_struct/link_pointer.h

@@ -49 +49 @@
         ((address & LINK_POINTER_ADDRESS_MASK) | LINK_POINTER_QUEUE_HEAD_FLAG)
 
+#define LINK_POINTER_TD(address) \
+        (address & LINK_POINTER_ADDRESS_MASK)
+
+#define LINK_POINTER_TERM \
+        ((link_pointer_t)LINK_POINTER_TERMINATE_FLAG)
+
 #endif
 /**

uspace/drv/uhci-hcd/hw_struct/queue_head.h

@@ -72 +72 @@
         /* Address is valid and not terminal */
         if (pa && ((pa & LINK_POINTER_TERMINATE_FLAG) == 0)) {
-                instance->next = (pa & LINK_POINTER_ADDRESS_MASK)
-                    | LINK_POINTER_QUEUE_HEAD_FLAG;
+                instance->next = LINK_POINTER_QH(pa);
         } else {
-                instance->next = 0 | LINK_POINTER_TERMINATE_FLAG;
+                instance->next = LINK_POINTER_TERM;
         }
 }
@@ -91 +90 @@
         /* Address is valid and not terminal */
         if (pa && ((pa & LINK_POINTER_TERMINATE_FLAG) == 0)) {
-                instance->element = (pa & LINK_POINTER_ADDRESS_MASK)
-                    | LINK_POINTER_QUEUE_HEAD_FLAG;
+                instance->element = LINK_POINTER_QH(pa);
         } else {
-                instance->element = 0 | LINK_POINTER_TERMINATE_FLAG;
+                instance->element = LINK_POINTER_TERM;
         }
 }
@@ -109 +107 @@
 {
         if (pa && ((pa & LINK_POINTER_TERMINATE_FLAG) == 0)) {
-                instance->element = (pa & LINK_POINTER_ADDRESS_MASK);
+                instance->element = LINK_POINTER_TD(pa);
         } else {
-                instance->element = 0 | LINK_POINTER_TERMINATE_FLAG;
+                instance->element = LINK_POINTER_TERM;
         }
 }

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

@@ -69 +69 @@
             || (pid == USB_PID_OUT));
 
+        const uint32_t next_pa = addr_to_phys(next);
+        assert((next_pa & LINK_POINTER_ADDRESS_MASK) == next_pa);
+
         instance->next = 0
             | LINK_POINTER_VERTICAL_FLAG
-            | ((next != NULL) ? addr_to_phys(next) : LINK_POINTER_TERMINATE_FLAG);
+            | (next_pa ? next_pa : LINK_POINTER_TERMINATE_FLAG);
 
         instance->status = 0
@@ -90 +93 @@
             | ((pid & TD_DEVICE_PID_MASK) << TD_DEVICE_PID_POS);
 
-        instance->buffer_ptr = 0;
-
-        if (size) {
-                instance->buffer_ptr = (uintptr_t)addr_to_phys(buffer);
-        }
+        instance->buffer_ptr = addr_to_phys(buffer);
 
         usb_log_debug2("Created TD(%p): %X:%X:%X:%X(%p).\n",
@@ -115 +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;