summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiod Vallat <miod@cvs.openbsd.org>2005-12-25 21:47:16 +0000
committerMiod Vallat <miod@cvs.openbsd.org>2005-12-25 21:47:16 +0000
commite086cf0e56cb81cc988ae8964d47be7e9d9bb7c6 (patch)
tree712d1c951dbc40cea5367314e318aa2371e4c8a7
parent25a76243f4e75462f57a73a755cd916fe4a5a307 (diff)
Return proper frame buffer type rather than generic SUN24 id, Xwsfb has known
the proper id for a long time already...
-rw-r--r--sys/arch/sparc/dev/cgfourteen.c7
-rw-r--r--sys/arch/sparc/dev/tcx.c7
2 files changed, 4 insertions, 10 deletions
diff --git a/sys/arch/sparc/dev/cgfourteen.c b/sys/arch/sparc/dev/cgfourteen.c
index 5434dff107a..778c962d71c 100644
--- a/sys/arch/sparc/dev/cgfourteen.c
+++ b/sys/arch/sparc/dev/cgfourteen.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cgfourteen.c,v 1.32 2005/03/23 17:17:15 miod Exp $ */
+/* $OpenBSD: cgfourteen.c,v 1.33 2005/12/25 21:47:15 miod Exp $ */
/* $NetBSD: cgfourteen.c,v 1.7 1997/05/24 20:16:08 pk Exp $ */
/*
@@ -347,10 +347,7 @@ cgfourteen_ioctl(void *dev, u_long cmd, caddr_t data, int flags, struct proc *p)
*/
switch (cmd) {
case WSDISPLAYIO_GTYPE:
- if (sc->sc_32)
- *(u_int *)data = WSDISPLAY_TYPE_SUN24;
- else
- *(u_int *)data = WSDISPLAY_TYPE_UNKNOWN;
+ *(u_int *)data = WSDISPLAY_TYPE_SUNCG14;
break;
case WSDISPLAYIO_GINFO:
wdf = (struct wsdisplay_fbinfo *)data;
diff --git a/sys/arch/sparc/dev/tcx.c b/sys/arch/sparc/dev/tcx.c
index 4b1e5c5e4ac..dacef4db0b3 100644
--- a/sys/arch/sparc/dev/tcx.c
+++ b/sys/arch/sparc/dev/tcx.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tcx.c,v 1.25 2005/03/23 17:16:34 miod Exp $ */
+/* $OpenBSD: tcx.c,v 1.26 2005/12/25 21:47:15 miod Exp $ */
/* $NetBSD: tcx.c,v 1.8 1997/07/29 09:58:14 fair Exp $ */
/*
@@ -276,10 +276,7 @@ tcx_ioctl(void *dev, u_long cmd, caddr_t data, int flags, struct proc *p)
*/
switch (cmd) {
case WSDISPLAYIO_GTYPE:
- if (sc->sc_cplane == NULL)
- *(u_int *)data = WSDISPLAY_TYPE_UNKNOWN;
- else
- *(u_int *)data = WSDISPLAY_TYPE_SUN24;
+ *(u_int *)data = WSDISPLAY_TYPE_SUNTCX;
break;
case WSDISPLAYIO_GINFO:
wdf = (struct wsdisplay_fbinfo *)data;