diff options
| author | John Hay <jhay@FreeBSD.org> | 1996-10-31 20:22:40 +0000 |
|---|---|---|
| committer | John Hay <jhay@FreeBSD.org> | 1996-10-31 20:22:40 +0000 |
| commit | 75c66a120a1ca214e8f3364ed3b5b64d02570dd3 (patch) | |
| tree | 9ab314f4a66bcd5422165265d7036f20a7f65215 /sys/dev/sr | |
| parent | eea6c03c51e4ee63b08831a5bffe6c5698aa6250 (diff) | |
Notes
Diffstat (limited to 'sys/dev/sr')
| -rw-r--r-- | sys/dev/sr/if_sr.c | 16 | ||||
| -rw-r--r-- | sys/dev/sr/if_sr_isa.c | 16 |
2 files changed, 10 insertions, 22 deletions
diff --git a/sys/dev/sr/if_sr.c b/sys/dev/sr/if_sr.c index 659a17ff58bf0..f41d76079e5f3 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 659a17ff58bf0..f41d76079e5f3 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); } |