Use ANSI prototypes and declarations.

Rename csr_{write|read}_* to aue_csr_* in keeping with NetBSD.

1 files changed, 123 insertions, 156 deletions

diff --git a/sys/dev/usb/if_aue.c b/sys/dev/usb/if_aue.c
index f1a0cfc..30455a6 100644
--- a/sys/dev/usb/if_aue.c
+++ b/sys/dev/usb/if_aue.c
@@ -159,49 +159,45 @@ Static struct aue_type aue_devs[] = {
 
 Static struct usb_qdat aue_qdat;
 
-Static int aue_match		(device_t);
-Static int aue_attach		(device_t);
-Static int aue_detach		(device_t);
-
-Static void aue_reset_pegasus_II(struct aue_softc *);
-Static int aue_tx_list_init	(struct aue_softc *);
-Static int aue_rx_list_init	(struct aue_softc *);
-Static int aue_newbuf		(struct aue_softc *, struct aue_chain *,
-				    struct mbuf *);
-Static int aue_encap		(struct aue_softc *, struct mbuf *, int);
+Static int aue_match(device_t);
+Static int aue_attach(device_t);
+Static int aue_detach(device_t);
+
+Static void aue_reset_pegasus_II(struct aue_softc *sc);
+Static int aue_tx_list_init(struct aue_softc *);
+Static int aue_rx_list_init(struct aue_softc *);
+Static int aue_newbuf(struct aue_softc *, struct aue_chain *, struct mbuf *);
+Static int aue_encap(struct aue_softc *, struct mbuf *, int);
 #ifdef AUE_INTR_PIPE
-Static void aue_intr		(usbd_xfer_handle,
-				    usbd_private_handle, usbd_status);
+Static void aue_intr(usbd_xfer_handle, usbd_private_handle, usbd_status);
 #endif
-Static void aue_rxeof		(usbd_xfer_handle,
-				    usbd_private_handle, usbd_status);
-Static void aue_txeof		(usbd_xfer_handle,
-				    usbd_private_handle, usbd_status);
-Static void aue_tick		(void *);
-Static void aue_rxstart		(struct ifnet *);
-Static void aue_start		(struct ifnet *);
-Static int aue_ioctl		(struct ifnet *, u_long, caddr_t);
-Static void aue_init		(void *);
-Static void aue_stop		(struct aue_softc *);
-Static void aue_watchdog		(struct ifnet *);
-Static void aue_shutdown		(device_t);
-Static int aue_ifmedia_upd	(struct ifnet *);
-Static void aue_ifmedia_sts	(struct ifnet *, struct ifmediareq *);
-
-Static void aue_eeprom_getword	(struct aue_softc *, int, u_int16_t *);
-Static void aue_read_eeprom	(struct aue_softc *, caddr_t, int, int, int);
-Static int aue_miibus_readreg	(device_t, int, int);
-Static int aue_miibus_writereg	(device_t, int, int, int);
-Static void aue_miibus_statchg	(device_t);
-
-Static void aue_setmulti	(struct aue_softc *);
-Static u_int32_t aue_crc	(caddr_t);
-Static void aue_reset		(struct aue_softc *);
-
-Static int csr_read_1		(struct aue_softc *, int);
-Static int csr_write_1		(struct aue_softc *, int, int);
-Static int csr_read_2		(struct aue_softc *, int);
-Static int csr_write_2		(struct aue_softc *, int, int);
+Static void aue_rxeof(usbd_xfer_handle, usbd_private_handle, usbd_status);
+Static void aue_txeof(usbd_xfer_handle, usbd_private_handle, usbd_status);
+Static void aue_tick(void *);
+Static void aue_rxstart(struct ifnet *);
+Static void aue_start(struct ifnet *);
+Static int aue_ioctl(struct ifnet *, u_long, caddr_t);
+Static void aue_init(void *);
+Static void aue_stop(struct aue_softc *);
+Static void aue_watchdog(struct ifnet *);
+Static void aue_shutdown(device_t);
+Static int aue_ifmedia_upd(struct ifnet *);
+Static void aue_ifmedia_sts(struct ifnet *, struct ifmediareq *);
+
+Static void aue_eeprom_getword(struct aue_softc *, int, u_int16_t *);
+Static void aue_read_eeprom(struct aue_softc *, caddr_t, int, int, int);
+Static int aue_miibus_readreg(device_t, int, int);
+Static int aue_miibus_writereg(device_t, int, int, int);
+Static void aue_miibus_statchg(device_t);
+
+Static void aue_setmulti(struct aue_softc *);
+Static u_int32_t aue_crc(caddr_t);
+Static void aue_reset(struct aue_softc *);
+
+Static int aue_csr_read_1(struct aue_softc *, int);
+Static int aue_csr_write_1(struct aue_softc *, int, int);
+Static int aue_csr_read_2(struct aue_softc *, int);
+Static int aue_csr_write_2(struct aue_softc *, int, int);
 
 Static device_method_t aue_methods[] = {
 	/* Device interface */
@@ -234,14 +230,13 @@ DRIVER_MODULE(if_aue, uhub, aue_driver, aue_devclass, usbd_driver_load, 0);
 DRIVER_MODULE(miibus, aue, miibus_driver, miibus_devclass, 0, 0);
 
 #define AUE_SETBIT(sc, reg, x)				\
-	csr_write_1(sc, reg, csr_read_1(sc, reg) | (x))
+	aue_csr_write_1(sc, reg, aue_csr_read_1(sc, reg) | (x))
 
 #define AUE_CLRBIT(sc, reg, x)				\
-	csr_write_1(sc, reg, csr_read_1(sc, reg) & ~(x))
+	aue_csr_write_1(sc, reg, aue_csr_read_1(sc, reg) & ~(x))
 
-Static int csr_read_1(sc, reg)
-	struct aue_softc	*sc;
-	int			reg;
+Static int
+aue_csr_read_1(struct aue_softc *sc, int reg)
 {
 	usb_device_request_t	req;
 	usbd_status		err;
@@ -269,9 +264,8 @@ Static int csr_read_1(sc, reg)
 	return(val);
 }
 
-Static int csr_read_2(sc, reg)
-	struct aue_softc	*sc;
-	int			reg;
+Static int
+aue_csr_read_2(struct aue_softc *sc, int reg)
 {
 	usb_device_request_t	req;
 	usbd_status		err;
@@ -299,9 +293,8 @@ Static int csr_read_2(sc, reg)
 	return(val);
 }
 
-Static int csr_write_1(sc, reg, val)
-	struct aue_softc	*sc;
-	int			reg, val;
+Static int
+aue_csr_write_1(struct aue_softc *sc, int reg, int val)
 {
 	usb_device_request_t	req;
 	usbd_status		err;
@@ -328,9 +321,8 @@ Static int csr_write_1(sc, reg, val)
 	return(0);
 }
 
-Static int csr_write_2(sc, reg, val)
-	struct aue_softc	*sc;
-	int			reg, val;
+Static int
+aue_csr_write_2(struct aue_softc *sc, int reg, int val)
 {
 	usb_device_request_t	req;
 	usbd_status		err;
@@ -360,19 +352,17 @@ Static int csr_write_2(sc, reg, val)
 /*
  * Read a word of data stored in the EEPROM at address 'addr.'
  */
-Static void aue_eeprom_getword(sc, addr, dest)
-	struct aue_softc	*sc;
-	int			addr;
-	u_int16_t		*dest;
+Static void
+aue_eeprom_getword(struct aue_softc *sc, int addr, u_int16_t *dest)
 {
 	register int		i;
 	u_int16_t		word = 0;
 
-	csr_write_1(sc, AUE_EE_REG, addr);
-	csr_write_1(sc, AUE_EE_CTL, AUE_EECTL_READ);
+	aue_csr_write_1(sc, AUE_EE_REG, addr);
+	aue_csr_write_1(sc, AUE_EE_CTL, AUE_EECTL_READ);
 
 	for (i = 0; i < AUE_TIMEOUT; i++) {
-		if (csr_read_1(sc, AUE_EE_CTL) &
+		if (aue_csr_read_1(sc, AUE_EE_CTL) &
 		    AUE_EECTL_DONE)
 			break;
 	}
@@ -382,7 +372,7 @@ Static void aue_eeprom_getword(sc, addr, dest)
 		    sc->aue_unit);
 	}
 
-	word = csr_read_2(sc, AUE_EE_DATA);
+	word = aue_csr_read_2(sc, AUE_EE_DATA);
 	*dest = word;
 
 	return;
@@ -391,12 +381,8 @@ Static void aue_eeprom_getword(sc, addr, dest)
 /*
  * Read a sequence of words from the EEPROM.
  */
-Static void aue_read_eeprom(sc, dest, off, cnt, swap)
-	struct aue_softc	*sc;
-	caddr_t			dest;
-	int			off;
-	int			cnt;
-	int			swap;
+Static void
+aue_read_eeprom(struct aue_softc *sc, caddr_t dest, int off, int cnt, int swap)
 {
 	int			i;
 	u_int16_t		word = 0, *ptr;
@@ -413,9 +399,8 @@ Static void aue_read_eeprom(sc, dest, off, cnt, swap)
 	return;
 }
 
-Static int aue_miibus_readreg(dev, phy, reg)
-	device_t		dev;
-	int			phy, reg;
+Static int
+aue_miibus_readreg(device_t dev, int phy, int reg)
 {
 	struct aue_softc	*sc;
 	int			i;
@@ -443,11 +428,11 @@ Static int aue_miibus_readreg(dev, phy, reg)
 #endif
 	}
 
-	csr_write_1(sc, AUE_PHY_ADDR, phy);
-	csr_write_1(sc, AUE_PHY_CTL, reg|AUE_PHYCTL_READ);
+	aue_csr_write_1(sc, AUE_PHY_ADDR, phy);
+	aue_csr_write_1(sc, AUE_PHY_CTL, reg|AUE_PHYCTL_READ);
 
 	for (i = 0; i < AUE_TIMEOUT; i++) {
-		if (csr_read_1(sc, AUE_PHY_CTL) &
+		if (aue_csr_read_1(sc, AUE_PHY_CTL) &
 		    AUE_PHYCTL_DONE)
 			break;
 	}
@@ -457,14 +442,12 @@ Static int aue_miibus_readreg(dev, phy, reg)
 		    sc->aue_unit);
 	}
 
-	val = csr_read_2(sc, AUE_PHY_DATA);
+	val = aue_csr_read_2(sc, AUE_PHY_DATA);
 
 	return(val);
 }
 
-Static int aue_miibus_writereg(dev, phy, reg, data)
-	device_t		dev;
-	int			phy, reg, data;
+Static int aue_miibus_writereg(device_t dev, int phy, int reg, int data)
 {
 	struct aue_softc	*sc;
 	int			i;
@@ -474,12 +457,12 @@ Static int aue_miibus_writereg(dev, phy, reg, data)
 
 	sc = device_get_softc(dev);
 
-	csr_write_2(sc, AUE_PHY_DATA, data);
-	csr_write_1(sc, AUE_PHY_ADDR, phy);
-	csr_write_1(sc, AUE_PHY_CTL, reg|AUE_PHYCTL_WRITE);
+	aue_csr_write_2(sc, AUE_PHY_DATA, data);
+	aue_csr_write_1(sc, AUE_PHY_ADDR, phy);
+	aue_csr_write_1(sc, AUE_PHY_CTL, reg|AUE_PHYCTL_WRITE);
 
 	for (i = 0; i < AUE_TIMEOUT; i++) {
-		if (csr_read_1(sc, AUE_PHY_CTL) &
+		if (aue_csr_read_1(sc, AUE_PHY_CTL) &
 		    AUE_PHYCTL_DONE)
 			break;
 	}
@@ -492,8 +475,7 @@ Static int aue_miibus_writereg(dev, phy, reg, data)
 	return(0);
 }
 
-Static void aue_miibus_statchg(dev)
-	device_t		dev;
+Static void aue_miibus_statchg(device_t dev)
 {
 	struct aue_softc	*sc;
 	struct mii_data		*mii;
@@ -532,8 +514,8 @@ Static void aue_miibus_statchg(dev)
 #define AUE_POLY	0xEDB88320
 #define AUE_BITS	6
 
-Static u_int32_t aue_crc(addr)
-	caddr_t			addr;
+Static u_int32_t
+aue_crc(caddr_t addr)
 {
 	u_int32_t		idx, bit, data, crc;
 
@@ -548,8 +530,8 @@ Static u_int32_t aue_crc(addr)
 	return (crc & ((1 << AUE_BITS) - 1));
 }
 
-Static void aue_setmulti(sc)
-	struct aue_softc	*sc;
+Static void
+aue_setmulti(struct aue_softc *sc)
 {
 	struct ifnet		*ifp;
 	struct ifmultiaddr	*ifma;
@@ -566,7 +548,7 @@ Static void aue_setmulti(sc)
 
 	/* first, zot all the existing hash bits */
 	for (i = 0; i < 8; i++)
-		csr_write_1(sc, AUE_MAR0 + i, 0);
+		aue_csr_write_1(sc, AUE_MAR0 + i, 0);
 
 	/* now program new ones */
 	TAILQ_FOREACH(ifma, &ifp->if_multiaddrs, ifma_link) {
@@ -580,29 +562,27 @@ Static void aue_setmulti(sc)
 }
 
 Static void
-aue_reset_pegasus_II(sc)
-	struct aue_softc	*sc;
+aue_reset_pegasus_II(struct aue_softc *sc)
 {
 	/* Magic constants taken from Linux driver. */
-	csr_write_1(sc, AUE_REG_1D, 0);
-	csr_write_1(sc, AUE_REG_7B, 2);
+	aue_csr_write_1(sc, AUE_REG_1D, 0);
+	aue_csr_write_1(sc, AUE_REG_7B, 2);
 #if 0
 	if ((sc->aue_flags & HAS_HOME_PNA) && mii_mode)
-		csr_write_1(sc, AUE_REG_81, 6);
+		aue_csr_write_1(sc, AUE_REG_81, 6);
 	else
 #endif
-		csr_write_1(sc, AUE_REG_81, 2);
+		aue_csr_write_1(sc, AUE_REG_81, 2);
 }
 
-Static void aue_reset(sc)
-	struct aue_softc	*sc;
+Static void aue_reset(struct aue_softc *sc)
 {
 	register int		i;
 
 	AUE_SETBIT(sc, AUE_CTL1, AUE_CTL1_RESETMAC);
 
 	for (i = 0; i < AUE_TIMEOUT; i++) {
-		if (!(csr_read_1(sc, AUE_CTL1) & AUE_CTL1_RESETMAC))
+		if (!(aue_csr_read_1(sc, AUE_CTL1) & AUE_CTL1_RESETMAC))
 			break;
 	}
 
@@ -618,13 +598,13 @@ Static void aue_reset(sc)
 	 * Note: We force all of the GPIO pins low first, *then*
 	 * enable the ones we want.
 	 */
-	csr_write_1(sc, AUE_GPIO0, AUE_GPIO_OUT0|AUE_GPIO_SEL0);
-	csr_write_1(sc, AUE_GPIO0, AUE_GPIO_OUT0|AUE_GPIO_SEL0|AUE_GPIO_SEL1);
+	aue_csr_write_1(sc, AUE_GPIO0, AUE_GPIO_OUT0|AUE_GPIO_SEL0);
+	aue_csr_write_1(sc, AUE_GPIO0, AUE_GPIO_OUT0|AUE_GPIO_SEL0|AUE_GPIO_SEL1);
 
 	/* Grrr. LinkSys has to be different from everyone else. */
 	if (sc->aue_info->aue_flags & LSYS) {
-		csr_write_1(sc, AUE_GPIO0, AUE_GPIO_SEL0|AUE_GPIO_SEL1);
-		csr_write_1(sc, AUE_GPIO0, AUE_GPIO_SEL0|AUE_GPIO_SEL1|
+		aue_csr_write_1(sc, AUE_GPIO0, AUE_GPIO_SEL0|AUE_GPIO_SEL1);
+		aue_csr_write_1(sc, AUE_GPIO0, AUE_GPIO_SEL0|AUE_GPIO_SEL1|
 			AUE_GPIO_OUT0);
 	}
 
@@ -791,8 +771,8 @@ USB_ATTACH(aue)
 	USB_ATTACH_SUCCESS_RETURN;
 }
 
-Static int aue_detach(dev)
-	device_t		dev;
+Static int
+aue_detach(device_t dev)
 {
 	struct aue_softc	*sc;
 	struct ifnet		*ifp;
@@ -823,10 +803,8 @@ Static int aue_detach(dev)
 /*
  * Initialize an RX descriptor and attach an MBUF cluster.
  */
-Static int aue_newbuf(sc, c, m)
-	struct aue_softc	*sc;
-	struct aue_chain	*c;
-	struct mbuf		*m;
+Static int
+aue_newbuf(struct aue_softc *sc, struct aue_chain *c, struct mbuf *m)
 {
 	struct mbuf		*m_new = NULL;
 
@@ -858,8 +836,8 @@ Static int aue_newbuf(sc, c, m)
 	return(0);
 }
 
-Static int aue_rx_list_init(sc)
-	struct aue_softc	*sc;
+Static int
+aue_rx_list_init(struct aue_softc *sc)
 {
 	struct aue_cdata	*cd;
 	struct aue_chain	*c;
@@ -882,8 +860,8 @@ Static int aue_rx_list_init(sc)
 	return(0);
 }
 
-Static int aue_tx_list_init(sc)
-	struct aue_softc	*sc;
+Static int
+aue_tx_list_init(struct aue_softc *sc)
 {
 	struct aue_cdata	*cd;
 	struct aue_chain	*c;
@@ -909,10 +887,8 @@ Static int aue_tx_list_init(sc)
 }
 
 #ifdef AUE_INTR_PIPE
-Static void aue_intr(xfer, priv, status)
-	usbd_xfer_handle	xfer;
-	usbd_private_handle	priv;
-	usbd_status		status;
+Static void
+aue_intr(usbd_xfer_handle xfer, usbd_private_handle priv, usbd_status status)
 {
 	struct aue_softc	*sc;
 	struct ifnet		*ifp;
@@ -953,8 +929,8 @@ Static void aue_intr(xfer, priv, status)
 }
 #endif
 
-Static void aue_rxstart(ifp)
-	struct ifnet		*ifp;
+Static void
+aue_rxstart(struct ifnet *ifp)
 {
 	struct aue_softc	*sc;
 	struct aue_chain	*c;
@@ -983,10 +959,8 @@ Static void aue_rxstart(ifp)
  * A frame has been uploaded: pass the resulting mbuf chain up to
  * the higher level protocols.
  */
-Static void aue_rxeof(xfer, priv, status)
-	usbd_xfer_handle	xfer;
-	usbd_private_handle	priv;
-	usbd_status		status;
+Static void
+aue_rxeof(usbd_xfer_handle xfer, usbd_private_handle priv, usbd_status status)
 {
 	struct aue_softc	*sc;
 	struct aue_chain	*c;
@@ -1065,10 +1039,8 @@ done:
  * the list buffers.
  */
 
-Static void aue_txeof(xfer, priv, status)
-	usbd_xfer_handle	xfer;
-	usbd_private_handle	priv;
-	usbd_status		status;
+Static void
+aue_txeof(usbd_xfer_handle xfer, usbd_private_handle priv, usbd_status status)
 {
 	struct aue_softc	*sc;
 	struct aue_chain	*c;
@@ -1113,8 +1085,8 @@ Static void aue_txeof(xfer, priv, status)
 	return;
 }
 
-Static void aue_tick(xsc)
-	void			*xsc;
+Static void
+aue_tick(void *xsc)
 {
 	struct aue_softc	*sc;
 	struct ifnet		*ifp;
@@ -1149,10 +1121,8 @@ Static void aue_tick(xsc)
 	return;
 }
 
-Static int aue_encap(sc, m, idx)
-	struct aue_softc	*sc;
-	struct mbuf		*m;
-	int			idx;
+Static int
+aue_encap(struct aue_softc *sc, struct mbuf *m, int idx)
 {
 	int			total_len;
 	struct aue_chain	*c;
@@ -1194,8 +1164,8 @@ Static int aue_encap(sc, m, idx)
 	return(0);
 }
 
-Static void aue_start(ifp)
-	struct ifnet		*ifp;
+Static void
+aue_start(struct ifnet *ifp)
 {
 	struct aue_softc	*sc;
 	struct mbuf		*m_head = NULL;
@@ -1244,8 +1214,8 @@ Static void aue_start(ifp)
 	return;
 }
 
-Static void aue_init(xsc)
-	void			*xsc;
+Static void
+aue_init(void *xsc)
 {
 	struct aue_softc	*sc = xsc;
 	struct ifnet		*ifp = &sc->arpcom.ac_if;
@@ -1270,7 +1240,7 @@ Static void aue_init(xsc)
 
 	/* Set MAC address */
 	for (i = 0; i < ETHER_ADDR_LEN; i++)
-		csr_write_1(sc, AUE_PAR0 + i, sc->arpcom.ac_enaddr[i]);
+		aue_csr_write_1(sc, AUE_PAR0 + i, sc->arpcom.ac_enaddr[i]);
 
 	 /* If we want promiscuous mode, set the allframes bit. */
 	if (ifp->if_flags & IFF_PROMISC) {
@@ -1301,7 +1271,7 @@ Static void aue_init(xsc)
 	aue_setmulti(sc);
 
 	/* Enable RX and TX */
-	csr_write_1(sc, AUE_CTL0, AUE_CTL0_RXSTAT_APPEND|AUE_CTL0_RX_ENB);
+	aue_csr_write_1(sc, AUE_CTL0, AUE_CTL0_RXSTAT_APPEND|AUE_CTL0_RX_ENB);
 	AUE_SETBIT(sc, AUE_CTL0, AUE_CTL0_TX_ENB);
 	AUE_SETBIT(sc, AUE_CTL2, AUE_CTL2_EP3_CLR);
 	mii_mediachg(mii);
@@ -1359,8 +1329,8 @@ Static void aue_init(xsc)
 /*
  * Set media options.
  */
-Static int aue_ifmedia_upd(ifp)
-	struct ifnet		*ifp;
+Static int
+aue_ifmedia_upd(struct ifnet *ifp)
 {
 	struct aue_softc	*sc;
 	struct mii_data		*mii;
@@ -1382,9 +1352,8 @@ Static int aue_ifmedia_upd(ifp)
 /*
  * Report current media status.
  */
-Static void aue_ifmedia_sts(ifp, ifmr)
-	struct ifnet		*ifp;
-	struct ifmediareq	*ifmr;
+Static void
+aue_ifmedia_sts(struct ifnet *ifp, struct ifmediareq *ifmr)
 {
 	struct aue_softc	*sc;
 	struct mii_data		*mii;
@@ -1399,10 +1368,8 @@ Static void aue_ifmedia_sts(ifp, ifmr)
 	return;
 }
 
-Static int aue_ioctl(ifp, command, data)
-	struct ifnet		*ifp;
-	u_long			command;
-	caddr_t			data;
+Static int
+aue_ioctl(struct ifnet *ifp, u_long command, caddr_t data)
 {
 	struct aue_softc	*sc = ifp->if_softc;
 	struct ifreq		*ifr = (struct ifreq *) data;
@@ -1456,8 +1423,8 @@ Static int aue_ioctl(ifp, command, data)
 	return(error);
 }
 
-Static void aue_watchdog(ifp)
-	struct ifnet		*ifp;
+Static void
+aue_watchdog(struct ifnet *ifp)
 {
 	struct aue_softc	*sc;
 	struct aue_chain	*c;
@@ -1483,8 +1450,8 @@ Static void aue_watchdog(ifp)
  * Stop the adapter and free any mbufs allocated to the
  * RX and TX lists.
  */
-Static void aue_stop(sc)
-	struct aue_softc	*sc;
+Static void
+aue_stop(struct aue_softc *sc)
 {
 	usbd_status		err;
 	struct ifnet		*ifp;
@@ -1494,8 +1461,8 @@ Static void aue_stop(sc)
 	ifp = &sc->arpcom.ac_if;
 	ifp->if_timer = 0;
 
-	csr_write_1(sc, AUE_CTL0, 0);
-	csr_write_1(sc, AUE_CTL1, 0);
+	aue_csr_write_1(sc, AUE_CTL0, 0);
+	aue_csr_write_1(sc, AUE_CTL1, 0);
 	aue_reset(sc);
 	untimeout(aue_tick, sc, sc->aue_stat_ch);
 
@@ -1593,8 +1560,8 @@ Static void aue_stop(sc)
  * Stop all chip I/O so that the kernel's probe routines don't
  * get confused by errant DMAs when rebooting.
  */
-Static void aue_shutdown(dev)
-	device_t		dev;
+Static void
+aue_shutdown(device_t dev)
 {
 	struct aue_softc	*sc;