Changeset 6143ce3 in mainline for uspace/drv/uhci-hcd/uhci_struct

Timestamp:

2011-03-13T15:37:28Z (15 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

8850690

Parents:

eb0dc58

Message:

Rename queue_head_t ⇒ qh_t

Refactoring

Location:

uspace/drv/uhci-hcd/uhci_struct

Files:

• link_pointer.h (modified) (1 diff)
• queue_head.h (modified) (1 diff)
• transfer_descriptor.h (modified) (1 diff)

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

@@ -46 +46 @@
 #define LINK_POINTER_ADDRESS_MASK 0xfffffff0 /* upper 28 bits */
 
+#define LINK_POINTER_QH(address) \
+        ((address & LINK_POINTER_ADDRESS_MASK) | LINK_POINTER_QUEUE_HEAD_FLAG)
+
 #endif
 /**

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

@@ -43 +43 @@
 
 typedef struct queue_head {
-        volatile link_pointer_t next_queue;
+        volatile link_pointer_t next;
         volatile link_pointer_t element;
-} __attribute__((packed)) queue_head_t;
-
-static inline void queue_head_init(queue_head_t *instance)
+} __attribute__((packed)) qh_t;
+/*----------------------------------------------------------------------------*/
+static inline void qh_init(qh_t *instance)
 {
         assert(instance);
 
         instance->element = 0 | LINK_POINTER_TERMINATE_FLAG;
-        instance->next_queue = 0 | LINK_POINTER_TERMINATE_FLAG;
+        instance->next = 0 | LINK_POINTER_TERMINATE_FLAG;
 }
-
-static inline void queue_head_append_qh(queue_head_t *instance, uint32_t pa)
+/*----------------------------------------------------------------------------*/
+static inline void qh_set_next_qh(qh_t *instance, uint32_t pa)
 {
-        if (pa) {
-                instance->next_queue = (pa & LINK_POINTER_ADDRESS_MASK)
+        /* 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;
+        } else {
+                instance->next = 0 | LINK_POINTER_TERMINATE_FLAG;
         }
 }
-
-static inline void queue_head_element_qh(queue_head_t *instance, uint32_t pa)
+/*----------------------------------------------------------------------------*/
+static inline void qh_set_element_qh(qh_t *instance, uint32_t pa)
 {
-        if (pa) {
-                instance->next_queue = (pa & LINK_POINTER_ADDRESS_MASK)
+        /* 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;
+        } else {
+                instance->element = 0 | LINK_POINTER_TERMINATE_FLAG;
         }
 }
-
-static inline void queue_head_set_element_td(queue_head_t *instance, uint32_t pa)
+/*----------------------------------------------------------------------------*/
+static inline void qh_set_element_td(qh_t *instance, uint32_t pa)
 {
-        if (pa) {
+        if (pa && ((pa & LINK_POINTER_TERMINATE_FLAG) == 0)) {
                 instance->element = (pa & LINK_POINTER_ADDRESS_MASK);
+        } else {
+                instance->element = 0 | LINK_POINTER_TERMINATE_FLAG;
         }
 }

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

@@ -49 +49 @@
 #define TD_STATUS_ERROR_COUNT_POS ( 27 )
 #define TD_STATUS_ERROR_COUNT_MASK ( 0x3 )
-#define TD_STATUS_ERROR_COUNT_DEFAULT 3
 #define TD_STATUS_LOW_SPEED_FLAG ( 1 << 26 )
 #define TD_STATUS_ISOCHRONOUS_FLAG ( 1 << 25 )