Changeset 1433ecda in mainline for uspace/lib/usbhost

Timestamp:

2018-04-04T15:42:37Z (7 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

2c4e1cc

Parents:

47b2d7e3

Message:

Fix cstyle: make ccheck-fix and commit only files where all the changes are good.

Location:

uspace/lib/usbhost

Files:

• include/usb/host/endpoint.h (modified) (1 diff)
• include/usb/host/utils/malloc32.h (modified) (1 diff)
• src/bus.c (modified) (4 diffs)
• src/usb_transfer_batch.c (modified) (3 diffs)

uspace/lib/usbhost/include/usb/host/endpoint.h

@@ -133 +133 @@
 static inline bus_t *endpoint_get_bus(endpoint_t *ep)
 {
-        device_t * const device = ep->device;
+        device_t *const device = ep->device;
         return device ? device->bus : NULL;
 }

uspace/lib/usbhost/include/usb/host/utils/malloc32.h

@@ -72 +72 @@
  * @return Address of the aligned and big enough memory place, NULL on failure.
  */
-static inline void * malloc32(size_t size)
+static inline void *malloc32(size_t size)
 {
         uintptr_t phys;

uspace/lib/usbhost/src/bus.c

@@ -114 +114 @@
                 dev->tt.dev = dev->hub;
                 dev->tt.port = dev->port;
-        }
-        else {
+        } else {
                 /* Inherit hub's TT */
                 dev->tt = dev->hub->tt;
@@ -172 +171 @@
                     ddf_fun_get_name(dev->fun), i, op);
 
-                endpoint_t * const ep = dev->endpoints[i];
+                endpoint_t *const ep = dev->endpoints[i];
                 endpoint_add_ref(ep);
 
@@ -190 +189 @@
         /* Remove also orphaned children. */
         while (!list_empty(&dev->devices)) {
-                device_t * const child = list_get_instance(list_first(&dev->devices), device_t, link);
+                device_t *const child = list_get_instance(list_first(&dev->devices), device_t, link);
 
                 /*
@@ -405 +404 @@
         if (ep->max_transfer_size == 0) {
                 usb_log_warning("Invalid endpoint description (mps %zu, "
-                        "%u packets)", ep->max_packet_size, ep->packets_per_uframe);
+                    "%u packets)", ep->max_packet_size, ep->packets_per_uframe);
                 goto drop;
         }

uspace/lib/usbhost/src/usb_transfer_batch.c

@@ -93 +93 @@
                     batch, USB_TRANSFER_BATCH_ARGS(*batch));
                 bus->ops->batch_destroy(batch);
-        }
-        else {
+        } else {
                 usb_log_debug2("Batch %p " USB_TRANSFER_BATCH_FMT " disposing.",
                     batch, USB_TRANSFER_BATCH_ARGS(*batch));
@@ -118 +117 @@
         size_t chunk_mask = dma_policy_chunk_mask(batch->dma_buffer.policy);
         size_t required_chunk_mask =
-             dma_policy_chunk_mask(batch->ep->required_transfer_buffer_policy);
+            dma_policy_chunk_mask(batch->ep->required_transfer_buffer_policy);
 
         /* If the chunks are at least as large as required, we're good */
@@ -180 +179 @@
                         /* We we're forced to use bounce buffer, copy it back */
                         if (batch->dir == USB_DIRECTION_IN)
-                        memcpy(batch->original_buffer,
-                            batch->dma_buffer.virt,
-                            batch->transferred_size);
+                                memcpy(batch->original_buffer,
+                                    batch->dma_buffer.virt,
+                                    batch->transferred_size);
 
                         dma_buffer_free(&batch->dma_buffer);
-                }
-                else {
+                } else {
                         dma_buffer_release(&batch->dma_buffer);
                 }