d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use kbdd_* macros.

Browse Source
This commit is contained in:
nyan 2007-12-30 12:27:31 +00:00
parent 6b8eb7af60
commit fac9c01c23
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sys/pc98/cbus/pckbd.c
View File

@ -150,7 +150,7 @@ pckbdresume(device_t dev)
kbd = kbd_get_keyboard(kbd_find_keyboard(DRIVER_NAME,
device_get_unit(dev)));
if (kbd)
(*kbdsw[kbd->kb_index]->clear_state)(kbd);
kbdd_clear_state(kbd);
return (0);
}
@ -160,7 +160,7 @@ pckbd_isa_intr(void *arg)
{
keyboard_t *kbd = arg;
(*kbdsw[kbd->kb_index]->intr)(kbd, NULL);
kbdd_intr(kbd, NULL);
}
static int
@ -246,15 +246,15 @@ pckbd_timeout(void *arg)
*/
s = spltty();
kbd = (keyboard_t *)arg;
if ((*kbdsw[kbd->kb_index]->lock)(kbd, TRUE)) {
if (kbdd_lock(kbd, TRUE)) {
/*
* We have seen the lock flag is not set. Let's reset
* the flag early, otherwise the LED update routine fails
* which may want the lock during the interrupt routine.
*/
(*kbdsw[kbd->kb_index]->lock)(kbd, FALSE);
if ((*kbdsw[kbd->kb_index]->check_char)(kbd))
(*kbdsw[kbd->kb_index]->intr)(kbd, NULL);
kbdd_lock(kbd, FALSE);
if (kbdd_check_char(kbd))
kbdd_intr(kbd, NULL);
}
splx(s);
timeout(pckbd_timeout, arg, hz/10);