diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2002-07-25 19:01:20 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2002-07-25 19:01:20 +0000 |
| commit | c7866a5b25f02593194ade0e26348772eb9dd911 (patch) | |
| tree | ced7950f277ea613c723558e1f990f2b76b33c36 | |
| parent | df4cfe998081e84c31e7e2e2849ec7c18bd52e77 (diff) | |
Rename the WSDISPLAY_TYPE_SUNFFB display type into a more generic name,
..._SUN24, since this only means 24 bit framebuffers with BGR encoding.
Also add a WSDISPLAY_TYPE_SUNBW for Sun monochrome framebuffers, to be used
by Xwsfb shortly.
| -rw-r--r-- | sbin/wsconsctl/util.c | 5 | ||||
| -rw-r--r-- | sys/dev/wscons/wsconsio.h | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/sbin/wsconsctl/util.c b/sbin/wsconsctl/util.c index 0db1556c752..f5ac93f6df8 100644 --- a/sbin/wsconsctl/util.c +++ b/sbin/wsconsctl/util.c @@ -1,4 +1,4 @@ -/* $OpenBSD: util.c,v 1.12 2002/06/07 20:56:38 drahn Exp $ */ +/* $OpenBSD: util.c,v 1.13 2002/07/25 19:01:15 miod Exp $ */ /* $NetBSD: util.c,v 1.8 2000/03/14 08:11:53 sato Exp $ */ /*- @@ -107,7 +107,8 @@ static const struct nameint dpytype_tab[] = { { WSDISPLAY_TYPE_SB_P9100, "p9100" }, { WSDISPLAY_TYPE_EGA, "ega" }, { WSDISPLAY_TYPE_DCPVR, "powervr" }, - { WSDISPLAY_TYPE_SUNFFB, "sunffb" } + { WSDISPLAY_TYPE_SUN24, "sun24" }, + { WSDISPLAY_TYPE_SUNBW, "sunbw" } }; static const struct nameint kbdenc_tab[] = { diff --git a/sys/dev/wscons/wsconsio.h b/sys/dev/wscons/wsconsio.h index c25d795ef9b..d652ac82c8b 100644 --- a/sys/dev/wscons/wsconsio.h +++ b/sys/dev/wscons/wsconsio.h @@ -1,4 +1,4 @@ -/* $OpenBSD: wsconsio.h,v 1.21 2002/06/11 22:56:48 jason Exp $ */ +/* $OpenBSD: wsconsio.h,v 1.22 2002/07/25 19:01:19 miod Exp $ */ /* $NetBSD: wsconsio.h,v 1.31.2.1 2000/07/07 09:49:17 hannken Exp $ */ /* @@ -252,7 +252,8 @@ struct wsmouse_calibcoords { #define WSDISPLAY_TYPE_SB_P9100 22 /* Tadpole SPARCbook P9100 */ #define WSDISPLAY_TYPE_EGA 23 /* (generic) EGA */ #define WSDISPLAY_TYPE_DCPVR 24 /* Dreamcast PowerVR */ -#define WSDISPLAY_TYPE_SUNFFB 25 /* Sun UPA FFB */ +#define WSDISPLAY_TYPE_SUN24 25 /* Sun 24 bit framebuffers */ +#define WSDISPLAY_TYPE_SUNBW 26 /* Sun black and white fb */ /* Basic display information. Not applicable to all display types. */ struct wsdisplay_fbinfo { |