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

Timestamp:

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

uspace/drv/bus/usb/usbhub/usbhub.c

@@ -83 +83 @@
  */
 static const usb_endpoint_description_t
-        status_change_single_tt_only = HUB_STATUS_CHANGE_EP(0),
-        status_change_mtt_available = HUB_STATUS_CHANGE_EP(1);
+    status_change_single_tt_only = HUB_STATUS_CHANGE_EP(0),
+    status_change_mtt_available = HUB_STATUS_CHANGE_EP(1);
 
 const usb_endpoint_description_t *usb_hub_endpoints [] = {
@@ -107 +107 @@
 
 static bool usb_hub_polling_error_callback(usb_device_t *dev,
-        errno_t err_code, void *arg)
+    errno_t err_code, void *arg)
 {
         assert(dev);
@@ -113 +113 @@
 
         usb_log_error("Device %s polling error: %s",
-                usb_device_get_name(dev), str_error(err_code));
+            usb_device_get_name(dev), str_error(err_code));
 
         return true;
@@ -153 +153 @@
         }
 
-        const usb_endpoint_description_t *status_change = hub_dev->mtt_available
-            ? &status_change_mtt_available
-            : &status_change_single_tt_only;
-
-        usb_endpoint_mapping_t *status_change_mapping
-                = usb_device_get_mapped_ep_desc(hub_dev->usb_device, status_change);
+        const usb_endpoint_description_t *status_change = hub_dev->mtt_available ?
+            &status_change_mtt_available :
+            &status_change_single_tt_only;
+
+        usb_endpoint_mapping_t *status_change_mapping =
+            usb_device_get_mapped_ep_desc(hub_dev->usb_device, status_change);
         if (!status_change_mapping) {
                 usb_log_error("Failed to map the Status Change Endpoint of a hub.");
@@ -212 +212 @@
         if (ret != EOK) {
                 usb_log_error("(%p) Failed to unbind '%s' function: %s.",
-                   hub, HUB_FNC_NAME, str_error(ret));
+                    hub, HUB_FNC_NAME, str_error(ret));
                 return ret;
         }
@@ -272 +272 @@
  */
 static errno_t usb_hub_polling_init(usb_hub_dev_t *hub_dev,
-        usb_endpoint_mapping_t *mapping)
+    usb_endpoint_mapping_t *mapping)
 {
         errno_t err;
@@ -377 +377 @@
         usb_pipe_t *control_pipe = usb_device_get_default_pipe(hub_dev->usb_device);
 
-        usb_descriptor_type_t desc_type = hub_dev->speed >= USB_SPEED_SUPER
-                ? USB_DESCTYPE_SSPEED_HUB : USB_DESCTYPE_HUB;
+        usb_descriptor_type_t desc_type = hub_dev->speed >= USB_SPEED_SUPER ?
+            USB_DESCTYPE_SSPEED_HUB : USB_DESCTYPE_HUB;
 
         /* Get hub descriptor. */
@@ -420 +420 @@
             descriptor.characteristics & HUB_CHAR_POWER_PER_PORT_FLAG;
 
-        const uint8_t protocol = usb_device_descriptors(hub_dev->usb_device)
-                ->device.device_protocol;
+        const uint8_t protocol = usb_device_descriptors(hub_dev->usb_device)->device.device_protocol;
         hub_dev->mtt_available = (protocol == 2);
 
@@ -456 +455 @@
 
         if (config_size < sizeof(usb_standard_configuration_descriptor_t)) {
-            usb_log_error("Configuration descriptor is not big enough"
-                " to fit standard configuration descriptor.\n");
-            return EOVERFLOW;
+                usb_log_error("Configuration descriptor is not big enough"
+                    " to fit standard configuration descriptor.\n");
+                return EOVERFLOW;
         }