summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sys/arch/sparc/dev/cons.c6
-rw-r--r--sys/arch/sparc/dev/zs.c9
-rw-r--r--sys/arch/sparc/sparc/conf.c7
3 files changed, 18 insertions, 4 deletions
diff --git a/sys/arch/sparc/dev/cons.c b/sys/arch/sparc/dev/cons.c
index fba5c2e4eb1..974db9c8ca8 100644
--- a/sys/arch/sparc/dev/cons.c
+++ b/sys/arch/sparc/dev/cons.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cons.c,v 1.6 1997/08/08 08:24:56 downsj Exp $ */
+/* $OpenBSD: cons.c,v 1.7 2000/06/28 20:22:14 mjacob Exp $ */
/* $NetBSD: cons.c,v 1.30 1997/07/07 23:30:23 pk Exp $ */
/*
@@ -76,6 +76,7 @@
#endif
#include "zs.h"
+#include "kbd.h"
struct tty *constty = 0; /* virtual console output device */
struct tty *fbconstty = 0; /* tty structure for frame buffer console */
@@ -235,13 +236,14 @@ setup_console:
zsconsole(tp, 1, 0, NULL);
break;
#endif
-
+#if NKBD > 0
case PROMDEV_KBD:
/*
* Tell the keyboard driver to direct ASCII input here.
*/
kbd_ascii(tp);
break;
+#endif
default:
rom_console_input = 1;
diff --git a/sys/arch/sparc/dev/zs.c b/sys/arch/sparc/dev/zs.c
index 07a2575c95a..ec83c5e7e54 100644
--- a/sys/arch/sparc/dev/zs.c
+++ b/sys/arch/sparc/dev/zs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: zs.c,v 1.22 1999/09/20 02:49:25 deraadt Exp $ */
+/* $OpenBSD: zs.c,v 1.23 2000/06/28 20:22:14 mjacob Exp $ */
/* $NetBSD: zs.c,v 1.49 1997/08/31 21:26:37 pk Exp $ */
/*
@@ -55,6 +55,7 @@
* This driver knows far too much about chip to usage mappings.
*/
#include "zs.h"
+#include "kbd.h"
#include <sys/param.h>
#include <sys/systm.h>
@@ -333,7 +334,9 @@ zsattach(parent, dev, aux)
*/
tp->t_ispeed = tp->t_ospeed = cs->cs_speed;
tp->t_cflag = CS8;
+#if NKBD > 0
kbd_serial(tp, zsiopen, zsiclose);
+#endif
cs->cs_conk = 1; /* do L1-A processing */
ringsize = 128;
} else {
@@ -1196,7 +1199,11 @@ again:
* bstreams XXX gag choke
*/
if (unit == ZS_KBD)
+#if NKDD > 0
kbd_rint(cc);
+#else
+ ;
+#endif
else if (unit == ZS_MOUSE)
ms_rint(cc);
else
diff --git a/sys/arch/sparc/sparc/conf.c b/sys/arch/sparc/sparc/conf.c
index c750ac74dc2..32e6efbb8f2 100644
--- a/sys/arch/sparc/sparc/conf.c
+++ b/sys/arch/sparc/sparc/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.24 2000/02/21 08:16:36 mjacob Exp $ */
+/* $OpenBSD: conf.c,v 1.25 2000/06/28 20:22:15 mjacob Exp $ */
/* $NetBSD: conf.c,v 1.40 1996/04/11 19:20:03 thorpej Exp $ */
/*
@@ -72,6 +72,7 @@
#include "rd.h"
#include "zs.h"
+#include "kbd.h"
#include "fdc.h" /* has NFDC and NFD; see files.sparc */
#include "bwtwo.h"
#include "cgtwo.h"
@@ -158,7 +159,11 @@ struct cdevsw cdevsw[] =
cdev_notdef(), /* 26 */
cdev_fb_init(NBWTWO,bwtwo), /* 27: /dev/bwtwo */
cdev_notdef(), /* 28 */
+#if NKBD > 0
cdev_gen_init(1,kbd), /* 29: /dev/kbd */
+#else
+ cdev_notdef(), /* 29 */
+#endif
cdev_notdef(), /* 30 */
cdev_fb_init(NCGTWO,cgtwo), /* 31: /dev/cgtwo */
cdev_notdef(), /* 32: should be /dev/gpone */