[src/trunk]: src/sys/dev/wscons Normalize wscons devices (except leaving one ...

[uebayasi <uebayasi%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/518d66ea34c5
branches:  trunk
changeset: 332857:518d66ea34c5
user:      uebayasi <uebayasi%NetBSD.org@localhost>
date:      Fri Oct 10 17:53:08 2014 +0000

description:
Normalize wscons devices (except leaving one strange definition).

diffstat:

 sys/dev/wscons/files.wscons |  28 ++++++++++++++++------------
 1 files changed, 16 insertions(+), 12 deletions(-)

diffs (58 lines):

diff -r 8ea76cc1c2b9 -r 518d66ea34c5 sys/dev/wscons/files.wscons
--- a/sys/dev/wscons/files.wscons       Fri Oct 10 17:49:55 2014 +0000
+++ b/sys/dev/wscons/files.wscons       Fri Oct 10 17:53:08 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: files.wscons,v 1.47 2012/10/04 19:09:20 macallan Exp $
+# $NetBSD: files.wscons,v 1.48 2014/10/10 17:53:08 uebayasi Exp $
 
 #
 # "Workstation Console" glue; attaches frame buffer to emulator & keyboard,
@@ -36,25 +36,29 @@
 defparam opt_wsdisplay_compat.h WSDISPLAY_SCROLLBACK_LINES=100
 
 # this loses, but there's no way to define attributes which have attributes
-device wsdisplay #tty?
+device wsdisplay: wsevent      # tty?
 attach wsdisplay at wsemuldisplaydev with wsdisplay_emul
 attach wsdisplay at wsdisplaydev with wsdisplay_noemul
-device wskbd
+device wskbd: wsevent
 attach wskbd at wskbddev
-device wsmouse
+device wsmouse: wsevent
 attach wsmouse at wsmousedev
 
 file   dev/wscons/wsdisplay.c          wsdisplay               needs-flag
-file   dev/wscons/wsdisplay_compat_usl.c wsdisplay & wsdisplay_compat_usl
+define wsdisplay_compat_usl: wsdisplay
+file   dev/wscons/wsdisplay_compat_usl.c       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
-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
+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/wskbd.c              wskbd                   needs-flag
 file   dev/wscons/wskbdutil.c          wskbd                   needs-flag
 file   dev/wscons/wsmouse.c            wsmouse                 needs-flag
@@ -65,7 +69,7 @@
 file   dev/wscons/wscons_rinit.c       wsrasteremulops
 file   dev/wscons/wscons_rops.c        wsrasteremulops
 
-defpseudo      wsmux
+defpseudo      wsmux: wsevent
 file   dev/wscons/wsmux.c              wsmux                   needs-flag
 
 define tpcalib