diff options
| author | gibbs <gibbs@FreeBSD.org> | 1997-09-21 21:41:49 +0000 |
|---|---|---|
| committer | gibbs <gibbs@FreeBSD.org> | 1997-09-21 21:41:49 +0000 |
| commit | e1b0aaaa7646122022e6179a0b6406809f2126b8 (patch) | |
| tree | 453c2e0b2fbd7526c2bfa12a66b852f740856480 /sys/dev/ie | |
| parent | dc043d9d0aa92d02293099dc6adcabe0e6c972cb (diff) | |
| download | FreeBSD-src-e1b0aaaa7646122022e6179a0b6406809f2126b8.zip FreeBSD-src-e1b0aaaa7646122022e6179a0b6406809f2126b8.tar.gz | |
aha1542.c aic6360.c cy.c fd.c ft.c
if_ie.c if_wl.c if_zp.c isa.c isa_device.h
labpc.c mcd.c ncr5380.c scd.c seagate.c si.c
sio.c tw.c ultra14f.c wcd.c wd.c:
Update for changes in the callout interface.
apic_vector.s icu_vector.s ipl.s ipl_funcs.c:
Add CAM software/hardware interrupt support.
Diffstat (limited to 'sys/dev/ie')
| -rw-r--r-- | sys/dev/ie/if_ie.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sys/dev/ie/if_ie.c b/sys/dev/ie/if_ie.c index 24f8cf3..c1e4a5d 100644 --- a/sys/dev/ie/if_ie.c +++ b/sys/dev/ie/if_ie.c @@ -47,7 +47,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: if_ie.c,v 1.44 1997/07/20 14:09:59 bde Exp $ + * $Id: if_ie.c,v 1.45 1997/09/02 01:18:14 bde Exp $ */ /* @@ -1915,6 +1915,7 @@ command_and_wait(int unit, int cmd, volatile void *pcmd, int mask) { volatile struct ie_cmd_common *cc = pcmd; volatile int timedout = 0; + struct callout_handle ch; ie_softc[unit].scb->ie_command = (u_short) cmd; @@ -1925,7 +1926,8 @@ command_and_wait(int unit, int cmd, volatile void *pcmd, int mask) * According to the packet driver, the minimum timeout * should be .369 seconds, which we round up to .37. */ - timeout(chan_attn_timeout, (caddr_t)&timedout, 37 * hz / 100); + ch = timeout(chan_attn_timeout, (caddr_t)&timedout, + 37 * hz / 100); /* ignore cast-qual */ /* @@ -1940,7 +1942,7 @@ command_and_wait(int unit, int cmd, volatile void *pcmd, int mask) break; } - untimeout(chan_attn_timeout, (caddr_t)&timedout); + untimeout(chan_attn_timeout, (caddr_t)&timedout, ch); /* ignore cast-qual */ return (timedout); |
