define a new wsemul_sun attribute and add it to the sparc64 framebuffers

[This needs to be extended to the vt100 and dumb emulations too.. in time].
(This allows the removal of WSEMUL_SUN from sparc64/conf/GENERIC)

6 files changed, 17 insertions, 14 deletions

diff --git a/sys/arch/sparc64/conf/GENERIC b/sys/arch/sparc64/conf/GENERIC
index 76ff7f9879c..3ee5eb1f07a 100644
--- a/sys/arch/sparc64/conf/GENERIC
+++ b/sys/arch/sparc64/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.35 2002/01/03 16:20:55 jason Exp $
+#	$OpenBSD: GENERIC,v 1.36 2002/01/03 21:58:59 jason Exp $
 # 	$NetBSD: GENERIC32,v 1.18 2001/07/20 00:07:12 eeh Exp $
 
 machine		sparc64
@@ -9,7 +9,6 @@ option		SUN4U
 option		_LP64
 
 option		PCIVERBOSE
-option		WSEMUL_SUN
 
 maxusers	64
 
diff --git a/sys/arch/sparc64/conf/files.sparc64 b/sys/arch/sparc64/conf/files.sparc64
index 216daafdbb6..4b585d64e28 100644
--- a/sys/arch/sparc64/conf/files.sparc64
+++ b/sys/arch/sparc64/conf/files.sparc64
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.sparc64,v 1.22 2001/12/14 14:59:04 jason Exp $
+#	$OpenBSD: files.sparc64,v 1.23 2002/01/03 21:58:59 jason Exp $
 #	$NetBSD: files.sparc64,v 1.50 2001/08/10 20:53:50 eeh Exp $
 
 # maxpartitions must be first item in files.${ARCH}
@@ -19,12 +19,12 @@ device	hme: ether, ifnet, mii, ifmedia
 file	dev/ic/hme.c			hme
 
 include "dev/sun/files.sun"
+include "dev/wscons/files.wscons"
 include "dev/sbus/files.sbus"
 include "dev/i2o/files.i2o"
 include "dev/mii/files.mii"
 include "dev/atapiscsi/files.atapiscsi"
 include "dev/ata/files.ata"
-include "dev/wscons/files.wscons"
 
 # COMPAT_NETBSD
 include "compat/netbsd/files.netbsd"
@@ -42,7 +42,7 @@ file	arch/sparc64/dev/pci_machdep.c		psycho
 attach	hme at pci with hme_pci
 file	dev/pci/if_hme_pci.c		hme_pci
 
-device vgafb: wsemuldisplaydev, wsrasteremulops
+device vgafb: wsemuldisplaydev, wsrasteremulops, wsemul_sun
 attach vgafb at pci
 file	arch/sparc64/dev/vgafb.c		vgafb
 
diff --git a/sys/dev/sbus/files.sbus b/sys/dev/sbus/files.sbus
index 4747a33362c..ae32c96dfed 100644
--- a/sys/dev/sbus/files.sbus
+++ b/sys/dev/sbus/files.sbus
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.sbus,v 1.9 2001/12/04 21:43:01 jason Exp $
+#	$OpenBSD: files.sbus,v 1.10 2002/01/03 21:58:59 jason Exp $
 #	$NetBSD: files.sbus,v 1.16 2000/12/08 17:29:12 martin Exp $
 #
 # Config file and device description for machine-independent SBUS code.
@@ -52,10 +52,10 @@ file	dev/sbus/cs4231.c		audiocs
 attach	isp at sbus with isp_sbus
 file	dev/sbus/isp_sbus.c		isp_sbus
 
-device	cgsix: wsemuldisplaydev, wsrasteremulops
+device	cgsix: wsemuldisplaydev, wsrasteremulops, wsemul_sun
 attach	cgsix at sbus
 file	dev/sbus/cgsix.c		cgsix
 
-device	cgthree: wsemuldisplaydev, wsrasteremulops
+device	cgthree: wsemuldisplaydev, wsrasteremulops, wsemul_sun
 attach	cgthree at sbus
 file	dev/sbus/cgthree.c		cgthree
