Source-Changes-HG archive

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

[src/trunk]: src/sys/arch/evbppc/mpc85xx Wait it actually wait.



details:   https://anonhg.NetBSD.org/src/rev/bd098bfbc85a
branches:  trunk
changeset: 788671:bd098bfbc85a
user:      matt <matt%NetBSD.org@localhost>
date:      Wed Jul 17 23:25:12 2013 +0000

description:
Wait it actually wait.

diffstat:

 sys/arch/evbppc/mpc85xx/autoconf.c |  10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diffs (38 lines):

diff -r 0f2289534a18 -r bd098bfbc85a sys/arch/evbppc/mpc85xx/autoconf.c
--- a/sys/arch/evbppc/mpc85xx/autoconf.c        Wed Jul 17 23:15:20 2013 +0000
+++ b/sys/arch/evbppc/mpc85xx/autoconf.c        Wed Jul 17 23:25:12 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: autoconf.c,v 1.7 2012/07/29 21:39:43 matt Exp $        */
+/*     $NetBSD: autoconf.c,v 1.8 2013/07/17 23:25:12 matt Exp $        */
 /*-
  * Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.7 2012/07/29 21:39:43 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.8 2013/07/17 23:25:12 matt Exp $");
 
 #define __INTR_PRIVATE
 
@@ -80,7 +80,7 @@
        /*
         * We wait up to 10 seconds for a bootable device to be found.
         */
-       while (rootconf_timo-- > 0) {
+       while (rootconf_timo > 0) {
                if (booted_device != NULL) {
                        aprint_normal_dev(booted_device, "boot device\n");
                        break;
@@ -92,7 +92,9 @@
                        break;
                }
 
-               kpause("autoconf", true, 1, NULL);
+               if (EWOULDBLOCK == kpause("autoconf", true, 1, NULL)) {
+                       rootconf_timo--;
+               }
        }
 
        rootconf();



Home | Main Index | Thread Index | Old Index