Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

__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).
This commit is contained in:
bjh21 2004-02-10 01:11:45 +00:00
parent 6f9c4a91f1
commit 47df99b02a
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sys/arch/sparc/dev/pckbc_js.c
View File

@ -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_machdep_cnattach(constag, slot)
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
}

3
sys/arch/sparc/include/types.h
View File

@ -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 @@ typedef __volatile int __cpu_simple_lock_t;
#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 */