Switch type of vxintr instead of using the previous casts.

Requested by:	bde
This commit is contained in:
Eivind Eklund 1999-01-12 02:09:33 +00:00
parent 44b74eef5c
commit 685df2085d
6 changed files with 11 additions and 11 deletions

View File

@ -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 (;;) {

View File

@ -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;

View File

@ -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 = {

View File

@ -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 *));

View File

@ -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;

View File

@ -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 = {