diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2006-01-09 21:52:13 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2006-01-09 21:52:13 +0000 |
| commit | 359511731a3d6745a36ce439977017c551795a88 (patch) | |
| tree | 191df327b5ca2efd0c04e4cb55f039542367a75c | |
| parent | 16c1fc8fb8468cd6d1006bdd325f7ca7c1cee280 (diff) | |
Introduce a wsdisplay type for mac68k frame buffers; we might need to become
less generic in the future, though.
| -rw-r--r-- | sbin/wsconsctl/util.c | 11 | ||||
| -rw-r--r-- | sys/arch/mac68k/dev/macfb.c | 4 | ||||
| -rw-r--r-- | sys/dev/wscons/wsconsio.h | 5 |
3 files changed, 11 insertions, 9 deletions
diff --git a/sbin/wsconsctl/util.c b/sbin/wsconsctl/util.c index fe477d3baf0..7a09b132eda 100644 --- a/sbin/wsconsctl/util.c +++ b/sbin/wsconsctl/util.c @@ -1,4 +1,4 @@ -/* $OpenBSD: util.c,v 1.30 2005/05/31 15:33:57 brad Exp $ */ +/* $OpenBSD: util.c,v 1.31 2006/01/09 21:52:09 miod Exp $ */ /* $NetBSD: util.c,v 1.8 2000/03/14 08:11:53 sato Exp $ */ /*- @@ -104,9 +104,9 @@ static const struct nameint dpytype_tab[] = { { WSDISPLAY_TYPE_SFBP, "dec-sfb+" }, { WSDISPLAY_TYPE_PCIMISC, "generic-pci" }, { WSDISPLAY_TYPE_NEXTMONO, "next-mono" }, - { WSDISPLAY_TYPE_PX, "dex-px" }, - { WSDISPLAY_TYPE_PXG, "dex-pxg" }, - { WSDISPLAY_TYPE_TX, "dex-tx" }, + { WSDISPLAY_TYPE_PX, "dec-px" }, + { WSDISPLAY_TYPE_PXG, "dec-pxg" }, + { WSDISPLAY_TYPE_TX, "dec-tx" }, { WSDISPLAY_TYPE_HPCFB, "generic-hpc" }, { WSDISPLAY_TYPE_VIDC, "arm-vidc" }, { WSDISPLAY_TYPE_SPX, "dec-spx" }, @@ -139,7 +139,8 @@ static const struct nameint dpytype_tab[] = { { WSDISPLAY_TYPE_RBOX, "renaissance" }, { WSDISPLAY_TYPE_HYPERION, "hyperion" }, { WSDISPLAY_TYPE_TOPCAT, "topcat" }, - { WSDISPLAY_TYPE_PXALCD, "pxalcd" } + { WSDISPLAY_TYPE_PXALCD, "pxalcd" }, + { WSDISPLAY_TYPE_MAC68K, "mac68k" } }; static const struct nameint kbdenc_tab[] = { diff --git a/sys/arch/mac68k/dev/macfb.c b/sys/arch/mac68k/dev/macfb.c index 580788718b8..ecd49508841 100644 --- a/sys/arch/mac68k/dev/macfb.c +++ b/sys/arch/mac68k/dev/macfb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: macfb.c,v 1.6 2006/01/09 20:51:48 miod Exp $ */ +/* $OpenBSD: macfb.c,v 1.7 2006/01/09 21:52:12 miod Exp $ */ /* $NetBSD: macfb.c,v 1.11 2005/01/15 16:00:59 chs Exp $ */ /* * Copyright (c) 1998 Matt DeBergalis @@ -262,7 +262,7 @@ macfb_ioctl(void *v, u_long cmd, caddr_t data, int flag, struct proc *p) switch (cmd) { case WSDISPLAYIO_GTYPE: - *(int *)data = 0; /* XXX */ + *(int *)data = WSDISPLAY_TYPE_MAC68K; break; case WSDISPLAYIO_GINFO: diff --git a/sys/dev/wscons/wsconsio.h b/sys/dev/wscons/wsconsio.h index c8b2996375c..39bd7c2cea1 100644 --- a/sys/dev/wscons/wsconsio.h +++ b/sys/dev/wscons/wsconsio.h @@ -1,4 +1,4 @@ -/* $OpenBSD: wsconsio.h,v 1.36 2005/05/15 11:29:15 miod Exp $ */ +/* $OpenBSD: wsconsio.h,v 1.37 2006/01/09 21:52:12 miod Exp $ */ /* $NetBSD: wsconsio.h,v 1.74 2005/04/28 07:15:44 martin Exp $ */ /* @@ -256,7 +256,7 @@ struct wsmouse_calibcoords { #define WSDISPLAY_TYPE_HPCFB 16 /* Handheld/PalmSize PC */ #define WSDISPLAY_TYPE_VIDC 17 /* Acorn/ARM VIDC */ #define WSDISPLAY_TYPE_SPX 18 /* DEC SPX (VS3100/VS4000) */ -#define WSDISPLAY_TYPE_GPX 19 /* DEC GPX (uVAX/VS2K/VS3100 */ +#define WSDISPLAY_TYPE_GPX 19 /* DEC GPX (uVAX/VS2K/VS3100) */ #define WSDISPLAY_TYPE_LCG 20 /* DEC LCG (VS4000) */ #define WSDISPLAY_TYPE_VAX_MONO 21 /* DEC VS2K/VS3100 mono */ #define WSDISPLAY_TYPE_SB_P9100 22 /* Tadpole SPARCbook P9100 */ @@ -286,6 +286,7 @@ struct wsmouse_calibcoords { #define WSDISPLAY_TYPE_HYPERION 46 /* HP Hyperion */ #define WSDISPLAY_TYPE_TOPCAT 47 /* HP Topcat */ #define WSDISPLAY_TYPE_PXALCD 48 /* PXALCD (Zaurus) */ +#define WSDISPLAY_TYPE_MAC68K 49 /* Generic mac68k framebuffer */ /* Basic display information. Not applicable to all display types. */ struct wsdisplay_fbinfo { |