Changeset ae3a941 in mainline for uspace/drv/bus/usb/xhci/commands.c

Timestamp:

2018-02-26T16:51:40Z (7 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

e773f58

Parents:

3692678

Message:

usb: cstyle

File:

• uspace/drv/bus/usb/xhci/commands.c (modified) (7 diffs)

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

@@ -150 +150 @@
 
         while (cmd_link != NULL) {
-                xhci_cmd_t *cmd = list_get_instance(cmd_link, xhci_cmd_t, _header.link);
+                xhci_cmd_t *cmd = list_get_instance(cmd_link, xhci_cmd_t,
+                    _header.link);
 
                 if (cmd->_header.trb_phys == phys)
@@ -158 +159 @@
         }
 
-        return cmd_link ? list_get_instance(cmd_link, xhci_cmd_t, _header.link)
-                : NULL;
+        return cmd_link
+            ? list_get_instance(cmd_link, xhci_cmd_t, _header.link)
+            : NULL;
 }
 
@@ -167 +169 @@
 
         cr->state = state;
-        if (state == XHCI_CR_STATE_OPEN
-            || state == XHCI_CR_STATE_CLOSED)
+        if (state == XHCI_CR_STATE_OPEN || state == XHCI_CR_STATE_CLOSED)
                 fibril_condvar_broadcast(&cr->state_cv);
 }
@@ -206 +207 @@
         }
 
-        usb_log_debug("Sending command %s", xhci_trb_str_type(TRB_TYPE(cmd->_header.trb)));
+        usb_log_debug("Sending command %s",
+            xhci_trb_str_type(TRB_TYPE(cmd->_header.trb)));
 
         list_append(&cmd->_header.link, &cr->cmd_list);
@@ -337 +339 @@
                 usb_log_error("Command resulted in error: %s.", trb_codes[code]);
         else
-                usb_log_error("Command resulted in reserved or vendor specific error.");
+                usb_log_error("Command resulted in reserved or "
+                    "vendor specific error.");
 }
 
@@ -657 +660 @@
         }
 
-        usb_log_error("Timeout while waiting for command: aborting current command.");
+        usb_log_error("Timeout while waiting for command: "
+            "aborting current command.");
 
         cr_set_state(cr, XHCI_CR_STATE_CHANGING);
@@ -663 +667 @@
         abort_command_ring(hc);
 
-        fibril_condvar_wait_timeout(&cr->stopped_cv, &cr->guard, XHCI_CR_ABORT_TIMEOUT);
+        fibril_condvar_wait_timeout(&cr->stopped_cv, &cr->guard,
+            XHCI_CR_ABORT_TIMEOUT);
 
         if (XHCI_REG_RD(hc->op_regs, XHCI_OP_CRR)) {