Module Name: src
Committed By: rin
Date: Fri Mar 13 01:48:16 UTC 2020
Modified Files:
src/sys/arch/sun2/dev: zsvar.h
Log Message:
Fix build without kbd at zstty, simplify.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/sun2/dev/zsvar.h
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/sun2/dev/zsvar.h
diff -u src/sys/arch/sun2/dev/zsvar.h:1.8 src/sys/arch/sun2/dev/zsvar.h:1.9
--- src/sys/arch/sun2/dev/zsvar.h:1.8 Thu Jul 7 06:55:38 2016
+++ src/sys/arch/sun2/dev/zsvar.h Fri Mar 13 01:48:16 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: zsvar.h,v 1.8 2016/07/07 06:55:38 msaitoh Exp $ */
+/* $NetBSD: zsvar.h,v 1.9 2020/03/13 01:48:16 rin Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -44,15 +44,18 @@
#include <dev/ic/z8530sc.h>
#include <sun2/dev/zsreg.h>
+#ifdef _KERNEL_OPT
+#include "kbd.h"
+#endif
+
+#if NKBD > 0
/*
* Need to override cn_console_dev() for zstty and zskbd.
*/
-#ifdef cn_isconsole
-#undef cn_isconsole
-#endif
extern struct consdev *cn_hw;
-extern struct consdev *cn_tab;
+#undef cn_isconsole
#define cn_isconsole(d) ((d) == cn_tab->cn_dev || (d) == cn_hw->cn_dev)
+#endif
struct zsc_softc {
device_t zsc_dev; /* base device */
