Changeset 8033f89 in mainline for uspace/drv/bus/usb/xhci/rh.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/rh.c (modified) (5 diffs)

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

@@ -155 +155 @@
                 return ENOENT;
 
-        unsigned psiv = (status & XHCI_REG_MASK(XHCI_PORT_PS)) >> XHCI_REG_SHIFT(XHCI_PORT_PS);
+        unsigned psiv = (status & XHCI_REG_MASK(XHCI_PORT_PS))
+            >> XHCI_REG_SHIFT(XHCI_PORT_PS);
         const usb_speed_t speed = port->rh->hc->speeds[psiv].usb_speed;
 
@@ -171 +172 @@
         port->device->rh_port = dev->port;
 
-        usb_log_debug("Enumerating new %s-speed device on port %u.", usb_str_speed(dev->speed), dev->port);
+        usb_log_debug("Enumerating new %s-speed device on port %u.",
+            usb_str_speed(dev->speed), dev->port);
 
         if ((err = bus_device_enumerate(dev))) {
@@ -229 +231 @@
                  * standard mechanisms of register handling fails here.
                  */
-                XHCI_REG_WR_FIELD(&port->regs->portsc, status & ~XHCI_REG_MASK(XHCI_PORT_PED), 32);
+                XHCI_REG_WR_FIELD(&port->regs->portsc,
+                    status & ~XHCI_REG_MASK(XHCI_PORT_PED), 32);
 
                 const bool connected = !!(status & XHCI_REG_MASK(XHCI_PORT_CCS));
@@ -264 +267 @@
 }
 
-void xhci_rh_set_ports_protocol(xhci_rh_t *rh, unsigned offset, unsigned count, unsigned major)
+void xhci_rh_set_ports_protocol(xhci_rh_t *rh,
+    unsigned offset, unsigned count, unsigned major)
 {
         for (unsigned i = offset; i < offset + count; i++)
@@ -285 +289 @@
                  * such ports.
                  */
-                if (XHCI_REG_RD(port->regs, XHCI_PORT_CCS) && port->base.state == PORT_DISABLED)
+                if (XHCI_REG_RD(port->regs, XHCI_PORT_CCS)
+                    && port->base.state == PORT_DISABLED)
                         usb_port_connected(&port->base, &rh_enumerate_device);
         }