mirror of
https://git.FreeBSD.org/src.git
synced 2024-12-13 10:02:38 +00:00
Update for changes in the callout interface.
This commit is contained in:
parent
3ac702e056
commit
6936988f22
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=29717
@ -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;
|
||||
}
|
||||
}
|
||||
|
@ -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__ */
|
||||
|
@ -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__)
|
||||
|
Loading…
Reference in New Issue
Block a user