ANSI-fy. No functional change.

From Brad.

1 files changed, 22 insertions, 55 deletions

diff --git a/sys/dev/pci/if_bce.c b/sys/dev/pci/if_bce.c
index 7c94e153e0b..68256db81cf 100644
--- a/sys/dev/pci/if_bce.c
+++ b/sys/dev/pci/if_bce.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_bce.c,v 1.16 2007/04/07 22:11:05 krw Exp $ */
+/* $OpenBSD: if_bce.c,v 1.17 2007/04/07 23:59:58 krw Exp $ */
 /* $NetBSD: if_bce.c,v 1.3 2003/09/29 01:53:02 mrg Exp $	 */
 
 /*
@@ -215,19 +215,14 @@ const struct pci_matchid bce_devices[] = {
 };
 
 int
-bce_probe(parent, match, aux)
-	struct device  *parent;
-	void           *match;
-	void           *aux;
+bce_probe(struct device *parent, void *match, void *aux)
 {
 	return (pci_matchbyid((struct pci_attach_args *)aux, bce_devices,
 	    sizeof(bce_devices)/sizeof(bce_devices[0])));
 }
 
 void
-bce_attach(parent, self, aux)
-	struct device  *parent, *self;
-	void           *aux;
+bce_attach(struct device *parent, struct device *self, void *aux)
 {
 	struct bce_softc *sc = (struct bce_softc *) self;
 	struct pci_attach_args *pa = aux;
@@ -437,10 +432,7 @@ bce_attach(parent, self, aux)
 
 /* handle media, and ethernet requests */
 static int
