ansify and remove statics

5 files changed, 65 insertions, 124 deletions

diff --git a/sys/dev/sbus/if_hme_sbus.c b/sys/dev/sbus/if_hme_sbus.c
index e3c035db6b4..3e9042e1956 100644
--- a/sys/dev/sbus/if_hme_sbus.c
+++ b/sys/dev/sbus/if_hme_sbus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_hme_sbus.c,v 1.6 2003/06/27 01:36:53 jason Exp $	*/
+/*	$OpenBSD: if_hme_sbus.c,v 1.7 2003/07/07 15:37:07 jason Exp $	*/
 /*	$NetBSD: if_hme_sbus.c,v 1.6 2001/02/28 14:52:48 mrg Exp $	*/
 
 /*-
@@ -84,10 +84,7 @@ struct cfattach hme_sbus_ca = {
 };
 
 int
-hmematch_sbus(parent, vcf, aux)
-	struct device *parent;
-	void *vcf;
-	void *aux;
+hmematch_sbus(struct device *parent, void *vcf, void *aux)
 {
 	struct cfdata *cf = vcf;
 	struct sbus_attach_args *sa = aux;
@@ -98,9 +95,7 @@ hmematch_sbus(parent, vcf, aux)
 }
 
 void
-hmeattach_sbus(parent, self, aux)
-	struct device *parent, *self;
-	void *aux;
+hmeattach_sbus(struct device *parent, struct device *self, void *aux)
 {
 	struct sbus_attach_args *sa = aux;
 	struct hmesbus_softc *hsc = (void *)self;
diff --git a/sys/dev/sbus/if_le.c b/sys/dev/sbus/if_le.c
index 02699192cb7..3a81f60d4f2 100644
--- a/sys/dev/sbus/if_le.c
+++ b/sys/dev/sbus/if_le.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_le.c,v 1.8 2003/06/24 21:54:38 henric Exp $	*/
+/*	$OpenBSD: if_le.c,v 1.9 2003/07/07 15:37:07 jason Exp $	*/
 /*	$NetBSD: if_le.c,v 1.17 2001/05/30 11:46:35 mrg Exp $	*/
 
 /*-
@@ -93,13 +93,11 @@ struct cfattach le_sbus_ca = {
 	sizeof(struct le_softc), lematch_sbus, leattach_sbus
 };
 
-static void lewrcsr(struct am7990_softc *, u_int16_t, u_int16_t);
-static u_int16_t lerdcsr(struct am7990_softc *, u_int16_t);
+void le_sbus_wrcsr(struct am7990_softc *, u_int16_t, u_int16_t);
+u_int16_t le_sbus_rdcsr(struct am7990_softc *, u_int16_t);
 
-static void
-lewrcsr(sc, port, val)
-	struct am7990_softc *sc;
-	u_int16_t port, val;
+void
+le_sbus_wrcsr(struct am7990_softc *sc, u_int16_t port, u_int16_t val)
 {
 	struct le_softc *lesc = (struct le_softc *)sc;
 
@@ -124,10 +122,8 @@ lewrcsr(sc, port, val)
 #endif
 }
 
-static u_int16_t
-lerdcsr(sc, port)
-	struct am7990_softc *sc;
-	u_int16_t port;
+u_int16_t
+le_sbus_rdcsr(struct am7990_softc *sc, u_int16_t port)
 {
 	struct le_softc *lesc = (struct le_softc *)sc;
 
@@ -139,10 +135,7 @@ lerdcsr(sc, port)
 
 
 int
-lematch_sbus(parent, vcf, aux)
-	struct device *parent;
-	void *vcf;
-	void *aux;
+lematch_sbus(struct device *parent, void *vcf, void *aux)
 {
 	struct cfdata *cf = vcf;
 	struct sbus_attach_args *sa = aux;
@@ -151,9 +144,7 @@ lematch_sbus(parent, vcf, aux)
 }
 
 void
-leattach_sbus(parent, self, aux)
-	struct device *parent, *self;
-	void *aux;
+leattach_sbus(struct device *parent, struct device *self, void *aux)
 {
 	struct sbus_attach_args *sa = aux;
 	struct le_softc *lesc = (struct le_softc *)self;
@@ -255,8 +246,8 @@ leattach_sbus(parent, self, aux)
 	sc->sc_copyfrombuf = am7990_copyfrombuf_contig;
 	sc->sc_zerobuf = am7990_zerobuf_contig;
 
-	sc->sc_rdcsr = lerdcsr;
-	sc->sc_wrcsr = lewrcsr;
+	sc->sc_rdcsr = le_sbus_rdcsr;
+	sc->sc_wrcsr = le_sbus_wrcsr;
 
 	am7990_config(&lesc->sc_am7990);
 
diff --git a/sys/dev/sbus/if_le_lebuffer.c b/sys/dev/sbus/if_le_lebuffer.c
index 11f04c30f9e..e3c85a41ad9 100644
--- a/sys/dev/sbus/if_le_lebuffer.c
+++ b/sys/dev/sbus/if_le_lebuffer.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_le_lebuffer.c,v 1.3 2003/06/24 21:54:38 henric Exp $	*/
+/*	$OpenBSD: if_le_lebuffer.c,v 1.4 2003/07/07 15:37:07 jason Exp $	*/
 /*	$NetBSD: if_le_lebuffer.c,v 1.10 2002/03/11 16:00:56 pk Exp $	*/
 
 /*-
@@ -95,13 +95,11 @@ struct cfdriver lebuffer_cd = {
 	NULL, "lebuffer", DV_DULL
 };
 
-static void lewrcsr(struct am7990_softc *, u_int16_t, u_int16_t);
-static u_int16_t lerdcsr(struct am7990_softc *, u_int16_t);
+void le_lebuffer_wrcsr(struct am7990_softc *, u_int16_t, u_int16_t);
+u_int16_t le_lebuffer_rdcsr(struct am7990_softc *, u_int16_t);
 
-static void
-lewrcsr(sc, port, val)
-	struct am7990_softc *sc;
-	u_int16_t port, val;
+void
+le_lebuffer_wrcsr(struct am7990_softc *sc, u_int16_t port, u_int16_t val)
 {
 	struct le_softc *lesc = (struct le_softc *)sc;
 
@@ -122,10 +120,8 @@ lewrcsr(sc, port, val)
 #endif
 }
 
-static u_int16_t
-lerdcsr(sc, port)
-	struct am7990_softc *sc;
-	u_int16_t port;
+u_int16_t
+le_lebuffer_rdcsr(struct am7990_softc *sc, u_int16_t port)
 {
 	struct le_softc *lesc = (struct le_softc *)sc;
 
@@ -134,10 +130,7 @@ lerdcsr(sc, port)
 }
 
 int
-lematch_lebuffer(parent, vcf, aux)
-	struct device *parent;
-	void *vcf;
-	void *aux;
+lematch_lebuffer(struct device *parent, void *vcf, void *aux)
 {
 	struct sbus_attach_args *sa = aux;
 	struct cfdata *cf = vcf;
@@ -147,9 +140,7 @@ lematch_lebuffer(parent, vcf, aux)
 
 
 void
-leattach_lebuffer(parent, self, aux)
-	struct device *parent, *self;
-	void *aux;
+leattach_lebuffer(struct device *parent, struct device *self, void *aux)
 {
 	struct sbus_attach_args *sa = aux;
 	struct le_softc *lesc = (struct le_softc *)self;
@@ -189,8 +180,8 @@ leattach_lebuffer(parent, self, aux)
 	sc->sc_copyfrombuf = am7990_copyfrombuf_contig;
 	sc->sc_zerobuf = am7990_zerobuf_contig;
 
-	sc->sc_rdcsr = lerdcsr;
-	sc->sc_wrcsr = lewrcsr;
+	sc->sc_rdcsr = le_lebuffer_rdcsr;
+	sc->sc_wrcsr = le_lebuffer_wrcsr;
 
 	am7990_config(&lesc->sc_am7990);
 
diff --git a/sys/dev/sbus/if_le_ledma.c b/sys/dev/sbus/if_le_ledma.c
index c376aa14bed..a62a032f27a 100644
--- a/sys/dev/sbus/if_le_ledma.c
+++ b/sys/dev/sbus/if_le_ledma.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_le_ledma.c,v 1.9 2003/06/24 21:54:38 henric Exp $	*/
+/*	$OpenBSD: if_le_ledma.c,v 1.10 2003/07/07 15:37:07 jason Exp $	*/
 /*	$NetBSD: if_le_ledma.c,v 1.14 2001/05/30 11:46:35 mrg Exp $	*/
 
 /*-
@@ -94,8 +94,8 @@ void	leattach_ledma(struct device *, struct device *, void *);
  * Media types supported by the Sun4m.
  */
 
