ansi

1 files changed, 15 insertions, 43 deletions

diff --git a/sys/dev/ic/ne2000.c b/sys/dev/ic/ne2000.c
index fd5a27195ea..b3749265533 100644
--- a/sys/dev/ic/ne2000.c
+++ b/sys/dev/ic/ne2000.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ne2000.c,v 1.18 2006/10/10 00:09:07 brad Exp $	*/
+/*	$OpenBSD: ne2000.c,v 1.19 2006/10/20 16:54:01 brad Exp $	*/
 /*	$NetBSD: ne2000.c,v 1.12 1998/06/10 01:15:50 thorpej Exp $	*/
 
 /*-
@@ -107,9 +107,7 @@ struct cfdriver ne_cd = {
 };
 
 int
-ne2000_attach(nsc, myea)
-	struct ne2000_softc *nsc;
-	u_int8_t *myea;
+ne2000_attach(struct ne2000_softc *nsc, u_int8_t *myea)
 {
 	struct dp8390_softc *dsc = &nsc->sc_dp8390;
 	bus_space_tag_t nict = dsc->sc_regt;
@@ -306,8 +304,7 @@ ne2000_attach(nsc, myea)
  * Detect an NE-2000 or compatible.  Returns a model code.
  */
 int
-ne2000_detect(nsc)
-	struct ne2000_softc *nsc;
+ne2000_detect(struct ne2000_softc *nsc)
 {
 	struct dp8390_softc *dsc = &nsc->sc_dp8390;
 	bus_space_tag_t nict = dsc->sc_regt;
@@ -476,10 +473,7 @@ ne2000_detect(nsc)
  * I/O.
  */
 int
-ne2000_write_mbuf(sc, m, buf)
-	struct dp8390_softc *sc;
-	struct mbuf *m;
-	int buf;
+ne2000_write_mbuf(struct dp8390_softc *sc, struct mbuf *m, int buf)
 {
 	struct ne2000_softc *nsc = (struct ne2000_softc *)sc;
 	bus_space_tag_t nict = sc->sc_regt;
@@ -651,11 +645,8 @@ ne2000_write_mbuf(sc, m, buf)
  * ring-wrap.
  */
 int
-ne2000_ring_copy(sc, src, dst, amount)
-	struct dp8390_softc *sc;
-	int src;
-	caddr_t dst;
-	u_short amount;
+ne2000_ring_copy(struct dp8390_softc *sc, int src, caddr_t dst,
+    u_short amount)
 {
 	struct ne2000_softc *nsc = (struct ne2000_softc *)sc;
 	bus_space_tag_t nict = sc->sc_regt;
@@ -685,10 +676,7 @@ ne2000_ring_copy(sc, src, dst, amount)
 }
 
 void
-ne2000_read_hdr(sc, buf, hdr)
-	struct dp8390_softc *sc;
-	int buf;
-	struct dp8390_ring *hdr;
+ne2000_read_hdr(struct dp8390_softc *sc, int buf, struct dp8390_ring *hdr)
 {
 	struct ne2000_softc *nsc = (struct ne2000_softc *)sc;
 
@@ -701,10 +689,8 @@ ne2000_read_hdr(sc, buf, hdr)
 }
 
 int
-ne2000_test_mem(sc)
-	struct dp8390_softc *sc;
+ne2000_test_mem(struct dp8390_softc *sc)
 {
-
 	/* Noop. */
 	return (0);
 }
@@ -715,15 +701,9 @@ ne2000_test_mem(sc)
  * rounded up to a word - ok as long as mbufs are word sized.
  */
 void
-ne2000_readmem(nict, nich, asict, asich, src, dst, amount, useword)
-	bus_space_tag_t nict;
-	bus_space_handle_t nich;
-	bus_space_tag_t asict;
-	bus_space_handle_t asich;
-	int src;
-	u_int8_t *dst;
-	size_t amount;
-	int useword;
+ne2000_readmem(bus_space_tag_t nict, bus_space_handle_t nich,
+    bus_space_tag_t asict, bus_space_handle_t asich, int src,
+    u_int8_t *dst, size_t amount, int useword)
 {
 
 	/* Select page 0 registers. */
@@ -767,15 +747,9 @@ ne2000_readmem(nict, nich, asict, asich, src, dst, amount, useword)
  * used in the probe routine to test the memory.  'len' must be even.
  */
 void
-ne2000_writemem(nict, nich, asict, asich, src, dst, len, useword)
-	bus_space_tag_t nict;
-	bus_space_handle_t nich;
-	bus_space_tag_t asict;
-	bus_space_handle_t asich;
-	u_int8_t *src;
-	int dst;
-	size_t len;
-	int useword;
+ne2000_writemem(bus_space_tag_t nict, bus_space_handle_t nich,
+    bus_space_tag_t asict, bus_space_handle_t asich, u_int8_t *src,
+    int dst, size_t len, int useword)
 {
 	int maxwait = 100;	/* about 120us */
 
@@ -830,9 +804,7 @@ ne2000_writemem(nict, nich, asict, asich, src, dst, len, useword)
 }
 
 int
-ne2000_detach(sc, flags)
-	struct ne2000_softc *sc;
-	int flags;
+ne2000_detach(struct ne2000_softc *sc, int flags)
 {
 	return (dp8390_detach(&sc->sc_dp8390, flags));
 }