summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorMiod Vallat <miod@cvs.openbsd.org>2006-06-29 17:54:33 +0000
committerMiod Vallat <miod@cvs.openbsd.org>2006-06-29 17:54:33 +0000
commit15242d449370d1f3cad950d452ff1c3e53a93484 (patch)
tree6adbc763bc526adbf97e34b928a85ccf6d811608 /sys
parentb72c6ee96af7f31eb5c7b25ede5b193eed0e7053 (diff)
No need to keep specific variables for the kernel messages colors on sun
emulation, we can reuse the existing WSCOL_xxx codes, and WSCOL_BLACK and WSCOL_WHITE will point to variables anyway.
Diffstat (limited to 'sys')
-rw-r--r--sys/arch/sparc/dev/fb.c4
-rw-r--r--sys/arch/sparc64/dev/fb.c4
-rw-r--r--sys/dev/wscons/wsdisplayvar.h3
-rw-r--r--sys/dev/wscons/wsemul_sun.c8
4 files changed, 6 insertions, 13 deletions
diff --git a/sys/arch/sparc/dev/fb.c b/sys/arch/sparc/dev/fb.c
index 19f6c8a9c6d..33c91e963c7 100644
--- a/sys/arch/sparc/dev/fb.c
+++ b/sys/arch/sparc/dev/fb.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: fb.c,v 1.36 2006/03/12 22:53:01 miod Exp $ */
+/* $OpenBSD: fb.c,v 1.37 2006/06/29 17:54:30 miod Exp $ */
/* $NetBSD: fb.c,v 1.23 1997/07/07 23:30:22 pk Exp $ */
/*
@@ -418,8 +418,6 @@ fbwscons_console_init(struct sunfb *sf, int row)
if (sf->sf_depth > 8) {
wscol_white = 0;
wscol_black = 255;
- wskernel_bg = 0;
- wskernel_fg = 255;
}
if (ISSET(sf->sf_ro.ri_caps, WSSCREEN_WSCOLORS) &&
diff --git a/sys/arch/sparc64/dev/fb.c b/sys/arch/sparc64/dev/fb.c
index d5c94e5bab1..4084633c93e 100644
--- a/sys/arch/sparc64/dev/fb.c
+++ b/sys/arch/sparc64/dev/fb.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: fb.c,v 1.10 2006/03/12 22:53:02 miod Exp $ */
+/* $OpenBSD: fb.c,v 1.11 2006/06/29 17:54:32 miod Exp $ */
/* $NetBSD: fb.c,v 1.23 1997/07/07 23:30:22 pk Exp $ */
/*
@@ -235,8 +235,6 @@ fbwscons_console_init(struct sunfb *sf, int row)
if (sf->sf_depth > 8) {
wscol_white = 0;
wscol_black = 255;
- wskernel_bg = 0;
- wskernel_fg = 255;
}
if (ISSET(sf->sf_ro.ri_caps, WSSCREEN_WSCOLORS) &&
diff --git a/sys/dev/wscons/wsdisplayvar.h b/sys/dev/wscons/wsdisplayvar.h
index 520fb9be4f4..3c4fde4c8a0 100644
--- a/sys/dev/wscons/wsdisplayvar.h
+++ b/sys/dev/wscons/wsdisplayvar.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: wsdisplayvar.h,v 1.16 2005/09/27 21:45:20 miod Exp $ */
+/* $OpenBSD: wsdisplayvar.h,v 1.17 2006/06/29 17:54:32 miod Exp $ */
/* $NetBSD: wsdisplayvar.h,v 1.30 2005/02/04 02:10:49 perry Exp $ */
/*
@@ -92,7 +92,6 @@ struct wsdisplay_emulops {
/* XXX should be #if NWSEMUL_SUN > 1 */
#if defined(__sparc__) || defined(__sparc64__)
extern int wscol_white, wscol_black;
-extern int wskernel_fg, wskernel_bg;
#endif
#define WSSCREEN_NAME_SIZE 16
diff --git a/sys/dev/wscons/wsemul_sun.c b/sys/dev/wscons/wsemul_sun.c
index 04fa0dda598..dd58be25200 100644
--- a/sys/dev/wscons/wsemul_sun.c
+++ b/sys/dev/wscons/wsemul_sun.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wsemul_sun.c,v 1.13 2005/03/09 17:48:41 miod Exp $ */
+/* $OpenBSD: wsemul_sun.c,v 1.14 2006/06/29 17:54:32 miod Exp $ */
/* $NetBSD: wsemul_sun.c,v 1.11 2000/01/05 11:19:36 drochner Exp $ */
/*
@@ -127,8 +127,6 @@ struct wsemul_sun_emuldata wsemul_sun_console_emuldata;
*/
int wscol_white = 0; /* 0 */
int wscol_black = 7; /* 255 */
-int wskernel_bg = 7; /* 0 */
-int wskernel_fg = 0; /* 255 */
void
wsemul_sun_init(edp, type, cookie, ccol, crow, defattr)
@@ -174,10 +172,10 @@ wsemul_sun_cnattach(type, cookie, ccol, crow, defattr)
wsemul_sun_init(edp, type, cookie, ccol, crow, defattr);
#ifndef WS_KERNEL_FG
-#define WS_KERNEL_FG wskernel_bg
+#define WS_KERNEL_FG WSCOL_BLACK
#endif
#ifndef WS_KERNEL_BG
-#define WS_KERNEL_BG wskernel_fg
+#define WS_KERNEL_BG WSCOL_WHITE
#endif
#ifndef WS_KERNEL_COLATTR
#define WS_KERNEL_COLATTR 0