Changeset 3bacee1 in mainline for uspace/drv/bus/usb/uhci/hw_struct/transfer_descriptor.c

Timestamp:

2018-04-12T16:27:17Z (7 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.

File:

• uspace/drv/bus/usb/uhci/hw_struct/transfer_descriptor.c (modified) (3 diffs)

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

@@ -72 +72 @@
         assert(instance);
         assert(size < 1024);
-        assert((pid == USB_PID_SETUP) || (pid == USB_PID_IN)
-            || (pid == USB_PID_OUT));
+        assert((pid == USB_PID_SETUP) || (pid == USB_PID_IN) ||
+            (pid == USB_PID_OUT));
 
         const uint32_t next_pa = addr_to_phys(next);
         assert((next_pa & LINK_POINTER_ADDRESS_MASK) == next_pa);
 
-        instance->next = 0
-            | LINK_POINTER_VERTICAL_FLAG
-            | (next_pa ? next_pa : LINK_POINTER_TERMINATE_FLAG);
+        instance->next = 0 |
+            LINK_POINTER_VERTICAL_FLAG |
+            (next_pa ? next_pa : LINK_POINTER_TERMINATE_FLAG);
 
-        instance->status = 0
-            | ((err_count & TD_STATUS_ERROR_COUNT_MASK)
-                << TD_STATUS_ERROR_COUNT_POS)
-            | (low_speed ? TD_STATUS_LOW_SPEED_FLAG : 0)
-            | (iso ? TD_STATUS_ISOCHRONOUS_FLAG : 0)
-            | TD_STATUS_ERROR_ACTIVE;
+        instance->status = 0 |
+            ((err_count & TD_STATUS_ERROR_COUNT_MASK) <<
+            TD_STATUS_ERROR_COUNT_POS) |
+            (low_speed ? TD_STATUS_LOW_SPEED_FLAG : 0) |
+            (iso ? TD_STATUS_ISOCHRONOUS_FLAG : 0) |
+            TD_STATUS_ERROR_ACTIVE;
 
         if (pid == USB_PID_IN && !iso) {
@@ -93 +93 @@
         }
 
-        instance->device = 0
-            | (((size - 1) & TD_DEVICE_MAXLEN_MASK) << TD_DEVICE_MAXLEN_POS)
-            | (toggle ? TD_DEVICE_DATA_TOGGLE_ONE_FLAG : 0)
-            | ((target.address & TD_DEVICE_ADDRESS_MASK)
-                << TD_DEVICE_ADDRESS_POS)
-            | ((target.endpoint & TD_DEVICE_ENDPOINT_MASK)
-                << TD_DEVICE_ENDPOINT_POS)
-            | ((pid & TD_DEVICE_PID_MASK) << TD_DEVICE_PID_POS);
+        instance->device = 0 |
+            (((size - 1) & TD_DEVICE_MAXLEN_MASK) << TD_DEVICE_MAXLEN_POS) |
+            (toggle ? TD_DEVICE_DATA_TOGGLE_ONE_FLAG : 0) |
+            ((target.address & TD_DEVICE_ADDRESS_MASK) <<
+            TD_DEVICE_ADDRESS_POS) |
+            ((target.endpoint & TD_DEVICE_ENDPOINT_MASK) <<
+            TD_DEVICE_ENDPOINT_POS) |
+            ((pid & TD_DEVICE_PID_MASK) << TD_DEVICE_PID_POS);
 
         instance->buffer_ptr = addr_to_phys(buffer);
@@ -175 +175 @@
             (s & TD_STATUS_ERROR_BIT_STUFF) ? " BIT_STUFF," : "",
             (s & TD_STATUS_ERROR_RESERVED) ? " RESERVED," : "",
-            td_act_size(instance)
-        );
+            td_act_size(instance));
 }
 /**