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

Timestamp:

2012-03-05T20:33:48Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

1b90e90

Parents:

d1ca752

Message:

ohci: Use different macros for register and memory access.

File:

• uspace/drv/bus/usb/ohci/hw_struct/endpoint_descriptor.h (modified) (11 diffs)

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

@@ -40 +40 @@
 #include <usb/host/endpoint.h>
 
-#include "../ohci_regs.h"
 #include "../utils/malloc32.h"
 #include "transfer_descriptor.h"
 
 #include "completion_codes.h"
+#include "mem_access.h"
 
 /**
@@ -117 +117 @@
 {
         assert(instance);
-        return (OHCI_RD(instance->td_head) & ED_TDHEAD_HALTED_FLAG)
-            || (OHCI_RD(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);
 }
 
@@ -124 +124 @@
 {
         assert(instance);
-        OHCI_CLR(instance->td_head, ED_TDHEAD_HALTED_FLAG);
+        OHCI_MEM32_CLR(instance->td_head, ED_TDHEAD_HALTED_FLAG);
 }
 
@@ -135 +135 @@
 {
         assert(instance);
-        return (OHCI_RD(instance->td_head) & ED_TDHEAD_PTR_MASK)
-            != (OHCI_RD(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);
 }
 
@@ -148 +148 @@
         assert(instance);
         const uintptr_t pa = addr_to_phys(td);
-        OHCI_WR(instance->td_tail, pa & ED_TDTAIL_PTR_MASK);
+        OHCI_MEM32_WR(instance->td_tail, pa & ED_TDTAIL_PTR_MASK);
 }
 
@@ -154 +154 @@
 {
         assert(instance);
-        return OHCI_RD(instance->td_tail) & ED_TDTAIL_PTR_MASK;
+        return OHCI_MEM32_RD(instance->td_tail) & ED_TDTAIL_PTR_MASK;
 }
 
@@ -160 +160 @@
 {
         assert(instance);
-        return OHCI_RD(instance->td_head) & ED_TDHEAD_PTR_MASK;
+        return OHCI_MEM32_RD(instance->td_head) & ED_TDHEAD_PTR_MASK;
 }
 
@@ -174 +174 @@
         const uint32_t pa = addr_to_phys(next);
         assert((pa & ED_NEXT_PTR_MASK) << ED_NEXT_PTR_SHIFT == pa);
-        OHCI_WR(instance->next, pa);
+        OHCI_MEM32_WR(instance->next, pa);
 }
 
@@ -180 +180 @@
 {
         assert(instance);
-        return OHCI_RD(instance->next) & ED_NEXT_PTR_MASK;
+        return OHCI_MEM32_RD(instance->next) & ED_NEXT_PTR_MASK;
 }
 
@@ -191 +191 @@
 {
         assert(instance);
-        return (OHCI_RD(instance->td_head) & ED_TDHEAD_TOGGLE_CARRY) ? 1 : 0;
+        return (OHCI_MEM32_RD(instance->td_head) & ED_TDHEAD_TOGGLE_CARRY) ? 1 : 0;
 }
 
@@ -203 +203 @@
         assert(instance);
         if (toggle) {
-                OHCI_SET(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? */
-                OHCI_CLR(instance->td_head, ED_TDHEAD_TOGGLE_CARRY);
-                OHCI_CLR(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);
         }
 }