From b7de61b9b3474465718fe6429469d50e911c47e6 Mon Sep 17 00:00:00 2001
From: martin <martin@NetBSD.org>
Date: Mon, 23 May 2005 09:44:57 +0000
Subject: [PATCH] Rename REALWHITE to SNOWWHITE. While there, add LIGHT
 versions of the other predefined colours as well.

---
 sys/arch/sparc64/conf/GENERIC32 |  6 +++---
 sys/dev/wscons/wsdisplayvar.h   | 11 +++++++++--
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/sys/arch/sparc64/conf/GENERIC32 b/sys/arch/sparc64/conf/GENERIC32
index 13a4042a61c0..084a1eb17706 100644
--- a/sys/arch/sparc64/conf/GENERIC32
+++ b/sys/arch/sparc64/conf/GENERIC32
@@ -1,10 +1,10 @@
-# 	$NetBSD: GENERIC32,v 1.103 2005/05/22 20:17:09 martin Exp $
+# 	$NetBSD: GENERIC32,v 1.104 2005/05/23 09:44:57 martin Exp $
 
 include "arch/sparc64/conf/std.sparc64"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.103 $"
+#ident 		"GENERIC-$Revision: 1.104 $"
 
 maxusers	64
 
@@ -799,7 +799,7 @@ wskbd0 at kbd0
 # sun console as possible
 options 	WSEMUL_SUN		# sun terminal emulation
 options 	WS_DEFAULT_FG=WSCOL_BLACK
-options 	WS_DEFAULT_BG=WSCOL_REALWHITE
+options 	WS_DEFAULT_BG=WSCOL_LIGHT_WHITE
 options 	WSDISPLAY_COMPAT_USL		# VT handling
 options 	WSDISPLAY_COMPAT_RAWKBD		# can get raw scancodes
 options 	WSDISPLAY_DEFAULTSCREENS=4
diff --git a/sys/dev/wscons/wsdisplayvar.h b/sys/dev/wscons/wsdisplayvar.h
index b4a5350d448c..0fefbb58051d 100644
--- a/sys/dev/wscons/wsdisplayvar.h
+++ b/sys/dev/wscons/wsdisplayvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: wsdisplayvar.h,v 1.31 2005/05/22 20:16:08 martin Exp $ */
+/* $NetBSD: wsdisplayvar.h,v 1.32 2005/05/23 09:44:57 martin Exp $ */
 
 /*
  * Copyright (c) 1996, 1997 Christopher G. Demetriou.  All rights reserved.
@@ -66,7 +66,14 @@ struct wsdisplay_emulops {
 #define WSCOL_MAGENTA	5
 #define WSCOL_CYAN	6
 #define WSCOL_WHITE	7
-#define WSCOL_REALWHITE	(WSCOL_WHITE+8)
+#define WSCOL_LIGHT_GREY	(WSCOL_BLACK+8)
+#define WSCOL_LIGHT_RED		(WSCOL_RED+8)
+#define WSCOL_LIGHT_GREEN	(WSCOL_GREEN+8)
+#define WSCOL_LIGHT_BROWN	(WSCOL_BROWN+8)
+#define WSCOL_LIGHT_BLUE	(WSCOL_BLUE+8)
+#define WSCOL_LIGHT_MAGENTA	(WSCOL_MAGENTA+8)
+#define WSCOL_LIGHT_CYAN	(WSCOL_CYAN+8)
+#define WSCOL_LIGHT_WHITE	(WSCOL_WHITE+8)
 /* flag values: */
 #define WSATTR_REVERSE	1
 #define WSATTR_HILIT	2