[src/trunk]: src/sys/arch/sparc __HAVE_NWSCONS seems to mean, "If this port u...

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

details:   https://anonhg.NetBSD.org/src/rev/cbd9c1a7996d
branches:  trunk
changeset: 558413:cbd9c1a7996d
user:      bjh21 <bjh21%NetBSD.org@localhost>
date:      Tue Feb 10 01:11:45 2004 +0000

description:
__HAVE_NWSCONS seems to mean, "If this port uses pckbc(4), it also uses
sys/dev/pckbc/files.pckbc."  This is true of sparc, so define __HAVE_NWSCONS,
and remove the code in pckbc_machdep_cnattach() that was conditional on its
not being defined and that is no longer needed (since with __HAVE_NWSCONS,
pckbc_cnattach() will call pckbd_cnattach() itself if necessary).

diffstat:

 sys/arch/sparc/dev/pckbc_js.c  |  9 ++-------
 sys/arch/sparc/include/types.h |  3 ++-
 2 files changed, 4 insertions(+), 8 deletions(-)

diffs (46 lines):

diff -r f3d3e88730b7 -r cbd9c1a7996d sys/arch/sparc/dev/pckbc_js.c
--- a/sys/arch/sparc/dev/pckbc_js.c     Tue Feb 10 01:08:05 2004 +0000
+++ b/sys/arch/sparc/dev/pckbc_js.c     Tue Feb 10 01:11:45 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pckbc_js.c,v 1.9 2003/12/12 14:31:39 martin Exp $ */
+/*     $NetBSD: pckbc_js.c,v 1.10 2004/02/10 01:11:45 bjh21 Exp $ */
 
 /*
  * Copyright (c) 2002 Valeriy E. Ushakov
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pckbc_js.c,v 1.9 2003/12/12 14:31:39 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pckbc_js.c,v 1.10 2004/02/10 01:11:45 bjh21 Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -310,10 +310,5 @@
     pckbc_slot_t slot;
 {
 
-#if !defined(__HAVE_NWSCONS) && defined(MSIIEP)
-       /* we do use wscons on krups! */
-       return (pckbd_cnattach(constag, slot));
-#else
        return (0);
-#endif
 }
diff -r f3d3e88730b7 -r cbd9c1a7996d sys/arch/sparc/include/types.h
--- a/sys/arch/sparc/include/types.h    Tue Feb 10 01:08:05 2004 +0000
+++ b/sys/arch/sparc/include/types.h    Tue Feb 10 01:11:45 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: types.h,v 1.37 2004/01/18 18:23:19 martin Exp $ */
+/*     $NetBSD: types.h,v 1.38 2004/02/10 01:11:45 bjh21 Exp $ */
 
 /*
  * Copyright (c) 1992, 1993
@@ -100,6 +100,7 @@
 #define        __HAVE_DEVICE_REGISTER
 #define        __HAVE_GENERIC_SOFT_INTERRUPTS
 #define        __GENERIC_SOFT_INTERRUPTS_ALL_LEVELS
+#define        __HAVE_NWSCONS
 
 #ifdef SUN4U
 #define __HAVE_CPU_COUNTER     /* sparc v9 CPUs have %tick */