sanchayanmaity/minix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

simplified the code a little, corrected some hasty statements.

Browse source
This commit is contained in:
Ben Gras 2009-02-04 17:30:01 +00:00
parent 6a0e8e3b80
commit bb18be5d06
1 changed files with 9 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
drivers/tty/keyboard.c
View file

@ -454,13 +454,6 @@ message *m;
}
/*===========================================================================*
* map_key0 *
*===========================================================================*/
/* Map a scan code to an ASCII code ignoring modifiers. */
#define map_key0(scode) \
((unsigned) keymap[(scode) * MAP_COLS])
/*===========================================================================*
* map_key *
*===========================================================================*/
@ -472,12 +465,10 @@ int scode;
int caps, column, lk;
u16_t *keyrow;
if (scode == SLASH_SCAN && esc) return '/'; /* don't map numeric slash */
if(esc)
keyrow = &keymap[scode * MAP_COLS];
else
keyrow = &keymap_escaped[scode * MAP_COLS];
else
keyrow = &keymap[scode * MAP_COLS];
caps = shift;
lk = locks[ccurrent];
@ -771,12 +762,13 @@ int scode; /* scan code of key just struck or released */
esc = 1; /* Next key is escaped */
return(-1);
default: /* A normal key */
if(!ch) {
printf("tty: ignoring unrecognized %s scancode 0x%x\n",
esc ? "escaped" : "straight", scode);
return -1;
}
if(make) return(ch);
if(!make)
return -1;
if(ch)
return ch;
printf("tty: ignoring unrecognized %s scancode 0x%x\n",
escape ? "escaped" : "straight", scode);
return -1;
}
/* Key release, or a shift type key. */