Changeset 72cf064 in mainline for uspace/drv/bus/usb/ohci/hw_struct/endpoint_descriptor.c

Timestamp:

2012-08-13T17:17:04Z (12 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

33fee91

Parents:

f4a8734 (diff), 4820360 (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/endpoint_descriptor.c (modified) (2 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. */
-                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. */
-        instance->status = 0
-            | ((ep->address & ED_STATUS_FA_MASK) << ED_STATUS_FA_SHIFT)
+        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)
             | ((dir[ep->direction] & ED_STATUS_D_MASK) << ED_STATUS_D_SHIFT)
             | ((ep->max_packet_size & ED_STATUS_MPS_MASK)
-                << ED_STATUS_MPS_SHIFT);
+                << ED_STATUS_MPS_SHIFT));
 
         /* Low speed flag */
         if (ep->speed == USB_SPEED_LOW)
-                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)
-                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);
-        instance->td_head = pa & ED_TDHEAD_PTR_MASK;
-        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)
-                instance->td_head |= ED_TDHEAD_TOGGLE_CARRY;
+                OHCI_MEM32_SET(instance->td_head, ED_TDHEAD_TOGGLE_CARRY);
 
 }