KNF

1 files changed, 46 insertions, 24 deletions

diff --git a/sys/dev/pcmcia/if_wi.c b/sys/dev/pcmcia/if_wi.c
index 0c5dbf925ee..8607786ee47 100644
--- a/sys/dev/pcmcia/if_wi.c
+++ b/sys/dev/pcmcia/if_wi.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_wi.c,v 1.13 2000/06/19 00:12:41 aaron Exp $	*/
+/*	$OpenBSD: if_wi.c,v 1.14 2000/06/20 07:24:36 todd Exp $	*/
 
 /*
  * Copyright (c) 1997, 1998, 1999
@@ -135,7 +135,7 @@ u_int32_t	widebug = WIDEBUG;
 
 #if !defined(lint) && !defined(__OpenBSD__)
 static const char rcsid[] =
-	"$OpenBSD: if_wi.c,v 1.13 2000/06/19 00:12:41 aaron Exp $";
+	"$OpenBSD: if_wi.c,v 1.14 2000/06/20 07:24:36 todd Exp $";
 #endif	/* lint */
 
 #ifdef foo
@@ -397,7 +397,8 @@ wi_pcmcia_activate(dev, act)
 	return (0);
 }
 
-int wi_intr(vsc)
+int
+wi_intr(vsc)
 	void			*vsc;
 {
 	struct wi_softc		*sc = vsc;
@@ -461,7 +462,8 @@ int wi_intr(vsc)
 	return (1);
 }
 
-STATIC void wi_rxeof(sc)
+STATIC void
+wi_rxeof(sc)
 	struct wi_softc		*sc;
 {
 	struct ifnet		*ifp;
@@ -566,7 +568,8 @@ STATIC void wi_rxeof(sc)
 	return;
 }
 
-STATIC void wi_txeof(sc, status)
+STATIC void
+wi_txeof(sc, status)
 	struct wi_softc		*sc;
 	int			status;
 {
@@ -585,7 +588,8 @@ STATIC void wi_txeof(sc, status)
 	return;
 }
 
-void wi_inquire(xsc)
+void
+wi_inquire(xsc)
 	void			*xsc;
 {
 	struct wi_softc		*sc;
@@ -605,7 +609,8 @@ void wi_inquire(xsc)
 	return;
 }
 
-void wi_update_stats(sc)
+void
+wi_update_stats(sc)
 	struct wi_softc		*sc;
 {
 	struct wi_ltv_gen	gen;
@@ -643,7 +648,8 @@ void wi_update_stats(sc)
 	return;
 }
 
-STATIC int wi_cmd(sc, cmd, val)
+STATIC int
+wi_cmd(sc, cmd, val)
 	struct wi_softc		*sc;
 	int			cmd;
 	int			val;
@@ -679,7 +685,8 @@ STATIC int wi_cmd(sc, cmd, val)
 	return(0);
 }
 
