diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2008-12-29 22:25:17 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2008-12-29 22:25:17 +0000 |
| commit | 6abfdf50114371528040e5b8090ff9ed9cec0f34 (patch) | |
| tree | 54fc508ffe183a79ae1c00d1483fb17747d401dc | |
| parent | b00c90210f261c8640896650107a2d2de139910e (diff) | |
Give ifb its own display type (be sure to make includes before rebuilding
wsconsctl)
| -rw-r--r-- | sbin/wsconsctl/util.c | 5 | ||||
| -rw-r--r-- | sys/arch/sparc64/dev/ifb.c | 4 | ||||
| -rw-r--r-- | sys/dev/wscons/wsconsio.h | 3 |
3 files changed, 7 insertions, 5 deletions
diff --git a/sbin/wsconsctl/util.c b/sbin/wsconsctl/util.c index f2c996066e8..405aa22ac61 100644 --- a/sbin/wsconsctl/util.c +++ b/sbin/wsconsctl/util.c @@ -1,4 +1,4 @@ -/* $OpenBSD: util.c,v 1.38 2008/08/24 20:10:55 miod Exp $ */ +/* $OpenBSD: util.c,v 1.39 2008/12/29 22:25:15 miod Exp $ */ /* $NetBSD: util.c,v 1.8 2000/03/14 08:11:53 sato Exp $ */ /*- @@ -141,7 +141,8 @@ static const struct nameint dpytype_tab[] = { { WSDISPLAY_TYPE_CFXGA, "cfxga" }, { WSDISPLAY_TYPE_LCSPX, "dec-lcspx" }, { WSDISPLAY_TYPE_GBE, "gbe" }, - { WSDISPLAY_TYPE_LEGSS, "dec-legss" } + { WSDISPLAY_TYPE_LEGSS, "dec-legss" }, + { WSDISPLAY_TYPE_IFB, "ifb" } }; static const struct nameint kbdenc_tab[] = { diff --git a/sys/arch/sparc64/dev/ifb.c b/sys/arch/sparc64/dev/ifb.c index e5d4bd8bbae..a125e96414a 100644 --- a/sys/arch/sparc64/dev/ifb.c +++ b/sys/arch/sparc64/dev/ifb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ifb.c,v 1.10 2008/12/29 22:07:35 miod Exp $ */ +/* $OpenBSD: ifb.c,v 1.11 2008/12/29 22:25:16 miod Exp $ */ /* * Copyright (c) 2007, 2008 Miodrag Vallat. @@ -363,7 +363,7 @@ ifb_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_IFB; break; case WSDISPLAYIO_SMODE: diff --git a/sys/dev/wscons/wsconsio.h b/sys/dev/wscons/wsconsio.h index 11869506b69..aed872a6515 100644 --- a/sys/dev/wscons/wsconsio.h +++ b/sys/dev/wscons/wsconsio.h @@ -1,4 +1,4 @@ -/* $OpenBSD: wsconsio.h,v 1.48 2008/08/24 20:10:57 miod Exp $ */ +/* $OpenBSD: wsconsio.h,v 1.49 2008/12/29 22:25:16 miod Exp $ */ /* $NetBSD: wsconsio.h,v 1.74 2005/04/28 07:15:44 martin Exp $ */ /* @@ -301,6 +301,7 @@ struct wsmouse_calibcoords { #define WSDISPLAY_TYPE_LCSPX 53 /* DEC LCSPX (VS4000) */ #define WSDISPLAY_TYPE_GBE 54 /* SGI GBE frame buffer */ #define WSDISPLAY_TYPE_LEGSS 55 /* DEC LEGSS (VS35x0) */ +#define WSDISPLAY_TYPE_IFB 56 /* Sun Expert3D{,-Lite} */ /* Basic display information. Not applicable to all display types. */ struct wsdisplay_fbinfo { |