-void	lesetutp(struct am7990_softc *);
-void	lesetaui(struct am7990_softc *);
+void	le_ledma_setutp(struct am7990_softc *);
+void	le_ledma_setaui(struct am7990_softc *);
 
 int	lemediachange(struct ifnet *);
 void	lemediastatus(struct ifnet *, struct ifmediareq *);
@@ -104,28 +104,14 @@ struct cfattach le_ledma_ca = {
 	sizeof(struct le_softc), lematch_ledma, leattach_ledma
 };
 
-#if defined(_KERNEL_OPT)
-#include "opt_ddb.h"
-#endif
-
-#ifdef DDB
-#define	integrate
-#define hide
-#else
-#define	integrate	static __inline
-#define hide		static
-#endif
-
-static void lewrcsr(struct am7990_softc *, u_int16_t, u_int16_t);
-static u_int16_t lerdcsr(struct am7990_softc *, u_int16_t);
-hide void lehwreset(struct am7990_softc *);
-hide void lehwinit(struct am7990_softc *);
-hide void lenocarrier(struct am7990_softc *);
+void le_ledma_wrcsr(struct am7990_softc *, u_int16_t, u_int16_t);
+u_int16_t le_ledma_rdcsr(struct am7990_softc *, u_int16_t);
+void le_ledma_hwreset(struct am7990_softc *);
+void le_ledma_hwinit(struct am7990_softc *);
+void le_ledma_nocarrier(struct am7990_softc *);
 
