Module Name: src
Committed By: jdc
Date: Sat Oct 13 18:00:03 UTC 2012
Modified Files:
src/sys/arch/sparc64/conf: GENERIC files.sparc64
Log Message:
Add pckbc at ebus.
To generate a diff of this commit:
cvs rdiff -u -r1.152 -r1.153 src/sys/arch/sparc64/conf/GENERIC
cvs rdiff -u -r1.138 -r1.139 src/sys/arch/sparc64/conf/files.sparc64
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/sparc64/conf/GENERIC
diff -u src/sys/arch/sparc64/conf/GENERIC:1.152 src/sys/arch/sparc64/conf/GENERIC:1.153
--- src/sys/arch/sparc64/conf/GENERIC:1.152 Sat Sep 1 18:17:51 2012
+++ src/sys/arch/sparc64/conf/GENERIC Sat Oct 13 18:00:03 2012
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.152 2012/09/01 18:17:51 jakllsch Exp $
+# $NetBSD: GENERIC,v 1.153 2012/10/13 18:00:03 jdc Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/sparc64/conf/std.sparc64"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.152 $"
+#ident "GENERIC-$Revision: 1.153 $"
maxusers 64
@@ -297,6 +297,14 @@ com* at ebus? # `com' driver for `su'
kbd0 at com? # keyboard
ms0 at com? # mouse
+## Tadpole SPARCle PS/2 keyboard and mouse
+pckbc* at ebus? # PC keyboard controller
+pckbd* at pckbc? # PC keyboard
+pms* at pckbc? # PS/2 mouse for wsmouse
+options PMS_SYNAPTICS_TOUCHPAD # Enable support for Synaptics Touchpads
+wskbd* at pckbd? console ?
+wsmouse* at pms? mux 0
+
## Magma Serial/Parallel driver (not tested)
#magma* at sbus? slot ? offset ?
#mtty* at magma?
Index: src/sys/arch/sparc64/conf/files.sparc64
diff -u src/sys/arch/sparc64/conf/files.sparc64:1.138 src/sys/arch/sparc64/conf/files.sparc64:1.139
--- src/sys/arch/sparc64/conf/files.sparc64:1.138 Sat Mar 3 03:21:16 2012
+++ src/sys/arch/sparc64/conf/files.sparc64 Sat Oct 13 18:00:03 2012
@@ -1,4 +1,4 @@
-# $NetBSD: files.sparc64,v 1.138 2012/03/03 03:21:16 nakayama Exp $
+# $NetBSD: files.sparc64,v 1.139 2012/10/13 18:00:03 jdc Exp $
# @(#)files.sparc64 8.1 (Berkeley) 7/19/93
# sparc64-specific configuration info
@@ -153,6 +153,11 @@ file arch/sparc64/dev/sab.c sab | sabt
attach com at ebus with com_ebus
file arch/sparc64/dev/com_ebus.c com_ebus
+# ebus PS/2 keyboard attachment for Tadpole SPARCle, etc.
+include "dev/pckbport/files.pckbport"
+attach pckbc at ebus with pckbc_ebus
+file arch/sparc64/dev/pckbc_ebus.c pckbc_ebus
+
device zstty {}: tty
attach zstty at zs
file dev/ic/z8530tty.c zstty needs-flag