Changes in uspace/drv/uhci-hcd/hw_struct/queue_head.h [9d2d444:1e70157] in mainline

File:

• uspace/drv/uhci-hcd/hw_struct/queue_head.h (modified) (4 diffs)

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

@@ -34 +34 @@
 #ifndef DRV_UHCI_QH_H
 #define DRV_UHCI_QH_H
+
+/* libc */
 #include <assert.h>
 
 #include "link_pointer.h"
-#include "transfer_descriptor.h"
-#include "utils/malloc32.h"
 
-/** This structure is defined in UHCI design guide p. 31 */
 typedef struct queue_head {
-        /** Pointer to the next entity (another QH or TD */
         volatile link_pointer_t next;
-        /** Pointer to the contained entities (execution controlled by vertical flag*/
         volatile link_pointer_t element;
 } __attribute__((packed)) qh_t;
@@ -67 +64 @@
  * @param[in] pa Physical address of the next queue head.
  *
- * Adds proper flag. If the pointer is NULL, sets next to terminal NULL.
+ * Adds proper flag. If the pointer is NULL or terminal, sets next to terminal
+ * NULL.
  */
-static inline void qh_set_next_qh(qh_t *instance, qh_t *next)
+static inline void qh_set_next_qh(qh_t *instance, uint32_t pa)
 {
-        uint32_t pa = addr_to_phys(next);
-        if (pa) {
+        /* Address is valid and not terminal */
+        if (pa && ((pa & LINK_POINTER_TERMINATE_FLAG) == 0)) {
                 instance->next = LINK_POINTER_QH(pa);
         } else {
@@ -82 +80 @@
  *
  * @param[in] instance qh_t structure to initialize.
+ * @param[in] pa Physical address of the next queue head.
+ *
+ * Adds proper flag. If the pointer is NULL or terminal, sets element
+ * to terminal NULL.
+ */
+static inline void qh_set_element_qh(qh_t *instance, uint32_t pa)
+{
+        /* Address is valid and not terminal */
+        if (pa && ((pa & LINK_POINTER_TERMINATE_FLAG) == 0)) {
+                instance->element = LINK_POINTER_QH(pa);
+        } else {
+                instance->element = LINK_POINTER_TERM;
+        }
+}
+/*----------------------------------------------------------------------------*/
+/** Set queue head element pointer
+ *
+ * @param[in] instance qh_t structure to initialize.
  * @param[in] pa Physical address of the TD structure.
  *
- * Adds proper flag. If the pointer is NULL, sets element to terminal NULL.
+ * Adds proper flag. If the pointer is NULL or terminal, sets element
+ * to terminal NULL.
  */
-static inline void qh_set_element_td(qh_t *instance, td_t *td)
+static inline void qh_set_element_td(qh_t *instance, uint32_t pa)
 {
-        uint32_t pa = addr_to_phys(td);
-        if (pa) {
+        if (pa && ((pa & LINK_POINTER_TERMINATE_FLAG) == 0)) {
                 instance->element = LINK_POINTER_TD(pa);
         } else {
@@ -95 +111 @@
         }
 }
+
 #endif
 /**