Changeset 3cbc138 in mainline

Timestamp:

2017-10-25T13:45:53Z (7 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

47ab89e

Parents:

2b35478

Message:

xhci commands: sync returns EOK only if the command was finished successfully

File:

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

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

@@ -262 +262 @@
         }
 
+        /* Semantics of NO_OP_CMD is that success is marked as a TRB error. */
+        if (command->_header.cmd == XHCI_CMD_NO_OP && code == XHCI_TRBC_TRB_ERROR)
+                code = XHCI_TRBC_SUCCESS;
+
         command->status = code;
         command->slot_id = TRB_GET_SLOT(*trb);
 
         usb_log_debug2("Completed command trb: %s", xhci_trb_str_type(TRB_TYPE(command->_header.trb)));
-        if (TRB_TYPE(command->_header.trb) != XHCI_TRB_TYPE_NO_OP_CMD) {
-                if (code != XHCI_TRBC_SUCCESS) {
-                        report_error(code);
-                        xhci_dump_trb(&command->_header.trb);
-                }
+
+        if (code != XHCI_TRBC_SUCCESS) {
+                report_error(code);
+                xhci_dump_trb(&command->_header.trb);
         }
 
         switch (TRB_TYPE(command->_header.trb)) {
         case XHCI_TRB_TYPE_NO_OP_CMD:
-                assert(code == XHCI_TRBC_TRB_ERROR);
                 break;
         case XHCI_TRB_TYPE_ENABLE_SLOT_CMD:
@@ -585 +587 @@
         }
 
-        return EOK;
+        return cmd->status == XHCI_TRBC_SUCCESS ? EOK : EINVAL;
 }