diff options
| author | Mats O Jansson <maja@cvs.openbsd.org> | 1997-09-10 08:28:43 +0000 |
|---|---|---|
| committer | Mats O Jansson <maja@cvs.openbsd.org> | 1997-09-10 08:28:43 +0000 |
| commit | 7ee17d6b3862934e2abfa86ded9fdde7be1133ca (patch) | |
| tree | dfb678cb72706fd77e4d70fadd0027a3c1b87ce0 /sys/arch/vax/if/if_de.c | |
| parent | f901e1c269a36d910c1f51b683c3ce6dd98ac417 (diff) | |
Sync with NetBSD 970516. -moj
Diffstat (limited to 'sys/arch/vax/if/if_de.c')
| -rw-r--r-- | sys/arch/vax/if/if_de.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/sys/arch/vax/if/if_de.c b/sys/arch/vax/if/if_de.c index 0984fb92d44..f9ab288aef9 100644 --- a/sys/arch/vax/if/if_de.c +++ b/sys/arch/vax/if/if_de.c @@ -1,5 +1,5 @@ -/* $OpenBSD: if_de.c,v 1.9 1997/05/28 23:10:59 niklas Exp $ */ -/* $NetBSD: if_de.c,v 1.25 1996/11/15 03:11:19 thorpej Exp $ */ +/* $OpenBSD: if_de.c,v 1.10 1997/09/10 08:28:39 maja Exp $ */ +/* $NetBSD: if_de.c,v 1.27 1997/04/19 15:02:29 ragge Exp $ */ /* * Copyright (c) 1982, 1986, 1989 Regents of the University of California. @@ -91,8 +91,8 @@ extern char all_es_snpa[], all_is_snpa[]; #include <vax/uba/ubareg.h> #include <vax/uba/ubavar.h> -#define NXMT 3 /* number of transmit buffers */ -#define NRCV 7 /* number of receive buffers (must be > 1) */ +#define NXMT 3 /* number of transmit buffers */ +#define NRCV 7 /* number of receive buffers (must be > 1) */ int dedebug = 0; @@ -145,16 +145,16 @@ int dematch __P((struct device *, void *, void *)); void deattach __P((struct device *, struct device *, void *)); int dewait __P((struct de_softc *, char *)); void deinit __P((struct de_softc *)); -int deioctl __P((struct ifnet *, u_long, caddr_t)); +int deioctl __P((struct ifnet *, u_long, caddr_t)); void dereset __P((int)); -void destart __P((struct ifnet *)); +void destart __P((struct ifnet *)); void deread __P((struct de_softc *, struct ifrw *, int)); -void derecv __P((int)); +void derecv __P((int)); void de_setaddr __P((u_char *, struct de_softc *)); void deintr __P((int)); -struct cfdriver de_cd = { +struct cfdriver de_cd = { NULL, "de", DV_IFNET }; @@ -362,7 +362,7 @@ void destart(ifp) struct ifnet *ifp; { - int len; + int len; register struct de_softc *ds = ifp->if_softc; volatile struct dedevice *addr = ds->ds_vaddr; register struct de_ring *rp; @@ -495,7 +495,7 @@ deintr(unit) * If input error just drop packet. * Otherwise purge input buffered data path and examine * packet to determine type. If can't determine length - * from type, then have to drop packet. Othewise decapsulate + * from type, then have to drop packet. Othewise decapsulate * packet based on type and pass to type specific higher-level * input routine. */ @@ -557,7 +557,7 @@ deread(ds, ifrw, len) int len; { struct ether_header *eh; - struct mbuf *m; + struct mbuf *m; /* * Deal with trailer protocol: if type is trailer type @@ -689,7 +689,7 @@ dematch(parent, match, aux) void *match, *aux; { struct uba_attach_args *ua = aux; - volatile struct dedevice *addr = (struct dedevice *)ua->ua_addr; + volatile struct dedevice *addr = (struct dedevice *)ua->ua_addr; int i; /* @@ -720,7 +720,7 @@ dematch(parent, match, aux) DELAY(50000); ua->ua_ivec = deintr; - ua->ua_reset = dereset; /* Wish to be called after ubareset */ + ua->ua_reset = dereset; /* Wish to be called after ubareset */ return 1; } |