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

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

@@ -244 +244 @@
         cr_set_state(cr, XHCI_CR_STATE_CLOSED);
 
+        /* Some systems, inc. QEMU, need whole 64-bit qword to be written */
         XHCI_REG_SET(hc->op_regs, XHCI_OP_CS, 1);
-        XHCI_REG_SET(hc->op_regs, XHCI_OP_CRCR_HI, 0); // Some systems (incl. QEMU) require 64-bit write
+        XHCI_REG_SET(hc->op_regs, XHCI_OP_CRCR_HI, 0);
 
         while (XHCI_REG_RD(hc->op_regs, XHCI_OP_CRR))
@@ -259 +260 @@
 static void abort_command_ring(xhci_hc_t *hc)
 {
-        XHCI_REG_WR(hc->op_regs, XHCI_OP_CA, 1);
-        XHCI_REG_SET(hc->op_regs, XHCI_OP_CRCR_HI, 0); // Some systems (incl. QEMU) require 64-bit write
+        /* Some systems, inc. QEMU, need whole 64-bit qword to be written */
+        XHCI_REG_SET(hc->op_regs, XHCI_OP_CA, 1);
+        XHCI_REG_SET(hc->op_regs, XHCI_OP_CRCR_HI, 0);
 }
 
@@ -370 +372 @@
         command->slot_id = TRB_GET_SLOT(*trb);
 
-        usb_log_debug("Completed command %s", xhci_trb_str_type(TRB_TYPE(command->_header.trb)));
+        usb_log_debug("Completed command %s",
+            xhci_trb_str_type(TRB_TYPE(command->_header.trb)));
 
         if (code != XHCI_TRBC_SUCCESS) {
@@ -412 +415 @@
 
         TRB_SET_TYPE(cmd->_header.trb, XHCI_TRB_TYPE_ENABLE_SLOT_CMD);
-        cmd->_header.trb.control |= host2xhci(32, XHCI_REG_RD(hc->xecp, XHCI_EC_SP_SLOT_TYPE) << 16);
+        cmd->_header.trb.control |=
+            host2xhci(32, XHCI_REG_RD(hc->xecp, XHCI_EC_SP_SLOT_TYPE) << 16);
 
         return enqueue_command(hc, cmd);
@@ -683 +687 @@
         while (!cmd->_header.completed) {
 
-                rv = fibril_condvar_wait_timeout(&cmd->_header.completed_cv, &cmd->_header.completed_mtx, XHCI_COMMAND_TIMEOUT);
+                rv = fibril_condvar_wait_timeout(&cmd->_header.completed_cv,
+                    &cmd->_header.completed_mtx, XHCI_COMMAND_TIMEOUT);
 
                 /* The waiting timed out. Current command (not necessarily