diff options
author | eivind <eivind@FreeBSD.org> | 1999-01-12 02:09:33 +0000 |
---|---|---|
committer | eivind <eivind@FreeBSD.org> | 1999-01-12 02:09:33 +0000 |
commit | cdcdfed3b958dab535c34fed0cb83f31cdd4a913 (patch) | |
tree | 1d39e21664799d6ddd583b135257be00cff9aa2d /sys/dev/vx | |
parent | 80536f17c618b1dbef8800dc2ad27fd9640747cf (diff) | |
download | FreeBSD-src-cdcdfed3b958dab535c34fed0cb83f31cdd4a913.zip FreeBSD-src-cdcdfed3b958dab535c34fed0cb83f31cdd4a913.tar.gz |
Switch type of vxintr instead of using the previous casts.
Requested by: bde
Diffstat (limited to 'sys/dev/vx')
-rw-r--r-- | sys/dev/vx/if_vx.c | 8 | ||||
-rw-r--r-- | sys/dev/vx/if_vx_eisa.c | 4 | ||||
-rw-r--r-- | sys/dev/vx/if_vx_pci.c | 2 | ||||
-rw-r--r-- | sys/dev/vx/if_vxreg.h | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/sys/dev/vx/if_vx.c b/sys/dev/vx/if_vx.c index df8a606..b1d056f 100644 --- a/sys/dev/vx/if_vx.c +++ b/sys/dev/vx/if_vx.c @@ -27,7 +27,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: if_vx.c,v 1.17 1998/06/07 17:09:51 dfr Exp $ + * $Id: if_vx.c,v 1.18 1998/07/13 09:52:53 bde Exp $ * */ @@ -131,7 +131,6 @@ static void vxsetfilter __P((struct vx_softc *)); static void vxgetlink __P((struct vx_softc *)); static void vxsetlink __P((struct vx_softc *)); /* int vxbusyeeprom __P((struct vx_softc *)); */ -/* void vxintr __P((void *)); */ struct vx_softc * vxalloc(unit) @@ -640,10 +639,11 @@ vxtxstat(sc) } void -vxintr(sc) - struct vx_softc *sc; +vxintr(voidsc) + void *voidsc; { register short status; + struct vx_softc *sc = voidsc; struct ifnet *ifp = &sc->arpcom.ac_if; for (;;) { diff --git a/sys/dev/vx/if_vx_eisa.c b/sys/dev/vx/if_vx_eisa.c index fcee846..b46fc75 100644 --- a/sys/dev/vx/if_vx_eisa.c +++ b/sys/dev/vx/if_vx_eisa.c @@ -159,7 +159,7 @@ vx_eisa_attach(e_dev) level_intr = FALSE; - if (eisa_reg_intr(e_dev, irq, (void (*)(void *)) vxintr, (void *) sc, &net_imask, + if (eisa_reg_intr(e_dev, irq, vxintr, (void *) sc, &net_imask, /* shared == */ level_intr)) { vxfree(sc); return -1; @@ -172,7 +172,7 @@ vx_eisa_attach(e_dev) if (eisa_enable_intr(e_dev, irq)) { vxfree(sc); - eisa_release_intr(e_dev, irq, (void (*)(void *)) vxintr); + eisa_release_intr(e_dev, irq, vxintr); return -1; } return 0; diff --git a/sys/dev/vx/if_vx_pci.c b/sys/dev/vx/if_vx_pci.c index 2584646..ab02693 100644 --- a/sys/dev/vx/if_vx_pci.c +++ b/sys/dev/vx/if_vx_pci.c @@ -126,7 +126,7 @@ vx_pci_attach( */ at_shutdown(vx_pci_shutdown, sc, SHUTDOWN_POST_SYNC); - pci_map_int(config_id, (void (*)(void *)) vxintr, (void *) sc, &net_imask); + pci_map_int(config_id, vxintr, (void *) sc, &net_imask); } static struct pci_device vxdevice = { diff --git a/sys/dev/vx/if_vxreg.h b/sys/dev/vx/if_vxreg.h index 99708af..688da03 100644 --- a/sys/dev/vx/if_vxreg.h +++ b/sys/dev/vx/if_vxreg.h @@ -452,5 +452,5 @@ extern struct vx_softc *vxalloc __P((int)); extern void vxfree __P((struct vx_softc *)); extern int vxattach __P((struct vx_softc *)); extern void vxstop __P((struct vx_softc *)); -extern void vxintr __P((struct vx_softc *)); +extern void vxintr __P((void *)); extern int vxbusyeeprom __P((struct vx_softc *)); |