Changeset 18b6a88 in mainline for uspace/drv/bus/usb/uhci/uhci_batch.c

Timestamp:

2018-04-15T09:35:04Z (7 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

c1f44ca

Parents:

8ebe212

Message:

More ccheck fixes, sometimes with manual intervention.

File:

• uspace/drv/bus/usb/uhci/uhci_batch.c (modified) (8 diffs)

uspace/drv/bus/usb/uhci/uhci_batch.c

@@ -53 +53 @@
 
 /** Transfer batch setup table. */
-static void (*const batch_setup[])(uhci_transfer_batch_t*);
+static void (*const batch_setup[])(uhci_transfer_batch_t *);
 
 /** Destroys uhci_transfer_batch_t structure.
@@ -72 +72 @@
  * NULL otherwise.
  */
-uhci_transfer_batch_t * uhci_transfer_batch_create(endpoint_t *ep)
+uhci_transfer_batch_t *uhci_transfer_batch_create(endpoint_t *ep)
 {
         uhci_transfer_batch_t *uhci_batch =
@@ -99 +99 @@
         usb_transfer_batch_t *usb_batch = &uhci_batch->base;
 
-        uhci_batch->td_count = (usb_batch->size + usb_batch->ep->max_packet_size - 1)
-                / usb_batch->ep->max_packet_size;
+        uhci_batch->td_count = (usb_batch->size + usb_batch->ep->max_packet_size - 1) /
+            usb_batch->ep->max_packet_size;
 
         if (usb_batch->ep->transfer_type == USB_TRANSFER_CONTROL) {
@@ -106 +106 @@
         }
 
-        const size_t setup_size = (usb_batch->ep->transfer_type == USB_TRANSFER_CONTROL)
-                ? USB_SETUP_PACKET_SIZE
-                : 0;
-
-        const size_t total_size = (sizeof(td_t) * uhci_batch->td_count)
-            + sizeof(qh_t) + setup_size;
+        const size_t setup_size = (usb_batch->ep->transfer_type == USB_TRANSFER_CONTROL) ?
+            USB_SETUP_PACKET_SIZE :
+            0;
+
+        const size_t total_size = (sizeof(td_t) * uhci_batch->td_count) +
+            sizeof(qh_t) + setup_size;
 
         if (dma_buffer_alloc(&uhci_batch->uhci_dma_buffer, total_size)) {
@@ -162 +162 @@
         uhci_endpoint_t *uhci_ep = (uhci_endpoint_t *) batch->ep;
 
-        for (size_t i = 0;i < uhci_batch->td_count; ++i) {
+        for (size_t i = 0; i < uhci_batch->td_count; ++i) {
                 if (td_is_active(&uhci_batch->tds[i])) {
                         return false;
@@ -180 +180 @@
                 }
 
-                batch->transferred_size
-                    += td_act_size(&uhci_batch->tds[i]);
+                batch->transferred_size +=
+                    td_act_size(&uhci_batch->tds[i]);
                 if (td_is_short(&uhci_batch->tds[i]))
                         goto substract_ret;
@@ -235 +235 @@
                 const size_t packet_size = min(remain_size, mps);
 
-                const td_t *next_td = (td + 1 < uhci_batch->td_count)
-                    ? &uhci_batch->tds[td + 1] : NULL;
+                const td_t *next_td = (td + 1 < uhci_batch->td_count) ?
+                    &uhci_batch->tds[td + 1] : NULL;
 
                 assert(td < uhci_batch->td_count);
@@ -328 +328 @@
 }
 
-static void (*const batch_setup[])(uhci_transfer_batch_t*) =
-{
+static void (*const batch_setup[])(uhci_transfer_batch_t *) =
+    {
         [USB_TRANSFER_CONTROL] = batch_control,
         [USB_TRANSFER_BULK] = batch_data,