Module Name: src
Committed By: macallan
Date: Thu Dec 31 05:08:05 UTC 2009
Modified Files:
src/sys/arch/sparc64/dev: gfb.c
src/sys/dev/wscons: wsconsio.h
Log Message:
add WSDISPLAY_TYPE_XVR1000
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/sparc64/dev/gfb.c
cvs rdiff -u -r1.91 -r1.92 src/sys/dev/wscons/wsconsio.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/sparc64/dev/gfb.c
diff -u src/sys/arch/sparc64/dev/gfb.c:1.1 src/sys/arch/sparc64/dev/gfb.c:1.2
--- src/sys/arch/sparc64/dev/gfb.c:1.1 Tue Dec 29 06:55:55 2009
+++ src/sys/arch/sparc64/dev/gfb.c Thu Dec 31 05:08:05 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: gfb.c,v 1.1 2009/12/29 06:55:55 macallan Exp $ */
+/* $NetBSD: gfb.c,v 1.2 2009/12/31 05:08:05 macallan Exp $ */
/*
* Copyright (c) 2009 Michael Lorenz
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gfb.c,v 1.1 2009/12/29 06:55:55 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gfb.c,v 1.2 2009/12/31 05:08:05 macallan Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -244,7 +244,7 @@
switch (cmd) {
case WSDISPLAYIO_GTYPE:
- *(u_int *)data = WSDISPLAY_TYPE_PCIMISC;
+ *(u_int *)data = WSDISPLAY_TYPE_XVR1000;
return 0;
case WSDISPLAYIO_GINFO:
Index: src/sys/dev/wscons/wsconsio.h
diff -u src/sys/dev/wscons/wsconsio.h:1.91 src/sys/dev/wscons/wsconsio.h:1.92
--- src/sys/dev/wscons/wsconsio.h:1.91 Sun Nov 15 17:42:24 2009
+++ src/sys/dev/wscons/wsconsio.h Thu Dec 31 05:08:05 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: wsconsio.h,v 1.91 2009/11/15 17:42:24 tsutsui Exp $ */
+/* $NetBSD: wsconsio.h,v 1.92 2009/12/31 05:08:05 macallan Exp $ */
/*
* Copyright (c) 1996, 1997 Christopher G. Demetriou. All rights reserved.
@@ -321,6 +321,7 @@
#define WSDISPLAY_TYPE_PXALCD 47 /* PXA2x0 LCD controller */
#define WSDISPLAY_TYPE_AG10 48 /* Fujitsu AG-10e */
#define WSDISPLAY_TYPE_DL 49 /* DisplayLink DL-1x0/DL-1x5 */
+#define WSDISPLAY_TYPE_XVR1000 50 /* Sun XVR-1000 */
/* Basic display information. Not applicable to all display types. */
struct wsdisplay_fbinfo {