Changeset 05aeee0e in mainline

Timestamp:

2017-07-13T19:28:53Z (7 years ago)

Author:

Jaroslav Jindrak <dzejrou@…>

Branches:

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

Children:

7bd99bf

Parents:

4fa5342

Message:

Added reset endpoing and stop endpoint sending functions.

Location:

uspace/drv/bus/usb/xhci

Files:

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

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

@@ -215 +215 @@
 }
 
+int xhci_send_reset_endpoint_command(xhci_hc_t *hc, uint32_t slot_id, uint32_t ep_id, uint8_t tcs)
+{
+        /**
+         * Note: TCS can have values 0 or 1. If it is set to 0, see sectuon 4.5.8 for
+         *       information about this flag.
+         */
+        xhci_trb_t trb;
+        memset(&trb, 0, sizeof(trb));
+
+        trb.control = host2xhci(32, XHCI_TRB_TYPE_RESET_ENDPOINT_CMD << 10);
+        trb.control |= host2xhci(32, hc->command_ring.pcs);
+        trb.control |= host2xhci(32, (tcs & 0x1) << 9);
+        trb.control |= host2xhci(32, (ep_id & 0x5) << 16);
+        trb.control |= host2xhci(32, slot_id << 24);
+
+        return enqueue_trb(hc, &trb, 0, 0);
+}
+
+int xhci_send_stop_endpoint_command(xhci_hc_t *hc, uint32_t slot_id, uint32_t ep_id, uint8_t susp)
+{
+        xhci_trb_t trb;
+        memset(&trb, 0, sizeof(trb));
+
+        trb.control = host2xhci(32, XHCI_TRB_TYPE_STOP_ENDPOINT_CMD << 10);
+        trb.control |= host2xhci(32, hc->command_ring.pcs);
+        trb.control |= host2xhci(32, (ep_id & 0x5) << 16);
+        trb.control |= host2xhci(32, (susp & 0x1) << 23);
+        trb.control |= host2xhci(32, slot_id << 24);
+
+        return enqueue_trb(hc, &trb, 0, 0);
+
+}
+
 int xhci_handle_command_completion(xhci_hc_t *hc, xhci_trb_t *trb)
 {
@@ -250 +283 @@
         case XHCI_TRB_TYPE_EVALUATE_CONTEXT_CMD:
                 return EOK;
+        case XHCI_TRB_TYPE_RESET_ENDPOINT_CMD:
+                return EOK;
+        case XHCI_TRB_TYPE_STOP_ENDPOINT_CMD:
+                // Note: If the endpoint was in the middle of a transfer, then the xHC
+                //       will add a Transfer TRB before the Event TRB, research that and
+                //       handle it appropriately!
+                return EOK;
         default:
                 usb_log_debug2("Unsupported command trb.");

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

@@ -47 +47 @@
 int xhci_send_configure_endpoint_command(xhci_hc_t *, uint32_t, xhci_input_ctx_t *);
 int xhci_send_evaluate_context_command(xhci_hc_t *, uint32_t, xhci_input_ctx_t *);
+int xhci_send_reset_endpoint_command(xhci_hc_t *, uint32_t, uint32_t, uint8_t);
+int xhci_send_stop_endpoint_command(xhci_hc_t *, uint32_t, uint32_t, uint8_t);
 
 int xhci_handle_command_completion(xhci_hc_t *, xhci_trb_t *);