Changeset 3bacee1 in mainline for uspace/drv/bus/usb/ohci/ohci_batch.c

Timestamp:

2018-04-12T16:27:17Z (6 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/ohci/ohci_batch.c (modified) (8 diffs)

uspace/drv/bus/usb/ohci/ohci_batch.c

@@ -48 +48 @@
 #include "ohci_bus.h"
 
-static void (*const batch_setup[])(ohci_transfer_batch_t*);
+static void (*const batch_setup[])(ohci_transfer_batch_t *);
 
 /** Safely destructs ohci_transfer_batch_t structure
@@ -67 +67 @@
  * NULL otherwise.
  */
-ohci_transfer_batch_t * ohci_transfer_batch_create(endpoint_t *ep)
+ohci_transfer_batch_t *ohci_transfer_batch_create(endpoint_t *ep)
 {
         assert(ep);
@@ -97 +97 @@
                 return ENOTSUP;
 
-        ohci_batch->td_count = (usb_batch->size + OHCI_TD_MAX_TRANSFER - 1)
-            / OHCI_TD_MAX_TRANSFER;
+        ohci_batch->td_count = (usb_batch->size + OHCI_TD_MAX_TRANSFER - 1) /
+            OHCI_TD_MAX_TRANSFER;
         /* Control transfer need Setup and Status stage */
         if (usb_batch->ep->transfer_type == USB_TRANSFER_CONTROL) {
@@ -110 +110 @@
 
         const size_t td_size = ohci_batch->td_count * sizeof(td_t);
-        const size_t setup_size = (usb_batch->ep->transfer_type == USB_TRANSFER_CONTROL)
-                ? USB_SETUP_PACKET_SIZE
-                : 0;
+        const size_t setup_size = (usb_batch->ep->transfer_type == USB_TRANSFER_CONTROL) ?
+            USB_SETUP_PACKET_SIZE :
+            0;
 
         if (dma_buffer_alloc(&ohci_batch->ohci_dma_buffer, td_size + setup_size)) {
@@ -190 +190 @@
                          * we leave the very last(unused) TD behind.
                          */
-                        usb_batch->transferred_size
-                            -= td_remain_size(ohci_batch->tds[i]);
+                        usb_batch->transferred_size -=
+                            td_remain_size(ohci_batch->tds[i]);
                 } else {
                         usb_log_debug("Batch %p found error TD(%zu):%08x.",
@@ -289 +289 @@
         /* Data stage */
         size_t td_current = 1;
-        const char* buffer = ohci_batch->data_buffer;
+        const char *buffer = ohci_batch->data_buffer;
         size_t remain_size = ohci_batch->base.size;
         while (remain_size > 0) {
@@ -347 +347 @@
         char *buffer = ohci_batch->data_buffer;
         while (remain_size > 0) {
-                const size_t transfer_size = remain_size > OHCI_TD_MAX_TRANSFER
-                    ? OHCI_TD_MAX_TRANSFER : remain_size;
+                const size_t transfer_size = remain_size > OHCI_TD_MAX_TRANSFER ?
+                    OHCI_TD_MAX_TRANSFER : remain_size;
 
                 td_init(
@@ -374 +374 @@
 
 /** Transfer setup table. */
-static void (*const batch_setup[])(ohci_transfer_batch_t*) =
-{
+static void (*const batch_setup[])(ohci_transfer_batch_t *) =
+    {
         [USB_TRANSFER_CONTROL] = batch_control,
         [USB_TRANSFER_BULK] = batch_data,