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

Fix various breakage after the recent keyboard driver change.

Browse Source 
- Don't try to set typematic rate if there is not a keyboard.
- Fix wrong test on error code.
- Don't try to claim the keyboard twice.  The second call will fail.
This commit is contained in:
yokota 1999-01-14 03:17:32 +00:00
parent 72b25cc2b1
commit 0636c5bb0d
2 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
sys/i386/isa/pcvt/pcvt_drv.c
View File

@ -169,13 +169,12 @@ pcprobe(struct isa_device *dev)
#ifdef _DEV_KBD_KBDREG_H_
int i;
kbd = NULL;
kbd_configure(KB_CONF_PROBE_ONLY);
i = kbd_allocate("*", -1, (void *)&kbd, pcevent, (void *)dev->id_unit);
if ((i < 0) || ((kbd = kbd_get_keyboard(i)) == NULL))
{
if (kbd == NULL) {
reset_keyboard = 0;
return (-1);
kbd_configure(KB_CONF_PROBE_ONLY);
i = kbd_allocate("*", -1, (void *)&kbd, pcevent, (void *)dev->id_unit);
if ((i < 0) || ((kbd = kbd_get_keyboard(i)) == NULL))
return (-1);
}
reset_keyboard = 1; /* it's now safe to do kbd reset */
#endif /* _DEV_KBD_KBDREG_H_ */
@ -898,6 +897,7 @@ pcevent(keyboard_t *thiskbd, int event, void *arg)
pcrint(unit);
return 0;
case KBDIO_UNLOADING:
reset_keyboard = 0;
kbd = NULL;
kbd_release(thiskbd, (void *)&kbd);
timeout(detect_kbd, (void *)unit, hz*4);
@ -1182,17 +1182,17 @@ pccnprobe(struct consdev *cp)
}
#ifdef _DEV_KBD_KBDREG_H_
kbd = NULL;
kbd_configure(KB_CONF_PROBE_ONLY);
i = kbd_allocate("*", -1, (void *)&kbd, pcevent, (void *)dvp->id_unit);
if (i >= 0)
kbd = kbd_get_keyboard(i);
/*
* Don't reset the keyboard via `kbdio' just yet.
* The system clock has not been calibrated...
*/
reset_keyboard = 0;
if (kbd == NULL) {
kbd_configure(KB_CONF_PROBE_ONLY);
i = kbd_allocate("*", -1, (void *)&kbd, pcevent, (void *)dvp->id_unit);
if (i >= 0)
kbd = kbd_get_keyboard(i);
}
#if PCVT_SCANSET == 2
/*

5
sys/i386/isa/pcvt/pcvt_kbd.c
View File

@ -346,9 +346,10 @@ settpmrate(int rate)
else if(kbd_cmd(tpmrate) != 0)
printf("Keyboard TYPEMATIC data timeout\n");
#else
if (kbd == NULL)
return;
tpmrate = rate & 0x7f;
if ((*kbdsw[kbd->kb_index]->ioctl)(kbd, KDSETRAD,
(caddr_t)&tpmrate) == 0)
if ((*kbdsw[kbd->kb_index]->ioctl)(kbd, KDSETRAD, (caddr_t)&tpmrate))
printf("pcvt: failed to set keyboard TYPEMATIC.\n");
#endif /* !_DEV_KBD_KBDREG_H_ */
}