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

Use NVGA_ISA and NVGA_PCI instead of NVGA

Browse Source 
for ISA/PCI frontend of vga.c.
This commit is contained in:
sakamoto 1998-04-20 05:27:41 +00:00
parent bd51370674
commit 90bb94019a
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sys/arch/bebox/bebox/machdep.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: machdep.c,v 1.10 1998/03/26 23:45:59 sakamoto Exp $ */
/* $NetBSD: machdep.c,v 1.11 1998/04/20 05:27:41 sakamoto Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@ -76,8 +76,9 @@
#include <bebox/isa/pcvt/pcvt_cons.h>
#endif
#include "vga.h"
#if (NVGA > 0)
#include "vga_isa.h"
#include "vga_pci.h"
#if (NVGA_ISA > 0) || (NVGA_PCI > 0)
#include <dev/ic/vgareg.h>
#include <dev/ic/vgavar.h>
#endif
@ -628,9 +629,9 @@ consinit()
if (!consinfo)
panic("not found console information in bootinfo");
#if (NPC > 0) || (NVT > 0) || (NVGA > 0)
#if (NPC > 0) || (NVT > 0) || (NVGA_ISA > 0) || (NVGA_PCI > 0)
if (!strcmp(consinfo->devname, "vga")) {
#if (NVGA > 0)
#if (NVGA_ISA > 0) || (NVGA_PCI > 0)
if (!vga_cnattach(BEBOX_BUS_SPACE_IO, BEBOX_BUS_SPACE_MEM,
-1, 1))
goto dokbd;
@ -644,7 +645,7 @@ dokbd:
#endif
return;
}
#endif /* PC | VT | VGA */
#endif /* PC | VT | VGA_ISA | VGA_PCI */
#if (NCOM > 0)
if (!strcmp(consinfo->devname, "com")) {
bus_space_tag_t tag = BEBOX_BUS_SPACE_IO;