[src/trunk]: src/sys/dev/usb With the interrupt fix in the previous commit lo...

[augustss <augustss%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/b669eb1c8323
branches:  trunk
changeset: 580521:b669eb1c8323
user:      augustss <augustss%NetBSD.org@localhost>
date:      Wed Apr 27 16:20:26 2005 +0000

description:
With the interrupt fix in the previous commit low and full speed devices
have a chance to work, so allow them (with a warning).
Make a small change to the transaction translator scheduling to make it
at least hobble along (again from Dan Ellis).

diffstat:

 sys/dev/usb/ehci.c |  12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

diffs (45 lines):

diff -r bf0fcb3a7db2 -r b669eb1c8323 sys/dev/usb/ehci.c
--- a/sys/dev/usb/ehci.c        Wed Apr 27 15:19:17 2005 +0000
+++ b/sys/dev/usb/ehci.c        Wed Apr 27 16:20:26 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ehci.c,v 1.92 2005/04/27 02:12:20 augustss Exp $ */
+/*     $NetBSD: ehci.c,v 1.93 2005/04/27 16:20:26 augustss Exp $ */
 
 /*
  * Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -65,7 +65,7 @@
 */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ehci.c,v 1.92 2005/04/27 02:12:20 augustss Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ehci.c,v 1.93 2005/04/27 16:20:26 augustss Exp $");
 
 #include "ohci.h"
 #include "uhci.h"
@@ -1359,12 +1359,14 @@
        }
        if (speed != EHCI_QH_SPEED_HIGH) {
                printf("%s: *** WARNING: opening low/full speed device, this "
-                      "does not work yet.\n",
+                      "may not work yet.\n",
                       USBDEVNAME(sc->sc_bus.bdev));
                DPRINTFN(1,("ehci_open: hshubaddr=%d hshubport=%d\n",
                            hshubaddr, hshubport));
+#if 0
                if (xfertype != UE_CONTROL)
                        return USBD_INVAL;
+#endif
        }
 
        naks = 8;               /* XXX */
@@ -1386,8 +1388,8 @@
                EHCI_QH_SET_MULT(1) |
                EHCI_QH_SET_HUBA(hshubaddr) |
                EHCI_QH_SET_PORT(hshubport) |
-               EHCI_QH_SET_CMASK(0xf0) | /* XXX */
-               EHCI_QH_SET_SMASK(xfertype == UE_INTERRUPT ? 0x01 : 0)
+               EHCI_QH_SET_CMASK(0x08) | /* XXX */
+               EHCI_QH_SET_SMASK(xfertype == UE_INTERRUPT ? 0x02 : 0)
                );
        sqh->qh.qh_curqtd = EHCI_NULL;
        /* Fill the overlay qTD */