diff options
| author | kato <kato@FreeBSD.org> | 1997-09-22 12:25:31 +0000 |
|---|---|---|
| committer | kato <kato@FreeBSD.org> | 1997-09-22 12:25:31 +0000 |
| commit | 3d54ce0c25080254a79db1cf299a625e44e5bdc4 (patch) | |
| tree | 55505abe050c24ae0a5d9779004d0143eece9471 /sys/i386/isa/bs | |
| parent | 770e1ac403b529b6fb60dae2a19be6d5671d0203 (diff) | |
| download | FreeBSD-src-3d54ce0c25080254a79db1cf299a625e44e5bdc4.zip FreeBSD-src-3d54ce0c25080254a79db1cf299a625e44e5bdc4.tar.gz | |
Update for changes in the callout interface.
Diffstat (limited to 'sys/i386/isa/bs')
| -rw-r--r-- | sys/i386/isa/bs/bsfunc.h | 8 | ||||
| -rw-r--r-- | sys/i386/isa/bs/bsif.c | 1 | ||||
| -rw-r--r-- | sys/i386/isa/bs/bsif.h | 3 |
3 files changed, 11 insertions, 1 deletions
diff --git a/sys/i386/isa/bs/bsfunc.h b/sys/i386/isa/bs/bsfunc.h index 274be97..9a89acf 100644 --- a/sys/i386/isa/bs/bsfunc.h +++ b/sys/i386/isa/bs/bsfunc.h @@ -212,6 +212,9 @@ bs_start_timeout(bsc) if ((bsc->sc_flags & BSSTARTTIMEOUT) == 0) { bsc->sc_flags |= BSSTARTTIMEOUT; +#ifdef __FreeBSD__ + bsc->timeout_ch = +#endif timeout(bstimeout, bsc, BS_TIMEOUT_INTERVAL); } } @@ -223,7 +226,12 @@ bs_terminate_timeout(bsc) if (bsc->sc_flags & BSSTARTTIMEOUT) { +#ifdef __FreeBSD__ + untimeout(bstimeout, bsc, + bsc->timeout_ch); +#else untimeout(bstimeout, bsc); +#endif bsc->sc_flags &= ~BSSTARTTIMEOUT; } } diff --git a/sys/i386/isa/bs/bsif.c b/sys/i386/isa/bs/bsif.c index 08dc069..9629465 100644 --- a/sys/i386/isa/bs/bsif.c +++ b/sys/i386/isa/bs/bsif.c @@ -155,6 +155,7 @@ bsprobe(parent, self, aux) return rv; } bzero(bsc, sizeof(struct bs_softc)); + callout_handle_init(&bsc->timeout_ch); bscdata[unit] = bsc; bsc->unit = unit; #endif /* __FreeBSD__ */ diff --git a/sys/i386/isa/bs/bsif.h b/sys/i386/isa/bs/bsif.h index 39547f0..7602bab 100644 --- a/sys/i386/isa/bs/bsif.h +++ b/sys/i386/isa/bs/bsif.h @@ -52,7 +52,8 @@ #define OS_DEPEND_SCSI_HEADER \ struct scsi_link sc_link; -#define OS_DEPEND_MISC_HEADER +#define OS_DEPEND_MISC_HEADER \ + struct callout_handle timeout_ch; #endif /* __FreeBSD__ */ #if defined(__NetBSD__) |
