Changeset 90478727 in mainline for uspace/drv/bus/usb/ohci/hw_struct/transfer_descriptor.c

Timestamp:

2012-08-12T11:46:44Z (12 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

41b764b7

Parents:

e1e4192 (diff), 371cb6c (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.c (modified) (2 diffs)

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

@@ -33 +33 @@
  */
 #include <usb/usb.h>
+#include <mem.h>
+#include "../utils/malloc32.h"
 #include "transfer_descriptor.h"
 
@@ -58 +60 @@
         bzero(instance, sizeof(td_t));
         /* Set PID and Error code */
-        instance->status = 0
-            | ((dir[direction] & TD_STATUS_DP_MASK) << TD_STATUS_DP_SHIFT)
-            | ((CC_NOACCESS2 & TD_STATUS_CC_MASK) << TD_STATUS_CC_SHIFT);
+        OHCI_MEM32_WR(instance->status,
+            ((dir[direction] & TD_STATUS_DP_MASK) << TD_STATUS_DP_SHIFT)
+            | ((CC_NOACCESS2 & TD_STATUS_CC_MASK) << TD_STATUS_CC_SHIFT));
 
         if (toggle == 0 || toggle == 1) {
                 /* Set explicit toggle bit */
-                instance->status |= TD_STATUS_T_USE_TD_FLAG;
-                instance->status |= toggle ? TD_STATUS_T_FLAG : 0;
+                OHCI_MEM32_SET(instance->status, TD_STATUS_T_USE_TD_FLAG);
+                OHCI_MEM32_SET(instance->status, toggle ? TD_STATUS_T_FLAG : 0);
         }
 
         /* Alow less data on input. */
         if (dir == USB_DIRECTION_IN) {
-                instance->status |= TD_STATUS_ROUND_FLAG;
+                OHCI_MEM32_SET(instance->status, TD_STATUS_ROUND_FLAG);
         }
 
         if (buffer != NULL) {
                 assert(size != 0);
-                instance->cbp = addr_to_phys(buffer);
-                instance->be = addr_to_phys(buffer + size - 1);
+                OHCI_MEM32_WR(instance->cbp, addr_to_phys(buffer));
+                OHCI_MEM32_WR(instance->be, addr_to_phys(buffer + size - 1));
         }
 
-        instance->next = addr_to_phys(next) & TD_NEXT_PTR_MASK;
+        OHCI_MEM32_WR(instance->next, addr_to_phys(next) & TD_NEXT_PTR_MASK);
 
 }