Changeset 3bacee1 in mainline for uspace/drv/bus/usb/ohci/hw_struct

Timestamp:

2018-04-12T16:27:17Z (8 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

3cf22f9

Parents:

76d0981d

git-author:

Jiri Svoboda <jiri@…> (2018-04-11 19:25:33)

git-committer:

Jiri Svoboda <jiri@…> (2018-04-12 16:27:17)

Message:

Make ccheck-fix again and commit more good files.

Location:

uspace/drv/bus/usb/ohci/hw_struct

Files:

• endpoint_descriptor.c (modified) (1 diff)
• endpoint_descriptor.h (modified) (2 diffs)
• transfer_descriptor.c (modified) (1 diff)
• transfer_descriptor.h (modified) (2 diffs)

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

@@ -81 +81 @@
         /* Status: address, endpoint nr, direction mask and max packet size. */
         OHCI_MEM32_WR(instance->status,
-            ((ep->device->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));
+            ((ep->device->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));
 
         /* Low speed flag */

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

@@ -119 +119 @@
 {
         assert(instance);
-        return (OHCI_MEM32_RD(instance->td_head) & ED_TDHEAD_HALTED_FLAG)
-            || (OHCI_MEM32_RD(instance->status) & ED_STATUS_K_FLAG);
+        return (OHCI_MEM32_RD(instance->td_head) & ED_TDHEAD_HALTED_FLAG) ||
+            (OHCI_MEM32_RD(instance->status) & ED_STATUS_K_FLAG);
 }
 
@@ -137 +137 @@
 {
         assert(instance);
-        return (OHCI_MEM32_RD(instance->td_head) & ED_TDHEAD_PTR_MASK)
-            != (OHCI_MEM32_RD(instance->td_tail) & ED_TDTAIL_PTR_MASK);
+        return (OHCI_MEM32_RD(instance->td_head) & ED_TDHEAD_PTR_MASK) !=
+            (OHCI_MEM32_RD(instance->td_tail) & ED_TDTAIL_PTR_MASK);
 }
 

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

@@ -68 +68 @@
         /* Set PID and Error code */
         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));
+            ((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) {

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

@@ -103 +103 @@
 {
         assert(instance);
-        const int cc = (OHCI_MEM32_RD(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.
@@ -122 +122 @@
 {
         assert(instance);
-        const int cc = (OHCI_MEM32_RD(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);
 }