[src/trunk]: src/sys/arch/sparc64 Make softintr_establish prototype match oth...

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

details:   https://anonhg.NetBSD.org/src/rev/c795425e03d1
branches:  trunk
changeset: 500016:c795425e03d1
user:      fvdl <fvdl%NetBSD.org@localhost>
date:      Sun Dec 03 14:49:50 2000 +0000

description:
Make softintr_establish prototype match other ports, avoiding compile
warnings.

diffstat:

 sys/arch/sparc64/dev/com_ebus.c |  3 +--
 sys/arch/sparc64/dev/zs.c       |  7 +++----
 sys/arch/sparc64/include/intr.h |  4 ++--
 sys/arch/sparc64/sparc64/intr.c |  6 +++---
 4 files changed, 9 insertions(+), 11 deletions(-)

diffs (96 lines):

diff -r fc8450624960 -r c795425e03d1 sys/arch/sparc64/dev/com_ebus.c
--- a/sys/arch/sparc64/dev/com_ebus.c   Sun Dec 03 14:49:14 2000 +0000
+++ b/sys/arch/sparc64/dev/com_ebus.c   Sun Dec 03 14:49:50 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: com_ebus.c,v 1.2 2000/11/08 23:24:12 eeh Exp $ */
+/*     $NetBSD: com_ebus.c,v 1.3 2000/12/03 14:49:50 fvdl Exp $        */
 
 /*
  * Copyright (c) 1999, 2000 Matthew R. Green
@@ -118,7 +118,6 @@
        struct com_softc *sc = (void *)self;
        struct ebus_attach_args *ea = aux;
        struct kbd_ms_tty_attach_args kma;
-       struct consdev *old_cn = cn_tab;
 #if (NKBD > 0) || (NMS > 0)
        int maj;
 #endif
diff -r fc8450624960 -r c795425e03d1 sys/arch/sparc64/dev/zs.c
--- a/sys/arch/sparc64/dev/zs.c Sun Dec 03 14:49:14 2000 +0000
+++ b/sys/arch/sparc64/dev/zs.c Sun Dec 03 14:49:50 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: zs.c,v 1.27 2000/11/10 11:57:26 mrg Exp $      */
+/*     $NetBSD: zs.c,v 1.28 2000/12/03 14:49:50 fvdl Exp $     */
 
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -179,7 +179,7 @@
 /* Interrupt handlers. */
 int zscheckintr __P((void *));
 static int zshard __P((void *));
-static int zssoft __P((void *));
+static void zssoft __P((void *));
 
 static int zs_get_speed __P((struct zs_chanstate *));
 
@@ -489,7 +489,7 @@
 /*
  * We need this only for TTY_DEBUG purposes.
  */
-static int
+static void
 zssoft(arg)
        void *arg;
 {
@@ -513,7 +513,6 @@
        }
 #endif
        splx(s);
-       return (1);
 }
 
 
diff -r fc8450624960 -r c795425e03d1 sys/arch/sparc64/include/intr.h
--- a/sys/arch/sparc64/include/intr.h   Sun Dec 03 14:49:14 2000 +0000
+++ b/sys/arch/sparc64/include/intr.h   Sun Dec 03 14:49:50 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: intr.h,v 1.6 2000/08/23 21:35:56 eeh Exp $ */
+/*     $NetBSD: intr.h,v 1.7 2000/12/03 14:49:50 fvdl Exp $ */
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -56,7 +56,7 @@
 #define        __GENERIC_SOFT_INTERRUPTS
 
 void *
-softintr_establish __P((int level, int (*fun)(void *), void *arg));
+softintr_establish __P((int level, void (*fun)(void *), void *arg));
 
 void
 softintr_disestablish __P((void *cookie));
diff -r fc8450624960 -r c795425e03d1 sys/arch/sparc64/sparc64/intr.c
--- a/sys/arch/sparc64/sparc64/intr.c   Sun Dec 03 14:49:14 2000 +0000
+++ b/sys/arch/sparc64/sparc64/intr.c   Sun Dec 03 14:49:50 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: intr.c,v 1.34 2000/09/29 00:27:13 eeh Exp $ */
+/*     $NetBSD: intr.c,v 1.35 2000/12/03 14:49:50 fvdl Exp $ */
 
 /*
  * Copyright (c) 1992, 1993
@@ -313,14 +313,14 @@
 void *
 softintr_establish(level, fun, arg)
        int level; 
-       int (*fun) __P((void *));
+       void (*fun) __P((void *));
        void *arg;
 {
        struct intrhand *ih;
 
        ih = malloc(sizeof(*ih), M_DEVBUF, 0);
        bzero(ih, sizeof(*ih));
-       ih->ih_fun = fun;
+       ih->ih_fun = (int (*) __P((void *)))fun;        /* XXX */
        ih->ih_arg = arg;
        ih->ih_pil = level;
        ih->ih_pending = 0;