ansi

4 files changed, 39 insertions, 101 deletions

diff --git a/sys/dev/isa/if_ec.c b/sys/dev/isa/if_ec.c
index 9ce72a8722a..4ff37cf6260 100644
--- a/sys/dev/isa/if_ec.c
+++ b/sys/dev/isa/if_ec.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ec.c,v 1.8 2006/10/01 20:51:36 brad Exp $	*/
+/*	$OpenBSD: if_ec.c,v 1.9 2006/10/20 16:54:01 brad Exp $	*/
 /*	$NetBSD: if_ec.c,v 1.9 1998/07/05 06:49:12 jonathan Exp $	*/
 
 /*-
@@ -150,9 +150,7 @@ struct cfdriver ec_cd = {
 };
 
 int
-ec_probe(parent, match, aux)
-	struct device *parent;
-	void *match, *aux;
+ec_probe(struct device *parent, void *match, void *aux)
 {
 	struct isa_attach_args *ia = aux;
 	bus_space_tag_t nict, asict, memt;
@@ -257,9 +255,7 @@ ec_probe(parent, match, aux)
 }
 
 void
-ec_attach(parent, self, aux)
-	struct device *parent, *self;
-	void *aux;
+ec_attach(struct device *parent, struct device *self, void *aux)
 {
 	struct ec_softc *esc = (struct ec_softc *)self;
 	struct dp8390_softc *sc = &esc->sc_dp8390;
@@ -519,10 +515,8 @@ ec_attach(parent, self, aux)
 }
 
 int
-ec_fake_test_mem(sc)
-	struct dp8390_softc *sc;
+ec_fake_test_mem(struct dp8390_softc *sc)
 {
-
 	/*
 	 * We have to do this after we initialize the GA, but we
 	 * have to do that after calling dp8390_config(), which
@@ -533,8 +527,7 @@ ec_fake_test_mem(sc)
 }
 
 int
-ec_test_mem(sc)
-	struct dp8390_softc *sc;
+ec_test_mem(struct dp8390_softc *sc)
 {
 	struct ec_softc *esc = (struct ec_softc *)sc;
 	bus_space_tag_t memt = sc->sc_buft;
@@ -573,11 +566,7 @@ ec_test_mem(sc)
  * up to a word - ok as long as mbufs are word-sized.
  */
 __inline void
-ec_readmem(esc, from, to, len)
-	struct ec_softc *esc;
-	int from;
-	u_int8_t *to;
-	int len;
+ec_readmem(struct ec_softc *esc, int from, u_int8_t *to, int len)
 {
 	bus_space_tag_t memt = esc->sc_dp8390.sc_buft;
 	bus_space_handle_t memh = esc->sc_dp8390.sc_bufh;
@@ -593,10 +582,7 @@ ec_readmem(esc, from, to, len)
 }
 
 int
-ec_write_mbuf(sc, m, buf)
-	struct dp8390_softc *sc;
-	struct mbuf *m;
-	int buf;
+ec_write_mbuf(struct dp8390_softc *sc, struct mbuf *m, int buf)
 {
 	struct ec_softc *esc = (struct ec_softc *)sc;
 	bus_space_tag_t asict = esc->sc_asict;
@@ -702,11 +688,8 @@ ec_write_mbuf(sc, m, buf)
 }
 
 int
-ec_ring_copy(sc, src, dst, amount)
-	struct dp8390_softc *sc;
-	int src;
-	caddr_t dst;
-	u_short amount;
+ec_ring_copy(struct dp8390_softc *sc, int src, caddr_t dst,
+    u_short amount)
 {
 	struct ec_softc *esc = (struct ec_softc *)sc;
 	u_short tmp_amount;
@@ -729,10 +712,8 @@ ec_ring_copy(sc, src, dst, amount)
 }
 
 void
-ec_read_hdr(sc, packet_ptr, packet_hdrp)
-	struct dp8390_softc *sc;
-	int packet_ptr;
-	struct dp8390_ring *packet_hdrp;
+ec_read_hdr(struct dp8390_softc *sc, int packet_ptr,
+    struct dp8390_ring *packet_hdrp)
 {
 	struct ec_softc *esc = (struct ec_softc *)sc;
 
@@ -753,8 +734,7 @@ ec_media_init(struct dp8390_softc *sc)
 }
 
 int
-ec_mediachange(sc)
-	struct dp8390_softc *sc;
+ec_mediachange(struct dp8390_softc *sc)
 {
 	struct ec_softc *esc = (struct ec_softc *)sc;
 	struct ifmedia *ifm = &sc->sc_media;
@@ -763,9 +743,7 @@ ec_mediachange(sc)
 }
 
 void
