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

Put a comment, explaining why kbdmux(4) had to be fixed.

Browse Source 
While I'm here fix a couple of whitespaces.

Requested by:	netchild
MFC after:	1 day
This commit is contained in:
Maksim Yevmenkin 2006-02-25 22:59:01 +00:00
parent a4d159a817
commit 65b70c1dfd
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=156013
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
sys/dev/kbdmux/kbdmux.c
View File

@ -246,7 +246,16 @@ kbdmux_kbd_event(keyboard_t *kbd, int event, void *arg)
KBDMUX_LOCK(state);
/* read all chars from the keyboard */
/*
* Read all chars from the keyboard
*
* Turns out that atkbd(4) check_char() method may return
* "true" while read_char() method returns NOKEY. If this
* happens we could stuck in the loop below. Avoid this
* by breaking out of the loop if read_char() method returns
* NOKEY.
*/
while (KBDMUX_CHECK_CHAR(kbd)) {
c = KBDMUX_READ_CHAR(kbd, 0);
if (c == NOKEY)
@ -1128,8 +1137,8 @@ kbdmux_ioctl(keyboard_t *kbd, u_long cmd, caddr_t arg)
break;
case PIO_KEYMAP: /* set keyboard translation table */
case PIO_KEYMAPENT: /* set keyboard translation table entry */
case PIO_DEADKEYMAP: /* set accent key translation table */
case PIO_KEYMAPENT: /* set keyboard translation table entry */
case PIO_DEADKEYMAP: /* set accent key translation table */
KBDMUX_LOCK(state);
state->ks_accents = 0;