Changeset 904b1bc in mainline for uspace/lib/usbhost/src

Timestamp:

2018-05-22T10:36:58Z (7 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

a4eb3ba2

Parents:

4f8772d4

git-author:

Jiri Svoboda <jiri@…> (2018-05-21 17:36:30)

git-committer:

Jiri Svoboda <jiri@…> (2018-05-22 10:36:58)

Message:

Fix remaining ccheck issues.

Location:

uspace/lib/usbhost/src

Files:

• ddf_helpers.c (modified) (4 diffs)
• usb2_bus.c (modified) (2 diffs)
• utility.c (modified) (5 diffs)

uspace/lib/usbhost/src/ddf_helpers.c

@@ -66 +66 @@
  */
 static errno_t register_endpoint(ddf_fun_t *fun, usb_pipe_desc_t *pipe_desc,
-     const usb_endpoint_descriptors_t *ep_desc)
+    const usb_endpoint_descriptors_t *ep_desc)
 {
         assert(fun);
@@ -92 +92 @@
 }
 
- /**
-  * DDF usbhc_iface callback. Unregister endpoint that makes the other end of
-  * the pipe described.
-  *
-  * @param fun DDF function of the device in question.
-  * @param pipe_desc Pipe description.
-  * @return Error code.
-  */
+/**
+ * DDF usbhc_iface callback. Unregister endpoint that makes the other end of
+ * the pipe described.
+ *
+ * @param fun DDF function of the device in question.
+ * @param pipe_desc Pipe description.
+ * @return Error code.
+ */
 static errno_t unregister_endpoint(ddf_fun_t *fun, const usb_pipe_desc_t *pipe_desc)
 {
@@ -182 +182 @@
         }
 
-        /* If the driver didn't name the dev when enumerating,
+        /*
+         * If the driver didn't name the dev when enumerating,
          * do it in some generic way.
          */
@@ -281 +282 @@
         assert(dev);
 
-        const usb_target_t target = {{
-                .address = dev->address,
-                .endpoint = ifreq->endpoint,
-                .stream = ifreq->stream,
-        }};
+        const usb_target_t target = {
+                {
+                        .address = dev->address,
+                        .endpoint = ifreq->endpoint,
+                        .stream = ifreq->stream,
+                }
+        };
 
         if (!usb_target_is_valid(&target))

uspace/lib/usbhost/src/usb2_bus.c

@@ -89 +89 @@
 }
 
-static const usb_target_t usb2_default_target = {{
-        .address = USB_ADDRESS_DEFAULT,
-        .endpoint = 0,
-}};
+static const usb_target_t usb2_default_target = {
+        {
+                .address = USB_ADDRESS_DEFAULT,
+                .endpoint = 0,
+        }
+};
 
 /**
@@ -120 +122 @@
 
         usb_endpoint_descriptors_t ep0_desc = {
-            .endpoint.max_packet_size = CTRL_PIPE_MIN_PACKET_SIZE,
+                .endpoint.max_packet_size = CTRL_PIPE_MIN_PACKET_SIZE,
         };
 

uspace/lib/usbhost/src/utility.c

@@ -84 +84 @@
         }
 
-        const usb_target_t control_ep = {{
-                .address = dev->address,
-                .endpoint = 0,
-        }};
+        const usb_target_t control_ep = {
+                {
+                        .address = dev->address,
+                        .endpoint = 0,
+                }
+        };
 
         usb_standard_device_descriptor_t desc = { 0 };
@@ -123 +125 @@
 int hc_get_device_desc(device_t *device, usb_standard_device_descriptor_t *desc)
 {
-        const usb_target_t control_ep = {{
-                .address = device->address,
-                .endpoint = 0,
-        }};
+        const usb_target_t control_ep = {
+                {
+                        .address = device->address,
+                        .endpoint = 0,
+                }
+        };
 
         /* Get std device descriptor */
@@ -147 +151 @@
 int hc_get_hub_desc(device_t *device, usb_hub_descriptor_header_t *desc)
 {
-        const usb_target_t control_ep = {{
-                .address = device->address,
-                .endpoint = 0,
-        }};
-
-        const usb_descriptor_type_t type = device->speed >= USB_SPEED_SUPER
-                ? USB_DESCTYPE_SSPEED_HUB : USB_DESCTYPE_HUB;
+        const usb_target_t control_ep = {
+                {
+                        .address = device->address,
+                        .endpoint = 0,
+                }
+        };
+
+        const usb_descriptor_type_t type = device->speed >= USB_SPEED_SUPER ?
+            USB_DESCTYPE_SSPEED_HUB : USB_DESCTYPE_HUB;
 
         const usb_device_request_setup_packet_t get_hub_desc = {
-                .request_type = SETUP_REQUEST_TYPE_DEVICE_TO_HOST
-                    | (USB_REQUEST_TYPE_CLASS << 5)
-                    | USB_REQUEST_RECIPIENT_DEVICE,
+                .request_type = SETUP_REQUEST_TYPE_DEVICE_TO_HOST |
+                    (USB_REQUEST_TYPE_CLASS << 5) |
+                    USB_REQUEST_RECIPIENT_DEVICE,
                 .request = USB_DEVREQ_GET_DESCRIPTOR,
                 .value = uint16_host2usb(type << 8),
@@ -244 +250 @@
 void hc_reset_toggles(const usb_transfer_batch_t *batch, endpoint_reset_toggle_t reset_cb)
 {
-        if (batch->ep->transfer_type != USB_TRANSFER_CONTROL
-            || batch->dir != USB_DIRECTION_OUT)
+        if (batch->ep->transfer_type != USB_TRANSFER_CONTROL ||
+            batch->dir != USB_DIRECTION_OUT)
                 return;
 
         const usb_device_request_setup_packet_t *request = &batch->setup.packet;
-        device_t * const dev = batch->ep->device;
-
-        switch (request->request)
-        {
-        /* Clear Feature ENPOINT_STALL */
+        device_t *const dev = batch->ep->device;
+
+        switch (request->request) {
+                /* Clear Feature ENPOINT_STALL */
         case USB_DEVREQ_CLEAR_FEATURE: /*resets only cleared ep */
                 /* 0x2 ( HOST to device | STANDART | TO ENPOINT) */
@@ -273 +278 @@
         case USB_DEVREQ_SET_CONFIGURATION:
         case USB_DEVREQ_SET_INTERFACE:
-                /* Recipient must be device, this resets all endpoints,
+                /*
+                 * Recipient must be device, this resets all endpoints,
                  * In fact there should be no endpoints but EP 0 registered
                  * as different interfaces use different endpoints,
                  * unless you're changing configuration or alternative
-                 * interface of an already setup device. */
+                 * interface of an already setup device.
+                 */
                 if (!(request->request_type & SETUP_REQUEST_TYPE_DEVICE_TO_HOST))
                         for (usb_endpoint_t i = 0; i < 2 * USB_ENDPOINT_MAX; ++i)