Changes in uspace/drv/bus/usb/ohci/hw_struct/endpoint_descriptor.h [668a2e8:70d72dd] in mainline

File:

• uspace/drv/bus/usb/ohci/hw_struct/endpoint_descriptor.h (modified) (7 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"
@@ -117 +116 @@
 {
         assert(instance);
-        return (OHCI_RD(instance->td_head) & ED_TDHEAD_HALTED_FLAG)
-            || (OHCI_RD(instance->status) & ED_STATUS_K_FLAG);
-}
-
-static inline void ed_clear_halt(ed_t *instance)
-{
-        assert(instance);
-        OHCI_CLR(instance->td_head, ED_TDHEAD_HALTED_FLAG);
+        return (instance->td_head & ED_TDHEAD_HALTED_FLAG)
+            || (instance->status & ED_STATUS_K_FLAG);
 }
 
@@ -135 +128 @@
 {
         assert(instance);
-        return (OHCI_RD(instance->td_head) & ED_TDHEAD_PTR_MASK)
-            != (OHCI_RD(instance->td_tail) & ED_TDTAIL_PTR_MASK);
+        return (instance->td_head & ED_TDHEAD_PTR_MASK)
+            != (instance->td_tail & ED_TDTAIL_PTR_MASK);
 }
 
@@ -148 +141 @@
         assert(instance);
         const uintptr_t pa = addr_to_phys(td);
-        OHCI_WR(instance->td_tail, pa & ED_TDTAIL_PTR_MASK);
-}
-
-static inline uint32_t ed_tail_td(const ed_t *instance)
-{
-        assert(instance);
-        return OHCI_RD(instance->td_tail) & ED_TDTAIL_PTR_MASK;
-}
-
-static inline uint32_t ed_head_td(const ed_t *instance)
-{
-        assert(instance);
-        return OHCI_RD(instance->td_head) & ED_TDHEAD_PTR_MASK;
+        instance->td_tail = pa & ED_TDTAIL_PTR_MASK;
 }
 
@@ -174 +155 @@
         const uint32_t pa = addr_to_phys(next);
         assert((pa & ED_NEXT_PTR_MASK) << ED_NEXT_PTR_SHIFT == pa);
-        OHCI_WR(instance->next, pa);
-}
-
-static inline uint32_t ed_next(const ed_t *instance)
-{
-        assert(instance);
-        return OHCI_RD(instance->next) & ED_NEXT_PTR_MASK;
+        instance->next = pa;
 }
 
@@ -191 +166 @@
 {
         assert(instance);
-        return (OHCI_RD(instance->td_head) & ED_TDHEAD_TOGGLE_CARRY) ? 1 : 0;
+        return (instance->td_head & ED_TDHEAD_TOGGLE_CARRY) ? 1 : 0;
 }
 
@@ -203 +178 @@
         assert(instance);
         if (toggle) {
-                OHCI_SET(instance->td_head, ED_TDHEAD_TOGGLE_CARRY);
+                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);
+                instance->td_head &= ~ED_TDHEAD_TOGGLE_CARRY;
+                instance->td_head &= ~ED_TDHEAD_HALTED_FLAG;
         }
 }