-static void
-lewrcsr(sc, port, val)
-	struct am7990_softc *sc;
-	u_int16_t port, val;
+void
+le_ledma_wrcsr(struct am7990_softc *sc, u_int16_t port, u_int16_t val)
 {
 	struct le_softc *lesc = (struct le_softc *)sc;
 
@@ -146,10 +132,8 @@ lewrcsr(sc, port, val)
 #endif
 }
 
-static u_int16_t
-lerdcsr(sc, port)
-	struct am7990_softc *sc;
-	u_int16_t port;
+u_int16_t
+le_ledma_rdcsr(struct am7990_softc *sc, u_int16_t port)
 {
 	struct le_softc *lesc = (struct le_softc *)sc;
 
@@ -158,8 +142,7 @@ lerdcsr(sc, port)
 }
 
 void
-lesetutp(sc)
-	struct am7990_softc *sc;
+le_ledma_setutp(struct am7990_softc *sc)
 {
 	struct lsi64854_softc *dma = ((struct le_softc *)sc)->sc_dma;
 	u_int32_t csr;
@@ -171,8 +154,7 @@ lesetutp(sc)
 }
 
 void
-lesetaui(sc)
-	struct am7990_softc *sc;
+le_ledma_setaui(struct am7990_softc *sc)
 {
 	struct lsi64854_softc *dma = ((struct le_softc *)sc)->sc_dma;
 	u_int32_t csr;
@@ -184,8 +166,7 @@ lesetaui(sc)
 }
 
 int
-lemediachange(ifp)
-	struct ifnet *ifp;
+lemediachange(struct ifnet *ifp)
 {
 	struct am7990_softc *sc = ifp->if_softc;
 	struct ifmedia *ifm = &sc->sc_ifmedia;
@@ -201,11 +182,11 @@ lemediachange(ifp)
 	 */
 	switch (IFM_SUBTYPE(ifm->ifm_media)) {
 	case IFM_10_T:
-		lesetutp(sc);
+		le_ledma_setutp(sc);
 		break;
 
 	case IFM_10_5:
-		lesetaui(sc);
+		le_ledma_setaui(sc);
 		break;
 
 	case IFM_AUTO:
@@ -219,9 +200,7 @@ lemediachange(ifp)
 }
 
 void
-lemediastatus(ifp, ifmr)
-	struct ifnet *ifp;
-	struct ifmediareq *ifmr;
+lemediastatus(struct ifnet *ifp, struct ifmediareq *ifmr)
 {
 	struct am7990_softc *sc = ifp->if_softc;
 	struct lsi64854_softc *dma = ((struct le_softc *)sc)->sc_dma;
@@ -235,9 +214,8 @@ lemediastatus(ifp, ifmr)
 		ifmr->ifm_active = IFM_ETHER|IFM_10_5;
 }
 
-hide void
-lehwreset(sc)
-	struct am7990_softc *sc;
+void
+le_ledma_hwreset(struct am7990_softc *sc)
 {
 	struct le_softc *lesc = (struct le_softc *)sc;
 	struct lsi64854_softc *dma = lesc->sc_dma;
@@ -267,9 +245,8 @@ lehwreset(sc)
 	delay(20000);	/* must not touch le for 20ms */
 }
 
-hide void
-lehwinit(sc)
-	struct am7990_softc *sc;
+void
+le_ledma_hwinit(struct am7990_softc *sc)
 {
 
 	/*
@@ -278,18 +255,17 @@ lehwinit(sc)
 	 */
 	switch (IFM_SUBTYPE(sc->sc_ifmedia.ifm_cur->ifm_media)) {
 	case IFM_10_T:
-		lesetutp(sc);
+		le_ledma_setutp(sc);
 		break;
 
 	case IFM_10_5:
-		lesetaui(sc);
+		le_ledma_setaui(sc);
 		break;
 	}
 }
 
-hide void
-lenocarrier(sc)
-	struct am7990_softc *sc;
+void
+le_ledma_nocarrier(struct am7990_softc *sc)
 {
 	struct le_softc *lesc = (struct le_softc *)sc;
 
@@ -304,7 +280,7 @@ lenocarrier(sc)
 		case IFM_AUTO:
 			printf("%s: lost carrier on UTP port"
 			    ", switching to AUI port\n", sc->sc_dev.dv_xname);
-			lesetaui(sc);
+			le_ledma_setaui(sc);
 		}
 	} else {
 		switch (IFM_SUBTYPE(sc->sc_ifmedia.ifm_media)) {
@@ -312,16 +288,13 @@ lenocarrier(sc)
 		case IFM_AUTO:
 			printf("%s: lost carrier on AUI port"
 			    ", switching to UTP port\n", sc->sc_dev.dv_xname);
-			lesetutp(sc);
+			le_ledma_setutp(sc);
 		}
 	}
 }
 
 int
