[src/trunk]: src/sys/dev/usb Make sure tsleep() is not called during cold boot.

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

details:   https://anonhg.NetBSD.org/src/rev/d02b220cbd2d
branches:  trunk
changeset: 479713:d02b220cbd2d
user:      augustss <augustss%NetBSD.org@localhost>
date:      Mon Dec 20 02:12:23 1999 +0000

description:
Make sure tsleep() is not called during cold boot.

diffstat:

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

diffs (41 lines):

diff -r 95998bd0d182 -r d02b220cbd2d sys/dev/usb/usb.c
--- a/sys/dev/usb/usb.c Mon Dec 20 02:04:24 1999 +0000
+++ b/sys/dev/usb/usb.c Mon Dec 20 02:12:23 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: usb.c,v 1.34 1999/11/26 01:41:03 augustss Exp $        */
+/*     $NetBSD: usb.c,v 1.35 1999/12/20 02:12:23 augustss Exp $        */
 /*     $FreeBSD: src/sys/dev/usb/usb.c,v 1.20 1999/11/17 22:33:46 n_hibma Exp $        */
 
 /*
@@ -211,6 +211,10 @@
        }
        printf("\n");
 
+       /* Make sure not to use tsleep() if we are cold booting. */
+       if (cold)
+               sc->sc_bus->use_polling++;
+
        err = usbd_new_device(USBDEV(sc->sc_dev), sc->sc_bus, 0, 0, 0,
                  &sc->sc_port);
        if (!err) {
@@ -228,17 +232,16 @@
                 * until the USB event thread is running, which means that
                 * the keyboard will not work until after cold boot.
                 */
-               if (cold) {
-                       sc->sc_bus->use_polling++;
+               if (cold)
                        dev->hub->explore(sc->sc_bus->root_hub);
-                       sc->sc_bus->use_polling--;
-               }
 #endif
        } else {
                printf("%s: root hub problem, error=%d\n", 
                       USBDEVNAME(sc->sc_dev), err); 
                sc->sc_dying = 1;
        }
+       if (cold)
+               sc->sc_bus->use_polling--;
 
        kthread_create(usb_create_event_thread, sc);