aboutsummaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorJohn Hay <jhay@FreeBSD.org>1996-10-31 20:22:40 +0000
committerJohn Hay <jhay@FreeBSD.org>1996-10-31 20:22:40 +0000
commit75c66a120a1ca214e8f3364ed3b5b64d02570dd3 (patch)
tree9ab314f4a66bcd5422165265d7036f20a7f65215 /sys
parenteea6c03c51e4ee63b08831a5bffe6c5698aa6250 (diff)
downloadsrc-75c66a120a1ca214e8f3364ed3b5b64d02570dd3.tar.gz
src-75c66a120a1ca214e8f3364ed3b5b64d02570dd3.zip
if_sr.c corrupted the global variable `ticks'.
Cosmetic changes: if_sr_.c won't compile with a K&R compiler, so there is no need to cast the timeout arg to the (wrong) type. Submitted by: bde
Notes
Notes: svn path=/head/; revision=19296
Diffstat (limited to 'sys')
-rw-r--r--sys/dev/ar/if_ar.c13
-rw-r--r--sys/dev/ar/if_ar_isa.c13
-rw-r--r--sys/dev/sr/if_sr.c16
-rw-r--r--sys/dev/sr/if_sr_isa.c16
-rw-r--r--sys/i386/isa/if_ar.c13
-rw-r--r--sys/i386/isa/if_sr.c16
6 files changed, 27 insertions, 60 deletions
diff --git a/sys/dev/ar/if_ar.c b/sys/dev/ar/if_ar.c
index acb6a50e901c..b5c87ad478d7 100644
--- a/sys/dev/ar/if_ar.c
+++ b/sys/dev/ar/if_ar.c
@@ -28,7 +28,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: if_ar.c,v 1.10 1996/09/06 23:07:24 phk Exp $
+ * $Id: if_ar.c,v 1.11 1996/10/28 19:40:01 jhay Exp $
*/
/*
@@ -53,22 +53,15 @@
#include <sys/param.h>
#include <sys/systm.h>
-#include <sys/kernel.h>
#include <sys/mbuf.h>
-#include <sys/ioctl.h>
+#include <sys/sockio.h>
#include <sys/socket.h>
-#include <sys/conf.h>
-#include <sys/errno.h>
-#include <sys/malloc.h>
-#include <sys/syslog.h>
#include <net/if.h>
-#include <net/if_types.h>
#include <net/if_sppp.h>
#if NBPFILTER > 0
#include <net/bpf.h>
-#include <net/bpfdesc.h>
#endif
#include <machine/clock.h>
@@ -77,6 +70,8 @@
#include <i386/isa/if_arregs.h>
#include <i386/isa/ic/hd64570.h>
+#include "ioconf.h"
+
#ifdef TRACE
#define TRC(x) x
#else
diff --git a/sys/dev/ar/if_ar_isa.c b/sys/dev/ar/if_ar_isa.c
index acb6a50e901c..b5c87ad478d7 100644
--- a/sys/dev/ar/if_ar_isa.c
+++ b/sys/dev/ar/if_ar_isa.c
@@ -28,7 +28,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: if_ar.c,v 1.10 1996/09/06 23:07:24 phk Exp $
+ * $Id: if_ar.c,v 1.11 1996/10/28 19:40:01 jhay Exp $
*/
/*
@@ -53,22 +53,15 @@
#include <sys/param.h>
#include <sys/systm.h>
-#include <sys/kernel.h>
#include <sys/mbuf.h>
-#include <sys/ioctl.h>
+#include <sys/sockio.h>
#include <sys/socket.h>
-#include <sys/conf.h>
-#include <sys/errno.h>
-#include <sys/malloc.h>
-#include <sys/syslog.h>
#include <net/if.h>
-#include <net/if_types.h>
#include <net/if_sppp.h>
#if NBPFILTER > 0
#include <net/bpf.h>
-#include <net/bpfdesc.h>
#endif
#include <machine/clock.h>
@@ -77,6 +70,8 @@
#include <i386/isa/if_arregs.h>
#include <i386/isa/ic/hd64570.h>
+#include "ioconf.h"
+
#ifdef TRACE
#define TRC(x) x
#else
diff --git a/sys/dev/sr/if_sr.c b/sys/dev/sr/if_sr.c
index 659a17ff58bf..f41d76079e5f 100644
--- a/sys/dev/sr/if_sr.c
+++ b/sys/dev/sr/if_sr.c
@@ -27,7 +27,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: if_sr.c,v 1.2 1996/09/06 23:07:44 phk Exp $
+ * $Id: if_sr.c,v 1.3 1996/10/29 03:52:51 jhay Exp $
*/
/*
@@ -60,28 +60,23 @@
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/mbuf.h>
-#include <sys/ioctl.h>
+#include <sys/sockio.h>
#include <sys/socket.h>
-#include <sys/conf.h>
-#include <sys/errno.h>
-#include <sys/malloc.h>
-#include <sys/syslog.h>
#include <net/if.h>
-#include <net/if_types.h>
#include <net/if_sppp.h>
#if NBPFILTER > 0
#include <net/bpf.h>
-#include <net/bpfdesc.h>
#endif
-#include <machine/clock.h>
#include <machine/md_var.h>
#include <i386/isa/if_srregs.h>
#include <i386/isa/ic/hd64570.h>
+#include "ioconf.h"
+
/* #define USE_MODEMCK */
#ifndef BUGGY
@@ -2915,8 +2910,7 @@ sr_modemck(void *arg)
/*
* OK, now set up for the next modem signal checking pass...
*/
- ticks = 1 * hz; /* use 1 second granularity */
- timeout(sr_modemck, (caddr_t)0, ticks);
+ timeout(sr_modemck, NULL, hz);
splx(s);
}
diff --git a/sys/dev/sr/if_sr_isa.c b/sys/dev/sr/if_sr_isa.c
index 659a17ff58bf..f41d76079e5f 100644
--- a/sys/dev/sr/if_sr_isa.c
+++ b/sys/dev/sr/if_sr_isa.c
@@ -27,7 +27,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: if_sr.c,v 1.2 1996/09/06 23:07:44 phk Exp $
+ * $Id: if_sr.c,v 1.3 1996/10/29 03:52:51 jhay Exp $
*/
/*
@@ -60,28 +60,23 @@
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/mbuf.h>
-#include <sys/ioctl.h>
+#include <sys/sockio.h>
#include <sys/socket.h>
-#include <sys/conf.h>
-#include <sys/errno.h>
-#include <sys/malloc.h>
-#include <sys/syslog.h>
#include <net/if.h>
-#include <net/if_types.h>
#include <net/if_sppp.h>
#if NBPFILTER > 0
#include <net/bpf.h>
-#include <net/bpfdesc.h>
#endif
-#include <machine/clock.h>
#include <machine/md_var.h>
#include <i386/isa/if_srregs.h>
#include <i386/isa/ic/hd64570.h>
+#include "ioconf.h"
+
/* #define USE_MODEMCK */
#ifndef BUGGY
@@ -2915,8 +2910,7 @@ sr_modemck(void *arg)
/*
* OK, now set up for the next modem signal checking pass...
*/
- ticks = 1 * hz; /* use 1 second granularity */
- timeout(sr_modemck, (caddr_t)0, ticks);
+ timeout(sr_modemck, NULL, hz);
splx(s);
}
diff --git a/sys/i386/isa/if_ar.c b/sys/i386/isa/if_ar.c
index acb6a50e901c..b5c87ad478d7 100644
--- a/sys/i386/isa/if_ar.c
+++ b/sys/i386/isa/if_ar.c
@@ -28,7 +28,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: if_ar.c,v 1.10 1996/09/06 23:07:24 phk Exp $
+ * $Id: if_ar.c,v 1.11 1996/10/28 19:40:01 jhay Exp $
*/
/*
@@ -53,22 +53,15 @@
#include <sys/param.h>
#include <sys/systm.h>
-#include <sys/kernel.h>
#include <sys/mbuf.h>
-#include <sys/ioctl.h>
+#include <sys/sockio.h>
#include <sys/socket.h>
-#include <sys/conf.h>
-#include <sys/errno.h>
-#include <sys/malloc.h>
-#include <sys/syslog.h>
#include <net/if.h>
-#include <net/if_types.h>
#include <net/if_sppp.h>
#if NBPFILTER > 0
#include <net/bpf.h>
-#include <net/bpfdesc.h>
#endif
#include <machine/clock.h>
@@ -77,6 +70,8 @@
#include <i386/isa/if_arregs.h>
#include <i386/isa/ic/hd64570.h>
+#include "ioconf.h"
+
#ifdef TRACE
#define TRC(x) x
#else
diff --git a/sys/i386/isa/if_sr.c b/sys/i386/isa/if_sr.c
index 659a17ff58bf..f41d76079e5f 100644
--- a/sys/i386/isa/if_sr.c
+++ b/sys/i386/isa/if_sr.c
@@ -27,7 +27,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: if_sr.c,v 1.2 1996/09/06 23:07:44 phk Exp $
+ * $Id: if_sr.c,v 1.3 1996/10/29 03:52:51 jhay Exp $
*/
/*
@@ -60,28 +60,23 @@
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/mbuf.h>
-#include <sys/ioctl.h>
+#include <sys/sockio.h>
#include <sys/socket.h>
-#include <sys/conf.h>
-#include <sys/errno.h>
-#include <sys/malloc.h>
-#include <sys/syslog.h>
#include <net/if.h>
-#include <net/if_types.h>
#include <net/if_sppp.h>
#if NBPFILTER > 0
#include <net/bpf.h>
-#include <net/bpfdesc.h>
#endif
-#include <machine/clock.h>
#include <machine/md_var.h>
#include <i386/isa/if_srregs.h>
#include <i386/isa/ic/hd64570.h>
+#include "ioconf.h"
+
/* #define USE_MODEMCK */
#ifndef BUGGY
@@ -2915,8 +2910,7 @@ sr_modemck(void *arg)
/*
* OK, now set up for the next modem signal checking pass...
*/
- ticks = 1 * hz; /* use 1 second granularity */
- timeout(sr_modemck, (caddr_t)0, ticks);
+ timeout(sr_modemck, NULL, hz);
splx(s);
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-10 18:18:50 +0000