Changeset efdfebc in mainline for uspace/drv/bus/usb/ohci/hw_struct/endpoint_descriptor.h

Timestamp:

2012-11-06T21:03:44Z (11 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

338810f

Parents:

de73242 (diff), 94795812 (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/ohci/hw_struct/endpoint_descriptor.h (modified) (7 diffs)

uspace/drv/bus/usb/ohci/hw_struct/endpoint_descriptor.h

@@ -44 +44 @@
 
 #include "completion_codes.h"
+#include "mem_access.h"
 
 /**
@@ -116 +117 @@
 {
         assert(instance);
-        return (instance->td_head & ED_TDHEAD_HALTED_FLAG)
-            || (instance->status & ED_STATUS_K_FLAG);
+        return (OHCI_MEM32_RD(instance->td_head) & ED_TDHEAD_HALTED_FLAG)
+            || (OHCI_MEM32_RD(instance->status) & ED_STATUS_K_FLAG);
+}
+
+static inline void ed_clear_halt(ed_t *instance)
+{
+        assert(instance);
+        OHCI_MEM32_CLR(instance->td_head, ED_TDHEAD_HALTED_FLAG);
 }
 
@@ -128 +135 @@
 {
         assert(instance);
-        return (instance->td_head & ED_TDHEAD_PTR_MASK)
-            != (instance->td_tail & ED_TDTAIL_PTR_MASK);
+        return (OHCI_MEM32_RD(instance->td_head) & ED_TDHEAD_PTR_MASK)
+            != (OHCI_MEM32_RD(instance->td_tail) & ED_TDTAIL_PTR_MASK);
 }
 
@@ -141 +148 @@
         assert(instance);
         const uintptr_t pa = addr_to_phys(td);
-        instance->td_tail = pa & ED_TDTAIL_PTR_MASK;
+        OHCI_MEM32_WR(instance->td_tail, pa & ED_TDTAIL_PTR_MASK);
+}
+
+static inline uint32_t ed_tail_td(const ed_t *instance)
+{
+        assert(instance);
+        return OHCI_MEM32_RD(instance->td_tail) & ED_TDTAIL_PTR_MASK;
+}
+
+static inline uint32_t ed_head_td(const ed_t *instance)
+{
+        assert(instance);
+        return OHCI_MEM32_RD(instance->td_head) & ED_TDHEAD_PTR_MASK;
 }
 
@@ -155 +174 @@
         const uint32_t pa = addr_to_phys(next);
         assert((pa & ED_NEXT_PTR_MASK) << ED_NEXT_PTR_SHIFT == pa);
-        instance->next = pa;
+        OHCI_MEM32_WR(instance->next, pa);
+}
+
+static inline uint32_t ed_next(const ed_t *instance)
+{
+        assert(instance);
+        return OHCI_MEM32_RD(instance->next) & ED_NEXT_PTR_MASK;
 }
 
@@ -166 +191 @@
 {
         assert(instance);
-        return (instance->td_head & ED_TDHEAD_TOGGLE_CARRY) ? 1 : 0;
+        return (OHCI_MEM32_RD(instance->td_head) & ED_TDHEAD_TOGGLE_CARRY) ? 1 : 0;
 }
 
@@ -178 +203 @@
         assert(instance);
         if (toggle) {
-                instance->td_head |= ED_TDHEAD_TOGGLE_CARRY;
+                OHCI_MEM32_SET(instance->td_head, ED_TDHEAD_TOGGLE_CARRY);
         } else {
                 /* Clear halted flag when reseting toggle TODO: Why? */
-                instance->td_head &= ~ED_TDHEAD_TOGGLE_CARRY;
-                instance->td_head &= ~ED_TDHEAD_HALTED_FLAG;
+                OHCI_MEM32_CLR(instance->td_head, ED_TDHEAD_TOGGLE_CARRY);
+                OHCI_MEM32_CLR(instance->td_head, ED_TDHEAD_HALTED_FLAG);
         }
 }