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

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.c (modified) (3 diffs)

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

@@ -58 +58 @@
                 /* Mark as dead, used for dummy EDs at the beginning of
                  * endpoint lists. */
-                OHCI_WR(instance->status, ED_STATUS_K_FLAG);
+                OHCI_MEM32_WR(instance->status, ED_STATUS_K_FLAG);
                 return;
         }
@@ -65 +65 @@
 
         /* Status: address, endpoint nr, direction mask and max packet size. */
-        OHCI_WR(instance->status,
+        OHCI_MEM32_WR(instance->status,
             ((ep->address & ED_STATUS_FA_MASK) << ED_STATUS_FA_SHIFT)
             | ((ep->endpoint & ED_STATUS_EN_MASK) << ED_STATUS_EN_SHIFT)
@@ -74 +74 @@
         /* Low speed flag */
         if (ep->speed == USB_SPEED_LOW)
-                OHCI_SET(instance->status, ED_STATUS_S_FLAG);
+                OHCI_MEM32_SET(instance->status, ED_STATUS_S_FLAG);
 
         /* Isochronous format flag */
         if (ep->transfer_type == USB_TRANSFER_ISOCHRONOUS)
-                OHCI_SET(instance->status, ED_STATUS_F_FLAG);
+                OHCI_MEM32_SET(instance->status, ED_STATUS_F_FLAG);
 
         /* Set TD to the list */
         const uintptr_t pa = addr_to_phys(td);
-        OHCI_WR(instance->td_head, pa & ED_TDHEAD_PTR_MASK);
-        OHCI_WR(instance->td_tail, pa & ED_TDTAIL_PTR_MASK);
+        OHCI_MEM32_WR(instance->td_head, pa & ED_TDHEAD_PTR_MASK);
+        OHCI_MEM32_WR(instance->td_tail, pa & ED_TDTAIL_PTR_MASK);
 
         /* Set toggle bit */
         if (ep->toggle)
-                OHCI_SET(instance->td_head, ED_TDHEAD_TOGGLE_CARRY);
+                OHCI_MEM32_SET(instance->td_head, ED_TDHEAD_TOGGLE_CARRY);
 
 }