Changeset c362127 in mainline

Timestamp:

2017-07-13T13:20:01Z (8 years ago)

Author:

Jaroslav Jindrak <dzejrou@…>

Branches:

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

Children:

5ac5eb1

Parents:

f711f06

Message:

Updated .bzrignore to include the HelenOS executable of the xhci driver.

Files:

• .bzrignore (modified) (1 diff)
• uspace/drv/bus/usb/xhci/commands.c (modified) (1 diff)

.bzrignore

@@ -185 +185 @@
 uspace/dist/drv/xtkbd/
 uspace/dist/drv/atkbd/
+uspace/dist/drv/xhci/
 uspace/dist/srv/apic
 uspace/dist/srv/cdfs

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

@@ -92 +92 @@
 
         int code = XHCI_DWORD_EXTRACT(trb->status, 31, 24);
-        if (code != XHCI_TRBC_SUCCESS)
-                return EINVAL; // TODO: Find a better error code/handler.
 
         xhci_trb_t *command = (xhci_trb_t *) XHCI_QWORD_EXTRACT(trb->parameter, 63, 4);
+
         switch(TRB_TYPE(*command)) {
-                default:
-                        // TODO:
-                        break;
+        case XHCI_TRB_TYPE_NO_OP_CMD:
+                assert(code == XHCI_TRBC_TRB_ERROR);
+                break;
+        case XHCI_TRB_TYPE_ENABLE_SLOT_CMD:
+        {
+                uint32_t slot_id = XHCI_DWORD_EXTRACT(trb->control, 31, 24);
+                (void) slot_id;
+                // TODO: Call a device addition callback once it's implemented.
+                //       Also check for a suitable type of the slot id.
+                break;
+        }
+        default:
+                usb_log_warning("HC(%p) Command of an unsupported type has been completed.", hc);
+                break;
         }