-STATIC void wi_reset(sc)
+STATIC void
+wi_reset(sc)
 	struct wi_softc		*sc;
 {
 	DPRINTF(WID_RESET, ("wi_reset: sc %p\n", sc));
@@ -698,7 +705,8 @@ STATIC void wi_reset(sc)
 /*
  * Read an LTV record from the NIC.
  */
-STATIC int wi_read_record(sc, ltv)
+STATIC int
+wi_read_record(sc, ltv)
 	struct wi_softc		*sc;
 	struct wi_ltv_gen	*ltv;
 {
@@ -739,7 +747,8 @@ STATIC int wi_read_record(sc, ltv)
 /*
  * Same as read, except we inject data instead of reading it.
  */
-STATIC int wi_write_record(sc, ltv)
+STATIC int
+wi_write_record(sc, ltv)
 	struct wi_softc		*sc;
 	struct wi_ltv_gen	*ltv;
 {
@@ -762,7 +771,8 @@ STATIC int wi_write_record(sc, ltv)
 	return(0);
 }
 
-STATIC int wi_seek(sc, id, off, chan)
+STATIC int
+wi_seek(sc, id, off, chan)
 	struct wi_softc		*sc;
 	int			id, off, chan;
 {
@@ -798,7 +808,8 @@ STATIC int wi_seek(sc, id, off, chan)
 	return(0);
 }
 
-STATIC int wi_read_data(sc, id, off, buf, len)
+STATIC int
+wi_read_data(sc, id, off, buf, len)
 	struct wi_softc		*sc;
 	int			id, off;
 	caddr_t			buf;
@@ -829,7 +840,8 @@ STATIC int wi_read_data(sc, id, off, buf, len)
  * attempt to read then back. If we fail to locate the guard words where
  * we expect them, we preform the transfer over again.
  */
-STATIC int wi_write_data(sc, id, off, buf, len)
+STATIC int
+wi_write_data(sc, id, off, buf, len)
 	struct wi_softc		*sc;
 	int			id, off;
 	caddr_t			buf;
@@ -868,7 +880,8 @@ again:
  * Allocate a region of memory inside the NIC and zero
  * it out.
  */
-STATIC int wi_alloc_nicmem(sc, len, id)
+STATIC int
+wi_alloc_nicmem(sc, len, id)
 	struct wi_softc		*sc;
 	int			len;
 	int			*id;
@@ -901,7 +914,8 @@ STATIC int wi_alloc_nicmem(sc, len, id)
 	return(0);
 }
 
-STATIC void wi_setmulti(sc)
+STATIC void
+wi_setmulti(sc)
 	struct wi_softc		*sc;
 {
 	struct ifnet		*ifp;
@@ -945,7 +959,8 @@ STATIC void wi_setmulti(sc)
 	return;
 }
 
-STATIC void wi_setdef(sc, wreq)
+STATIC void
+wi_setdef(sc, wreq)
 	struct wi_softc		*sc;
 	struct wi_req		*wreq;
 {
@@ -1023,7 +1038,8 @@ STATIC void wi_setdef(sc, wreq)
 	return;
 }
 
-STATIC int wi_ioctl(ifp, command, data)
+STATIC int
+wi_ioctl(ifp, command, data)
 	struct ifnet		*ifp;
 	u_long			command;
 	caddr_t			data;
@@ -1156,7 +1172,8 @@ STATIC int wi_ioctl(ifp, command, data)
 	return(error);
 }
 
-STATIC void wi_init(xsc)
+STATIC void
+wi_init(xsc)
 	void			*xsc;
 {
 	struct wi_softc		*sc = xsc;
@@ -1265,7 +1282,8 @@ STATIC void wi_init(xsc)
 	return;
 }
 
-STATIC void wi_start(ifp)
+STATIC void
+wi_start(ifp)
 	struct ifnet		*ifp;
 {
 	struct wi_softc		*sc;
@@ -1359,7 +1377,8 @@ STATIC void wi_start(ifp)
 	return;
 }
 
-STATIC int wi_mgmt_xmit(sc, data, len)
+STATIC int
+wi_mgmt_xmit(sc, data, len)
 	struct wi_softc		*sc;
 	caddr_t			data;
 	int			len;
@@ -1396,7 +1415,8 @@ STATIC int wi_mgmt_xmit(sc, data, len)
 	return(0);
 }
 
-STATIC void wi_stop(sc)
+STATIC void 
+wi_stop(sc)
 	struct wi_softc		*sc;
 {
 	struct ifnet		*ifp;
@@ -1418,7 +1438,8 @@ STATIC void wi_stop(sc)
 	return;
 }
 
-STATIC void wi_watchdog(ifp)
+STATIC void
+wi_watchdog(ifp)
 	struct ifnet		*ifp;
 {
 	struct wi_softc		*sc;
@@ -1434,7 +1455,8 @@ STATIC void wi_watchdog(ifp)
 	return;
 }
 
-STATIC void wi_shutdown(arg)
+STATIC void
+wi_shutdown(arg)
 	void			*arg;
 {
 	struct wi_softc		*sc;