[src/mrg-ohci-jmcneill-usbmp]: src/sys/dev/usb mostly in sync with the branch...

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

details:   https://anonhg.NetBSD.org/src/rev/da874f86f8af
branches:  mrg-ohci-jmcneill-usbmp
changeset: 771773:da874f86f8af
user:      mrg <mrg%NetBSD.org@localhost>
date:      Thu Dec 08 09:54:30 2011 +0000

description:
mostly in sync with the branch here now.

diffstat:

 sys/dev/usb/usb.c |  20 ++++++++------------
 1 files changed, 8 insertions(+), 12 deletions(-)

diffs (76 lines):

diff -r 92be0c4adb40 -r da874f86f8af sys/dev/usb/usb.c
--- a/sys/dev/usb/usb.c Thu Dec 08 09:36:49 2011 +0000
+++ b/sys/dev/usb/usb.c Thu Dec 08 09:54:30 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: usb.c,v 1.125.6.1 2011/12/04 13:23:17 jmcneill Exp $   */
+/*     $NetBSD: usb.c,v 1.125.6.1.2.1 2011/12/08 09:54:30 mrg Exp $    */
 
 /*
  * Copyright (c) 1998, 2002, 2008 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: usb.c,v 1.125.6.1 2011/12/04 13:23:17 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usb.c,v 1.125.6.1.2.1 2011/12/08 09:54:30 mrg Exp $");
 
 #include "opt_compat_netbsd.h"
 #include "opt_usb.h"
@@ -83,6 +83,7 @@
 #else
 #define DPRINTF(x)
 #define DPRINTFN(n,x)
+#define        usb_noexplore 0
 #endif
 
 struct usb_softc {
@@ -372,17 +373,10 @@
        config_pending_decr();
 
        while (!sc->sc_dying) {
-#ifdef USB_DEBUG
                if (usb_noexplore < 2)
-#endif
-               usb_discover(sc);
-#ifdef USB_DEBUG
+                       usb_discover(sc);
                (void)tsleep(&sc->sc_bus->needs_explore, PWAIT, "usbevt",
                    usb_noexplore ? 0 : hz * 60);
-#else
-               (void)tsleep(&sc->sc_bus->needs_explore, PWAIT, "usbevt",
-                   hz * 60);
-#endif
                DPRINTFN(2,("usb_event_thread: woke up\n"));
        }
        sc->sc_event_thread = NULL;
@@ -777,10 +771,8 @@
 {
 
        DPRINTFN(2,("usb_discover\n"));
-#ifdef USB_DEBUG
        if (usb_noexplore > 1)
                return;
-#endif
        /*
         * We need mutual exclusion while traversing the device tree,
         * but this is guaranteed since this function is only called
@@ -890,7 +882,9 @@
        wakeup(&usb_events);
        selnotify(&usb_selevent, 0, 0);
        if (usb_async_proc != NULL) {
+               kpreempt_disable();
                softint_schedule(usb_async_sih);
+               kpreempt_enable();
        }
        splx(s);
 }
@@ -913,7 +907,9 @@
        if (bus->use_polling) {
                bus->methods->soft_intr(bus);
        } else {
+               kpreempt_disable();
                softint_schedule(bus->soft);
+               kpreempt_enable();
        }
 }