lint

SCCS-vsn: sys/net/if.c 7.21
SCCS-vsn: sys/hp/dev/ite.c 7.12
SCCS-vsn: sys/hp300/dev/fhpib.c 7.5
SCCS-vsn: sys/hp300/dev/nhpib.c 7.6
SCCS-vsn: sys/hp300/dev/rd.c 7.15
SCCS-vsn: sys/hp300/dev/hpibvar.h 7.4

diff --git a/usr/src/sys/hp/dev/ite.c b/usr/src/sys/hp/dev/ite.c
index eb329d3..132193f 100644 (file)
--- a/usr/src/sys/hp/dev/ite.c
+++ b/usr/src/sys/hp/dev/ite.c
@@ -11,7 +11,7 @@
  *
  * from: Utah $Hdr: ite.c 1.24 92/01/21$
  *
  *
  * from: Utah $Hdr: ite.c 1.24 92/01/21$
  *

- *     @(#)ite.c       7.11 (Berkeley) %G%
+ *     @(#)ite.c       7.12 (Berkeley) %G%

  */
 
 /*
  */
 
 /*


@@ -57,7 +57,7 @@ struct        tty ite_tty[NITE];
 struct  ite_softc ite_softc[NITE];
 
 void   itestart();
 struct  ite_softc ite_softc[NITE];
 
 void   itestart();

-extern int ttrstrt();
+extern void ttrstrt __P((void *));

 extern struct tty *constty;
 
 /*
 extern struct tty *constty;
 
 /*

diff --git a/usr/src/sys/hp300/dev/fhpib.c b/usr/src/sys/hp300/dev/fhpib.c
index 405e714..0cbe802 100644 (file)
--- a/usr/src/sys/hp300/dev/fhpib.c
+++ b/usr/src/sys/hp300/dev/fhpib.c
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)fhpib.c     7.4 (Berkeley) %G%
+ *     @(#)fhpib.c     7.5 (Berkeley) %G%

  */
 
 /*
  */
 
 /*


@@ -454,15 +454,20 @@ fhpibwait(hd, x)
 }
 
 /*
 }
 
 /*

- * XXX: this will have to change if we every allow more than one
+ * XXX: this will have to change if we ever allow more than one

  * pending operation per HP-IB.
  */
  * pending operation per HP-IB.
  */

-fhpibppwatch(unit)
+void
+fhpibppwatch(arg)
+       void *arg;

 {
 {

-       register struct hpib_softc *hs = &hpib_softc[unit];
+       register int unit;
+       register struct hpib_softc *hs;

        register struct fhpibdevice *hd;
        register int slave;
 
        register struct fhpibdevice *hd;
        register int slave;
 

+       unit = (int)arg;
+       hs = &hpib_softc[unit];

        if ((hs->sc_flags & HPIBF_PPOLL) == 0)
                return;
        hd = (struct fhpibdevice *)hs->sc_hc->hp_addr;
        if ((hs->sc_flags & HPIBF_PPOLL) == 0)
                return;
        hd = (struct fhpibdevice *)hs->sc_hc->hp_addr;


@@ -473,7 +478,7 @@ fhpibppwatch(unit)
                        hd->hpib_stat = ST_IENAB;
                        hd->hpib_imask = IM_IDLE | IM_ROOM;
                } else
                        hd->hpib_stat = ST_IENAB;
                        hd->hpib_imask = IM_IDLE | IM_ROOM;
                } else

-                       timeout(fhpibppwatch, unit, 1);
+                       timeout(fhpibppwatch, (void *)unit, 1);

                return;
        }
        if ((fhpibdebug & FDB_PPOLL) && unit == fhpibdebugunit)
                return;
        }
        if ((fhpibdebug & FDB_PPOLL) && unit == fhpibdebugunit)

