Changeset 3bacee1 in mainline for uspace/drv/bus/usb/ehci/ehci_batch.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/ehci/ehci_batch.c (modified) (11 diffs)

uspace/drv/bus/usb/ehci/ehci_batch.c

@@ -53 +53 @@
 #define EHCI_TD_MAX_TRANSFER   (16 * 1024)
 
-static void (*const batch_setup[])(ehci_transfer_batch_t*);
+static void (*const batch_setup[])(ehci_transfer_batch_t *);
 
 /** Safely destructs ehci_transfer_batch_t structure
@@ -74 +74 @@
  *
  */
-ehci_transfer_batch_t * ehci_transfer_batch_create(endpoint_t *ep)
+ehci_transfer_batch_t *ehci_transfer_batch_create(endpoint_t *ep)
 {
         assert(ep);
@@ -99 +99 @@
         assert(ehci_batch);
 
-        const size_t setup_size = (ehci_batch->base.ep->transfer_type == USB_TRANSFER_CONTROL)
-                ? USB_SETUP_PACKET_SIZE
-                : 0;
+        const size_t setup_size = (ehci_batch->base.ep->transfer_type == USB_TRANSFER_CONTROL) ?
+            USB_SETUP_PACKET_SIZE :
+            0;
 
         const size_t size = ehci_batch->base.size;
@@ -109 +109 @@
 
         /* Determine number of TDs needed */
-        ehci_batch->td_count = (size + EHCI_TD_MAX_TRANSFER - 1)
-                / EHCI_TD_MAX_TRANSFER;
+        ehci_batch->td_count = (size + EHCI_TD_MAX_TRANSFER - 1) /
+            EHCI_TD_MAX_TRANSFER;
 
         /* Control transfer need Setup and Status stage */
@@ -173 +173 @@
             ehci_batch->qh->next, ehci_batch->qh->alternate);
 
-        if (!qh_halted(ehci_batch->qh) && (qh_transfer_pending(ehci_batch->qh)
-            || qh_transfer_active(ehci_batch->qh)))
+        if (!qh_halted(ehci_batch->qh) && (qh_transfer_pending(ehci_batch->qh) ||
+            qh_transfer_active(ehci_batch->qh)))
                 return false;
 
@@ -204 +204 @@
                          * we leave the very last(unused) TD behind.
                          */
-                        ehci_batch->base.transferred_size
-                            -= td_remain_size(&ehci_batch->tds[i]);
+                        ehci_batch->base.transferred_size -=
+                            td_remain_size(&ehci_batch->tds[i]);
                 } else {
                         usb_log_debug("Batch %p found error TD(%zu):%08x: %s.",
@@ -274 +274 @@
             dma_buffer_phys(&ehci_batch->ehci_dma_buffer, ehci_batch->setup_buffer),
             USB_DIRECTION_BOTH, USB_SETUP_PACKET_SIZE, toggle, false);
-        usb_log_debug2("Batch %p: Created CONTROL SETUP TD(%"PRIxn"): "
+        usb_log_debug2("Batch %p: Created CONTROL SETUP TD(%" PRIxn "): "
             "%08x:%08x:%08x", ehci_batch,
             dma_buffer_phys(&ehci_batch->ehci_dma_buffer, &ehci_batch->tds[0]),
@@ -292 +292 @@
                     dma_buffer_phys(&ehci_batch->ehci_dma_buffer, &ehci_batch->tds[td_current + 1]),
                     buffer, data_dir, transfer_size, toggle, false);
-                usb_log_debug2("Batch %p: Created CONTROL DATA TD(%"PRIxn"): "
+                usb_log_debug2("Batch %p: Created CONTROL DATA TD(%" PRIxn "): "
                     "%08x:%08x:%08x", ehci_batch,
                     dma_buffer_phys(&ehci_batch->ehci_dma_buffer, &ehci_batch->tds[td_current]),
@@ -308 +308 @@
         assert(td_current == ehci_batch->td_count - 1);
         td_init(&ehci_batch->tds[td_current], 0, 0, status_dir, 0, 1, true);
-        usb_log_debug2("Batch %p: Created CONTROL STATUS TD %d(%"PRIxn"): "
+        usb_log_debug2("Batch %p: Created CONTROL STATUS TD %d(%" PRIxn "): "
             "%08x:%08x:%08x", ehci_batch, td_current,
             dma_buffer_phys(&ehci_batch->ehci_dma_buffer, &ehci_batch->tds[td_current]),
@@ -340 +340 @@
             ehci_batch->data_buffer);
         while (remain_size > 0) {
-                const size_t transfer_size = remain_size > EHCI_TD_MAX_TRANSFER
-                    ? EHCI_TD_MAX_TRANSFER : remain_size;
+                const size_t transfer_size = remain_size > EHCI_TD_MAX_TRANSFER ?
+                    EHCI_TD_MAX_TRANSFER : remain_size;
 
                 const bool last = (remain_size == transfer_size);
                 td_init(&ehci_batch->tds[td_current],
                     last ? 0 : dma_buffer_phys(&ehci_batch->ehci_dma_buffer,
-                            &ehci_batch->tds[td_current + 1]),
+                    &ehci_batch->tds[td_current + 1]),
                     buffer, ehci_batch->base.dir, transfer_size, -1, last);
 
-                usb_log_debug2("Batch %p: DATA TD(%"PRIxn": %08x:%08x:%08x",
+                usb_log_debug2("Batch %p: DATA TD(%" PRIxn ": %08x:%08x:%08x",
                     ehci_batch,
                     dma_buffer_phys(&ehci_batch->ehci_dma_buffer,
-                        &ehci_batch->tds[td_current]),
+                    &ehci_batch->tds[td_current]),
                     ehci_batch->tds[td_current].status,
                     ehci_batch->tds[td_current].next,
@@ -365 +365 @@
 
 /** Transfer setup table. */
-static void (*const batch_setup[])(ehci_transfer_batch_t*) =
-{
+static void (*const batch_setup[])(ehci_transfer_batch_t *) =
+    {
         [USB_TRANSFER_CONTROL] = batch_control,
         [USB_TRANSFER_BULK] = batch_data,