use a bit more standard (sys/device.h) prototype for {dp8390,ne2000}_detach().
This commit is contained in:
parent
2b4766a6b2
commit
f4e8883ccd
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: dp8390.c,v 1.29 2000/02/02 10:50:56 enami Exp $ */
|
||||
/* $NetBSD: dp8390.c,v 1.30 2000/02/02 11:41:56 itojun Exp $ */
|
||||
|
||||
/*
|
||||
* Device driver for National Semiconductor DS8390/WD83C690 based ethernet
|
||||
|
@ -1308,8 +1308,9 @@ dp8390_activate(self, act)
|
|||
}
|
||||
|
||||
int
|
||||
dp8390_detach(sc)
|
||||
dp8390_detach(sc, flags)
|
||||
struct dp8390_softc *sc;
|
||||
int flags;
|
||||
{
|
||||
struct ifnet *ifp = &sc->sc_ec.ec_if;
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: dp8390var.h,v 1.12 2000/02/02 10:00:06 itojun Exp $ */
|
||||
/* $NetBSD: dp8390var.h,v 1.13 2000/02/02 11:41:57 itojun Exp $ */
|
||||
|
||||
/*
|
||||
* Device driver for National Semiconductor DS8390/WD83C690 based ethernet
|
||||
|
@ -154,4 +154,4 @@ void dp8390_disable __P((struct dp8390_softc *));
|
|||
|
||||
int dp8390_activate __P((struct device *, enum devact));
|
||||
|
||||
int dp8390_detach __P((struct dp8390_softc *));
|
||||
int dp8390_detach __P((struct dp8390_softc *, int));
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: ne2000.c,v 1.24 2000/02/02 10:00:06 itojun Exp $ */
|
||||
/* $NetBSD: ne2000.c,v 1.25 2000/02/02 11:41:57 itojun Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
|
||||
|
@ -734,8 +734,9 @@ ne2000_writemem(nict, nich, asict, asich, src, dst, len, useword, quiet)
|
|||
}
|
||||
|
||||
int
|
||||
ne2000_detach(sc)
|
||||
ne2000_detach(sc, flags)
|
||||
struct ne2000_softc *sc;
|
||||
int flags;
|
||||
{
|
||||
return dp8390_detach(&sc->sc_dp8390);
|
||||
return dp8390_detach(&sc->sc_dp8390, flags);
|
||||
}
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: ne2000var.h,v 1.7 2000/02/02 10:00:06 itojun Exp $ */
|
||||
/* $NetBSD: ne2000var.h,v 1.8 2000/02/02 11:41:57 itojun Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
|
||||
|
@ -62,6 +62,6 @@ void ne2000_attach __P((struct ne2000_softc *, u_int8_t *,
|
|||
int *, int, int));
|
||||
int ne2000_detect __P((bus_space_tag_t, bus_space_handle_t,
|
||||
bus_space_tag_t, bus_space_handle_t));
|
||||
int ne2000_detach __P((struct ne2000_softc *));
|
||||
int ne2000_detach __P((struct ne2000_softc *, int));
|
||||
|
||||
#endif /* _DEV_IC_NE2000VAR_H_ */
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: if_ne_pcmcia.c,v 1.50 2000/02/02 11:17:32 itojun Exp $ */
|
||||
/* $NetBSD: if_ne_pcmcia.c,v 1.51 2000/02/02 11:41:58 itojun Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1997 Marc Horowitz. All rights reserved.
|
||||
|
@ -620,7 +620,7 @@ ne_pcmcia_detach(self, flags)
|
|||
struct ne_pcmcia_softc *psc = (struct ne_pcmcia_softc *)self;
|
||||
int rv;
|
||||
|
||||
rv = ne2000_detach(&psc->sc_ne2000);
|
||||
rv = ne2000_detach(&psc->sc_ne2000, flags);
|
||||
if (rv == 0) {
|
||||
/* Unmap our i/o windows. */
|
||||
pcmcia_io_unmap(psc->sc_pf, psc->sc_asic_io_window);
|
||||
|
|
Loading…
Reference in New Issue