Changeset 8033f89 in mainline for uspace/drv/bus/usb/xhci/device.c

Timestamp:

2018-01-23T12:41:22Z (7 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

e7e1fd3

Parents:

e546142

Message:

xhci: cstyle

File:

• uspace/drv/bus/usb/xhci/device.c (modified) (11 diffs)

uspace/drv/bus/usb/xhci/device.c

@@ -56 +56 @@
 #include "device.h"
 
-/** Initial descriptor used for control endpoint 0 before more configuration is retrieved. */
+/**
+ * Initial descriptor used for control endpoint 0,
+ * before more configuration is retrieved.
+ */
 static const usb_endpoint_descriptors_t ep0_initial_desc = {
         .endpoint.max_packet_size = CTRL_PIPE_MIN_PACKET_SIZE,
@@ -87 +90 @@
         dev->base.endpoints[0] = ep0_base;
 
-        usb_log_debug("Looking up new device initial MPS: %s", usb_str_speed(dev->base.speed));
+        usb_log_debug("Looking up new device initial MPS: %s",
+            usb_str_speed(dev->base.speed));
         ep0_base->max_packet_size = hc_get_ep0_initial_mps(dev->base.speed);
 
@@ -117 +121 @@
 
         uint16_t max_packet_size;
-        if ((err = hc_get_ep0_max_packet_size(&max_packet_size, (bus_t *) &hc->bus, &dev->base)))
+        if ((err = hc_get_ep0_max_packet_size(&max_packet_size,
+            (bus_t *) &hc->bus, &dev->base)))
                 return err;
 
@@ -160 +165 @@
         }
 
-        usb_log_debug("Device(%u): recognised USB hub with %u ports", dev->base.address, dev->num_ports);
+        usb_log_debug("Device(%u): recognised USB hub with %u ports",
+            dev->base.address, dev->num_ports);
         return EOK;
 }
@@ -197 +203 @@
 
         if (err) {
-                usb_log_error("Failed to setup address of the new device: %s", str_error(err));
+                usb_log_error("Failed to setup address of the new device: %s",
+                    str_error(err));
                 return err;
         }
@@ -208 +215 @@
 
         if ((err = setup_ep0_packet_size(bus->hc, xhci_dev))) {
-                usb_log_error("Failed to setup control endpoint of the new device: %s", str_error(err));
+                usb_log_error("Failed to setup control endpoint "
+                    "of the new device: %s", str_error(err));
                 goto err_address;
         }
@@ -215 +223 @@
 
         if ((err = hc_get_device_desc(dev, &desc))) {
-                usb_log_error("Device(%d): failed to get devices descriptor: %s", dev->address, str_error(err));
+                usb_log_error("Device(%d): failed to get device "
+                   "descriptor: %s", dev->address, str_error(err));
                 goto err_address;
         }
 
         if ((err = setup_hub(xhci_dev, &desc)))
-                usb_log_warning("Device(%d): failed to setup hub characteristics: %s. "
-                    " Continuing anyway.", dev->address, str_error(err));
+                usb_log_warning("Device(%d): failed to setup hub "
+                    "characteristics: %s.  Continuing anyway.",
+                    dev->address, str_error(err));
 
         if ((err = hcd_ddf_setup_match_ids(dev, &desc))) {
-                usb_log_error("Device(%d): failed to setup match IDs: %s", dev->address, str_error(err));
+                usb_log_error("Device(%d): failed to setup match IDs: %s",
+                    dev->address, str_error(err));
                 goto err_address;
         }
@@ -253 +264 @@
         const uint32_t slot_id = xhci_dev->slot_id;
         if ((err = hc_disable_slot(xhci_dev))) {
-                usb_log_warning("Failed to disable slot of device " XHCI_DEV_FMT ": %s",
-                    XHCI_DEV_ARGS(*xhci_dev), str_error(err));
+                usb_log_warning("Failed to disable slot of device " XHCI_DEV_FMT
+                    ": %s", XHCI_DEV_ARGS(*xhci_dev), str_error(err));
         }
 
@@ -277 +288 @@
         /* Transition the device from the Addressed to the Configured state. */
         if ((err = hc_configure_device(dev))) {
-                usb_log_warning("Failed to configure device " XHCI_DEV_FMT ".", XHCI_DEV_ARGS(*dev));
+                usb_log_warning("Failed to configure device " XHCI_DEV_FMT ".",
+                    XHCI_DEV_ARGS(*dev));
                 return err;
         }
@@ -302 +314 @@
         /* Issue one HC command to simultaneously drop all endpoints except zero. */
         if ((err = hc_deconfigure_device(dev))) {
-                usb_log_warning("Failed to deconfigure device " XHCI_DEV_FMT ".",
-                    XHCI_DEV_ARGS(*dev));
+                usb_log_warning("Failed to deconfigure device "
+                    XHCI_DEV_FMT ".", XHCI_DEV_ARGS(*dev));
         }
 }
@@ -339 +351 @@
         }
 
-        // As we always allocate space for whole input context, we can set this to maximum
+        /*
+         * As we always allocate space for whole input context, we can set this
+         * to maximum. The only exception being Address Device command, which
+         * explicitly requires this to be se to 1.
+         */
         XHCI_SLOT_CTX_ENTRIES_SET(*ctx, 31);
 }