From 6063b5f0ad5ad433df4b4a0f5fb985c4671c1b63 Mon Sep 17 00:00:00 2001 From: Robert Watson Date: Sun, 22 Aug 2004 21:32:52 +0000 Subject: [PATCH] Style update: use newer style function prototypes in if_sl.c in prep for merging locking. --- sys/net/if_sl.c | 53 ++++++++++++++----------------------------------- 1 file changed, 15 insertions(+), 38 deletions(-) diff --git a/sys/net/if_sl.c b/sys/net/if_sl.c index f5fa1d1519ea..2a23b161e7b6 100644 --- a/sys/net/if_sl.c +++ b/sys/net/if_sl.c @@ -240,8 +240,7 @@ slisunitfree(int unit) } static int -slisstatic(unit) - int unit; +slisstatic(int unit) { size_t i; @@ -252,8 +251,7 @@ slisstatic(unit) } static void -slmarkstatic(unit) - int unit; +slmarkstatic(int unit) { int *t; @@ -274,7 +272,7 @@ slmarkstatic(unit) } static struct sl_softc * -slcreate() +slcreate(void) { struct sl_softc *sc; int unit; @@ -346,9 +344,7 @@ slcreate() */ /* ARGSUSED */ static int -slopen(dev, tp) - struct cdev *dev; - register struct tty *tp; +slopen(struct cdev *dev, register struct tty *tp) { register struct sl_softc *sc; int s, error; @@ -406,9 +402,7 @@ sldestroy(struct sl_softc *sc) * Detach the tty from the sl unit. */ static int -slclose(tp,flag) - struct tty *tp; - int flag; +slclose(struct tty *tp, int flag) { register struct sl_softc *sc; int s; @@ -446,12 +440,8 @@ slclose(tp,flag) */ /* ARGSUSED */ static int -sltioctl(tp, cmd, data, flag, td) - struct tty *tp; - u_long cmd; - caddr_t data; - int flag; - struct thread *td; +sltioctl(struct tty *tp, u_long cmd, caddr_t data, int flag, + struct thread *td) { struct sl_softc *sc = (struct sl_softc *)tp->t_sc; int s, unit, wasup; @@ -544,11 +534,8 @@ sltioctl(tp, cmd, data, flag, td) * ordering gets trashed. It can be done for all packets in slstart. */ static int -sloutput(ifp, m, dst, rtp) - struct ifnet *ifp; - register struct mbuf *m; - struct sockaddr *dst; - struct rtentry *rtp; +sloutput(struct ifnet *ifp, register struct mbuf *m, struct sockaddr *dst, + struct rtentry *rtp) { register struct sl_softc *sc = ifp->if_softc; register struct ip *ip; @@ -600,8 +587,7 @@ sloutput(ifp, m, dst, rtp) * the interface before starting output. */ static int -slstart(tp) - register struct tty *tp; +slstart(struct tty *tp) { register struct sl_softc *sc = (struct sl_softc *)tp->t_sc; register struct mbuf *m; @@ -795,9 +781,7 @@ slstart(tp) * Copy data buffer to mbuf chain; add ifnet pointer. */ static struct mbuf * -sl_btom(sc, len) - register struct sl_softc *sc; - register int len; +sl_btom(struct sl_softc *sc, register int len) { struct mbuf *m, *newm; @@ -842,9 +826,7 @@ sl_btom(sc, len) * tty interface receiver interrupt. */ static int -slinput(c, tp) - register int c; - register struct tty *tp; +slinput(int c, struct tty *tp) { register struct sl_softc *sc; register struct mbuf *m; @@ -1005,10 +987,7 @@ newpack: * Process an ioctl request. */ static int -slioctl(ifp, cmd, data) - register struct ifnet *ifp; - u_long cmd; - caddr_t data; +slioctl(struct ifnet *ifp, u_long cmd, caddr_t data) { register struct ifaddr *ifa = (struct ifaddr *)data; register struct ifreq *ifr = (struct ifreq *)data; @@ -1076,8 +1055,7 @@ slioctl(ifp, cmd, data) } static void -sl_keepalive(chan) - void *chan; +sl_keepalive(void *chan) { struct sl_softc *sc = chan; @@ -1097,8 +1075,7 @@ sl_keepalive(chan) } static void -sl_outfill(chan) - void *chan; +sl_outfill(void *chan) { struct sl_softc *sc = chan; register struct tty *tp = sc->sc_ttyp;