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/si | |
| 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/si')
| -rw-r--r-- | sys/dev/si/si.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/dev/si/si.c b/sys/dev/si/si.c index bd756a3..6c4f899 100644 --- a/sys/dev/si/si.c +++ b/sys/dev/si/si.c @@ -30,7 +30,7 @@ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN * NO EVENT SHALL THE AUTHORS BE LIABLE. * - * $Id: si.c,v 1.59 1997/07/20 14:10:11 bde Exp $ + * $Id: si.c,v 1.60 1997/09/14 03:19:18 peter Exp $ */ #ifndef lint @@ -910,7 +910,7 @@ siclose(dev, flag, mode, p) /* ok. we are now still on the right track.. nuke the hardware */ if (pp->sp_state & SS_LSTART) { - untimeout(si_lstart, (caddr_t)pp); + untimeout(si_lstart, (caddr_t)pp, pp->lstart_ch); pp->sp_state &= ~SS_LSTART; } @@ -2114,12 +2114,12 @@ si_start(tp) } if ((pp->sp_state & (SS_LSTART|SS_INLSTART)) == SS_LSTART) { - untimeout(si_lstart, (caddr_t)pp); + untimeout(si_lstart, (caddr_t)pp, pp->lstart_ch); } else { pp->sp_state |= SS_LSTART; } DPRINT((pp, DBG_START, "arming lstart, time=%d\n", time)); - timeout(si_lstart, (caddr_t)pp, time); + pp->lstart_ch = timeout(si_lstart, (caddr_t)pp, time); } out: |
