Source-Changes-HG archive

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

[src/trunk]: src/sys/arch/x86/x86 Print a warning if no console keyboard was ...



details:   https://anonhg.NetBSD.org/src/rev/18248611d124
branches:  trunk
changeset: 580726:18248611d124
user:      augustss <augustss%NetBSD.org@localhost>
date:      Fri May 06 14:03:55 2005 +0000

description:
Print a warning if no console keyboard was found in consinit().

diffstat:

 sys/arch/x86/x86/consinit.c |  12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

diffs (40 lines):

diff -r 4cecbd3cee8e -r 18248611d124 sys/arch/x86/x86/consinit.c
--- a/sys/arch/x86/x86/consinit.c       Fri May 06 09:50:25 2005 +0000
+++ b/sys/arch/x86/x86/consinit.c       Fri May 06 14:03:55 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: consinit.c,v 1.6 2005/05/06 00:10:00 augustss Exp $    */
+/*     $NetBSD: consinit.c,v 1.7 2005/05/06 14:03:55 augustss Exp $    */
 
 /*
  * Copyright (c) 1998
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: consinit.c,v 1.6 2005/05/06 00:10:00 augustss Exp $");
+__KERNEL_RCSID(0, "$NetBSD: consinit.c,v 1.7 2005/05/06 14:03:55 augustss Exp $");
 
 #include "opt_kgdb.h"
 
@@ -177,16 +177,18 @@
 #endif
                if (0) goto dokbd; /* XXX stupid gcc */
 dokbd:
+               error = ENODEV;
 #if (NPCKBC > 0)
                error = pckbc_cnattach(X86_BUS_SPACE_IO, IO_KBD, KBCMDP,
                    PCKBC_KBD_SLOT);
-#else
-               error = EIO;
 #endif
 #if (NUKBD > 0)
                if (error)
-                       ukbd_cnattach();
+                       error = ukbd_cnattach();
 #endif
+               if (error)
+                       printf("WARNING: no console keyboard, error=%d\n",
+                              error);
                return;
        }
 #endif /* PC | VT | VGA | PCDISPLAY */



Home | Main Index | Thread Index | Old Index