-ec_mediastatus(sc, ifmr)
-	struct dp8390_softc *sc;
-	struct ifmediareq *ifmr;
+ec_mediastatus(struct dp8390_softc *sc, struct ifmediareq *ifmr)
 {
 	struct ifmedia *ifm = &sc->sc_media;
 
@@ -776,8 +754,7 @@ ec_mediastatus(sc, ifmr)
 }
 
 void
-ec_init_card(sc)
-	struct dp8390_softc *sc;
+ec_init_card(struct dp8390_softc *sc)
 {
 	struct ec_softc *esc = (struct ec_softc *)sc;
 	struct ifmedia *ifm = &sc->sc_media;
@@ -786,9 +763,7 @@ ec_init_card(sc)
 }
 
 int
-ec_set_media(esc, media)
-	struct ec_softc *esc;
-	int media;
+ec_set_media(struct ec_softc *esc, int media)
 {
 	u_int8_t new;
 
diff --git a/sys/dev/isa/if_ne_isa.c b/sys/dev/isa/if_ne_isa.c
index 7a087cccff5..25de93b76eb 100644
--- a/sys/dev/isa/if_ne_isa.c
+++ b/sys/dev/isa/if_ne_isa.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ne_isa.c,v 1.10 2005/11/21 18:16:40 millert Exp $	*/
+/*	$OpenBSD: if_ne_isa.c,v 1.11 2006/10/20 16:54:01 brad Exp $	*/
 /*	$NetBSD: if_ne_isa.c,v 1.6 1998/07/05 06:49:13 jonathan Exp $	*/
 
 /*-
@@ -102,9 +102,7 @@ struct cfattach ne_isa_ca = {
 };
 
 int
-ne_isa_match(parent, match, aux)
-	struct device *parent;
-	void *match, *aux;
+ne_isa_match(struct device *parent, void *match, void *aux)
 {
 	struct ne_isa_softc *isc = match;
 	struct ne2000_softc *nsc = &isc->sc_ne2000;
@@ -152,9 +150,7 @@ ne_isa_match(parent, match, aux)
 }
 
 void
-ne_isa_attach(parent, self, aux)
-	struct device *parent, *self;
-	void *aux;
+ne_isa_attach(struct device *parent, struct device *self, void *aux)
 {
 	struct ne_isa_softc *isc = (struct ne_isa_softc *)self;
 	struct ne2000_softc *nsc = &isc->sc_ne2000;
diff --git a/sys/dev/isa/if_ne_isapnp.c b/sys/dev/isa/if_ne_isapnp.c
index b9b727224b7..40a6083cbf1 100644
--- a/sys/dev/isa/if_ne_isapnp.c
+++ b/sys/dev/isa/if_ne_isapnp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ne_isapnp.c,v 1.9 2005/11/21 18:16:40 millert Exp $	*/
+/*	$OpenBSD: if_ne_isapnp.c,v 1.10 2006/10/20 16:54:01 brad Exp $	*/
 /*	$NetBSD: if_ne_isapnp.c,v 1.7 1998/07/23 19:30:45 christos Exp $	*/
 
 /*-
@@ -108,18 +108,13 @@ struct cfattach ne_isapnp_ca = {
 };
 
 static int
-ne_isapnp_match(parent, match, aux)
-	struct device *parent;
-	void *match, *aux;
+ne_isapnp_match(struct device *parent, void *match, void *aux)
 {
-	return 1;
+	return (1);
 }
 
 static void
-ne_isapnp_attach(
-	struct device *parent,
-	struct device *self,
-	void *aux)
+ne_isapnp_attach(struct device *parent, struct device *self, void *aux)
 {
 	struct ne_isapnp_softc * const isc = (struct ne_isapnp_softc *)self;
 	struct ne2000_softc * const nsc = &isc->sc_ne2000;
diff --git a/sys/dev/isa/if_we.c b/sys/dev/isa/if_we.c
index 0fefb38814a..37fbe057787 100644
--- a/sys/dev/isa/if_we.c
+++ b/sys/dev/isa/if_we.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_we.c,v 1.15 2006/10/01 20:51:36 brad Exp $	*/
+/*	$OpenBSD: if_we.c,v 1.16 2006/10/20 16:54:01 brad Exp $	*/
 /*	$NetBSD: if_we.c,v 1.11 1998/07/05 06:49:14 jonathan Exp $	*/
 
 /*-
@@ -205,9 +205,7 @@ do { \
 } while (0)
 
 int
-we_probe(parent, match, aux)
-	struct device *parent;
-	void *match, *aux;
+we_probe(struct device *parent, void *match, void *aux)
 {
 	struct isa_attach_args *ia = aux;
 	struct cfdata *cf = match;
@@ -350,9 +348,7 @@ we_probe(parent, match, aux)
 }
 
 void
-we_attach(parent, self, aux)
-	struct device *parent, *self;
-	void *aux;
+we_attach(struct device *parent, struct device *self, void *aux)
 {
 	struct we_softc *wsc = (struct we_softc *)self;
 	struct dp8390_softc *sc = &wsc->sc_dp8390;
@@ -572,8 +568,7 @@ we_attach(parent, self, aux)
 }
 
 int
-we_test_mem(sc)
-	struct dp8390_softc *sc;
+we_test_mem(struct dp8390_softc *sc)
 {
 	struct we_softc *wsc = (struct we_softc *)sc;
 	bus_space_tag_t memt = sc->sc_buft;
@@ -613,11 +608,7 @@ we_test_mem(sc)
  * up to a word - ok as long as mbufs are word-sized.
  */
 __inline void
-we_readmem(wsc, from, to, len)
-	struct we_softc *wsc;
-	int from;
-	u_int8_t *to;
-	int len;
+we_readmem(struct we_softc *wsc, int from, u_int8_t *to, int len)
 {
 	bus_space_tag_t memt = wsc->sc_dp8390.sc_buft;
 	bus_space_handle_t memh = wsc->sc_dp8390.sc_bufh;
@@ -634,10 +625,7 @@ we_readmem(wsc, from, to, len)
 }
 
 int
-we_write_mbuf(sc, m, buf)
-	struct dp8390_softc *sc;
-	struct mbuf *m;
-	int buf;
+we_write_mbuf(struct dp8390_softc *sc, struct mbuf *m, int buf)
 {
 	struct we_softc *wsc = (struct we_softc *)sc;
 	bus_space_tag_t memt = wsc->sc_dp8390.sc_buft;
@@ -731,11 +719,7 @@ we_write_mbuf(sc, m, buf)
 }
 
 int
-we_ring_copy(sc, src, dst, amount)
-	struct dp8390_softc *sc;
-	int src;
-	caddr_t dst;
-	u_short amount;
+we_ring_copy(struct dp8390_softc *sc, int src, caddr_t dst, u_short amount)
 {
 	struct we_softc *wsc = (struct we_softc *)sc;
 	u_short tmp_amount;
@@ -758,10 +742,8 @@ we_ring_copy(sc, src, dst, amount)
 }
 
 void
-we_read_hdr(sc, packet_ptr, packet_hdrp)
-	struct dp8390_softc *sc;
-	int packet_ptr;
-	struct dp8390_ring *packet_hdrp;
+we_read_hdr(struct dp8390_softc *sc, int packet_ptr,
+    struct dp8390_ring *packet_hdrp)
 {
 	struct we_softc *wsc = (struct we_softc *)sc;
 
@@ -773,8 +755,7 @@ we_read_hdr(sc, packet_ptr, packet_hdrp)
 }
 
 void
-we_recv_int(sc)
-	struct dp8390_softc *sc;
+we_recv_int(struct dp8390_softc *sc)
 {
 	struct we_softc *wsc = (struct we_softc *)sc;
 
@@ -816,8 +797,7 @@ we_media_init(struct dp8390_softc *sc)
 }
 
 int
-we_mediachange(sc)
-	struct dp8390_softc *sc;
+we_mediachange(struct dp8390_softc *sc)
 {
 
 	/*
@@ -830,9 +810,7 @@ we_mediachange(sc)
 }
 
 void
-we_mediastatus(sc, ifmr)
-	struct dp8390_softc *sc;
-	struct ifmediareq *ifmr;
+we_mediastatus(struct dp8390_softc *sc, struct ifmediareq *ifmr)
 {
 	struct ifmedia *ifm = &sc->sc_media;
 
@@ -843,8 +821,7 @@ we_mediastatus(sc, ifmr)
 }
 
 void
-we_init_card(sc)
-	struct dp8390_softc *sc;
+we_init_card(struct dp8390_softc *sc)
 {
 	struct we_softc *wsc = (struct we_softc *)sc;
 	struct ifmedia *ifm = &sc->sc_media;
@@ -853,9 +830,7 @@ we_init_card(sc)
 }
 
 void
-we_set_media(wsc, media)
-	struct we_softc *wsc;
-	int media;
+we_set_media(struct we_softc *wsc, int media)
 {
 	struct dp8390_softc *sc = &wsc->sc_dp8390;
 	bus_space_tag_t asict = wsc->sc_asict;
@@ -887,12 +862,9 @@ we_set_media(wsc, media)
 }
 
 const char *
-we_params(asict, asich, typep, memsizep, is16bitp, is790p)
-	bus_space_tag_t asict;
-	bus_space_handle_t asich;
-	u_int8_t *typep;
-	bus_size_t *memsizep;
-	int *is16bitp, *is790p;
+we_params(bus_space_tag_t asict, bus_space_handle_t asich,
+    u_int8_t *typep, bus_size_t *memsizep, int *is16bitp,
+    int *is790p)
 {
 	const char *typestr;
 	bus_size_t memsize;