[src/trunk]: src/sys/dev Stop wscons from conflicting with rcons.

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

details:   https://anonhg.NetBSD.org/src/rev/beeaab74077f
branches:  trunk
changeset: 515840:beeaab74077f
user:      eeh <eeh%NetBSD.org@localhost>
date:      Fri Oct 05 22:08:28 2001 +0000

description:
Stop wscons from conflicting with rcons.

diffstat:

 sys/dev/rcons/files.rcons   |  6 +++---
 sys/dev/wscons/files.wscons |  6 ++----
 2 files changed, 5 insertions(+), 7 deletions(-)

diffs (37 lines):

diff -r 78929b7671d0 -r beeaab74077f sys/dev/rcons/files.rcons
--- a/sys/dev/rcons/files.rcons Fri Oct 05 22:00:23 2001 +0000
+++ b/sys/dev/rcons/files.rcons Fri Oct 05 22:08:28 2001 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: files.rcons,v 1.7 1999/11/23 01:52:52 scottr Exp $
+# $NetBSD: files.rcons,v 1.8 2001/10/05 22:08:28 eeh Exp $
 #
 # Configuration file for RASTER Console.
 #
-file dev/rcons/raster_op.c     raster
-file dev/rcons/raster_text.c   raster
+file dev/rcons/raster_op.c     raster | wsrasteremulops
+file dev/rcons/raster_text.c   raster | wsrasteremulops
 
 file dev/rcons/rcons_kern.c    rasterconsole
 file dev/rcons/rcons_subr.c    rasterconsole
diff -r 78929b7671d0 -r beeaab74077f sys/dev/wscons/files.wscons
--- a/sys/dev/wscons/files.wscons       Fri Oct 05 22:00:23 2001 +0000
+++ b/sys/dev/wscons/files.wscons       Fri Oct 05 22:08:28 2001 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: files.wscons,v 1.21 2001/02/24 01:59:48 lukem Exp $
+# $NetBSD: files.wscons,v 1.22 2001/10/05 22:08:29 eeh Exp $
 
 #
 # "Workstation Console" glue; attaches frame buffer to emulator & keyboard,
@@ -46,10 +46,8 @@
 file   dev/wscons/wsmouse.c            wsmouse                 needs-flag
 
 # rcons bit-depth options
-defopt opt_rcons.h     RCONS_2BPP RCONS_4BPP RCONS_16BPP
+include "dev/rcons/files.rcons"
 
-file   dev/rcons/raster_op.c           wsrasteremulops
-file   dev/rcons/raster_text.c         wsrasteremulops
 file   dev/wscons/wscons_rinit.c       wsrasteremulops
 file   dev/wscons/wscons_rops.c        wsrasteremulops