Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

No longer try to attach unichromefb as an initial console device.

Browse Source
This commit is contained in:
jmcneill 2006-08-13 20:22:27 +00:00
parent b28babedf4
commit ac96fed0c2
1 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sys/arch/x86/x86/consinit.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: consinit.c,v 1.11 2006/08/02 01:44:50 jmcneill Exp $ */ /* $NetBSD: consinit.c,v 1.12 2006/08/13 20:22:27 jmcneill Exp $ */
/* /*
* Copyright (c) 1998 * Copyright (c) 1998
@ -27,7 +27,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: consinit.c,v 1.11 2006/08/02 01:44:50 jmcneill Exp $"); __KERNEL_RCSID(0, "$NetBSD: consinit.c,v 1.12 2006/08/13 20:22:27 jmcneill Exp $");
#include "opt_kgdb.h" #include "opt_kgdb.h"
@ -76,10 +76,6 @@ __KERNEL_RCSID(0, "$NetBSD: consinit.c,v 1.11 2006/08/02 01:44:50 jmcneill Exp $
#if (NVESAFB > 0) #if (NVESAFB > 0)
#include <arch/i386/bios/vesafbvar.h> #include <arch/i386/bios/vesafbvar.h>
#endif #endif
#include "unichromefb.h"
#if (NUNICHROMEFB > 0)
extern int unichromefb_cnattach(void);
#endif
#endif #endif
#include "com.h" #include "com.h"
@ -169,11 +165,6 @@ consinit()
#if (NPC > 0) || (NVGA > 0) || (NEGA > 0) || (NPCDISPLAY > 0) || (NVESAFB > 0) #if (NPC > 0) || (NVGA > 0) || (NEGA > 0) || (NPCDISPLAY > 0) || (NVESAFB > 0)
if (!strcmp(consinfo->devname, "pc")) { if (!strcmp(consinfo->devname, "pc")) {
int error; int error;
#if (NUNICHROMEFB > 0)
if (!unichromefb_cnattach())
goto dokbd;
#endif
#if (NVESAFB > 0) #if (NVESAFB > 0)
if (!vesafb_cnattach()) if (!vesafb_cnattach())
goto dokbd; goto dokbd;