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

Timestamp:

2012-03-05T20:33:48Z (13 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/transfer_descriptor.h (modified) (4 diffs)

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

@@ -38 +38 @@
 #include <stdint.h>
 
-#include "../ohci_regs.h"
+#include "mem_access.h"
 #include "completion_codes.h"
 
@@ -100 +100 @@
 {
         assert(instance);
-        const int cc =(OHCI_RD(instance->status)
+        const int cc =(OHCI_MEM32_RD(instance->status)
             >> TD_STATUS_CC_SHIFT) & TD_STATUS_CC_MASK;
         /* This value is changed on transfer completion,
@@ -119 +119 @@
 {
         assert(instance);
-        const int cc = (OHCI_RD(instance->status)
+        const int cc = (OHCI_MEM32_RD(instance->status)
             >> TD_STATUS_CC_SHIFT) & TD_STATUS_CC_MASK;
         return cc_to_rc(cc);
@@ -136 +136 @@
                 return 0;
         /* Buffer end points to the last byte of transfer buffer, so add 1 */
-        return OHCI_RD(instance->be) - OHCI_RD(instance->cbp) + 1;
+        return OHCI_MEM32_RD(instance->be) - OHCI_MEM32_RD(instance->cbp) + 1;
 }
 #endif