diff --git a/sys/dev/wscons/files.wscons b/sys/dev/wscons/files.wscons
index 8fe65772292..a777e5650a1 100644
--- a/sys/dev/wscons/files.wscons
+++ b/sys/dev/wscons/files.wscons
@@ -1,4 +1,4 @@
-# $OpenBSD: files.wscons,v 1.5 2001/12/01 18:41:33 deraadt Exp $
+# $OpenBSD: files.wscons,v 1.6 2002/01/03 21:58:59 jason Exp $
 # $NetBSD: files.wscons,v 1.19 1999/12/12 08:17:28 scottr Exp $
 
 #
@@ -26,7 +26,6 @@ file	dev/wscons/wsdisplay.c			wsdisplay needs-flag
 file	dev/wscons/wsdisplay_compat_usl.c	wsdisplay & wsdisplay_compat_usl
 file	dev/wscons/wsemulconf.c			wsdisplay
 file	dev/wscons/wsemul_dumb.c		wsdisplay & wsemul_dumb
-file	dev/wscons/wsemul_sun.c			wsdisplay & wsemul_sun
 file	dev/wscons/wsemul_vt100.c		wsdisplay & !wsemul_no_vt100
 file	dev/wscons/wsemul_vt100_subr.c		wsdisplay & !wsemul_no_vt100
 file	dev/wscons/wsemul_vt100_chars.c		wsdisplay & !wsemul_no_vt100
@@ -45,3 +44,6 @@ file	dev/wscons/wscons_font8x16.c	wsrasteremulops
 
 pseudo-device	wsmux
 file	dev/wscons/wsmux.c			wsmux | wsdisplay needs-flag
+
+define	wsemul_sun
+file	dev/wscons/wsemul_sun.c			wsdisplay & wsemul_sun needs-flag
diff --git a/sys/dev/wscons/wsemulconf.c b/sys/dev/wscons/wsemulconf.c
index b62df80a615..bac9ab91920 100644
--- a/sys/dev/wscons/wsemulconf.c
+++ b/sys/dev/wscons/wsemulconf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wsemulconf.c,v 1.4 2001/12/01 18:41:33 deraadt Exp $ */
+/* $OpenBSD: wsemulconf.c,v 1.5 2002/01/03 21:58:59 jason Exp $ */
 /* $NetBSD: wsemulconf.c,v 1.4 2000/01/05 11:19:37 drochner Exp $ */
 
 /*
@@ -31,6 +31,8 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include "wsdisplay.h"
+
 #include <sys/cdefs.h>
 
 #include <sys/param.h>
@@ -43,7 +45,7 @@
 #include <dev/wscons/wscons_callbacks.h>
 
 static const struct wsemul_ops *wsemul_conf[] = {
-#ifdef WSEMUL_SUN
+#if defined(WSEMUL_SUN) || (NWSEMUL_SUN > 0)
 	&wsemul_sun_ops,
 #endif
 #ifndef WSEMUL_NO_VT100
diff --git a/sys/dev/wscons/wsemulvar.h b/sys/dev/wscons/wsemulvar.h
index a5e7d084ee0..3bd52522a89 100644
--- a/sys/dev/wscons/wsemulvar.h
+++ b/sys/dev/wscons/wsemulvar.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: wsemulvar.h,v 1.4 2001/12/01 18:41:33 deraadt Exp $ */
+/* $OpenBSD: wsemulvar.h,v 1.5 2002/01/03 21:58:59 jason Exp $ */
 /* $NetBSD: wsemulvar.h,v 1.6 1999/01/17 15:46:15 drochner Exp $ */
 
 /*
@@ -57,7 +57,7 @@ struct wsemul_ops {
 #ifdef WSEMUL_DUMB
 extern const struct wsemul_ops wsemul_dumb_ops;
 #endif
-#ifdef WSEMUL_SUN
+#if defined(WSEMUL_SUN) || NWSEMUL_SUN > 0
 extern const struct wsemul_ops wsemul_sun_ops;
 #endif
 #ifndef WSEMUL_NO_VT100