diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2004-03-01 07:53:02 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2004-03-01 07:53:02 +0000 |
| commit | 29504a6ddef63c8e7aa23353f2f7250d9b62a3fa (patch) | |
| tree | 9b8ecabe1bab959a76f41d5f0af0bbc738565256 | |
| parent | 49595e316ec769af36ace3e888af3174cd385114 (diff) | |
Define a wsdisplay type for rfx; ok deraadt@
| -rw-r--r-- | sbin/wsconsctl/util.c | 3 | ||||
| -rw-r--r-- | sys/arch/sparc/dev/rfx.c | 4 | ||||
| -rw-r--r-- | sys/dev/wscons/wsconsio.h | 3 |
3 files changed, 6 insertions, 4 deletions
diff --git a/sbin/wsconsctl/util.c b/sbin/wsconsctl/util.c index c7436636686..6b7467bd8c3 100644 --- a/sbin/wsconsctl/util.c +++ b/sbin/wsconsctl/util.c @@ -1,4 +1,4 @@ -/* $OpenBSD: util.c,v 1.22 2003/06/17 21:21:26 miod Exp $ */ +/* $OpenBSD: util.c,v 1.23 2004/03/01 07:52:57 miod Exp $ */ /* $NetBSD: util.c,v 1.8 2000/03/14 08:11:53 sato Exp $ */ /*- @@ -126,6 +126,7 @@ static const struct nameint dpytype_tab[] = { { WSDISPLAY_TYPE_SUNCG12, "suncg12" }, { WSDISPLAY_TYPE_MGX, "mgx" }, { WSDISPLAY_TYPE_SB_P9000, "p9000" }, + { WSDISPLAY_TYPE_RFLEX, "rasterflex" } }; static const struct nameint kbdenc_tab[] = { diff --git a/sys/arch/sparc/dev/rfx.c b/sys/arch/sparc/dev/rfx.c index 7701bf41629..c17dbd29cc7 100644 --- a/sys/arch/sparc/dev/rfx.c +++ b/sys/arch/sparc/dev/rfx.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rfx.c,v 1.1 2004/02/29 21:44:14 miod Exp $ */ +/* $OpenBSD: rfx.c,v 1.2 2004/03/01 07:53:01 miod Exp $ */ /* * Copyright (c) 2004, Miodrag Vallat. @@ -328,7 +328,7 @@ rfx_ioctl(void *v, u_long cmd, caddr_t data, int flags, struct proc *p) switch (cmd) { case WSDISPLAYIO_GTYPE: - *(u_int *)data = WSDISPLAY_TYPE_UNKNOWN; + *(u_int *)data = WSDISPLAY_TYPE_RFLEX; break; case WSDISPLAYIO_GINFO: wdf = (struct wsdisplay_fbinfo *)data; diff --git a/sys/dev/wscons/wsconsio.h b/sys/dev/wscons/wsconsio.h index 285dbf3547a..bcd38000b35 100644 --- a/sys/dev/wscons/wsconsio.h +++ b/sys/dev/wscons/wsconsio.h @@ -1,4 +1,4 @@ -/* $OpenBSD: wsconsio.h,v 1.29 2003/06/17 21:21:33 miod Exp $ */ +/* $OpenBSD: wsconsio.h,v 1.30 2004/03/01 07:53:01 miod Exp $ */ /* $NetBSD: wsconsio.h,v 1.31.2.1 2000/07/07 09:49:17 hannken Exp $ */ /* @@ -271,6 +271,7 @@ struct wsmouse_calibcoords { #define WSDISPLAY_TYPE_SUNCG12 38 /* Sun cgtwelve */ #define WSDISPLAY_TYPE_MGX 39 /* SMS MGX */ #define WSDISPLAY_TYPE_SB_P9000 40 /* Tadpole SPARCbook P9000 */ +#define WSDISPLAY_TYPE_RFLEX 41 /* RasterFlex series */ /* Basic display information. Not applicable to all display types. */ struct wsdisplay_fbinfo { |