summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Kettenis <kettenis@cvs.openbsd.org>2009-06-02 04:53:58 +0000
committerMark Kettenis <kettenis@cvs.openbsd.org>2009-06-02 04:53:58 +0000
commit407bab894317dd6e751ad93fdc1dd4135665df59 (patch)
tree502deeeaf6b9fdb20a89eef8935e1eac75641317
parent104eda389186a5bffb50c6771eaeb9dde503bd3b (diff)
Define a proper wsdisplay type for machfb(4).
requested by miod@
-rw-r--r--sys/arch/sparc64/dev/machfb.c4
-rw-r--r--sys/dev/wscons/wsconsio.h3
2 files changed, 4 insertions, 3 deletions
diff --git a/sys/arch/sparc64/dev/machfb.c b/sys/arch/sparc64/dev/machfb.c
index 016c204da9c..0968c7e6d0e 100644
--- a/sys/arch/sparc64/dev/machfb.c
+++ b/sys/arch/sparc64/dev/machfb.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machfb.c,v 1.2 2009/06/02 04:47:04 kettenis Exp $ */
+/* $OpenBSD: machfb.c,v 1.3 2009/06/02 04:53:57 kettenis Exp $ */
/*
* Copyright (c) 2009 Mark Kettenis.
@@ -338,7 +338,7 @@ machfb_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_MACHFB;
break;
case WSDISPLAYIO_SMODE:
sc->sc_mode = *(u_int *)data;
diff --git a/sys/dev/wscons/wsconsio.h b/sys/dev/wscons/wsconsio.h
index a553c00fe0c..8d66b56e677 100644
--- a/sys/dev/wscons/wsconsio.h
+++ b/sys/dev/wscons/wsconsio.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: wsconsio.h,v 1.52 2009/05/20 18:22:33 miod Exp $ */
+/* $OpenBSD: wsconsio.h,v 1.53 2009/06/02 04:53:57 kettenis Exp $ */
/* $NetBSD: wsconsio.h,v 1.74 2005/04/28 07:15:44 martin Exp $ */
/*
@@ -305,6 +305,7 @@ struct wsmouse_calibcoords {
#define WSDISPLAY_TYPE_IFB 56 /* Sun Expert3D{,-Lite} */
#define WSDISPLAY_TYPE_RAPTOR 57 /* Tech Source Raptor */
#define WSDISPLAY_TYPE_DL 58 /* DisplayLink DL-120/DL-160 */
+#define WSDISPLAY_TYPE_MACHFB 59 /* Sun PGX/PGX64 */
/* Basic display information. Not applicable to all display types. */
struct wsdisplay_fbinfo {