summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authoruebayasi <uebayasi@NetBSD.org>2014-10-17 10:09:21 +0000
committeruebayasi <uebayasi@NetBSD.org>2014-10-17 10:09:21 +0000
commit75eaf34c7b9d87c20dea91909dd06dae5cfaaa36 (patch)
tree70c274e310c1a7d4829cabe400ce2ceccd1c3706 /sys/dev
parent47485af2389cb06bd23677722f268218a42497ec (diff)
Give up making wscons modular for now.
My intent is to make "no" handle dependency right so that you can simplely do: no wsdisplay*
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/wscons/files.wscons28
1 files changed, 12 insertions, 16 deletions
diff --git a/sys/dev/wscons/files.wscons b/sys/dev/wscons/files.wscons
index b0171b3686c..6d39201af7d 100644
--- a/sys/dev/wscons/files.wscons
+++ b/sys/dev/wscons/files.wscons
@@ -1,4 +1,4 @@
-# $NetBSD: files.wscons,v 1.48 2014/10/10 17:53:08 uebayasi Exp $
+# $NetBSD: files.wscons,v 1.49 2014/10/17 10:09:21 uebayasi Exp $
#
# "Workstation Console" glue; attaches frame buffer to emulator & keyboard,
@@ -36,29 +36,25 @@ defparam opt_wsdisplay_compat.h WSCOMPAT_USL_SYNCTIMEOUT
defparam opt_wsdisplay_compat.h WSDISPLAY_SCROLLBACK_LINES=100
# this loses, but there's no way to define attributes which have attributes
-device wsdisplay: wsevent # tty?
+device wsdisplay #tty?
attach wsdisplay at wsemuldisplaydev with wsdisplay_emul
attach wsdisplay at wsdisplaydev with wsdisplay_noemul
-device wskbd: wsevent
+device wskbd
attach wskbd at wskbddev
-device wsmouse: wsevent
+device wsmouse
attach wsmouse at wsmousedev
file dev/wscons/wsdisplay.c wsdisplay needs-flag
-define wsdisplay_compat_usl: wsdisplay
-file dev/wscons/wsdisplay_compat_usl.c wsdisplay_compat_usl
+file dev/wscons/wsdisplay_compat_usl.c wsdisplay & wsdisplay_compat_usl
file dev/wscons/wsdisplay_util.c wsdisplay
file dev/wscons/wsemulconf.c wsdisplay
file dev/wscons/wsemul_dumb.c wsdisplay & !wsemul_no_dumb
-define wsemul_sun: wsdisplay
-file dev/wscons/wsemul_sun.c wsemul_sun
-define wsemul_vt100: wsdisplay
-file dev/wscons/wsemul_vt100.c wsemul_vt100
-file dev/wscons/wsemul_vt100_subr.c wsemul_vt100
-file dev/wscons/wsemul_vt100_chars.c wsemul_vt100
-file dev/wscons/wsemul_vt100_keys.c wsemul_vt100
-define wsevent
-file dev/wscons/wsevent.c
+file dev/wscons/wsemul_sun.c wsdisplay & wsemul_sun
+file dev/wscons/wsemul_vt100.c wsdisplay & wsemul_vt100
+file dev/wscons/wsemul_vt100_subr.c wsdisplay & wsemul_vt100
+file dev/wscons/wsemul_vt100_chars.c wsdisplay & wsemul_vt100
+file dev/wscons/wsemul_vt100_keys.c wsdisplay & wsemul_vt100
+file dev/wscons/wsevent.c wsdisplay | wskbd | wsmouse | wsmux
file dev/wscons/wskbd.c wskbd needs-flag
file dev/wscons/wskbdutil.c wskbd needs-flag
file dev/wscons/wsmouse.c wsmouse needs-flag
@@ -69,7 +65,7 @@ include "dev/rcons/files.rcons"
file dev/wscons/wscons_rinit.c wsrasteremulops
file dev/wscons/wscons_rops.c wsrasteremulops
-defpseudo wsmux: wsevent
+defpseudo wsmux
file dev/wscons/wsmux.c wsmux needs-flag
define tpcalib