diff --git a/repos/libports/src/lib/sdl/video/SDL_genode_fb_events.cc b/repos/libports/src/lib/sdl/video/SDL_genode_fb_events.cc index 004c056a70..aa7c0ce0db 100644 --- a/repos/libports/src/lib/sdl/video/SDL_genode_fb_events.cc +++ b/repos/libports/src/lib/sdl/video/SDL_genode_fb_events.cc @@ -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; diff --git a/repos/os/include/input/keycodes.h b/repos/os/include/input/keycodes.h index 47b4681606..ff7966833a 100644 --- a/repos/os/include/input/keycodes.h +++ b/repos/os/include/input/keycodes.h @@ -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) \ diff --git a/repos/os/src/drivers/input/spec/ps2/ps2_keyboard.h b/repos/os/src/drivers/input/spec/ps2/ps2_keyboard.h index c846b0a7f0..5cb9c08f55 100644 --- a/repos/os/src/drivers/input/spec/ps2/ps2_keyboard.h +++ b/repos/os/src/drivers/input/spec/ps2/ps2_keyboard.h @@ -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, diff --git a/repos/os/src/drivers/input/spec/ps2/scan_code_set_1.h b/repos/os/src/drivers/input/spec/ps2/scan_code_set_1.h index 3cca79210f..fc86727456 100644 --- a/repos/os/src/drivers/input/spec/ps2/scan_code_set_1.h +++ b/repos/os/src/drivers/input/spec/ps2/scan_code_set_1.h @@ -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;