Changeset d3991b2 in mainline

Timestamp:

2011-03-18T21:41:53Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

ebf59e4

Parents:

eedac04

Message:

QH and link pointer refactoring

Location:

uspace/drv/uhci-hcd/uhci_struct

Files:

• link_pointer.h (modified) (1 diff)
• queue_head.h (modified) (3 diffs)

uspace/drv/uhci-hcd/uhci_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/uhci_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;
         }
 }