[src/trunk]: src/sys/arch/acorn32/conf Add support for iomdkbc, pckbd, and pm...

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

details:   https://anonhg.NetBSD.org/src/rev/71441f191b58
branches:  trunk
changeset: 559243:71441f191b58
user:      bjh21 <bjh21%NetBSD.org@localhost>
date:      Sat Mar 13 17:59:00 2004 +0000

description:
Add support for iomdkbc, pckbd, and pms.  Don't enable pckbd in any default
config because the X server shipped with 1.6 didn't support it, and it seems
rude to break people's X servers when they upgrade their kernels.

diffstat:

 sys/arch/acorn32/conf/NC_WSCONS     |  15 +++++++++++++--
 sys/arch/acorn32/conf/RPC_WSCONS    |  16 ++++++++++++----
 sys/arch/acorn32/conf/files.acorn32 |   6 +++++-
 3 files changed, 30 insertions(+), 7 deletions(-)

diffs (93 lines):

diff -r 7df91086aa27 -r 71441f191b58 sys/arch/acorn32/conf/NC_WSCONS
--- a/sys/arch/acorn32/conf/NC_WSCONS   Sat Mar 13 17:54:38 2004 +0000
+++ b/sys/arch/acorn32/conf/NC_WSCONS   Sat Mar 13 17:59:00 2004 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: NC_WSCONS,v 1.26 2004/02/13 11:36:09 wiz Exp $
+#      $NetBSD: NC_WSCONS,v 1.27 2004/03/13 17:59:00 bjh21 Exp $
 #
 #      NC - with wscons
 #
@@ -177,6 +177,17 @@
 rpckbd*                at iomd?                # based on old `kbd' driver
 wskbd*         at rpckbd?              # wskbd on RiscPC keyboard
 
+#iomdkbc*      at iomd?
+#pckbd*                at iomdkbc? slot ?
+#options       PCKBD_LAYOUT=KB_UK
+pms*           at iomdkbc? slot ?
+
+#wskbd*                at pckbd?
+wsmouse*       at pms?
+
+#wsqms*                at iomd?                # ws quadmouse driver
+#wsmouse*      at wsqms?               # wsmouse on ws quadmouse
+
 pseudo-device  wsmux
 
 
@@ -185,7 +196,7 @@
 # vidcconsole PS2 mouse at IOMD
 #vidcconsole0  at vidc?                # display + vt100 emulation
 #kbd*          at iomd?                # PS/2 keyboard for vidcconsole
-opms*          at iomd?                # PS/2 mouse
+#opms*         at iomd?                # PS/2 mouse
 
 # generic VT console device
 #vt0   at vidc?
diff -r 7df91086aa27 -r 71441f191b58 sys/arch/acorn32/conf/RPC_WSCONS
--- a/sys/arch/acorn32/conf/RPC_WSCONS  Sat Mar 13 17:54:38 2004 +0000
+++ b/sys/arch/acorn32/conf/RPC_WSCONS  Sat Mar 13 17:59:00 2004 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: RPC_WSCONS,v 1.25 2004/02/13 11:36:09 wiz Exp $
+#      $NetBSD: RPC_WSCONS,v 1.26 2004/03/13 17:59:00 bjh21 Exp $
 #
 #      RPC_WSCONS -- Full RiscPC config with wscons
 #
@@ -22,7 +22,7 @@
 
 #options       INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident         "GENERIC-$Revision: 1.25 $"
+#ident         "GENERIC-$Revision: 1.26 $"
 
 # estimated number of users
 maxusers       32
@@ -192,8 +192,16 @@
 vidcvideo0     at vidc?                # wscons driver for VIDC
 wsdisplay*     at vidcvideo? console ? # display itself
 
-rpckbd*                at iomd?                # based on old `kbd' driver
-wskbd*         at rpckbd?              # wskbd on RiscPC keyboard
+iomdkbc*       at iomd?
+#pckbd*                at iomdkbc? slot ?
+#options       PCKBD_LAYOUT=KB_UK
+#pms*          at iomdkbc? slot ?
+
+#wskbd*                at pckbd?
+#wsmouse*      at pms?
+
+rpckbd*        at iomd?
+wskbd*         at rpckbd?
 
 wsqms*         at iomd?                # ws quadmouse driver
 wsmouse*       at wsqms?               # wsmouse on ws quadmouse
diff -r 7df91086aa27 -r 71441f191b58 sys/arch/acorn32/conf/files.acorn32
--- a/sys/arch/acorn32/conf/files.acorn32       Sat Mar 13 17:54:38 2004 +0000
+++ b/sys/arch/acorn32/conf/files.acorn32       Sat Mar 13 17:59:00 2004 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: files.acorn32,v 1.22 2004/01/22 13:25:51 bjh21 Exp $
+#      $NetBSD: files.acorn32,v 1.23 2004/03/13 17:59:00 bjh21 Exp $
 #
 # First try for arm-specific configuration info
 #
@@ -199,6 +199,10 @@
 #
 include "dev/i2o/files.i2o"
 
+#
+# MI PC keyboard port drivers
+#
+include "dev/pckbport/files.pckbport"
 
 #
 # maybe we will use these later one time :