Changeset 69b2dfee in mainline

Timestamp:

2018-01-19T19:07: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:

c6f82e5

Parents:

7e5a12b

Message:

xhci: satisfy picky Intel xHC

File:

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

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

@@ -776 +776 @@
         /* Initialize slot_ctx according to section 4.3.3 point 3. */
         XHCI_SLOT_ROOT_HUB_PORT_SET(*ctx, dev->rh_port);
-        XHCI_SLOT_CTX_ENTRIES_SET(*ctx, 1);
         XHCI_SLOT_ROUTE_STRING_SET(*ctx, dev->route_str);
         XHCI_SLOT_SPEED_SET(*ctx, usb_speed_to_psiv[dev->base.speed]);
@@ -850 +849 @@
         xhci_setup_endpoint_context(ep0, &ictx->endpoint_ctx[0]);
 
+        /* Address device needs Ctx entries set to 1 only */
+        xhci_slot_ctx_t *slot_ctx = &ictx->slot_ctx;
+        XHCI_SLOT_CTX_ENTRIES_SET(*slot_ctx, 1);
+
         /* Issue Address Device command. */
         if ((err = xhci_cmd_sync_inline(hc, ADDRESS_DEVICE, .slot_id = dev->slot_id, .input_ctx = ictx_dma_buf)))