Changeset 0cabd10 in mainline

Timestamp:

2017-07-29T21:55:16Z (7 years ago)

Author:

Petr Manek <petr.manek@…>

Branches:

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

Children:

c9bec1c

Parents:

9f5b613

Message:

Added command to set TR dequeue pointer.

Location:

uspace/drv/bus/usb/xhci

Files:

• commands.c (modified) (2 diffs)
• commands.h (modified) (1 diff)

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

@@ -47 +47 @@
 #define TRB_SET_TYPE(trb, type) (trb).control |= host2xhci(32, (type) << 10)
 #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)
 #define TRB_SET_SUSP(trb, susp) (trb).control |= host2xhci(32, ((susp) & 0x1) << 23)
 #define TRB_SET_SLOT(trb, slot) (trb).control |= host2xhci(32, (slot) << 24)
 
+/**
+ * TODO: Not sure about SCT and DCS (see section 6.4.3.9).
+ */
+#define TRB_SET_DEQUEUE_PTR(trb, dptr) (trb).parameter |= host2xhci(64, (dptr))
 #define TRB_SET_ICTX(trb, phys) (trb).parameter |= host2xhci(32, phys_addr & (~0xF))
 
@@ -421 +426 @@
 }
 
+int xhci_send_set_dequeue_ptr_command(xhci_hc_t *hc, xhci_cmd_t *cmd,
+                                      uintptr_t dequeue_ptr, uint16_t stream_id,
+                                      uint32_t ep_id)
+{
+        assert(hc);
+        assert(cmd);
+
+        xhci_trb_t trb;
+        memset(&trb, 0, sizeof(trb));
+
+        TRB_SET_TYPE(trb, XHCI_TRB_TYPE_SET_TR_DEQUEUE_POINTER_CMD);
+        TRB_SET_EP(trb, ep_id);
+        TRB_SET_STREAM(trb, stream_id);
+        TRB_SET_SLOT(trb, cmd->slot_id);
+        TRB_SET_DEQUEUE_PTR(trb, dequeue_ptr);
+
+        /**
+         * TODO: Set DCS (see section 4.6.10).
+         */
+
+        cmd = add_cmd(hc, cmd);
+
+        return enqueue_trb(hc, &trb, 0, 0);
+}
+
 int xhci_send_reset_device_command(xhci_hc_t *hc, xhci_cmd_t *cmd)
 {

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

@@ -74 +74 @@
 int xhci_send_reset_endpoint_command(xhci_hc_t *, xhci_cmd_t *, uint32_t, uint8_t);
 int xhci_send_stop_endpoint_command(xhci_hc_t *, xhci_cmd_t *, uint32_t, uint8_t);
-// TODO: Set dequeue ptr (section 4.6.10).
+int xhci_send_set_dequeue_ptr_command(xhci_hc_t *, xhci_cmd_t *, uintptr_t, uint16_t, uint32_t);
 int xhci_send_reset_device_command(xhci_hc_t *, xhci_cmd_t *);
 // TODO: Force event (optional normative, for VMM, section 4.6.12).