diff options
author | bde <bde@FreeBSD.org> | 1995-11-18 08:58:14 +0000 |
---|---|---|
committer | bde <bde@FreeBSD.org> | 1995-11-18 08:58:14 +0000 |
commit | 0b3bb1936af4aef53737b02354c17ce3bdda20dc (patch) | |
tree | b0dd352fb50b0991fd5cc27cb872f6123c98e4bd /sys/i386/isa/if_zp.c | |
parent | 5f8371d19f1c1685eb2ede2ad9a0f1b9f6372c8b (diff) | |
download | FreeBSD-src-0b3bb1936af4aef53737b02354c17ce3bdda20dc.zip FreeBSD-src-0b3bb1936af4aef53737b02354c17ce3bdda20dc.tar.gz |
Fixed the types of the apm hook functions.
Completed function declarations.
Added prototypes.
Partially fixed the path to cons.h.
Diffstat (limited to 'sys/i386/isa/if_zp.c')
-rw-r--r-- | sys/i386/isa/if_zp.c | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/sys/i386/isa/if_zp.c b/sys/i386/isa/if_zp.c index 5552f77..5c1dd15 100644 --- a/sys/i386/isa/if_zp.c +++ b/sys/i386/isa/if_zp.c @@ -34,7 +34,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * From: if_ep.c,v 1.9 1994/01/25 10:46:29 deraadt Exp $ - * $Id: if_zp.c,v 1.10 1995/10/26 20:29:53 julian Exp $ + * $Id: if_zp.c,v 1.11 1995/10/28 15:39:13 phk Exp $ */ /*- * TODO: @@ -143,6 +143,7 @@ enum memtype { #include <sys/param.h> #if defined(__FreeBSD__) #include <sys/systm.h> +#include <sys/conf.h> #include <sys/kernel.h> #endif #include <sys/mbuf.h> @@ -186,7 +187,7 @@ enum memtype { #endif #if defined(__FreeBSD__) && defined(ZP_DEBUG) -#include <i386/i386/cons.h> +#include <machine/cons.h> #endif #include <i386/isa/isa.h> @@ -271,11 +272,12 @@ static unsigned char card_info[256]; int zpprobe __P((struct isa_device *)); int zpattach __P((struct isa_device *)); +static int zp_suspend __P((void *visa_dev)); +static int zp_resume __P((void *visa_dev)); static int zpioctl __P((struct ifnet * ifp, int, caddr_t)); static u_short read_eeprom_data __P((int, int)); void zpinit __P((int)); -void zpintr __P((int)); void zpmbuffill __P((void *)); static void zpmbufempty __P((struct zp_softc *)); void zpread __P((struct zp_softc *)); @@ -711,9 +713,10 @@ re_init: #if NAPM > 0 static int -zp_suspend(isa_dev) - struct isa_device *isa_dev; +zp_suspend(visa_dev) + void *visa_dev; { + struct isa_device *isa_dev = visa_dev; struct zp_softc *sc = &zp_softc[isa_dev->id_unit]; pcic_power_off(sc->slot); @@ -721,9 +724,11 @@ zp_suspend(isa_dev) } static int -zp_resume(isa_dev) - struct isa_device *isa_dev; +zp_resume(visa_dev) + void *visa_dev; { + struct isa_device *isa_dev = visa_dev; + prev_slot = 0; reconfig_isadev(isa_dev, &net_imask); return 0; |