diff options
| author | gibbs <gibbs@FreeBSD.org> | 1997-09-21 21:43:54 +0000 |
|---|---|---|
| committer | gibbs <gibbs@FreeBSD.org> | 1997-09-21 21:43:54 +0000 |
| commit | 3579df4d35e102051246eb21aa0d7712fbfb6544 (patch) | |
| tree | 8d1f4c2b2e369e3fe2c31dd6990d82ab0ca66efb /sys/i386/isa/pcvt/pcvt_kbd.c | |
| parent | d281074565525b1dfa00c6fad20aa0005b0a7867 (diff) | |
| download | FreeBSD-src-3579df4d35e102051246eb21aa0d7712fbfb6544.zip FreeBSD-src-3579df4d35e102051246eb21aa0d7712fbfb6544.tar.gz | |
Update for changes in the callout interface.
Diffstat (limited to 'sys/i386/isa/pcvt/pcvt_kbd.c')
| -rw-r--r-- | sys/i386/isa/pcvt/pcvt_kbd.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/sys/i386/isa/pcvt/pcvt_kbd.c b/sys/i386/isa/pcvt/pcvt_kbd.c index 6f6b348..6a4e15b 100644 --- a/sys/i386/isa/pcvt/pcvt_kbd.c +++ b/sys/i386/isa/pcvt/pcvt_kbd.c @@ -197,6 +197,8 @@ do_vgapage(int page) */ static int lost_intr_timeout_queued = 0; +static struct callout_handle lost_intr_ch = + CALLOUT_HANDLE_INITIALIZER(&lost_intr_ch); static void check_for_lost_intr (void *arg) @@ -220,7 +222,7 @@ check_for_lost_intr (void *arg) pcrint (0); splx (opri); } - timeout(check_for_lost_intr, (void *)NULL, hz); + lost_intr_ch = timeout(check_for_lost_intr, (void *)NULL, hz); lost_intr_timeout_queued = 1; #endif /* !_I386_ISA_KBDIO_H_ */ } @@ -309,9 +311,9 @@ update_led(void) #if PCVT_UPDLED_LOSES_INTR if (lost_intr_timeout_queued) - untimeout(check_for_lost_intr, NULL); + untimeout(check_for_lost_intr, NULL, lost_intr_ch); - timeout(check_for_lost_intr, NULL, hz); + lost_intr_ch = timeout(check_for_lost_intr, NULL, hz); lost_intr_timeout_queued = 1; #endif /* PCVT_UPDLED_LOSES_INTR */ @@ -675,7 +677,7 @@ r_entry: return; if (lost_intr_timeout_queued) { - untimeout(check_for_lost_intr, (void *)NULL); + untimeout(check_for_lost_intr, (void *)NULL, lost_intr_ch); lost_intr_timeout_queued = 0; } @@ -816,7 +818,7 @@ r_entry: update_led(); - timeout(check_for_lost_intr, (void *)NULL, hz); + lost_intr_ch = timeout(check_for_lost_intr, (void *)NULL, hz); lost_intr_timeout_queued = 1; #endif /* !_I386_ISA_KBDIO_H_ */ |
