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

Timestamp:

2012-08-14T18:16:39Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

669f5cae

Parents:

76d92db1 (diff), 4802dd7 (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/transfer_descriptor.h (modified) (4 diffs)

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

@@ -38 +38 @@
 #include <stdint.h>
 
-#include "../utils/malloc32.h"
+#include "mem_access.h"
 #include "completion_codes.h"
 
@@ -100 +100 @@
 {
         assert(instance);
-        const int cc =
-            (instance->status >> TD_STATUS_CC_SHIFT) & TD_STATUS_CC_MASK;
+        const int cc =(OHCI_MEM32_RD(instance->status)
+            >> TD_STATUS_CC_SHIFT) & TD_STATUS_CC_MASK;
         /* This value is changed on transfer completion,
          * either to CC_NOERROR or and error code.
@@ -119 +119 @@
 {
         assert(instance);
-        const int cc =
-            (instance->status >> TD_STATUS_CC_SHIFT) & TD_STATUS_CC_MASK;
+        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 instance->be - instance->cbp + 1;
+        return OHCI_MEM32_RD(instance->be) - OHCI_MEM32_RD(instance->cbp) + 1;
 }
 #endif