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

Attach vesafb driver if available.

Browse Source
This commit is contained in:
jmcneill 2006-04-24 14:15:47 +00:00
parent 14b1ff949d
commit ba3a7d2db2
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
/* $NetBSD: consinit.c,v 1.9 2006/02/03 11:08:24 jmmv Exp $ */
/* $NetBSD: consinit.c,v 1.10 2006/04/24 14:15:47 jmcneill Exp $ */
/*
* Copyright (c) 1998
@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: consinit.c,v 1.9 2006/02/03 11:08:24 jmmv Exp $");
__KERNEL_RCSID(0, "$NetBSD: consinit.c,v 1.10 2006/04/24 14:15:47 jmcneill Exp $");
#include "opt_kgdb.h"
@ -71,6 +71,13 @@ __KERNEL_RCSID(0, "$NetBSD: consinit.c,v 1.9 2006/02/03 11:08:24 jmmv Exp $");
#include <machine/pccons.h>
#endif
#ifdef __i386__
#include "vesafb.h"
#if (NVESAFB > 0)
#include <arch/i386/bios/vesafbvar.h>
#endif
#endif
#include "com.h"
#if (NCOM > 0)
#include <sys/termios.h>
@ -155,10 +162,14 @@ consinit()
#endif
consinfo = &default_consinfo;
#if (NPC > 0) || (NVGA > 0) || (NEGA > 0) || (NPCDISPLAY > 0)
#if (NPC > 0) || (NVGA > 0) || (NEGA > 0) || (NPCDISPLAY > 0) || (NVESAFB > 0)
if (!strcmp(consinfo->devname, "pc")) {
int error;
#if (NVESAFB > 0)
if (!vesafb_cnattach())
goto dokbd;
#endif
#if (NVGA > 0)
if (!vga_cnattach(X86_BUS_SPACE_IO, X86_BUS_SPACE_MEM,
-1, 1))
@ -191,7 +202,7 @@ dokbd:
error);
return;
}
#endif /* PC | VT | VGA | PCDISPLAY */
#endif /* PC | VT | VGA | PCDISPLAY | VESAFB */
#if (NCOM > 0)
if (!strcmp(consinfo->devname, "com")) {
bus_space_tag_t tag = X86_BUS_SPACE_IO;