From 954a7b9824f794a5be97bdb0e260a0f8d1df3eef Mon Sep 17 00:00:00 2001
From: eeh <eeh@NetBSD.org>
Date: Thu, 9 Nov 2000 00:00:40 +0000
Subject: [PATCH] Switch to sunkbd for both com and zstty.

---
 sys/arch/sparc64/conf/files.sparc64 | 24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/sys/arch/sparc64/conf/files.sparc64 b/sys/arch/sparc64/conf/files.sparc64
index 34223a5c398b..7f74e00ab5f8 100644
--- a/sys/arch/sparc64/conf/files.sparc64
+++ b/sys/arch/sparc64/conf/files.sparc64
@@ -1,4 +1,4 @@
-#	$NetBSD: files.sparc64,v 1.39 2000/11/08 19:48:52 ad Exp $
+#	$NetBSD: files.sparc64,v 1.40 2000/11/09 00:00:40 eeh Exp $
 
 # @(#)files.sparc64	8.1 (Berkeley) 7/19/93
 # sparc64-specific configuration info
@@ -84,7 +84,7 @@ file	arch/sparc64/sparc64/cpu.c
 
 device zs {channel = -1}
 attach zs at mainbus, sbus
-file	arch/sparc64/dev/zs.c			zs needs-count
+file	arch/sparc64/dev/zs.c			zs needs-flag
 file	dev/ic/z8530sc.c			zs
 
 # siemens SAB82532; found on U5/U10/... for tty ports.
@@ -126,6 +126,7 @@ file	arch/sparc64/dev/cs4231_ebus.c		audiocs_ebus
 # Console (zs) related stuff
 #
 
+define zstty {}
 device zstty: tty
 attach zstty at zs
 file dev/ic/z8530tty.c			zstty needs-flag
@@ -136,25 +137,20 @@ file arch/sparc/dev/zs_kgdb.c		kgdb
 #file dev/ic/sabtty.c			sabtty needs-flag
 
 device kbd
+device sunkbd
 attach kbd at zs with kbd_zs
-#attach kbd at ucom with kbd_ucom
+attach kbd at zstty, com
 file dev/sun/kbd_zs.c			kbd_zs
-file dev/sun/kbd.c			kbd needs-flag
-file dev/sun/kbd_tables.c 		kbd
-file arch/sparc64/dev/kd.c 		kbd
-#file arch/sparc64/dev/kbd_ucom.c 	kbd_ucom
+file dev/sun/kbd.c			sunkbd | kbd needs-flag
+file dev/sun/kbd_tables.c 		sunkbd | kbd
+file arch/sparc64/dev/kd.c 		sunkbd | kbd
+file dev/sun/sunkbd.c			sunkbd | kbd needs-flag
 
 device ms
 attach ms at zs with ms_zs
-#attach ms at ucom with ms_ucom
+attach ms at zstty, com
 file dev/sun/ms_zs.c			ms_zs
 file dev/sun/ms.c			ms needs-flag
-#file arch/sparc64/dev/ms_ucom.c 	ms_ucom
-
-attach kbd at com
-file dev/sun/sunkbd.c			kbd needs-flag
-
-attach ms at com
 file dev/sun/sunms.c			ms needs-flag
 
 #