From 0c5c1c33e91f219477db6be275f8f69e3f302a1b Mon Sep 17 00:00:00 2001
From: Jason Wright <jason@cvs.openbsd.org>
Date: Fri, 28 Mar 2003 02:59:32 +0000
Subject: add a whole bunch of display types (will be used by the accelerated X
 stuff coming soon to a tree near you).

---
 sbin/wsconsctl/util.c     | 15 +++++++++++++--
 sys/dev/wscons/wsconsio.h | 13 ++++++++++++-
 2 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/sbin/wsconsctl/util.c b/sbin/wsconsctl/util.c
index e0473b1771d..46ab1cfa3ab 100644
--- a/sbin/wsconsctl/util.c
+++ b/sbin/wsconsctl/util.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: util.c,v 1.19 2003/02/12 01:44:09 miod Exp $ */
+/*	$OpenBSD: util.c,v 1.20 2003/03/28 02:59:31 jason Exp $ */
 /*	$NetBSD: util.c,v 1.8 2000/03/14 08:11:53 sato Exp $ */
 
 /*-
@@ -112,7 +112,18 @@ static const struct nameint dpytype_tab[] = {
 	{ WSDISPLAY_TYPE_DCPVR,		"powervr" },
 	{ WSDISPLAY_TYPE_SUN24,		"sun24" },
 	{ WSDISPLAY_TYPE_SUNBW,		"sunbw" },
-	{ WSDISPLAY_TYPE_STI,		"hp-sti" }
+	{ WSDISPLAY_TYPE_STI,		"hp-sti" },
+	{ WSDISPLAY_TYPE_SUNCG3,	"suncg3" },
+	{ WSDISPLAY_TYPE_SUNCG6,	"suncg6" },
+	{ WSDISPLAY_TYPE_SUNFFB,	"sunffb" },
+	{ WSDISPLAY_TYPE_SUNCG14,	"suncg14" },
+	{ WSDISPLAY_TYPE_SUNCG2,	"suncg2" },
+	{ WSDISPLAY_TYPE_SUNCG4,	"suncg4" },
+	{ WSDISPLAY_TYPE_SUNCG8,	"suncg8" },
+	{ WSDISPLAY_TYPE_SUNTCX,	"suntcx" },
+	{ WSDISPLAY_TYPE_AGTEN,		"agten" },
+	{ WSDISPLAY_TYPE_XVIDEO,	"xvideo" },
+	{ WSDISPLAY_TYPE_SUNCG12,	"suncg12" },
 };
 
 static const struct nameint kbdenc_tab[] = {
diff --git a/sys/dev/wscons/wsconsio.h b/sys/dev/wscons/wsconsio.h
index 7a9dd46f4ef..cce41a8551d 100644
--- a/sys/dev/wscons/wsconsio.h
+++ b/sys/dev/wscons/wsconsio.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: wsconsio.h,v 1.26 2003/02/16 02:08:04 miod Exp $ */
+/* $OpenBSD: wsconsio.h,v 1.27 2003/03/28 02:59:31 jason Exp $ */
 /* $NetBSD: wsconsio.h,v 1.31.2.1 2000/07/07 09:49:17 hannken Exp $ */
 
 /*
@@ -258,6 +258,17 @@ struct wsmouse_calibcoords {
 #define		WSDISPLAY_TYPE_SUN24	25	/* Sun 24 bit framebuffers */
 #define		WSDISPLAY_TYPE_SUNBW	26	/* Sun black and white fb */
 #define		WSDISPLAY_TYPE_STI	27	/* HP STI frambuffers */
+#define		WSDISPLAY_TYPE_SUNCG3	28	/* Sun cgthree */
+#define		WSDISPLAY_TYPE_SUNCG6	29	/* Sun cgsix */
+#define		WSDISPLAY_TYPE_SUNFFB	30	/* Sun creator FFB */
+#define		WSDISPLAY_TYPE_SUNCG14	31	/* Sun cgfourteen */
+#define		WSDISPLAY_TYPE_SUNCG2	32	/* Sun cgtwo */
+#define		WSDISPLAY_TYPE_SUNCG4	33	/* Sun cgfour */
+#define		WSDISPLAY_TYPE_SUNCG8	34	/* Sun cgeight */
+#define		WSDISPLAY_TYPE_SUNTCX	35	/* Sun TCX */
+#define		WSDISPLAY_TYPE_AGTEN	36	/* AG10E */
+#define		WSDISPLAY_TYPE_XVIDEO	37	/* Xvideo */
+#define		WSDISPLAY_TYPE_SUNCG12	38	/* Sun cgtwelve */
 
 /* Basic display information.  Not applicable to all display types. */
 struct wsdisplay_fbinfo {
-- 
cgit v1.2.3