summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2004-07-06 02:49:06 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2004-07-06 02:49:06 +0000
commit744d46dbd08f9c47659e2a33a9173793a825e7df (patch)
treeca4029c73e79ba71a308664f42efc2184a05dc6d
parentbc4d619f49723064239cc713d932886e6b4fba75 (diff)
from netbsd, via loki@animata.net, ehci.c revision 1.56 sans some debugging
printfs that crept in. log message: Failure to properly mask off UE_DIR_IN from the endpoint address was causing OHCI_ED_FORMAT_ISO and EHCI_QH_HRECL to get set spuriously, causing rather interesting lossage.
-rw-r--r--sys/dev/usb/ehci.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/dev/usb/ehci.c b/sys/dev/usb/ehci.c
index 05fb9857b59..4c49cf4bb4b 100644
--- a/sys/dev/usb/ehci.c
+++ b/sys/dev/usb/ehci.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ehci.c,v 1.8 2004/07/05 03:07:45 deraadt Exp $ */
+/* $OpenBSD: ehci.c,v 1.9 2004/07/06 02:49:05 deraadt Exp $ */
/* $NetBSD: ehci.c,v 1.54 2004/01/17 13:15:05 jdolecek Exp $ */
/*
@@ -1257,7 +1257,7 @@ ehci_open(usbd_pipe_handle pipe)
/* qh_link filled when the QH is added */
sqh->qh.qh_endp = htole32(
EHCI_QH_SET_ADDR(addr) |
- EHCI_QH_SET_ENDPT(ed->bEndpointAddress) |
+ EHCI_QH_SET_ENDPT(UE_GET_ADDR(ed->bEndpointAddress)) |
EHCI_QH_SET_EPS(speed) | /* XXX */
/* XXX EHCI_QH_DTC ? */
EHCI_QH_SET_MPL(UGETW(ed->wMaxPacketSize)) |