Changeset 00aece0 in mainline for uspace/drv/bus/usb/uhci/hw_struct/queue_head.h

Timestamp:

2012-02-18T16:47:38Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

4449c6c

Parents:

bd5f3b7 (diff), f943dd3 (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 mainline changes.

File:

• uspace/drv/bus/usb/uhci/hw_struct/queue_head.h (modified) (3 diffs)

uspace/drv/bus/usb/uhci/hw_struct/queue_head.h

@@ -58 +58 @@
         assert(instance);
 
-        instance->element = 0 | LINK_POINTER_TERMINATE_FLAG;
-        instance->next = 0 | LINK_POINTER_TERMINATE_FLAG;
+        instance->element = LINK_POINTER_TERM;
+        instance->next = LINK_POINTER_TERM;
 }
 /*----------------------------------------------------------------------------*/
@@ -71 +71 @@
 static inline void qh_set_next_qh(qh_t *instance, qh_t *next)
 {
-        uint32_t pa = addr_to_phys(next);
+        /* Physical address has to be below 4GB,
+         * it is an UHCI limitation and malloc32
+         * should guarantee this */
+        const uint32_t pa = addr_to_phys(next);
         if (pa) {
                 instance->next = LINK_POINTER_QH(pa);
@@ -88 +91 @@
 static inline void qh_set_element_td(qh_t *instance, td_t *td)
 {
-        uint32_t pa = addr_to_phys(td);
+        /* Physical address has to be below 4GB,
+         * it is an UHCI limitation and malloc32
+         * should guarantee this */
+        const uint32_t pa = addr_to_phys(td);
         if (pa) {
                 instance->element = LINK_POINTER_TD(pa);