Do not make sun terminal emulation selected by the wsemul_sun frame buffer

attribute anymore; remove it and use option WSEMUL_SUN instead, which gets
added to all sparc* kernels.

While there, do not compile vt100 emulation on sparc* kernels, this saves 16+
KB of text.

ok deraadt@

4 files changed, 24 insertions, 33 deletions

diff --git a/sys/dev/sbus/files.sbus b/sys/dev/sbus/files.sbus
index aff0aa10327..6c7b26bc6f0 100644
--- a/sys/dev/sbus/files.sbus
+++ b/sys/dev/sbus/files.sbus
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.sbus,v 1.34 2006/12/02 11:00:33 miod Exp $
+#	$OpenBSD: files.sbus,v 1.35 2006/12/09 20:06:48 miod 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.
@@ -55,43 +55,43 @@ file	dev/sbus/cs4231.c		audiocs
 attach	isp at sbus with isp_sbus
 file	dev/sbus/isp_sbus.c		isp_sbus
 
-device	agten: wsemuldisplaydev, rasops8, wsemul_sun
+device	agten: wsemuldisplaydev, rasops8
 attach	agten at sbus
 file	dev/sbus/agten.c		agten
 
-device	bwtwo: wsemuldisplaydev, rasops1, wsemul_sun
+device	bwtwo: wsemuldisplaydev, rasops1
 attach	bwtwo at sbus
 file	dev/sbus/bwtwo.c		bwtwo
 
-device	cgsix: wsemuldisplaydev, rasops8, wsemul_sun
+device	cgsix: wsemuldisplaydev, rasops8
 attach	cgsix at sbus
 file	dev/sbus/cgsix.c		cgsix
 
-device	cgthree: wsemuldisplaydev, rasops8, wsemul_sun
+device	cgthree: wsemuldisplaydev, rasops8
 attach	cgthree at sbus
 file	dev/sbus/cgthree.c		cgthree
 
-device	cgtwelve: wsemuldisplaydev, rasops1, wsemul_sun
+device	cgtwelve: wsemuldisplaydev, rasops1
 attach	cgtwelve at sbus
 file	dev/sbus/cgtwelve.c		cgtwelve
 
-device	mgx: wsemuldisplaydev, rasops8, wsemul_sun
+device	mgx: wsemuldisplaydev, rasops8
 attach	mgx at sbus
 file	dev/sbus/mgx.c			mgx
 
-device	rfx: wsemuldisplaydev, rasops8, wsemul_sun
+device	rfx: wsemuldisplaydev, rasops8
 attach	rfx at sbus
 file	dev/sbus/rfx.c			rfx
 
-device	tvtwo: wsemuldisplaydev, rasops8, wsemul_sun
+device	tvtwo: wsemuldisplaydev, rasops8
 attach	tvtwo at sbus
 file	dev/sbus/tvtwo.c		tvtwo
 
-device	vigra: wsemuldisplaydev, rasops8, wsemul_sun
+device	vigra: wsemuldisplaydev, rasops8
 attach	vigra at sbus
 file	dev/sbus/vigra.c		vigra
 
-device	zx: wsemuldisplaydev, rasops8, wsemul_sun
+device	zx: wsemuldisplaydev, rasops8
 attach	zx at sbus
 file	dev/sbus/zx.c			zx
 
diff --git a/sys/dev/wscons/files.wscons b/sys/dev/wscons/files.wscons
index c84b9363020..362da8dce90 100644
--- a/sys/dev/wscons/files.wscons
+++ b/sys/dev/wscons/files.wscons
@@ -1,4 +1,4 @@
-# $OpenBSD: files.wscons,v 1.13 2006/08/14 15:56:02 miod Exp $
+# $OpenBSD: files.wscons,v 1.14 2006/12/09 20:06:48 miod Exp $
 # $NetBSD: files.wscons,v 1.34 2005/05/04 01:52:16 augustss Exp $
 
 #
@@ -24,12 +24,6 @@ attach	wsmouse at wsmousedev
 
 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_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
-file	dev/wscons/wsemul_vt100_keys.c		wsdisplay & !wsemul_no_vt100
 file	dev/wscons/wsevent.c			wsdisplay | wskbd |
 						wsmouse | wsmux
 file	dev/wscons/wskbd.c			wskbd		needs-flag
@@ -41,6 +35,11 @@ file	dev/wscons/wsmouse.c			wsmouse		needs-flag
 pseudo-device	wsmux
 file	dev/wscons/wsmux.c			wsmux		needs-flag
 
-define	wsemul_sun
-file	dev/wscons/wsemul_sun.c			wsdisplay &
-						wsemul_sun	needs-flag
+# emulation code
+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
+file	dev/wscons/wsemul_vt100_keys.c		wsdisplay & !wsemul_no_vt100
diff --git a/sys/dev/wscons/wsemulconf.c b/sys/dev/wscons/wsemulconf.c
index bac9ab91920..eeabbf5175f 100644
--- a/sys/dev/wscons/wsemulconf.c
+++ b/sys/dev/wscons/wsemulconf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wsemulconf.c,v 1.5 2002/01/03 21:58:59 jason Exp $ */
+/* $OpenBSD: wsemulconf.c,v 1.6 2006/12/09 20:06:48 miod Exp $ */
 /* $NetBSD: wsemulconf.c,v 1.4 2000/01/05 11:19:37 drochner Exp $ */
 
 /*
@@ -33,19 +33,17 @@
 
 #include "wsdisplay.h"
 
-#include <sys/cdefs.h>
-
 #include <sys/param.h>
 #include <sys/systm.h>
 
 #include <dev/wscons/wsconsio.h>
 #include <dev/wscons/wsdisplayvar.h>
 #include <dev/wscons/wsksymvar.h>
-#include <dev/wscons/wsemulvar.h>		/* pulls in opt_wsemul.h */
+#include <dev/wscons/wsemulvar.h>
 #include <dev/wscons/wscons_callbacks.h>
 
 static const struct wsemul_ops *wsemul_conf[] = {
-#if defined(WSEMUL_SUN) || (NWSEMUL_SUN > 0)
+#ifdef WSEMUL_SUN
 	&wsemul_sun_ops,
 #endif
 #ifndef WSEMUL_NO_VT100
diff --git a/sys/dev/wscons/wsemulvar.h b/sys/dev/wscons/wsemulvar.h
index 050429448e1..4c19f5c91c3 100644
--- a/sys/dev/wscons/wsemulvar.h
+++ b/sys/dev/wscons/wsemulvar.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: wsemulvar.h,v 1.6 2002/03/14 01:27:03 millert Exp $ */
+/* $OpenBSD: wsemulvar.h,v 1.7 2006/12/09 20:06:48 miod Exp $ */
 /* $NetBSD: wsemulvar.h,v 1.6 1999/01/17 15:46:15 drochner Exp $ */
 
 /*
@@ -54,15 +54,9 @@ struct wsemul_ops {
 	void    (*reset)(void *, enum wsemul_resetops);
 };
 
-#ifdef WSEMUL_DUMB
 extern const struct wsemul_ops wsemul_dumb_ops;
-#endif
-#if defined(WSEMUL_SUN) || NWSEMUL_SUN > 0
 extern const struct wsemul_ops wsemul_sun_ops;
-#endif
-#ifndef WSEMUL_NO_VT100
 extern const struct wsemul_ops wsemul_vt100_ops;
-#endif
 
 const struct wsemul_ops *wsemul_pick(const char *);