-bce_ioctl(ifp, cmd, data)
-	struct ifnet   *ifp;
-	u_long          cmd;
-	caddr_t         data;
+bce_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
 {
 	struct bce_softc *sc = ifp->if_softc;
 	struct ifreq   *ifr = (struct ifreq *) data;
@@ -522,8 +514,7 @@ bce_ioctl(ifp, cmd, data)
 
 /* Start packet transmission on the interface. */
 static void
-bce_start(ifp)
-	struct ifnet   *ifp;
+bce_start(struct ifnet *ifp)
 {
 	struct bce_softc *sc = ifp->if_softc;
 	struct mbuf    *m0;
@@ -654,8 +645,7 @@ bce_start(ifp)
 
 /* Watchdog timer handler. */
 static void
-bce_watchdog(ifp)
-	struct ifnet   *ifp;
+bce_watchdog(struct ifnet *ifp)
 {
 	struct bce_softc *sc = ifp->if_softc;
 
@@ -669,8 +659,7 @@ bce_watchdog(ifp)
 }
 
 int
-bce_intr(xsc)
-	void           *xsc;
+bce_intr(void *xsc)
 {
 	struct bce_softc *sc;
 	struct ifnet   *ifp;
@@ -743,8 +732,7 @@ bce_intr(xsc)
 
 /* Receive interrupt handler */
 void
-bce_rxintr(sc)
-	struct bce_softc *sc;
+bce_rxintr(struct bce_softc *sc)
 {
 	struct ifnet   *ifp = &sc->bce_ac.ac_if;
 	struct rx_pph  *pph;
@@ -859,8 +847,7 @@ bce_rxintr(sc)
 
 /* Transmit interrupt handler */
 void
-bce_txintr(sc)
-	struct bce_softc *sc;
+bce_txintr(struct bce_softc *sc)
 {
 	struct ifnet   *ifp = &sc->bce_ac.ac_if;
 	int             curr;
@@ -902,8 +889,7 @@ bce_txintr(sc)
 
 /* initialize the interface */
 static int
-bce_init(ifp)
-	struct ifnet   *ifp;
+bce_init(struct ifnet *ifp)
 {
 	struct bce_softc *sc = ifp->if_softc;
 	u_int32_t reg_win;
@@ -1035,10 +1021,7 @@ bce_init(ifp)
 
 /* add a mac address to packet filter */
 void
-bce_add_mac(sc, mac, idx)
-	struct bce_softc *sc;
-	u_int8_t *mac;
-	unsigned long   idx;
+bce_add_mac(struct bce_softc *sc, u_int8_t *mac, unsigned long idx)
 {
 	int             i;
 	u_int32_t rval;
@@ -1065,9 +1048,7 @@ bce_add_mac(sc, mac, idx)
 
 /* Add a receive buffer to the indiciated descriptor. */
 static int
-bce_add_rxbuf(sc, idx)
-	struct bce_softc *sc;
-	int             idx;
+bce_add_rxbuf(struct bce_softc *sc, int idx)
 {
 	struct mbuf    *m;
 	int             error;
@@ -1104,8 +1085,7 @@ bce_add_rxbuf(sc, idx)
 
 /* Drain the receive queue. */
 static void
-bce_rxdrain(sc)
-	struct bce_softc *sc;
+bce_rxdrain(struct bce_softc *sc)
 {
 	int             i;
 
@@ -1121,9 +1101,7 @@ bce_rxdrain(sc)
 
 /* Stop transmission on the interface */
 static void
-bce_stop(ifp, disable)
-	struct ifnet   *ifp;
-	int             disable;
+bce_stop(struct ifnet *ifp, int disable)
 {
 	struct bce_softc *sc = ifp->if_softc;
 	int             i;
@@ -1176,8 +1154,7 @@ bce_stop(ifp, disable)
 
 /* reset the chip */
 static void
-bce_reset(sc)
-	struct bce_softc *sc;
+bce_reset(struct bce_softc *sc)
 {
 	u_int32_t val;
 	u_int32_t sbval;
@@ -1348,8 +1325,7 @@ bce_reset(sc)
 
 /* Set up the receive filter. */
 void
-bce_set_filter(ifp)
-	struct ifnet   *ifp;
+bce_set_filter(struct ifnet *ifp)
 {
 	struct bce_softc *sc = ifp->if_softc;
 
@@ -1398,9 +1374,7 @@ bce_set_filter(ifp)
 
 /* Read a PHY register on the MII. */
 int
-bce_mii_read(self, phy, reg)
-	struct device  *self;
-	int             phy, reg;
+bce_mii_read(struct device *self, int phy, int reg)
 {
 	struct bce_softc *sc = (struct bce_softc *) self;
 	int             i;
@@ -1431,9 +1405,7 @@ bce_mii_read(self, phy, reg)
 
 /* Write a PHY register on the MII */
 void
-bce_mii_write(self, phy, reg, val)
-	struct device  *self;
-	int             phy, reg, val;
+bce_mii_write(struct device *self, int phy, int reg, int val)
 {
 	struct bce_softc *sc = (struct bce_softc *) self;
 	int             i;
@@ -1466,8 +1438,7 @@ bce_mii_write(self, phy, reg, val)
 
 /* sync hardware duplex mode to software state */
 void
-bce_statchg(self)
-	struct device  *self;
+bce_statchg(struct device *self)
 {
 	struct bce_softc *sc = (struct bce_softc *) self;
 	u_int32_t reg;
@@ -1494,8 +1465,7 @@ bce_statchg(self)
 
 /* Set hardware to newly-selected media */
 int
-bce_mediachange(ifp)
-	struct ifnet   *ifp;
+bce_mediachange(struct ifnet *ifp)
 {
 	struct bce_softc *sc = ifp->if_softc;
 
@@ -1506,9 +1476,7 @@ bce_mediachange(ifp)
 
 /* Get the current interface media status */
 static void
-bce_mediastatus(ifp, ifmr)
-	struct ifnet   *ifp;
-	struct ifmediareq *ifmr;
+bce_mediastatus(struct ifnet *ifp, struct ifmediareq *ifmr)
 {
 	struct bce_softc *sc = ifp->if_softc;
 
@@ -1519,8 +1487,7 @@ bce_mediastatus(ifp, ifmr)
 
 /* One second timer, checks link status */
 static void
-bce_tick(v)
-	void           *v;
+bce_tick(void *v)
 {
 	struct bce_softc *sc = v;