Changeset 50ba203 in mainline for uspace/drv/uhci-hcd/uhci_struct/queue_head.h

Timestamp:

2011-02-20T15:46:48Z (14 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

6bb83c7

Parents:

d81ef61c (diff), 0c00dac (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:

merge with usb/development

File:

• uspace/drv/uhci-hcd/uhci_struct/queue_head.h (modified) (1 diff)

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

@@ -55 +55 @@
 }
 
-static inline void queue_head_add_next(queue_head_t *instance, uint32_t next_queue_pa)
+static inline void queue_head_append_qh(queue_head_t *instance, uint32_t pa)
 {
-        if (next_queue_pa) {
-                instance->next_queue = (next_queue_pa & LINK_POINTER_ADDRESS_MASK)
-                  | LINK_POINTER_QUEUE_HEAD_FLAG;
+        if (pa) {
+                instance->next_queue = (pa & LINK_POINTER_ADDRESS_MASK)
+                    | LINK_POINTER_QUEUE_HEAD_FLAG;
         }
 }
 
-static inline queue_head_t * queue_head_get()
-        { return malloc32(sizeof(queue_head_t)); }
+static inline void queue_head_element_qh(queue_head_t *instance, uint32_t pa)
+{
+        if (pa) {
+                instance->next_queue = (pa & LINK_POINTER_ADDRESS_MASK)
+                    | LINK_POINTER_QUEUE_HEAD_FLAG;
+        }
+}
+
+static inline void queue_head_element_td(queue_head_t *instance, uint32_t pa)
+{
+        if (pa) {
+                instance->element = (pa & LINK_POINTER_ADDRESS_MASK);
+        }
+}
+
+static inline queue_head_t * queue_head_get() {
+        queue_head_t *ret = malloc32(sizeof(queue_head_t));
+        if (ret)
+                queue_head_init(ret);
+        return ret;
+}
 
 static inline void queue_head_dispose(queue_head_t *head)