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

Fix initialitzation of border color at boot time through the

Browse Source 
WSDISPLAY_BORDER_COLOR option, broken by a last-minute change.
Pointed out by xtraeme@.

Also back out the previous change by dogcow@, which was an attempt
to fix kernel builds that didn't define WSDISPLAY_CUSTOM_BORDER;
shouldn't be needed now.  (Problem also introduced by the same
last-minute change; sorry).
This commit is contained in:
jmmv 2004-07-30 10:47:20 +00:00
parent 4ebba2e5cb
commit cda2a3bba1
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sys/dev/ic/vga.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: vga.c,v 1.77 2004/07/30 07:40:26 dogcow Exp $ */ /* $NetBSD: vga.c,v 1.78 2004/07/30 10:47:20 jmmv Exp $ */
/* /*
* Copyright (c) 1995, 1996 Carnegie-Mellon University. * Copyright (c) 1995, 1996 Carnegie-Mellon University.
@ -35,7 +35,7 @@
#include "opt_wsmsgattrs.h" #include "opt_wsmsgattrs.h"
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: vga.c,v 1.77 2004/07/30 07:40:26 dogcow Exp $"); __KERNEL_RCSID(0, "$NetBSD: vga.c,v 1.78 2004/07/30 10:47:20 jmmv Exp $");
#include <sys/param.h> #include <sys/param.h>
#include <sys/systm.h> #include <sys/systm.h>
@ -591,12 +591,9 @@ vga_init(struct vga_config *vc, bus_space_tag_t iot, bus_space_tag_t memt)
vc->currentfontset1 = vc->currentfontset2 = 0; vc->currentfontset1 = vc->currentfontset2 = 0;
#ifdef WSDISPLAY_CUSTOM_BORDER if (!vh->vh_mono && (u_int)WSDISPLAY_BORDER_COLOR < sizeof(fgansitopc))
/* This function does all the required sanity checks for us _vga_attr_write(vh, VGA_ATC_OVERSCAN,
* (mono video, valid color, etc.); we just don't care about fgansitopc[WSDISPLAY_BORDER_COLOR]);
* possible errors during initialization. */
(void)vga_setborder(vc->active, WSDISPLAY_BORDER_COLOR);
#endif /* WSDISPLAY_CUSTOM_BORDER */
} }
void void