Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/dev/usb Obey the interrupt interval here also.



details:   https://anonhg.NetBSD.org/src/rev/751b4da91e54
branches:  trunk
changeset: 480741:751b4da91e54
user:      augustss <augustss%NetBSD.org@localhost>
date:      Wed Jan 19 01:04:26 2000 +0000

description:
Obey the interrupt interval here also.

diffstat:

 sys/dev/usb/uhci.c |  9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diffs (37 lines):

diff -r ad25f8928914 -r 751b4da91e54 sys/dev/usb/uhci.c
--- a/sys/dev/usb/uhci.c        Wed Jan 19 01:02:11 2000 +0000
+++ b/sys/dev/usb/uhci.c        Wed Jan 19 01:04:26 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: uhci.c,v 1.78 2000/01/19 01:02:11 augustss Exp $       */
+/*     $NetBSD: uhci.c,v 1.79 2000/01/19 01:04:26 augustss Exp $       */
 /*     $FreeBSD: src/sys/dev/usb/uhci.c,v 1.33 1999/11/17 22:33:41 n_hibma Exp $       */
 
 /*
@@ -789,7 +789,6 @@
 {
 }
 
-
 void
 uhci_lock_frames(sc)
        uhci_softc_t *sc;
@@ -2524,6 +2523,7 @@
        struct uhci_pipe *upipe = (struct uhci_pipe *)pipe;
        usb_endpoint_descriptor_t *ed = pipe->endpoint->edesc;
        usbd_status err;
+       int ival;
 
        DPRINTFN(1, ("uhci_open: pipe=%p, addr=%d, endpt=%d (%d)\n",
                     pipe, pipe->device->address, 
@@ -2572,7 +2572,10 @@
                        break;
                case UE_INTERRUPT:
                        pipe->methods = &uhci_device_intr_methods;
-                       return (uhci_device_setintr(sc, upipe, ed->bInterval));
+                       ival = pipe->interval;
+                       if (ival == USBD_DEFAULT_INTERVAL)
+                               ival = ed->bInterval;
+                       return (ohci_device_setintr(sc, opipe, ival));
                case UE_ISOCHRONOUS:
                        pipe->methods = &uhci_device_isoc_methods;
                        return (uhci_setup_isoc(pipe));



Home | Main Index | Thread Index | Old Index