-lematch_ledma(parent, vcf, aux)
-	struct device *parent;
-	void *vcf;
-	void *aux;
+lematch_ledma(struct device *parent, void *vcf, void *aux)
 {
 	struct cfdata *cf = vcf;
 	struct sbus_attach_args *sa = aux;
@@ -331,9 +304,7 @@ lematch_ledma(parent, vcf, aux)
 
 
 void
-leattach_ledma(parent, self, aux)
-	struct device *parent, *self;
-	void *aux;
+leattach_ledma(struct device *parent, struct device *self, void *aux)
 {
 	struct sbus_attach_args *sa = aux;
 	struct le_softc *lesc = (struct le_softc *)self;
@@ -425,11 +396,11 @@ leattach_ledma(parent, self, aux)
 	sc->sc_copyfrombuf = am7990_copyfrombuf_contig;
 	sc->sc_zerobuf = am7990_zerobuf_contig;
 
-	sc->sc_rdcsr = lerdcsr;
-	sc->sc_wrcsr = lewrcsr;
-	sc->sc_hwinit = lehwinit;
-	sc->sc_nocarrier = lenocarrier;
-	sc->sc_hwreset = lehwreset;
+	sc->sc_rdcsr = le_ledma_rdcsr;
+	sc->sc_wrcsr = le_ledma_wrcsr;
+	sc->sc_hwinit = le_ledma_hwinit;
+	sc->sc_nocarrier = le_ledma_nocarrier;
+	sc->sc_hwreset = le_ledma_hwreset;
 
 	/* Establish interrupt handler */
 	if (sa->sa_nintr != 0)
@@ -439,5 +410,5 @@ leattach_ledma(parent, self, aux)
 	am7990_config(&lesc->sc_am7990);
 
 	/* now initialize DMA */
-	lehwreset(sc);
+	le_ledma_hwreset(sc);
 }
diff --git a/sys/dev/sbus/lebuffer.c b/sys/dev/sbus/lebuffer.c
index 7c37b127ddc..483f20f0fc4 100644
--- a/sys/dev/sbus/lebuffer.c
+++ b/sys/dev/sbus/lebuffer.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: lebuffer.c,v 1.4 2003/03/05 21:53:07 jason Exp $	*/
+/*	$OpenBSD: lebuffer.c,v 1.5 2003/07/07 15:37:07 jason Exp $	*/
 /*	$NetBSD: lebuffer.c,v 1.12 2002/03/11 16:00:57 pk Exp $ */
 
 /*-
@@ -61,9 +61,7 @@ struct cfattach lebuffer_ca = {
 };
 
 int
-lebufprint(aux, busname)
-	void *aux;
-	const char *busname;
+lebufprint(void *aux, const char *busname)
 {
 	struct sbus_attach_args *sa = aux;
 	bus_space_tag_t t = sa->sa_bustag;
@@ -76,10 +74,7 @@ lebufprint(aux, busname)
 }
 
 int
-lebufmatch(parent, vcf, aux)
-	struct device *parent;
-	void *vcf;
-	void *aux;
+lebufmatch(struct device *parent, void *vcf, void *aux)
 {
 	struct sbus_attach_args *sa = aux;
 	struct cfdata *cf = vcf;
@@ -91,9 +86,7 @@ lebufmatch(parent, vcf, aux)
  * Attach all the sub-devices we can find
  */
 void
-lebufattach(parent, self, aux)
-	struct device *parent, *self;
-	void *aux;
+lebufattach(struct device *parent, struct device *self, void *aux)
 {
 	struct sbus_attach_args *sa = aux;
 	struct lebuf_softc *sc = (void *)self;