Module Name: src
Committed By: martin
Date: Wed Jan 28 11:13:02 UTC 2015
Modified Files:
src/sys/arch/x86/x86 [netbsd-7]: consinit.c
Log Message:
Pull up following revision(s) (requested by is in ticket #462):
sys/arch/x86/x86/consinit.c: revision 1.28
Add support for the (cobalt) nullcons to amd64 and i386.
To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.27.4.1 src/sys/arch/x86/x86/consinit.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/x86/x86/consinit.c
diff -u src/sys/arch/x86/x86/consinit.c:1.27 src/sys/arch/x86/x86/consinit.c:1.27.4.1
--- src/sys/arch/x86/x86/consinit.c:1.27 Wed Mar 12 12:54:33 2014
+++ src/sys/arch/x86/x86/consinit.c Wed Jan 28 11:13:02 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: consinit.c,v 1.27 2014/03/12 12:54:33 martin Exp $ */
+/* $NetBSD: consinit.c,v 1.27.4.1 2015/01/28 11:13:02 martin Exp $ */
/*
* Copyright (c) 1998
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: consinit.c,v 1.27 2014/03/12 12:54:33 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: consinit.c,v 1.27.4.1 2015/01/28 11:13:02 martin Exp $");
#include "opt_kgdb.h"
#include "opt_puc.h"
@@ -39,6 +39,9 @@ __KERNEL_RCSID(0, "$NetBSD: consinit.c,v
#include <machine/bootinfo.h>
#include <arch/x86/include/genfb_machdep.h>
+#include <dev/cons.h>
+
+#include "nullcons.h"
#include "genfb.h"
#include "vga.h"
#include "ega.h"
@@ -235,6 +238,14 @@ dokbd:
return;
}
#endif
+#if (NNULLCONS > 0)
+ if (!strcmp(consinfo->devname, "nullcons")) {
+ void nullcninit(struct consdev *cn);
+
+ nullcninit(0);
+ return;
+ }
+#endif
panic("invalid console device %s", consinfo->devname);
}
