Changeset 4c70554 in mainline for uspace/drv/uhci-hcd/hw_struct/queue_head.h

Timestamp:

2011-04-13T19:06:11Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

9d2d444

Parents:

a0a134b

Message:

Refactoring, doxygen

Remove queue_head_pa, it was not really needed as this value was use exactly once for every list.
qh_set_next_qh accepts virtual address and does the conversion internally.
Removed unused qh function

File:

• uspace/drv/uhci-hcd/hw_struct/queue_head.h (modified) (2 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 "utils/malloc32.h"
 
 typedef struct queue_head {
@@ -67 +66 @@
  * NULL.
  */
-static inline void qh_set_next_qh(qh_t *instance, uint32_t pa)
+static inline void qh_set_next_qh(qh_t *instance, qh_t *next)
 {
         /* Address is valid and not terminal */
-        if (pa && ((pa & LINK_POINTER_TERMINATE_FLAG) == 0)) {
+        uint32_t pa = addr_to_phys(next);
+        if (pa) {
                 instance->next = LINK_POINTER_QH(pa);
         } else {
                 instance->next = LINK_POINTER_TERM;
-        }
-}
-/*----------------------------------------------------------------------------*/
-/** Set queue head element pointer
- *
- * @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;
         }
 }