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

Timestamp:

2017-10-23T21:26:22Z (7 years ago)

Author:

Petr Manek <petr.manek@…>

Branches:

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

Children:

ec700c7

Parents:

327f147

Message:

Moved some code from RH to HC. Simplified device address process. Issuing deconfigure device command.

File:

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

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

@@ -46 +46 @@
 #define TRB_SET_TCS(trb, tcs)   (trb).control |= host2xhci(32, ((tcs &0x1) << 9))
 #define TRB_SET_TYPE(trb, type) (trb).control |= host2xhci(32, (type) << 10)
+#define TRB_SET_DC(trb, dc)     (trb).control |= host2xhci(32, (dc) << 9)
 #define TRB_SET_EP(trb, ep)     (trb).control |= host2xhci(32, ((ep) & 0x5) << 16)
 #define TRB_SET_STREAM(trb, st) (trb).control |= host2xhci(32, ((st) & 0xFFFF) << 16)
@@ -323 +324 @@
         assert(hc);
         assert(cmd);
-        assert(ictx);
-
-        xhci_trb_clean(&cmd->trb);
-
-        uint64_t phys_addr = (uint64_t) addr_to_phys(ictx);
-        TRB_SET_ICTX(cmd->trb, phys_addr);
+
+        xhci_trb_clean(&cmd->trb);
+
+        if (!cmd->deconfigure) {
+                /* If the DC flag is on, input context is not evaluated. */
+                assert(ictx);
+
+                uint64_t phys_addr = (uint64_t) addr_to_phys(ictx);
+                TRB_SET_ICTX(cmd->trb, phys_addr);
+        }
 
         TRB_SET_TYPE(cmd->trb, XHCI_TRB_TYPE_CONFIGURE_ENDPOINT_CMD);
         TRB_SET_SLOT(cmd->trb, cmd->slot_id);
+        TRB_SET_DC(cmd->trb, cmd->deconfigure);
 
         return enqueue_command(hc, cmd, 0, 0);