ehmry/genode
ehmry
/
genode
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

input/ps2: add volume up/down/mute, sysrq, screenlock 

This commit renames KEY_COFFEE to KEY_SCREENLOCK, which is more
descriptive.

Issue #1962
This commit is contained in:
Alexander Boettcher 2016-05-20 11:24:47 +02:00 committed by Christian Helmuth
parent 66b7a01d58
commit 6b94e761f8
4 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
repos/libports/src/lib/sdl/video/SDL_genode_fb_events.cc
View File

@ -344,7 +344,7 @@ extern "C" {
case KEY_PROG2: keymap[i]=SDLK_UNKNOWN; break;
case KEY_WWW: keymap[i]=SDLK_UNKNOWN; break;
case KEY_MSDOS: keymap[i]=SDLK_UNKNOWN; break;
case KEY_COFFEE: keymap[i]=SDLK_UNKNOWN; break;
case KEY_SCREENLOCK: keymap[i]=SDLK_UNKNOWN; break;
case KEY_DIRECTION: keymap[i]=SDLK_UNKNOWN; break;
case KEY_CYCLEWINDOWS: keymap[i]=SDLK_UNKNOWN; break;
case KEY_MAIL: keymap[i]=SDLK_UNKNOWN; break;

2
repos/os/include/input/keycodes.h
View File

@ -176,7 +176,7 @@
GENODE_TAG_VALUE(KEY_PROG2, 149) \
GENODE_TAG_VALUE(KEY_WWW, 150) \
GENODE_TAG_VALUE(KEY_MSDOS, 151) \
GENODE_TAG_VALUE(KEY_COFFEE, 152) \
GENODE_TAG_VALUE(KEY_SCREENLOCK, 152) \
GENODE_TAG_VALUE(KEY_DIRECTION, 153) \
GENODE_TAG_VALUE(KEY_CYCLEWINDOWS, 154) \
GENODE_TAG_VALUE(KEY_MAIL, 155) \

4
repos/os/src/drivers/input/spec/ps2/ps2_keyboard.h
View File

@ -124,7 +124,7 @@ class Ps2_keyboard : public Input_driver
void process(unsigned char v, bool verbose_scan_codes)
{
if (verbose_scan_codes)
PLOG("process %02x", v);
PLOG("process %02x scan code set 1", v);
switch (_state) {
@ -257,7 +257,7 @@ class Ps2_keyboard : public Input_driver
void process(unsigned char v, bool verbose_scan_codes)
{
if (verbose_scan_codes)
PLOG("process %02x", v);
PLOG("process %02x scan code set 2", v);
enum {
EXTENDED_KEY_PREFIX = 0xe0,

7
repos/os/src/drivers/input/spec/ps2/scan_code_set_1.h
View File

@ -103,7 +103,7 @@ static unsigned short scan_code_set_1[SCAN_CODE_SET_1_NUM_KEYS] = {
/* 51 */ Input::KEY_KP3,
/* 52 */ Input::KEY_KP0,
/* 53 */ Input::KEY_KPDOT,
/* 54 */ Input::KEY_UNKNOWN,
/* 54 */ Input::KEY_SYSRQ,
/* 55 */ Input::KEY_UNKNOWN,
/* 56 */ Input::KEY_102ND,
/* 57 */ Input::KEY_F11,
@ -130,7 +130,7 @@ static unsigned short scan_code_set_1[SCAN_CODE_SET_1_NUM_KEYS] = {
/* 6c */ Input::KEY_UNKNOWN,
/* 6d */ Input::KEY_UNKNOWN,
/* 6e */ Input::KEY_UNKNOWN,
/* 6f */ Input::KEY_UNKNOWN,
/* 6f */ Input::KEY_SCREENLOCK,
/* 70 */ Input::KEY_UNKNOWN,
/* 71 */ Input::KEY_UNKNOWN,
/* 72 */ Input::KEY_UNKNOWN,
@ -166,6 +166,9 @@ inline void init_scan_code_set_1_0xe0()
scan_code_set_1_0xe0[0x1c] = Input::KEY_KPENTER;
scan_code_set_1_0xe0[0x1d] = Input::KEY_RIGHTCTRL;
scan_code_set_1_0xe0[0x20] = Input::KEY_MUTE;
scan_code_set_1_0xe0[0x2e] = Input::KEY_VOLUMEDOWN;
scan_code_set_1_0xe0[0x30] = Input::KEY_VOLUMEUP;
scan_code_set_1_0xe0[0x35] = Input::KEY_KPSLASH;
scan_code_set_1_0xe0[0x37] = Input::KEY_PRINT;
scan_code_set_1_0xe0[0x38] = Input::KEY_RIGHTALT;