[src/trunk]: src/sys fix kernel build error, such a configs w/o kbd, ms.

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

details:   https://anonhg.NetBSD.org/src/rev/8d88440ddf40
branches:  trunk
changeset: 542254:8d88440ddf40
user:      nakayama <nakayama%NetBSD.org@localhost>
date:      Fri Jan 24 16:54:34 2003 +0000

description:
fix kernel build error, such a configs w/o kbd, ms.
(approved by martin)

diffstat:

 sys/arch/sparc64/sparc64/netbsd32_machdep.c |  9 ++++++++-
 sys/arch/sparc64/sparc64/sunos32_machdep.c  |  9 ++++++++-
 sys/dev/sun/files.sun                       |  4 ++--
 3 files changed, 18 insertions(+), 4 deletions(-)

diffs (123 lines):

diff -r db8725aecf9e -r 8d88440ddf40 sys/arch/sparc64/sparc64/netbsd32_machdep.c
--- a/sys/arch/sparc64/sparc64/netbsd32_machdep.c       Fri Jan 24 16:24:44 2003 +0000
+++ b/sys/arch/sparc64/sparc64/netbsd32_machdep.c       Fri Jan 24 16:54:34 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: netbsd32_machdep.c,v 1.28 2003/01/18 06:55:25 thorpej Exp $    */
+/*     $NetBSD: netbsd32_machdep.c,v 1.29 2003/01/24 16:54:34 nakayama Exp $   */
 
 /*
  * Copyright (c) 1998, 2001 Matthew R. Green
@@ -30,6 +30,7 @@
 
 #ifdef _KERNEL_OPT
 #include "opt_compat_netbsd.h"
+#include "firm_events.h"
 #endif
 
 #include <sys/param.h>
@@ -74,7 +75,9 @@
 /* Provide a the name of the architecture we're emulating */
 char   machine_arch32[] = "sparc";     
 
+#if NFIRM_EVENTS > 0
 static int ev_out32 __P((struct firm_event *, int, struct uio *));
+#endif
 
 void netbsd32_upcall(struct lwp *, int, int, int, void *, void *, void *, sa_upcall_t);
 
@@ -102,8 +105,10 @@
        p->p_flag |= P_32;
 
        /* Setup the ev_out32 hook */
+#if NFIRM_EVENTS > 0
        if (ev_out32_hook == NULL)
                ev_out32_hook = ev_out32;
+#endif
 
        /*
         * Set the registers to 0 except for:
@@ -848,6 +853,7 @@
        return (0);
 }
 
+#if NFIRM_EVENTS > 0
 /*
  * Write out a series of 32-bit firm_events.
  */
@@ -870,6 +876,7 @@
        }
        return (error);
 }
+#endif
 
 /*
  * ioctl code
diff -r db8725aecf9e -r 8d88440ddf40 sys/arch/sparc64/sparc64/sunos32_machdep.c
--- a/sys/arch/sparc64/sparc64/sunos32_machdep.c        Fri Jan 24 16:24:44 2003 +0000
+++ b/sys/arch/sparc64/sparc64/sunos32_machdep.c        Fri Jan 24 16:54:34 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: sunos32_machdep.c,v 1.9 2003/01/18 06:55:25 thorpej Exp $      */
+/*     $NetBSD: sunos32_machdep.c,v 1.10 2003/01/24 16:54:34 nakayama Exp $    */
 /* from: NetBSD: sunos_machdep.c,v 1.14 2001/01/29 01:37:56 mrg Exp    */
 
 /*
@@ -31,6 +31,7 @@
 
 #ifdef _KERNEL_OPT
 #include "opt_ddb.h"
+#include "firm_events.h"
 #endif
 
 #include <sys/param.h>
@@ -88,7 +89,9 @@
        struct  sunos32_sigcontext sf_sc;       /* actual sigcontext */
 };
 
+#if NFIRM_EVENTS > 0
 static int ev_out32 __P((struct firm_event *, int, struct uio *));
+#endif
 
 /*
  * Set up registers on exec.
@@ -114,8 +117,10 @@
        p->p_flag |= P_32;
 
        /* Setup the ev_out32 hook */
+#if NFIRM_EVENTS > 0
        if (ev_out32_hook == NULL)
                ev_out32_hook = ev_out32;
+#endif
 
        /*
         * Set the registers to 0 except for:
@@ -360,6 +365,7 @@
        return (EJUSTRETURN);
 }
 
+#if NFIRM_EVENTS > 0
 /*
  * Write out a series of 32-bit firm_events.
  */
@@ -382,3 +388,4 @@
        }
        return (error);
 }
+#endif
diff -r db8725aecf9e -r 8d88440ddf40 sys/dev/sun/files.sun
--- a/sys/dev/sun/files.sun     Fri Jan 24 16:24:44 2003 +0000
+++ b/sys/dev/sun/files.sun     Fri Jan 24 16:54:34 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: files.sun,v 1.6 2002/10/26 19:11:13 martin Exp $
+# $NetBSD: files.sun,v 1.7 2003/01/24 16:54:35 nakayama Exp $
 #
 # Configuration file for devices found on Sun machines.
 #
@@ -9,7 +9,7 @@
 #
 
 define firm_events
-file   dev/sun/event.c                 firm_events
+file   dev/sun/event.c                 firm_events needs-flag
 
 
 # upper layer of sun kbd driver