summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoel Sing <jsing@cvs.openbsd.org>2010-03-04 14:31:13 +0000
committerJoel Sing <jsing@cvs.openbsd.org>2010-03-04 14:31:13 +0000
commit6c7b46ab88c086928bfcbd0bd0c184cfb4273dca (patch)
tree40f3c8d82932fce37af3512890f3763ff591fcfc
parentafa44d03d4c65c1254e4f0c975443fc9c5cfe86d (diff)
Add wsdisplay type for SGI VPro (aka Odyssey)
ok miod@
-rw-r--r--sbin/wsconsctl/util.c5
-rw-r--r--sys/dev/wscons/wsconsio.h3
2 files changed, 5 insertions, 3 deletions
diff --git a/sbin/wsconsctl/util.c b/sbin/wsconsctl/util.c
index 3e1b90c5fd5..b28740383b9 100644
--- a/sbin/wsconsctl/util.c
+++ b/sbin/wsconsctl/util.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: util.c,v 1.47 2010/02/28 22:32:48 miod Exp $ */
+/* $OpenBSD: util.c,v 1.48 2010/03/04 14:31:12 jsing Exp $ */
/* $NetBSD: util.c,v 1.8 2000/03/14 08:11:53 sato Exp $ */
/*-
@@ -153,7 +153,8 @@ static const struct nameint dpytype_tab[] = {
{ WSDISPLAY_TYPE_GFXP, "gfxp" },
{ WSDISPLAY_TYPE_RADEONFB, "radeon" },
{ WSDISPLAY_TYPE_SMFB, "smfb" },
- { WSDISPLAY_TYPE_SISFB, "sisfb" }
+ { WSDISPLAY_TYPE_SISFB, "sisfb" },
+ { WSDISPLAY_TYPE_ODYSSEY, "odyssey" }
};
static const struct nameint kbdenc_tab[] = {
diff --git a/sys/dev/wscons/wsconsio.h b/sys/dev/wscons/wsconsio.h
index 345b7957ae2..85b50838ac1 100644
--- a/sys/dev/wscons/wsconsio.h
+++ b/sys/dev/wscons/wsconsio.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: wsconsio.h,v 1.58 2010/02/28 22:32:50 miod Exp $ */
+/* $OpenBSD: wsconsio.h,v 1.59 2010/03/04 14:31:12 jsing Exp $ */
/* $NetBSD: wsconsio.h,v 1.74 2005/04/28 07:15:44 martin Exp $ */
/*
@@ -312,6 +312,7 @@ struct wsmouse_calibcoords {
#define WSDISPLAY_TYPE_RADEONFB 61 /* Sun XVR-100 */
#define WSDISPLAY_TYPE_SMFB 62 /* SiliconMotion SM712 */
#define WSDISPLAY_TYPE_SISFB 63 /* SiS 315 Pro */
+#define WSDISPLAY_TYPE_ODYSSEY 64 /* SGI Odyssey */
/* Basic display information. Not applicable to all display types. */
struct wsdisplay_fbinfo {