summaryrefslogtreecommitdiff
path: root/sys/dev/wscons/wsdisplayvar.h
diff options
context:
space:
mode:
authorMiod Vallat <miod@cvs.openbsd.org>2006-12-02 11:25:10 +0000
committerMiod Vallat <miod@cvs.openbsd.org>2006-12-02 11:25:10 +0000
commit5f7a51d9481bd1d438c6cefef01cde898e1e9cae (patch)
treee991a9c9d8596d7eba86952555d11f6c03481632 /sys/dev/wscons/wsdisplayvar.h
parentc7a7963da6902fde50c09b326f851dca9b7b5bb9 (diff)
Fix ri_devcmap[] to allow WSCOL_BLACK and WSCOL_WHITE to not have to be
different for sparc{,64} systems.
Diffstat (limited to 'sys/dev/wscons/wsdisplayvar.h')
-rw-r--r--sys/dev/wscons/wsdisplayvar.h10
1 files changed, 2 insertions, 8 deletions
diff --git a/sys/dev/wscons/wsdisplayvar.h b/sys/dev/wscons/wsdisplayvar.h
index 15138079c99..3ca65a69866 100644
--- a/sys/dev/wscons/wsdisplayvar.h
+++ b/sys/dev/wscons/wsdisplayvar.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: wsdisplayvar.h,v 1.21 2006/11/29 19:11:17 miod Exp $ */
+/* $OpenBSD: wsdisplayvar.h,v 1.22 2006/12/02 11:25:09 miod Exp $ */
/* $NetBSD: wsdisplayvar.h,v 1.30 2005/02/04 02:10:49 perry Exp $ */
/*
@@ -64,20 +64,14 @@ struct wsdisplay_emulops {
int (*alloc_attr)(void *c, int fg, int bg, int flags, long *attrp);
void (*unpack_attr)(void *c, long attr, int *fg, int *bg, int *ul);
/* fg / bg values. Made identical to ANSI terminal color codes. */
-/* XXX should be #if NWSEMUL_SUN > 1 */
-#if defined(__sparc__) || defined(__sparc64__)
-#define WSCOL_WHITE 0
-#define WSCOL_BLACK 15
-#else
#define WSCOL_BLACK 0
-#define WSCOL_WHITE 7
-#endif
#define WSCOL_RED 1
#define WSCOL_GREEN 2
#define WSCOL_BROWN 3
#define WSCOL_BLUE 4
#define WSCOL_MAGENTA 5
#define WSCOL_CYAN 6
+#define WSCOL_WHITE 7
/* flag values: */
#define WSATTR_REVERSE 1
#define WSATTR_HILIT 2