Module Name: src
Committed By: skrll
Date: Thu Apr 13 19:54:22 UTC 2017
Modified Files:
src/sys/dev/usb: xhci.c
Log Message:
PR/52154: xHCI Slot Context Not Include in configure endpoint process
eXtensible Host Controller Interface Specification(rev 1.1), 4.6.6:
"A0 shall be set to 1 and refer to section 6.2.2.2 for the Slot Context fields
used by the Configure Endpoint Command."
To generate a diff of this commit:
cvs rdiff -u -r1.70 -r1.71 src/sys/dev/usb/xhci.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/usb/xhci.c
diff -u src/sys/dev/usb/xhci.c:1.70 src/sys/dev/usb/xhci.c:1.71
--- src/sys/dev/usb/xhci.c:1.70 Sat Jan 21 07:39:30 2017
+++ src/sys/dev/usb/xhci.c Thu Apr 13 19:54:22 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: xhci.c,v 1.70 2017/01/21 07:39:30 skrll Exp $ */
+/* $NetBSD: xhci.c,v 1.71 2017/04/13 19:54:22 skrll Exp $ */
/*
* Copyright (c) 2013 Jonathan A. Kollasch
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xhci.c,v 1.70 2017/01/21 07:39:30 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xhci.c,v 1.71 2017/04/13 19:54:22 skrll Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -2956,8 +2956,7 @@ xhci_setup_ctx(struct usbd_pipe *pipe)
cp = xhci_slot_get_icv(sc, xs, XHCI_ICI_INPUT_CONTROL);
cp[0] = htole32(0);
cp[1] = htole32(XHCI_INCTX_1_ADD_MASK(dci));
- if (dci == XHCI_DCI_EP_CONTROL)
- cp[1] |= htole32(XHCI_INCTX_1_ADD_MASK(XHCI_DCI_SLOT));
+ cp[1] |= htole32(XHCI_INCTX_1_ADD_MASK(XHCI_DCI_SLOT));
cp[7] = htole32(0);
/* set up input slot context */
