Use ANSI prototypes and declarations.

2 files changed, 144 insertions, 188 deletions

diff --git a/sys/dev/usb/if_cue.c b/sys/dev/usb/if_cue.c
index 1a3a69edaa28..3a47790eaad8 100644
--- a/sys/dev/usb/if_cue.c
+++ b/sys/dev/usb/if_cue.c
@@ -93,40 +93,37 @@ Static struct cue_type cue_devs[] = {
 
 Static struct usb_qdat cue_qdat;
 
-Static int cue_match		(device_t);
-Static int cue_attach		(device_t);
-Static int cue_detach		(device_t);
-
-Static int cue_tx_list_init	(struct cue_softc *);
-Static int cue_rx_list_init	(struct cue_softc *);
-Static int cue_newbuf		(struct cue_softc *, struct cue_chain *,
-				    struct mbuf *);
-Static int cue_encap		(struct cue_softc *, struct mbuf *, int);
-Static void cue_rxeof		(usbd_xfer_handle,
-				    usbd_private_handle, usbd_status);
-Static void cue_txeof		(usbd_xfer_handle,
-				    usbd_private_handle, usbd_status);
-Static void cue_tick		(void *);
-Static void cue_rxstart		(struct ifnet *);
-Static void cue_start		(struct ifnet *);
-Static int cue_ioctl		(struct ifnet *, u_long, caddr_t);
-Static void cue_init		(void *);
-Static void cue_stop		(struct cue_softc *);
-Static void cue_watchdog		(struct ifnet *);
-Static void cue_shutdown		(device_t);
-
-Static void cue_setmulti	(struct cue_softc *);
-Static u_int32_t cue_crc	(caddr_t);
-Static void cue_reset		(struct cue_softc *);
-
-Static int csr_read_1		(struct cue_softc *, int);
-Static int csr_write_1		(struct cue_softc *, int, int);
-Static int csr_read_2		(struct cue_softc *, int);
+Static int cue_match(device_t);
+Static int cue_attach(device_t);
+Static int cue_detach(device_t);
+
+Static int cue_tx_list_init(struct cue_softc *);
+Static int cue_rx_list_init(struct cue_softc *);
+Static int cue_newbuf(struct cue_softc *, struct cue_chain *, struct mbuf *);
+Static int cue_encap(struct cue_softc *, struct mbuf *, int);
+Static void cue_rxeof(usbd_xfer_handle, usbd_private_handle, usbd_status);
+Static void cue_txeof(usbd_xfer_handle, usbd_private_handle, usbd_status);
+Static void cue_tick(void *);
+Static void cue_rxstart(struct ifnet *);
+Static void cue_start(struct ifnet *);
+Static int cue_ioctl(struct ifnet *, u_long, caddr_t);
+Static void cue_init(void *);
+Static void cue_stop(struct cue_softc *);
+Static void cue_watchdog(struct ifnet *);
+Static void cue_shutdown(device_t);
+
+Static void cue_setmulti(struct cue_softc *);
+Static u_int32_t cue_crc(caddr_t);
+Static void cue_reset(struct cue_softc *);
+
+Static int csr_read_1(struct cue_softc *, int);
+Static int csr_write_1(struct cue_softc *, int, int);
+Static int csr_read_2(struct cue_softc *, int);
 #ifdef notdef
-Static int csr_write_2		(struct cue_softc *, int, int);
+Static int csr_write_2(struct cue_softc *, int, int);
 #endif
-Static int cue_mem		(struct cue_softc *, int, int, void *, int);
-Static int cue_getmac		(struct cue_softc *, void *);
+Static int cue_mem(struct cue_softc *, int, int, void *, int);
+Static int cue_getmac(struct cue_softc *, void *);
 
 Static device_method_t cue_methods[] = {
 	/* Device interface */
@@ -155,9 +152,8 @@ MODULE_DEPEND(if_cue, usb, 1, 1, 1);
 #define CUE_CLRBIT(sc, reg, x)				\
 	csr_write_1(sc, reg, csr_read_1(sc, reg) & ~(x))
 
-Static int csr_read_1(sc, reg)
-	struct cue_softc	*sc;
-	int			reg;
+Static int
+csr_read_1(struct cue_softc *sc, int reg)
 {
 	usb_device_request_t	req;
 	usbd_status		err;
@@ -185,9 +181,8 @@ Static int csr_read_1(sc, reg)
 	return(val);
 }
 
-Static int csr_read_2(sc, reg)
-	struct cue_softc	*sc;
-	int			reg;
+Static int
+csr_read_2(struct cue_softc *sc, int reg)
 {
 	usb_device_request_t	req;
 	usbd_status		err;
@@ -215,9 +210,8 @@ Static int csr_read_2(sc, reg)
 	return(val);
 }
 
-Static int csr_write_1(sc, reg, val)
-	struct cue_softc	*sc;
-	int			reg, val;
+Static int
+csr_write_1(struct cue_softc *sc, int reg, int val)
 {
 	usb_device_request_t	req;
 	usbd_status		err;
@@ -245,9 +239,8 @@ Static int csr_write_1(sc, reg, val)
 }
 
 #ifdef notdef
-Static int csr_write_2(sc, reg, val)
-	struct cue_softc	*sc;
-	int			reg, val;
+Static int
+csr_write_2(struct cue_softc *sc, int reg, int val)
 {
 	usb_device_request_t	req;
 	usbd_status		err;
@@ -275,12 +268,8 @@ Static int csr_write_2(sc, reg, val)
 }
 #endif
 
-Static int cue_mem(sc, cmd, addr, buf, len)
-	struct cue_softc	*sc;
-	int			cmd;
-	int			addr;
-	void			*buf;
-	int			len;
+Static int
+cue_mem(struct cue_softc *sc, int cmd, int addr, void *buf, int len)
 {
 	usb_device_request_t	req;
 	usbd_status		err;
@@ -310,9 +299,8 @@ Static int cue_mem(sc, cmd, addr, buf, len)
 	return(0);
 }
 
-Static int cue_getmac(sc, buf)
-	struct cue_softc	*sc;
-	void			*buf;
+Static int
+cue_getmac(struct cue_softc *sc, void *buf)
 {
 	usb_device_request_t	req;
 	usbd_status		err;
@@ -344,8 +332,8 @@ Static int cue_getmac(sc, buf)
 #define CUE_POLY	0xEDB88320
 #define CUE_BITS	9
 
-Static u_int32_t cue_crc(addr)
-	caddr_t			addr;
+Static u_int32_t
+cue_crc(caddr_t addr)
 {
 	u_int32_t		idx, bit, data, crc;
 
@@ -360,8 +348,8 @@ Static u_int32_t cue_crc(addr)
 	return (crc & ((1 << CUE_BITS) - 1));
 }
 
-Static void cue_setmulti(sc)
-	struct cue_softc	*sc;
+Static void
+cue_setmulti(struct cue_softc *sc)
 {
 	struct ifnet		*ifp;
 	struct ifmultiaddr	*ifma;
@@ -404,8 +392,8 @@ Static void cue_setmulti(sc)
 	return;
 }
 
-Static void cue_reset(sc)
-	struct cue_softc	*sc;
+Static void
+cue_reset(struct cue_softc *sc)
 {
 	usb_device_request_t	req;
 	usbd_status		err;
@@ -552,8 +540,8 @@ USB_ATTACH(cue)
 	USB_ATTACH_SUCCESS_RETURN;
 }
 
-Static int cue_detach(dev)
-	device_t		dev;
+Static int
+cue_detach(device_t dev)
 {
 	struct cue_softc	*sc;
 	struct ifnet		*ifp;
@@ -582,10 +570,8 @@ Static int cue_detach(dev)
 /*
  * Initialize an RX descriptor and attach an MBUF cluster.
  */
-Static int cue_newbuf(sc, c, m)
-	struct cue_softc	*sc;
-	struct cue_chain	*c;
-	struct mbuf		*m;
+Static int
+cue_newbuf(struct cue_softc *sc, struct cue_chain *c, struct mbuf *m)
 {
 	struct mbuf		*m_new = NULL;
 
@@ -617,8 +603,8 @@ Static int cue_newbuf(sc, c, m)
 	return(0);
 }
 
-Static int cue_rx_list_init(sc)
-	struct cue_softc	*sc;
+Static int
+cue_rx_list_init(struct cue_softc *sc)
 {
 	struct cue_cdata	*cd;
 	struct cue_chain	*c;
@@ -641,8 +627,8 @@ Static int cue_rx_list_init(sc)
 	return(0);
 }
 
-Static int cue_tx_list_init(sc)
-	struct cue_softc	*sc;
+Static int
+cue_tx_list_init(struct cue_softc *sc)
 {
 	struct cue_cdata	*cd;
 	struct cue_chain	*c;
@@ -667,8 +653,8 @@ Static int cue_tx_list_init(sc)
 	return(0);
 }
 
-Static void cue_rxstart(ifp)
-	struct ifnet		*ifp;
+Static void
+cue_rxstart(struct ifnet *ifp)
 {
 	struct cue_softc	*sc;
 	struct cue_chain	*c;
@@ -697,10 +683,8 @@ Static void cue_rxstart(ifp)
  * A frame has been uploaded: pass the resulting mbuf chain up to
  * the higher level protocols.
  */
-Static void cue_rxeof(xfer, priv, status)
-	usbd_xfer_handle	xfer;
-	usbd_private_handle	priv;
-	usbd_status		status;
+Static void
+cue_rxeof(usbd_xfer_handle xfer, usbd_private_handle priv, usbd_status status)
 {
 	struct cue_softc	*sc;
 	struct cue_chain	*c;
@@ -770,10 +754,8 @@ done:
  * the list buffers.
  */
 
-Static void cue_txeof(xfer, priv, status)
-	usbd_xfer_handle	xfer;
-	usbd_private_handle	priv;
-	usbd_status		status;
+Static void
+cue_txeof(usbd_xfer_handle xfer, usbd_private_handle priv, usbd_status status)
 {
 	struct cue_softc	*sc;
 	struct cue_chain	*c;
@@ -818,8 +800,8 @@ Static void cue_txeof(xfer, priv, status)
 	return;
 }
 
-Static void cue_tick(xsc)
-	void			*xsc;
+Static void
+cue_tick(void *xsc)
 {
 	struct cue_softc	*sc;
 	struct ifnet		*ifp;
@@ -847,10 +829,8 @@ Static void cue_tick(xsc)
 	return;
 }
 
-Static int cue_encap(sc, m, idx)
-	struct cue_softc	*sc;
-	struct mbuf		*m;
-	int			idx;
+Static int
+cue_encap(struct cue_softc *sc, struct mbuf *m, int idx)
 {
 	int			total_len;
 	struct cue_chain	*c;
@@ -886,8 +866,8 @@ Static int cue_encap(sc, m, idx)
 	return(0);
 }
 
-Static void cue_start(ifp)
-	struct ifnet		*ifp;
+Static void
+cue_start(struct ifnet *ifp)
 {
 	struct cue_softc	*sc;
 	struct mbuf		*m_head = NULL;
@@ -931,8 +911,8 @@ Static void cue_start(ifp)
 	return;
 }
 
-Static void cue_init(xsc)
-	void			*xsc;
+Static void
+cue_init(void *xsc)
 {
 	struct cue_softc	*sc = xsc;
 	struct ifnet		*ifp = &sc->arpcom.ac_if;
@@ -1034,10 +1014,8 @@ Static void cue_init(xsc)
 	return;
 }
 
-Static int cue_ioctl(ifp, command, data)
-	struct ifnet		*ifp;
-	u_long			command;
-	caddr_t			data;
+Static int
+cue_ioctl(struct ifnet *ifp, u_long command, caddr_t data)
 {
 	struct cue_softc	*sc = ifp->if_softc;
 	int			error = 0;
@@ -1086,8 +1064,8 @@ Static int cue_ioctl(ifp, command, data)
 	return(error);
 }
 
-Static void cue_watchdog(ifp)
-	struct ifnet		*ifp;
+Static void
+cue_watchdog(struct ifnet *ifp)
 {
 	struct cue_softc	*sc;
 	struct cue_chain	*c;
@@ -1114,8 +1092,8 @@ Static void cue_watchdog(ifp)
  * Stop the adapter and free any mbufs allocated to the
  * RX and TX lists.
  */
-Static void cue_stop(sc)
-	struct cue_softc	*sc;
+Static void
+cue_stop(struct cue_softc *sc)
 {
 	usbd_status		err;
 	struct ifnet		*ifp;
@@ -1215,8 +1193,8 @@ Static void cue_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 cue_shutdown(dev)
-	device_t		dev;
+Static void
+cue_shutdown(device_t dev)
 {
 	struct cue_softc	*sc;
 
diff --git a/sys/dev/usb/if_kue.c b/sys/dev/usb/if_kue.c
index 8b9261a3a8be..f7e11340ea71 100644
--- a/sys/dev/usb/if_kue.c
+++ b/sys/dev/usb/if_kue.c
@@ -125,36 +125,32 @@ Static struct kue_type kue_devs[] = {
 
 Static struct usb_qdat kue_qdat;
 
-Static int kue_match		(device_t);
-Static int kue_attach		(device_t);
-Static int kue_detach		(device_t);
-Static void kue_shutdown		(device_t);
-Static int kue_tx_list_init	(struct kue_softc *);
-Static int kue_rx_list_init	(struct kue_softc *);
-Static int kue_newbuf		(struct kue_softc *, struct kue_chain *,
-				    struct mbuf *);
-Static int kue_encap		(struct kue_softc *, struct mbuf *, int);
-Static void kue_rxeof		(usbd_xfer_handle,
-				    usbd_private_handle, usbd_status);
-Static void kue_txeof		(usbd_xfer_handle,
-				    usbd_private_handle, usbd_status);
-Static void kue_start		(struct ifnet *);
-Static void kue_rxstart		(struct ifnet *);
-Static int kue_ioctl		(struct ifnet *, u_long, caddr_t);
-Static void kue_init		(void *);
-Static void kue_stop		(struct kue_softc *);
-Static void kue_watchdog		(struct ifnet *);
-
-Static void kue_setmulti	(struct kue_softc *);
-Static void kue_reset		(struct kue_softc *);
-
-Static usbd_status kue_do_request
-				(usbd_device_handle,
-				    usb_device_request_t *, void *);
-Static usbd_status kue_ctl	(struct kue_softc *, int, u_int8_t,
-				    u_int16_t, char *, int);
-Static usbd_status kue_setword	(struct kue_softc *, u_int8_t, u_int16_t);
-Static int kue_load_fw		(struct kue_softc *);
+Static int kue_match(device_t);
+Static int kue_attach(device_t);
+Static int kue_detach(device_t);
+Static void kue_shutdown(device_t);
+Static int kue_tx_list_init(struct kue_softc *);
+Static int kue_rx_list_init(struct kue_softc *);
+Static int kue_newbuf(struct kue_softc *, struct kue_chain *, struct mbuf *);
+Static int kue_encap(struct kue_softc *, struct mbuf *, int);
+Static void kue_rxeof(usbd_xfer_handle, usbd_private_handle, usbd_status);
+Static void kue_txeof(usbd_xfer_handle, usbd_private_handle, usbd_status);
+Static void kue_start(struct ifnet *);
+Static void kue_rxstart(struct ifnet *);
+Static int kue_ioctl(struct ifnet *, u_long, caddr_t);
+Static void kue_init(void *);
+Static void kue_stop(struct kue_softc *);
+Static void kue_watchdog(struct ifnet *);
+
+Static void kue_setmulti(struct kue_softc *);
+Static void kue_reset(struct kue_softc *);
+
+Static usbd_status kue_do_request(usbd_device_handle,
+				  usb_device_request_t *, void *);
+Static usbd_status kue_ctl(struct kue_softc *, int, u_int8_t,
+			   u_int16_t, char *, int);
+Static usbd_status kue_setword(struct kue_softc *, u_int8_t, u_int16_t);
+Static int kue_load_fw(struct kue_softc *);
 
 Static device_method_t kue_methods[] = {
 	/* Device interface */
@@ -183,10 +179,8 @@ DRIVER_MODULE(if_kue, uhub, kue_driver, kue_devclass, usbd_driver_load, 0);
  * to download the firmware to the device, which can take longer
  * than the default timeout.
  */
-Static usbd_status kue_do_request(dev, req, data)
-	usbd_device_handle	dev;
-	usb_device_request_t	*req;
-	void			*data;
+Static usbd_status
+kue_do_request(usbd_device_handle dev, usb_device_request_t *req, void *data)
 {
 	usbd_xfer_handle	xfer;
 	usbd_status		err;
@@ -199,10 +193,8 @@ Static usbd_status kue_do_request(dev, req, data)
 	return(err);
 }
 
-Static usbd_status kue_setword(sc, breq, word)
-	struct kue_softc	*sc;
-	u_int8_t		breq;
-	u_int16_t		word;
+Static usbd_status
+kue_setword(struct kue_softc *sc, u_int8_t breq, u_int16_t word)
 {
 	usbd_device_handle	dev;
 	usb_device_request_t	req;
@@ -229,13 +221,9 @@ Static usbd_status kue_setword(sc, breq, word)
 	return(err);
 }
 
-Static usbd_status kue_ctl(sc, rw, breq, val, data, len)
-	struct kue_softc	*sc;
-	int			rw;
-	u_int8_t		breq;
-	u_int16_t		val;
-	char			*data;
-	int			len;
+Static usbd_status
+kue_ctl(struct kue_softc *sc, int rw, u_int8_t breq, u_int16_t val,
+	char *data, int len)
 {
 	usbd_device_handle	dev;
 	usb_device_request_t	req;
@@ -265,8 +253,8 @@ Static usbd_status kue_ctl(sc, rw, breq, val, data, len)
 	return(err);
 }
 
-Static int kue_load_fw(sc)
-	struct kue_softc	*sc;
+Static int
+kue_load_fw(struct kue_softc *sc)
 {
 	usbd_status		err;
 	usb_device_descriptor_t	*dd;
@@ -322,8 +310,8 @@ Static int kue_load_fw(sc)
 	return(0);
 }
 
-Static void kue_setmulti(sc)
-	struct kue_softc	*sc;
+Static void
+kue_setmulti(struct kue_softc *sc)
 {
 	struct ifnet		*ifp;
 	struct ifmultiaddr	*ifma;
@@ -372,8 +360,8 @@ Static void kue_setmulti(sc)
  * done after the firmware is loaded into the adapter in order to
  * bring it into proper operation.
  */
-Static void kue_reset(sc)
-	struct kue_softc	*sc;
+Static void
+kue_reset(struct kue_softc *sc)
 {
 	if (usbd_set_config_no(sc->kue_udev, KUE_CONFIG_NO, 0)) {
 		printf("kue%d: getting interface handle failed\n",
@@ -512,8 +500,8 @@ USB_ATTACH(kue)
 	USB_ATTACH_SUCCESS_RETURN;
 }
 
-Static int kue_detach(dev)
-	device_t		dev;
+Static int
+kue_detach(device_t dev)
 {
 	struct kue_softc	*sc;
 	struct ifnet		*ifp;
@@ -546,10 +534,8 @@ Static int kue_detach(dev)
 /*
  * Initialize an RX descriptor and attach an MBUF cluster.
  */
-Static int kue_newbuf(sc, c, m)
-	struct kue_softc	*sc;
-	struct kue_chain	*c;
-	struct mbuf		*m;
+Static int
+kue_newbuf(struct kue_softc *sc, struct kue_chain *c, struct mbuf *m)
 {
 	struct mbuf		*m_new = NULL;
 
@@ -580,8 +566,8 @@ Static int kue_newbuf(sc, c, m)
 	return(0);
 }
 
-Static int kue_rx_list_init(sc)
-	struct kue_softc	*sc;
+Static int
+kue_rx_list_init(struct kue_softc *sc)
 {
 	struct kue_cdata	*cd;
 	struct kue_chain	*c;
@@ -604,8 +590,8 @@ Static int kue_rx_list_init(sc)
 	return(0);
 }
 
-Static int kue_tx_list_init(sc)
-	struct kue_softc	*sc;
+Static int
+kue_tx_list_init(struct kue_softc *sc)
 {
 	struct kue_cdata	*cd;
 	struct kue_chain	*c;
@@ -630,8 +616,8 @@ Static int kue_tx_list_init(sc)
 	return(0);
 }
 
-Static void kue_rxstart(ifp)
-	struct ifnet		*ifp;
+Static void
+kue_rxstart(struct ifnet *ifp)
 {
 	struct kue_softc	*sc;
 	struct kue_chain	*c;
@@ -660,10 +646,8 @@ Static void kue_rxstart(ifp)
  * A frame has been uploaded: pass the resulting mbuf chain up to
  * the higher level protocols.
  */
-Static void kue_rxeof(xfer, priv, status)
-	usbd_xfer_handle	xfer;
-	usbd_private_handle	priv;
-	usbd_status		status;
+Static void kue_rxeof(usbd_xfer_handle xfer, usbd_private_handle priv,
+		      usbd_status status)
 {
 	struct kue_softc	*sc;
 	struct kue_chain	*c;
@@ -736,10 +720,8 @@ done:
  * the list buffers.
  */
 
-Static void kue_txeof(xfer, priv, status)
-	usbd_xfer_handle	xfer;
-	usbd_private_handle	priv;
-	usbd_status		status;
+Static void
+kue_txeof(usbd_xfer_handle xfer, usbd_private_handle priv, usbd_status status)
 {
 	struct kue_softc	*sc;
 	struct kue_chain	*c;
@@ -785,10 +767,8 @@ Static void kue_txeof(xfer, priv, status)
 	return;
 }
 
-Static int kue_encap(sc, m, idx)
-	struct kue_softc	*sc;
-	struct mbuf		*m;
-	int			idx;
+Static int
+kue_encap(struct kue_softc *sc, struct mbuf *m, int idx)
 {
 	int			total_len;
 	struct kue_chain	*c;
@@ -825,8 +805,8 @@ Static int kue_encap(sc, m, idx)
 	return(0);
 }
 
-Static void kue_start(ifp)
-	struct ifnet		*ifp;
+Static void
+kue_start(struct ifnet *ifp)
 {
 	struct kue_softc	*sc;
 	struct mbuf		*m_head = NULL;
@@ -870,8 +850,8 @@ Static void kue_start(ifp)
 	return;
 }
 
-Static void kue_init(xsc)
-	void			*xsc;
+Static void
+kue_init(void *xsc)
 {
 	struct kue_softc	*sc = xsc;
 	struct ifnet		*ifp = &sc->arpcom.ac_if;
@@ -961,10 +941,8 @@ Static void kue_init(xsc)
 	return;
 }
 
-Static int kue_ioctl(ifp, command, data)
-	struct ifnet		*ifp;
-	u_long			command;
-	caddr_t			data;
+Static int
+kue_ioctl(struct ifnet *ifp, u_long command, caddr_t data)
 {
 	struct kue_softc	*sc = ifp->if_softc;
 	int			error = 0;
@@ -1015,8 +993,8 @@ Static int kue_ioctl(ifp, command, data)
 	return(error);
 }
 
-Static void kue_watchdog(ifp)
-	struct ifnet		*ifp;
+Static void
+kue_watchdog(struct ifnet *ifp)
 {
 	struct kue_softc	*sc;
 	struct kue_chain	*c;
@@ -1042,8 +1020,8 @@ Static void kue_watchdog(ifp)
  * Stop the adapter and free any mbufs allocated to the
  * RX and TX lists.
  */
-Static void kue_stop(sc)
-	struct kue_softc	*sc;
+Static void
+kue_stop(struct kue_softc *sc)
 {
 	usbd_status		err;
 	struct ifnet		*ifp;
@@ -1138,8 +1116,8 @@ Static void kue_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 kue_shutdown(dev)
-	device_t		dev;
+Static void
+kue_shutdown(device_t dev)
 {
 	struct kue_softc	*sc;