diff --git a/usr/src/sys/hp300/dev/hpibvar.h b/usr/src/sys/hp300/dev/hpibvar.h
index fc4433a..2ed6a1f 100644 (file)
--- a/usr/src/sys/hp300/dev/hpibvar.h
+++ b/usr/src/sys/hp300/dev/hpibvar.h
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)hpibvar.h   7.3 (Berkeley) %G%
+ *     @(#)hpibvar.h   7.4 (Berkeley) %G%

  */
 
 #define        HPIB_IPL(x)     ((((x) >> 4) & 0x3) + 3)
  */
 
 #define        HPIB_IPL(x)     ((((x) >> 4) & 0x3) + 3)


@@ -56,4 +56,6 @@ extern        struct hpib_softc hpib_softc[];
 extern caddr_t internalhpib;
 extern int hpibtimeout;
 extern int hpibdmathresh;
 extern caddr_t internalhpib;
 extern int hpibtimeout;
 extern int hpibdmathresh;

+void   fhpibppwatch __P((void *arg));
+void   nhpibppwatch __P((void *arg));

 #endif
 #endif

diff --git a/usr/src/sys/hp300/dev/nhpib.c b/usr/src/sys/hp300/dev/nhpib.c
index 1fd3484..d9aa560 100644 (file)
--- a/usr/src/sys/hp300/dev/nhpib.c
+++ b/usr/src/sys/hp300/dev/nhpib.c
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)nhpib.c     7.5 (Berkeley) %G%
+ *     @(#)nhpib.c     7.6 (Berkeley) %G%

  */
 
 /*
  */
 
 /*


@@ -307,16 +307,20 @@ nhpibwait(hd, x)
        return(0);
 }
 
        return(0);
 }
 

-nhpibppwatch(unit)
-       register int unit;
+void
+nhpibppwatch(arg)
+       void *arg;

 {
 {

-       register struct hpib_softc *hs = &hpib_softc[unit];
+       register struct hpib_softc *hs;
+       register int unit;

 
 

+       unit = (int)arg;
+       hs = &hpib_softc[unit];

        if ((hs->sc_flags & HPIBF_PPOLL) == 0)
                return;
        if (nhpibppoll(unit) & (0x80 >> hs->sc_sq.dq_forw->dq_slave))
                        ((struct nhpibdevice *)hs->sc_hc->hp_addr)->hpib_mim = MIS_BO;
        else
        if ((hs->sc_flags & HPIBF_PPOLL) == 0)
                return;
        if (nhpibppoll(unit) & (0x80 >> hs->sc_sq.dq_forw->dq_slave))
                        ((struct nhpibdevice *)hs->sc_hc->hp_addr)->hpib_mim = MIS_BO;
        else

-               timeout(nhpibppwatch, unit, 1);
+               timeout(nhpibppwatch, (void *)unit, 1);

 }
 #endif
 }
 #endif

diff --git a/usr/src/sys/hp300/dev/rd.c b/usr/src/sys/hp300/dev/rd.c
index 57a8d17..70c8f7c 100644 (file)
--- a/usr/src/sys/hp300/dev/rd.c
+++ b/usr/src/sys/hp300/dev/rd.c
@@ -11,7 +11,7 @@
  *
  * from: Utah $Hdr: rd.c 1.38 90/10/12$
  *
  *
  * from: Utah $Hdr: rd.c 1.38 90/10/12$
  *

- *     @(#)rd.c        7.14 (Berkeley) %G%
+ *     @(#)rd.c        7.15 (Berkeley) %G%

  */
 
 /*
  */
 
 /*


@@ -635,11 +635,12 @@ done:
 /*
  * Called from timeout() when handling maintenance releases
  */
 /*
  * Called from timeout() when handling maintenance releases
  */

-rdrestart(unit)
-       int unit;
+void
+rdrestart(arg)
+       void *arg;

 {
        int s = splbio();
 {
        int s = splbio();

-       rdustart(unit);
+       rdustart((int)arg);

        splx(s);
 }
 
        splx(s);
 }
 


@@ -913,7 +914,7 @@ rderror(unit)
                rdstats[unit].rdtimeouts++;
 #endif
                hpibfree(&rs->sc_dq);
                rdstats[unit].rdtimeouts++;
 #endif
                hpibfree(&rs->sc_dq);

-               timeout(rdrestart, unit, rdtimo*hz);
+               timeout(rdrestart, (void *)unit, rdtimo * hz);

                return(0);
        }
        /*
                return(0);
        }
        /*

diff --git a/usr/src/sys/net/if.c b/usr/src/sys/net/if.c
index b717a88..548c209 100644 (file)
--- a/usr/src/sys/net/if.c
+++ b/usr/src/sys/net/if.c
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)if.c        7.20 (Berkeley) %G%
+ *     @(#)if.c        7.21 (Berkeley) %G%

  */
 
 #include "param.h"
  */
 
 #include "param.h"


@@ -25,6 +25,7 @@
 #include "ether.h"
 
 int    ifqmaxlen = IFQ_MAXLEN;
 #include "ether.h"
 
 int    ifqmaxlen = IFQ_MAXLEN;

+void   if_slowtimo __P((void *arg));

 
 /*
  * Network interface utility routines.
 
 /*
  * Network interface utility routines.


@@ -40,7 +41,7 @@ ifinit()
        for (ifp = ifnet; ifp; ifp = ifp->if_next)
                if (ifp->if_snd.ifq_maxlen == 0)
                        ifp->if_snd.ifq_maxlen = ifqmaxlen;
        for (ifp = ifnet; ifp; ifp = ifp->if_next)
                if (ifp->if_snd.ifq_maxlen == 0)
                        ifp->if_snd.ifq_maxlen = ifqmaxlen;

-       if_slowtimo();
+       if_slowtimo(0);

 }
 
 #ifdef vax
 }
 
 #ifdef vax


@@ -361,7 +362,9 @@ if_qflush(ifq)
  * from softclock, we decrement timers (if set) and
  * call the appropriate interface routine on expiration.
  */
  * from softclock, we decrement timers (if set) and
  * call the appropriate interface routine on expiration.
  */

-if_slowtimo()
+void
+if_slowtimo(arg)
+       void *arg;

 {
        register struct ifnet *ifp;
        int s = splimp();
 {
        register struct ifnet *ifp;
        int s = splimp();


@@ -373,7 +376,7 @@ if_slowtimo()
                        (*ifp->if_watchdog)(ifp->if_unit);
        }
        splx(s);
                        (*ifp->if_watchdog)(ifp->if_unit);
        }
        splx(s);

-       timeout(if_slowtimo, (caddr_t)0, hz / IFNET_SLOWHZ);
+       timeout(if_slowtimo, (void *)0, hz / IFNET_SLOWHZ);

 }
 
 /*
 }
 
 /*