Changeset ae3a941 in mainline for uspace/drv/bus/usb/ohci/hw_struct

Timestamp:

2018-02-26T16:51:40Z (8 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

e773f58

Parents:

3692678

Message:

usb: cstyle

Location:

uspace/drv/bus/usb/ohci/hw_struct

Files:

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

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

@@ -84 +84 @@
             | ((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->max_packet_size & ED_STATUS_MPS_MASK) << ED_STATUS_MPS_SHIFT));
 
         /* Low speed flag */

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

@@ -107 +107 @@
 #define ED_NEXT_PTR_MASK (0xfffffff0)
 #define ED_NEXT_PTR_SHIFT (0)
-} __attribute__((packed,aligned(32))) ed_t;
+} __attribute__((packed, aligned(32))) ed_t;
 
 void ed_init(ed_t *instance, const endpoint_t *ep, const td_t *td);
@@ -204 +204 @@
 {
         assert(instance);
-        return (OHCI_MEM32_RD(instance->td_head) & ED_TDHEAD_TOGGLE_CARRY) ? 1 : 0;
+        return !!(OHCI_MEM32_RD(instance->td_head) & ED_TDHEAD_TOGGLE_CARRY);
 }
 

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

@@ -69 +69 @@
 #define ITD_OFFSET_CC_SHIFT (12)
 
-} __attribute__((packed,aligned(32))) itd_t;
+} __attribute__((packed, aligned(32))) itd_t;
 
 #endif

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

@@ -90 +90 @@
          */
         volatile uint32_t be;
-} __attribute__((packed,aligned(32))) td_t;
+} __attribute__((packed, aligned(32))) td_t;
 
 void td_init(td_t *, const td_t *, usb_direction_t, const void *, size_t, int);
@@ -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.