[src/trunk]: src/sys/dev Change footprint of ncr5380_intr() to match normal i...

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

details:   https://anonhg.NetBSD.org/src/rev/da1c674cb929
branches:  trunk
changeset: 483787:da1c674cb929
user:      mycroft <mycroft%NetBSD.org@localhost>
date:      Sat Mar 18 17:14:34 2000 +0000

description:
Change footprint of ncr5380_intr() to match normal interrupt handler usage.

diffstat:

 sys/dev/ic/ncr5380sbc.c |  7 ++++---
 sys/dev/ic/ncr5380var.h |  4 ++--
 sys/dev/isa/nca_isa.c   |  4 ++--
 3 files changed, 8 insertions(+), 7 deletions(-)

diffs (58 lines):

diff -r 21b195edb494 -r da1c674cb929 sys/dev/ic/ncr5380sbc.c
--- a/sys/dev/ic/ncr5380sbc.c   Sat Mar 18 17:07:46 2000 +0000
+++ b/sys/dev/ic/ncr5380sbc.c   Sat Mar 18 17:14:34 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ncr5380sbc.c,v 1.32 2000/03/18 16:13:26 mycroft Exp $  */
+/*     $NetBSD: ncr5380sbc.c,v 1.33 2000/03/18 17:14:34 mycroft Exp $  */
 
 /*
  * Copyright (c) 1995 David Jones, Gordon W. Ross
@@ -416,9 +416,10 @@
  * This may also called for a DMA timeout (at splbio).
  */
 int
-ncr5380_intr(sc)
-       struct ncr5380_softc *sc;
+ncr5380_intr(arg)
+       void *arg;
 {
+       struct ncr5380_softc *sc = arg;
        int claimed = 0;
 
        /*
diff -r 21b195edb494 -r da1c674cb929 sys/dev/ic/ncr5380var.h
--- a/sys/dev/ic/ncr5380var.h   Sat Mar 18 17:07:46 2000 +0000
+++ b/sys/dev/ic/ncr5380var.h   Sat Mar 18 17:14:34 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ncr5380var.h,v 1.16 2000/03/18 17:07:46 mycroft Exp $  */
+/*     $NetBSD: ncr5380var.h,v 1.17 2000/03/18 17:14:35 mycroft Exp $  */
 
 /*
  * Copyright (c) 1995 David Jones, Gordon W. Ross
@@ -214,7 +214,7 @@
 
 void   ncr5380_attach __P((struct ncr5380_softc *));
 int    ncr5380_detach __P((struct ncr5380_softc *, int));
-int    ncr5380_intr __P((struct ncr5380_softc *));
+int    ncr5380_intr __P((void *));
 int    ncr5380_scsi_cmd __P((struct scsipi_xfer *));
 int    ncr5380_pio_in __P((struct ncr5380_softc *, int, int, u_char *));
 int    ncr5380_pio_out __P((struct ncr5380_softc *, int, int, u_char *));
diff -r 21b195edb494 -r da1c674cb929 sys/dev/isa/nca_isa.c
--- a/sys/dev/isa/nca_isa.c     Sat Mar 18 17:07:46 2000 +0000
+++ b/sys/dev/isa/nca_isa.c     Sat Mar 18 17:14:34 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: nca_isa.c,v 1.4 2000/03/18 16:52:20 mycroft Exp $      */
+/*     $NetBSD: nca_isa.c,v 1.5 2000/03/18 17:14:35 mycroft Exp $      */
 
 /*-
  * Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
@@ -383,7 +383,7 @@
 
        if (ia->ia_irq != IRQUNK) {
                esc->sc_ih = isa_intr_establish(ic, ia->ia_irq, IST_EDGE,
-                               IPL_BIO, (int (*)(void *))ncr5380_intr, esc);
+                               IPL_BIO, ncr5380_intr, esc);
                if (esc->sc_ih == NULL) {
                        printf("nca: couldn't establish interrupt\n");
                        return;