Index: uspace/kbd/arch/ia32/include/kbd.h =================================================================== --- uspace/kbd/arch/ia32/include/kbd.h (revision 9141377d3aec1027ed16cfa6e2085fc028ba13f7) +++ uspace/kbd/arch/ia32/include/kbd.h (revision 27ab6a7c0ae5ecb4768a58e568c321a2c017a35b) @@ -37,8 +37,7 @@ */ -#ifndef __ia32_KBD_H__ -#define __ia32_KBD_H__ +#ifndef KBD_ia32_KBD_H_ +#define KBD_ia32_KBD_H_ -#include #include #include @@ -74,6 +73,4 @@ } -int kbd_arch_init(void); - #endif @@ -81,3 +78,2 @@ * @} */ - Index: uspace/kbd/arch/ia32/include/scanc.h =================================================================== --- uspace/kbd/arch/ia32/include/scanc.h (revision 27ab6a7c0ae5ecb4768a58e568c321a2c017a35b) +++ uspace/kbd/arch/ia32/include/scanc.h (revision 27ab6a7c0ae5ecb4768a58e568c321a2c017a35b) @@ -0,0 +1,59 @@ +/* + * Copyright (C) 2001-2004 Jakub Jermar + * Copyright (C) 2006 Josef Cejka + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup kbdia32 + * @{ + */ +/** @file + * @ingroup kbdamd64 + */ + +#ifndef KBD_ia32_SCANC_H_ +#define KBD_ia32_SCANC_H_ + +/** Scancodes. */ +#define SC_ESC 0x01 +#define SC_BACKSPACE 0x0e +#define SC_LSHIFT 0x2a +#define SC_RSHIFT 0x36 +#define SC_CAPSLOCK 0x3a +#define SC_SPEC_ESCAPE 0xe0 +#define SC_LEFTARR 0x4b +#define SC_RIGHTARR 0x4d +#define SC_UPARR 0x48 +#define SC_DOWNARR 0x50 +#define SC_DELETE 0x53 +#define SC_HOME 0x47 +#define SC_END 0x4f + +#endif + +/** + * @} + */ Index: uspace/kbd/arch/ia32/src/kbd.c =================================================================== --- uspace/kbd/arch/ia32/src/kbd.c (revision 9141377d3aec1027ed16cfa6e2085fc028ba13f7) +++ uspace/kbd/arch/ia32/src/kbd.c (revision 27ab6a7c0ae5ecb4768a58e568c321a2c017a35b) @@ -42,4 +42,5 @@ #include #include +#include /* Interesting bits for status register */ @@ -63,196 +64,8 @@ #define MOUSE_ACK 0xfa - -#define SPECIAL 255 #define KEY_RELEASE 0x80 - -/** - * These codes read from i8042 data register are silently ignored. - */ -#define IGNORE_CODE 0x7f - -#define PRESSED_SHIFT (1<<0) -#define PRESSED_CAPSLOCK (1<<1) -#define LOCKED_CAPSLOCK (1<<0) - -/** Scancodes. */ -#define SC_ESC 0x01 -#define SC_BACKSPACE 0x0e -#define SC_LSHIFT 0x2a -#define SC_RSHIFT 0x36 -#define SC_CAPSLOCK 0x3a -#define SC_SPEC_ESCAPE 0xe0 -#define SC_LEFTARR 0x4b -#define SC_RIGHTARR 0x4d -#define SC_UPARR 0x48 -#define SC_DOWNARR 0x50 -#define SC_DELETE 0x53 -#define SC_HOME 0x47 -#define SC_END 0x4f - -#define FUNCTION_KEYS 0x100 static volatile int keyflags; /**< Tracking of multiple keypresses. */ static volatile int lockflags; /**< Tracking of multiple keys lockings. */ - -/** Primary meaning of scancodes. */ -static int sc_primary_map[] = { - SPECIAL, /* 0x00 */ - SPECIAL, /* 0x01 - Esc */ - '1', '2', '3', '4', '5', '6', '7', '8', '9', '0', '-', '=', - '\b', /* 0x0e - Backspace */ - '\t', 'q', 'w', 'e', 'r', 't', 'y', 'u', 'i', 'o', 'p', '[', ']', '\n', - SPECIAL, /* 0x1d - LCtrl */ - 'a', 's', 'd', 'f', 'g', 'h', 'j', 'k', 'l', ';', '\'', - '`', - SPECIAL, /* 0x2a - LShift */ - '\\', - 'z', 'x', 'c', 'v', 'b', 'n', 'm', ',', '.', '/', - SPECIAL, /* 0x36 - RShift */ - '*', - SPECIAL, /* 0x38 - LAlt */ - ' ', - SPECIAL, /* 0x3a - CapsLock */ - (FUNCTION_KEYS | 1), /* 0x3b - F1 */ - (FUNCTION_KEYS | 2), /* 0x3c - F2 */ - (FUNCTION_KEYS | 3), /* 0x3d - F3 */ - (FUNCTION_KEYS | 4), /* 0x3e - F4 */ - (FUNCTION_KEYS | 5), /* 0x3f - F5 */ - (FUNCTION_KEYS | 6), /* 0x40 - F6 */ - (FUNCTION_KEYS | 7), /* 0x41 - F7 */ - (FUNCTION_KEYS | 8), /* 0x42 - F8 */ - (FUNCTION_KEYS | 9), /* 0x43 - F9 */ - (FUNCTION_KEYS | 10), /* 0x44 - F10 */ - SPECIAL, /* 0x45 - NumLock */ - SPECIAL, /* 0x46 - ScrollLock */ - '7', '8', '9', '-', - '4', '5', '6', '+', - '1', '2', '3', - '0', '.', - SPECIAL, /* 0x54 - Alt-SysRq */ - SPECIAL, /* 0x55 - F11/F12/PF1/FN */ - SPECIAL, /* 0x56 - unlabelled key next to LAlt */ - (FUNCTION_KEYS | 11), /* 0x57 - F11 */ - (FUNCTION_KEYS | 12), /* 0x58 - F12 */ - SPECIAL, /* 0x59 */ - SPECIAL, /* 0x5a */ - SPECIAL, /* 0x5b */ - SPECIAL, /* 0x5c */ - SPECIAL, /* 0x5d */ - SPECIAL, /* 0x5e */ - SPECIAL, /* 0x5f */ - SPECIAL, /* 0x60 */ - SPECIAL, /* 0x61 */ - SPECIAL, /* 0x62 */ - SPECIAL, /* 0x63 */ - SPECIAL, /* 0x64 */ - SPECIAL, /* 0x65 */ - SPECIAL, /* 0x66 */ - SPECIAL, /* 0x67 */ - SPECIAL, /* 0x68 */ - SPECIAL, /* 0x69 */ - SPECIAL, /* 0x6a */ - SPECIAL, /* 0x6b */ - SPECIAL, /* 0x6c */ - SPECIAL, /* 0x6d */ - SPECIAL, /* 0x6e */ - SPECIAL, /* 0x6f */ - SPECIAL, /* 0x70 */ - SPECIAL, /* 0x71 */ - SPECIAL, /* 0x72 */ - SPECIAL, /* 0x73 */ - SPECIAL, /* 0x74 */ - SPECIAL, /* 0x75 */ - SPECIAL, /* 0x76 */ - SPECIAL, /* 0x77 */ - SPECIAL, /* 0x78 */ - SPECIAL, /* 0x79 */ - SPECIAL, /* 0x7a */ - SPECIAL, /* 0x7b */ - SPECIAL, /* 0x7c */ - SPECIAL, /* 0x7d */ - SPECIAL, /* 0x7e */ - SPECIAL, /* 0x7f */ -}; - -/** Secondary meaning of scancodes. */ -static int sc_secondary_map[] = { - SPECIAL, /* 0x00 */ - 0x1b, /* 0x01 - Esc */ - '!', '@', '#', '$', '%', '^', '&', '*', '(', ')', '_', '+', - SPECIAL, /* 0x0e - Backspace */ - '\t', 'Q', 'W', 'E', 'R', 'T', 'Y', 'U', 'I', 'O', 'P', '{', '}', '\n', - SPECIAL, /* 0x1d - LCtrl */ - 'A', 'S', 'D', 'F', 'G', 'H', 'J', 'K', 'L', ':', '"', - '~', - SPECIAL, /* 0x2a - LShift */ - '|', - 'Z', 'X', 'C', 'V', 'B', 'N', 'M', '<', '>', '?', - SPECIAL, /* 0x36 - RShift */ - '*', - SPECIAL, /* 0x38 - LAlt */ - ' ', - SPECIAL, /* 0x3a - CapsLock */ - SPECIAL, /* 0x3b - F1 */ - SPECIAL, /* 0x3c - F2 */ - SPECIAL, /* 0x3d - F3 */ - SPECIAL, /* 0x3e - F4 */ - SPECIAL, /* 0x3f - F5 */ - SPECIAL, /* 0x40 - F6 */ - SPECIAL, /* 0x41 - F7 */ - SPECIAL, /* 0x42 - F8 */ - SPECIAL, /* 0x43 - F9 */ - SPECIAL, /* 0x44 - F10 */ - SPECIAL, /* 0x45 - NumLock */ - SPECIAL, /* 0x46 - ScrollLock */ - '7', '8', '9', '-', - '4', '5', '6', '+', - '1', '2', '3', - '0', '.', - SPECIAL, /* 0x54 - Alt-SysRq */ - SPECIAL, /* 0x55 - F11/F12/PF1/FN */ - SPECIAL, /* 0x56 - unlabelled key next to LAlt */ - SPECIAL, /* 0x57 - F11 */ - SPECIAL, /* 0x58 - F12 */ - SPECIAL, /* 0x59 */ - SPECIAL, /* 0x5a */ - SPECIAL, /* 0x5b */ - SPECIAL, /* 0x5c */ - SPECIAL, /* 0x5d */ - SPECIAL, /* 0x5e */ - SPECIAL, /* 0x5f */ - SPECIAL, /* 0x60 */ - SPECIAL, /* 0x61 */ - SPECIAL, /* 0x62 */ - SPECIAL, /* 0x63 */ - SPECIAL, /* 0x64 */ - SPECIAL, /* 0x65 */ - SPECIAL, /* 0x66 */ - SPECIAL, /* 0x67 */ - SPECIAL, /* 0x68 */ - SPECIAL, /* 0x69 */ - SPECIAL, /* 0x6a */ - SPECIAL, /* 0x6b */ - SPECIAL, /* 0x6c */ - SPECIAL, /* 0x6d */ - SPECIAL, /* 0x6e */ - SPECIAL, /* 0x6f */ - SPECIAL, /* 0x70 */ - SPECIAL, /* 0x71 */ - SPECIAL, /* 0x72 */ - SPECIAL, /* 0x73 */ - SPECIAL, /* 0x74 */ - SPECIAL, /* 0x75 */ - SPECIAL, /* 0x76 */ - SPECIAL, /* 0x77 */ - SPECIAL, /* 0x78 */ - SPECIAL, /* 0x79 */ - SPECIAL, /* 0x7a */ - SPECIAL, /* 0x7b */ - SPECIAL, /* 0x7c */ - SPECIAL, /* 0x7d */ - SPECIAL, /* 0x7e */ - SPECIAL, /* 0x7f */ -}; irq_cmd_t i8042_cmds[2] = { @@ -265,119 +78,4 @@ i8042_cmds }; - -static void key_released(keybuffer_t *keybuffer, unsigned char key) -{ - switch (key) { - case SC_LSHIFT: - case SC_RSHIFT: - keyflags &= ~PRESSED_SHIFT; - break; - case SC_CAPSLOCK: - keyflags &= ~PRESSED_CAPSLOCK; - if (lockflags & LOCKED_CAPSLOCK) - lockflags &= ~LOCKED_CAPSLOCK; - else - lockflags |= LOCKED_CAPSLOCK; - break; - default: - break; - } -} - -static void key_pressed(keybuffer_t *keybuffer, unsigned char key) -{ - int *map = sc_primary_map; - int ascii = sc_primary_map[key]; - int shift, capslock; - int letter = 0; - - static int esc_count=0; - - - if ( key == SC_ESC ) { - esc_count++; - if ( esc_count == 3 ) { - __SYSCALL0(SYS_DEBUG_ENABLE_CONSOLE); - } - } else { - esc_count=0; - } - - - - switch (key) { - case SC_LSHIFT: - case SC_RSHIFT: - keyflags |= PRESSED_SHIFT; - break; - case SC_CAPSLOCK: - keyflags |= PRESSED_CAPSLOCK; - break; - case SC_SPEC_ESCAPE: - break; - /* case SC_LEFTARR: - if (keybuffer_available(keybuffer) >= 3) { - keybuffer_push(keybuffer, 0x1b); - keybuffer_push(keybuffer, 0x5b); - keybuffer_push(keybuffer, 0x44); - } - break; - case SC_RIGHTARR: - if (keybuffer_available(keybuffer) >= 3) { - keybuffer_push(keybuffer, 0x1b); - keybuffer_push(keybuffer, 0x5b); - keybuffer_push(keybuffer, 0x43); - } - break; - case SC_UPARR: - if (keybuffer_available(keybuffer) >= 3) { - keybuffer_push(keybuffer, 0x1b); - keybuffer_push(keybuffer, 0x5b); - keybuffer_push(keybuffer, 0x41); - } - break; - case SC_DOWNARR: - if (keybuffer_available(keybuffer) >= 3) { - keybuffer_push(keybuffer, 0x1b); - keybuffer_push(keybuffer, 0x5b); - keybuffer_push(keybuffer, 0x42); - } - break; - case SC_HOME: - if (keybuffer_available(keybuffer) >= 3) { - keybuffer_push(keybuffer, 0x1b); - keybuffer_push(keybuffer, 0x4f); - keybuffer_push(keybuffer, 0x48); - } - break; - case SC_END: - if (keybuffer_available(keybuffer) >= 3) { - keybuffer_push(keybuffer, 0x1b); - keybuffer_push(keybuffer, 0x4f); - keybuffer_push(keybuffer, 0x46); - } - break; - case SC_DELETE: - if (keybuffer_available(keybuffer) >= 4) { - keybuffer_push(keybuffer, 0x1b); - keybuffer_push(keybuffer, 0x5b); - keybuffer_push(keybuffer, 0x33); - keybuffer_push(keybuffer, 0x7e); - } - break; - */ default: - letter = ((ascii >= 'a') && (ascii <= 'z')); - capslock = (keyflags & PRESSED_CAPSLOCK) || (lockflags & LOCKED_CAPSLOCK); - shift = keyflags & PRESSED_SHIFT; - if (letter && capslock) - shift = !shift; - if (shift) - map = sc_secondary_map; - if (map[key] != SPECIAL) - keybuffer_push(keybuffer, map[key]); - break; - } -} - static void wait_ready(void) { @@ -462,10 +160,8 @@ int scan_code = IPC_GET_ARG2(*call); - if (scan_code != IGNORE_CODE) { - if (scan_code & KEY_RELEASE) - key_released(keybuffer, scan_code ^ KEY_RELEASE); - else - key_pressed(keybuffer, scan_code); - } + if (scan_code & KEY_RELEASE) + key_released(keybuffer, scan_code ^ KEY_RELEASE); + else + key_pressed(keybuffer, scan_code); return 1; } @@ -474,3 +170,2 @@ * @} */ - Index: uspace/kbd/arch/ia32/src/scanc.c =================================================================== --- uspace/kbd/arch/ia32/src/scanc.c (revision 27ab6a7c0ae5ecb4768a58e568c321a2c017a35b) +++ uspace/kbd/arch/ia32/src/scanc.c (revision 27ab6a7c0ae5ecb4768a58e568c321a2c017a35b) @@ -0,0 +1,202 @@ +/* + * Copyright (C) 2001-2004 Jakub Jermar + * Copyright (C) 2006 Josef Cejka + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup kbdia32 + * @brief Scancodes for PC keyboards. + * @{ + */ +/** @file + * @ingroup kbdamd64 + */ + +#include + +/** Primary meaning of scancodes. */ +int sc_primary_map[] = { + SPECIAL, /* 0x00 */ + SPECIAL, /* 0x01 - Esc */ + '1', '2', '3', '4', '5', '6', '7', '8', '9', '0', '-', '=', + '\b', /* 0x0e - Backspace */ + '\t', 'q', 'w', 'e', 'r', 't', 'y', 'u', 'i', 'o', 'p', '[', ']', '\n', + SPECIAL, /* 0x1d - LCtrl */ + 'a', 's', 'd', 'f', 'g', 'h', 'j', 'k', 'l', ';', '\'', + '`', + SPECIAL, /* 0x2a - LShift */ + '\\', + 'z', 'x', 'c', 'v', 'b', 'n', 'm', ',', '.', '/', + SPECIAL, /* 0x36 - RShift */ + '*', + SPECIAL, /* 0x38 - LAlt */ + ' ', + SPECIAL, /* 0x3a - CapsLock */ + (FUNCTION_KEYS | 1), /* 0x3b - F1 */ + (FUNCTION_KEYS | 2), /* 0x3c - F2 */ + (FUNCTION_KEYS | 3), /* 0x3d - F3 */ + (FUNCTION_KEYS | 4), /* 0x3e - F4 */ + (FUNCTION_KEYS | 5), /* 0x3f - F5 */ + (FUNCTION_KEYS | 6), /* 0x40 - F6 */ + (FUNCTION_KEYS | 7), /* 0x41 - F7 */ + (FUNCTION_KEYS | 8), /* 0x42 - F8 */ + (FUNCTION_KEYS | 9), /* 0x43 - F9 */ + (FUNCTION_KEYS | 10), /* 0x44 - F10 */ + SPECIAL, /* 0x45 - NumLock */ + SPECIAL, /* 0x46 - ScrollLock */ + '7', '8', '9', '-', + '4', '5', '6', '+', + '1', '2', '3', + '0', '.', + SPECIAL, /* 0x54 - Alt-SysRq */ + SPECIAL, /* 0x55 - F11/F12/PF1/FN */ + SPECIAL, /* 0x56 - unlabelled key next to LAlt */ + (FUNCTION_KEYS | 11), /* 0x57 - F11 */ + (FUNCTION_KEYS | 12), /* 0x58 - F12 */ + SPECIAL, /* 0x59 */ + SPECIAL, /* 0x5a */ + SPECIAL, /* 0x5b */ + SPECIAL, /* 0x5c */ + SPECIAL, /* 0x5d */ + SPECIAL, /* 0x5e */ + SPECIAL, /* 0x5f */ + SPECIAL, /* 0x60 */ + SPECIAL, /* 0x61 */ + SPECIAL, /* 0x62 */ + SPECIAL, /* 0x63 */ + SPECIAL, /* 0x64 */ + SPECIAL, /* 0x65 */ + SPECIAL, /* 0x66 */ + SPECIAL, /* 0x67 */ + SPECIAL, /* 0x68 */ + SPECIAL, /* 0x69 */ + SPECIAL, /* 0x6a */ + SPECIAL, /* 0x6b */ + SPECIAL, /* 0x6c */ + SPECIAL, /* 0x6d */ + SPECIAL, /* 0x6e */ + SPECIAL, /* 0x6f */ + SPECIAL, /* 0x70 */ + SPECIAL, /* 0x71 */ + SPECIAL, /* 0x72 */ + SPECIAL, /* 0x73 */ + SPECIAL, /* 0x74 */ + SPECIAL, /* 0x75 */ + SPECIAL, /* 0x76 */ + SPECIAL, /* 0x77 */ + SPECIAL, /* 0x78 */ + SPECIAL, /* 0x79 */ + SPECIAL, /* 0x7a */ + SPECIAL, /* 0x7b */ + SPECIAL, /* 0x7c */ + SPECIAL, /* 0x7d */ + SPECIAL, /* 0x7e */ + SPECIAL, /* 0x7f */ +}; + +/** Secondary meaning of scancodes. */ +int sc_secondary_map[] = { + SPECIAL, /* 0x00 */ + 0x1b, /* 0x01 - Esc */ + '!', '@', '#', '$', '%', '^', '&', '*', '(', ')', '_', '+', + SPECIAL, /* 0x0e - Backspace */ + '\t', 'Q', 'W', 'E', 'R', 'T', 'Y', 'U', 'I', 'O', 'P', '{', '}', '\n', + SPECIAL, /* 0x1d - LCtrl */ + 'A', 'S', 'D', 'F', 'G', 'H', 'J', 'K', 'L', ':', '"', + '~', + SPECIAL, /* 0x2a - LShift */ + '|', + 'Z', 'X', 'C', 'V', 'B', 'N', 'M', '<', '>', '?', + SPECIAL, /* 0x36 - RShift */ + '*', + SPECIAL, /* 0x38 - LAlt */ + ' ', + SPECIAL, /* 0x3a - CapsLock */ + SPECIAL, /* 0x3b - F1 */ + SPECIAL, /* 0x3c - F2 */ + SPECIAL, /* 0x3d - F3 */ + SPECIAL, /* 0x3e - F4 */ + SPECIAL, /* 0x3f - F5 */ + SPECIAL, /* 0x40 - F6 */ + SPECIAL, /* 0x41 - F7 */ + SPECIAL, /* 0x42 - F8 */ + SPECIAL, /* 0x43 - F9 */ + SPECIAL, /* 0x44 - F10 */ + SPECIAL, /* 0x45 - NumLock */ + SPECIAL, /* 0x46 - ScrollLock */ + '7', '8', '9', '-', + '4', '5', '6', '+', + '1', '2', '3', + '0', '.', + SPECIAL, /* 0x54 - Alt-SysRq */ + SPECIAL, /* 0x55 - F11/F12/PF1/FN */ + SPECIAL, /* 0x56 - unlabelled key next to LAlt */ + SPECIAL, /* 0x57 - F11 */ + SPECIAL, /* 0x58 - F12 */ + SPECIAL, /* 0x59 */ + SPECIAL, /* 0x5a */ + SPECIAL, /* 0x5b */ + SPECIAL, /* 0x5c */ + SPECIAL, /* 0x5d */ + SPECIAL, /* 0x5e */ + SPECIAL, /* 0x5f */ + SPECIAL, /* 0x60 */ + SPECIAL, /* 0x61 */ + SPECIAL, /* 0x62 */ + SPECIAL, /* 0x63 */ + SPECIAL, /* 0x64 */ + SPECIAL, /* 0x65 */ + SPECIAL, /* 0x66 */ + SPECIAL, /* 0x67 */ + SPECIAL, /* 0x68 */ + SPECIAL, /* 0x69 */ + SPECIAL, /* 0x6a */ + SPECIAL, /* 0x6b */ + SPECIAL, /* 0x6c */ + SPECIAL, /* 0x6d */ + SPECIAL, /* 0x6e */ + SPECIAL, /* 0x6f */ + SPECIAL, /* 0x70 */ + SPECIAL, /* 0x71 */ + SPECIAL, /* 0x72 */ + SPECIAL, /* 0x73 */ + SPECIAL, /* 0x74 */ + SPECIAL, /* 0x75 */ + SPECIAL, /* 0x76 */ + SPECIAL, /* 0x77 */ + SPECIAL, /* 0x78 */ + SPECIAL, /* 0x79 */ + SPECIAL, /* 0x7a */ + SPECIAL, /* 0x7b */ + SPECIAL, /* 0x7c */ + SPECIAL, /* 0x7d */ + SPECIAL, /* 0x7e */ + SPECIAL, /* 0x7f */ +}; + +/** + * @} + */ Index: uspace/kbd/arch/ia64/include/kbd.h =================================================================== --- uspace/kbd/arch/ia64/include/kbd.h (revision 9141377d3aec1027ed16cfa6e2085fc028ba13f7) +++ uspace/kbd/arch/ia64/include/kbd.h (revision 27ab6a7c0ae5ecb4768a58e568c321a2c017a35b) @@ -35,11 +35,6 @@ */ - -#ifndef __ia64_KBD_H__ -#define __ia64_KBD_H__ - -#include - -int kbd_arch_init(void); +#ifndef KBD_ia64_KBD_H_ +#define KBD_ia64_KBD_H_ #endif Index: uspace/kbd/arch/ia64/src/kbd.c =================================================================== --- uspace/kbd/arch/ia64/src/kbd.c (revision 9141377d3aec1027ed16cfa6e2085fc028ba13f7) +++ uspace/kbd/arch/ia64/src/kbd.c (revision 27ab6a7c0ae5ecb4768a58e568c321a2c017a35b) @@ -54,5 +54,4 @@ #define KEY_F12 0x7e34325b1b - #define FUNCTION_KEYS 0x100 @@ -91,5 +90,4 @@ int scan_code = IPC_GET_ARG2(*call); - /* * Please preserve this code (it can be used to determine scancodes) @@ -105,5 +103,4 @@ } else { - if (buf == 0x1b) { esc_count++; @@ -119,40 +116,40 @@ } else { switch (buf) { - case KEY_F1: - keybuffer_push(keybuffer, FUNCTION_KEYS | 1); - break; - case KEY_F2: - keybuffer_push(keybuffer, FUNCTION_KEYS | 2); - break; - case KEY_F3: - keybuffer_push(keybuffer, FUNCTION_KEYS | 3); - break; - case KEY_F4: - keybuffer_push(keybuffer, FUNCTION_KEYS | 4); - break; - case KEY_F5: - keybuffer_push(keybuffer, FUNCTION_KEYS | 5); - break; - case KEY_F6: - keybuffer_push(keybuffer, FUNCTION_KEYS | 6); - break; - case KEY_F7: - keybuffer_push(keybuffer, FUNCTION_KEYS | 7); - break; - case KEY_F8: - keybuffer_push(keybuffer, FUNCTION_KEYS | 8); - break; - case KEY_F9: - keybuffer_push(keybuffer, FUNCTION_KEYS | 9); - break; - case KEY_F10: - keybuffer_push(keybuffer, FUNCTION_KEYS | 10); - break; - case KEY_F11: - keybuffer_push(keybuffer, FUNCTION_KEYS | 11); - break; - case KEY_F12: - keybuffer_push(keybuffer, FUNCTION_KEYS | 12); - break; + case KEY_F1: + keybuffer_push(keybuffer, FUNCTION_KEYS | 1); + break; + case KEY_F2: + keybuffer_push(keybuffer, FUNCTION_KEYS | 2); + break; + case KEY_F3: + keybuffer_push(keybuffer, FUNCTION_KEYS | 3); + break; + case KEY_F4: + keybuffer_push(keybuffer, FUNCTION_KEYS | 4); + break; + case KEY_F5: + keybuffer_push(keybuffer, FUNCTION_KEYS | 5); + break; + case KEY_F6: + keybuffer_push(keybuffer, FUNCTION_KEYS | 6); + break; + case KEY_F7: + keybuffer_push(keybuffer, FUNCTION_KEYS | 7); + break; + case KEY_F8: + keybuffer_push(keybuffer, FUNCTION_KEYS | 8); + break; + case KEY_F9: + keybuffer_push(keybuffer, FUNCTION_KEYS | 9); + break; + case KEY_F10: + keybuffer_push(keybuffer, FUNCTION_KEYS | 10); + break; + case KEY_F11: + keybuffer_push(keybuffer, FUNCTION_KEYS | 11); + break; + case KEY_F12: + keybuffer_push(keybuffer, FUNCTION_KEYS | 12); + break; } } Index: uspace/kbd/arch/mips32/include/kbd.h =================================================================== --- uspace/kbd/arch/mips32/include/kbd.h (revision 9141377d3aec1027ed16cfa6e2085fc028ba13f7) +++ uspace/kbd/arch/mips32/include/kbd.h (revision 27ab6a7c0ae5ecb4768a58e568c321a2c017a35b) @@ -35,10 +35,6 @@ */ -#ifndef __mips32_KBD_H__ -#define __mips32_KBD_H__ - -#include - -int kbd_arch_init(void); +#ifndef KBD_mips32_KBD_H_ +#define KBD_mips32_KBD_H_ #endif Index: uspace/kbd/arch/mips32/src/kbd.c =================================================================== --- uspace/kbd/arch/mips32/src/kbd.c (revision 9141377d3aec1027ed16cfa6e2085fc028ba13f7) +++ uspace/kbd/arch/mips32/src/kbd.c (revision 27ab6a7c0ae5ecb4768a58e568c321a2c017a35b) @@ -53,5 +53,4 @@ #define MSIM_KEY_F12 0x34325b1bL - #define GXEMUL_KEY_F1 0x504f5b1bL #define GXEMUL_KEY_F2 0x514f5b1bL @@ -67,7 +66,5 @@ #define GXEMUL_KEY_F12 0x34325b1bL - #define FUNCTION_KEYS 0x100 - irq_cmd_t msim_cmds[1] = { @@ -86,5 +83,5 @@ int kbd_arch_init(void) { - fb_fb=sysinfo_value("fb.kind")==1; + fb_fb = (sysinfo_value("fb.kind") == 1); ipc_register_irq(2, &msim_kbd); return 0; @@ -105,7 +102,6 @@ { - static unsigned long buf=0; - static int count=0; - + static unsigned long buf = 0; + static int count = 0; /* Please preserve this code (it can be used to determine scancodes) @@ -119,133 +115,123 @@ */ - if(scan_code==0x7e) - { - switch (buf){ - case MSIM_KEY_F5: - keybuffer_push(keybuffer,FUNCTION_KEYS | 5 ); - buf=count=0; - return 1; - case MSIM_KEY_F6: - keybuffer_push(keybuffer,FUNCTION_KEYS | 6 ); - buf=count=0; - return 1; - case MSIM_KEY_F7: - keybuffer_push(keybuffer,FUNCTION_KEYS | 7 ); - buf=count=0; - return 1; - case MSIM_KEY_F8: - keybuffer_push(keybuffer,FUNCTION_KEYS | 8 ); - buf=count=0; - return 1; - - case MSIM_KEY_F9: - keybuffer_push(keybuffer,FUNCTION_KEYS | 9 ); - buf=count=0; - return 1; - case MSIM_KEY_F10: - keybuffer_push(keybuffer,FUNCTION_KEYS | 10 ); - buf=count=0; - return 1; - - case MSIM_KEY_F11: - keybuffer_push(keybuffer,FUNCTION_KEYS | 11 ); - buf=count=0; - return 1; - case MSIM_KEY_F12: - keybuffer_push(keybuffer,FUNCTION_KEYS | 12 ); - buf=count=0; - return 1; - default: - keybuffer_push(keybuffer, buf & 0xff ); - keybuffer_push(keybuffer, (buf >> 8) &0xff ); - keybuffer_push(keybuffer, (buf >> 16) &0xff ); - keybuffer_push(keybuffer, (buf >> 24) &0xff ); - keybuffer_push(keybuffer, scan_code ); - buf=count=0; - return 1; - + if(scan_code == 0x7e) { + switch (buf) { + case MSIM_KEY_F5: + keybuffer_push(keybuffer,FUNCTION_KEYS | 5); + buf = count = 0; + return 1; + case MSIM_KEY_F6: + keybuffer_push(keybuffer,FUNCTION_KEYS | 6); + buf = count = 0; + return 1; + case MSIM_KEY_F7: + keybuffer_push(keybuffer,FUNCTION_KEYS | 7); + buf = count = 0; + return 1; + case MSIM_KEY_F8: + keybuffer_push(keybuffer,FUNCTION_KEYS | 8); + buf = count = 0; + return 1; + case MSIM_KEY_F9: + keybuffer_push(keybuffer,FUNCTION_KEYS | 9); + buf = count = 0; + return 1; + case MSIM_KEY_F10: + keybuffer_push(keybuffer,FUNCTION_KEYS | 10); + buf = count = 0; + return 1; + case MSIM_KEY_F11: + keybuffer_push(keybuffer,FUNCTION_KEYS | 11); + buf = count = 0; + return 1; + case MSIM_KEY_F12: + keybuffer_push(keybuffer,FUNCTION_KEYS | 12); + buf = count = 0; + return 1; + default: + keybuffer_push(keybuffer, buf & 0xff); + keybuffer_push(keybuffer, (buf >> 8) &0xff); + keybuffer_push(keybuffer, (buf >> 16) &0xff); + keybuffer_push(keybuffer, (buf >> 24) &0xff); + keybuffer_push(keybuffer, scan_code); + buf = count = 0; + return 1; } } - buf|=((unsigned long) scan_code)<<(8*(count++)); - - - if((buf & 0xff)!= (MSIM_KEY_F1 & 0xff)) { - - keybuffer_push(keybuffer,buf ); - buf=count=0; - return 1; - } - - if ( count <= 1 ) - return 1; - - if( (buf & 0xffff) != (MSIM_KEY_F1 & 0xffff) - && (buf & 0xffff) != (MSIM_KEY_F5 & 0xffff) ) { - - keybuffer_push(keybuffer, buf & 0xff ); - keybuffer_push(keybuffer, (buf >> 8) &0xff ); - buf=count=0; - return 1; - } - - if ( count <= 2) - return 1; - - switch (buf){ - case MSIM_KEY_F1: - keybuffer_push(keybuffer,FUNCTION_KEYS | 1 ); - buf=count=0; - return 1; - case MSIM_KEY_F2: - keybuffer_push(keybuffer,FUNCTION_KEYS | 2 ); - buf=count=0; - return 1; - case MSIM_KEY_F3: - keybuffer_push(keybuffer,FUNCTION_KEYS | 3 ); - buf=count=0; - return 1; - case MSIM_KEY_F4: - keybuffer_push(keybuffer,FUNCTION_KEYS | 4 ); - buf=count=0; - return 1; - } - - - if( (buf & 0xffffff) != (MSIM_KEY_F5 & 0xffffff) - && (buf & 0xffffff) != (MSIM_KEY_F9 & 0xffffff) ) { - - keybuffer_push(keybuffer, buf & 0xff ); - keybuffer_push(keybuffer, (buf >> 8) &0xff ); - keybuffer_push(keybuffer, (buf >> 16) &0xff ); - buf=count=0; - return 1; - } - - if ( count <= 3 ) - return 1; - - - - - switch (buf){ - case MSIM_KEY_F5: - case MSIM_KEY_F6: - case MSIM_KEY_F7: - case MSIM_KEY_F8: - case MSIM_KEY_F9: - case MSIM_KEY_F10: - case MSIM_KEY_F11: - case MSIM_KEY_F12: - return 1; - default: - keybuffer_push(keybuffer, buf & 0xff ); - keybuffer_push(keybuffer, (buf >> 8) &0xff ); - keybuffer_push(keybuffer, (buf >> 16) &0xff ); - keybuffer_push(keybuffer, (buf >> 24) &0xff ); - buf=count=0; - return 1; - - } + buf |= ((unsigned long) scan_code)<<(8*(count++)); + + if((buf & 0xff) != (MSIM_KEY_F1 & 0xff)) { + keybuffer_push(keybuffer, buf); + buf = count = 0; + return 1; + } + + if (count <= 1) + return 1; + + if ((buf & 0xffff) != (MSIM_KEY_F1 & 0xffff) + && (buf & 0xffff) != (MSIM_KEY_F5 & 0xffff) ) { + + keybuffer_push(keybuffer, buf & 0xff); + keybuffer_push(keybuffer, (buf >> 8) &0xff); + buf = count = 0; + return 1; + } + + if (count <= 2) + return 1; + + switch (buf) { + case MSIM_KEY_F1: + keybuffer_push(keybuffer,FUNCTION_KEYS | 1); + buf = count = 0; + return 1; + case MSIM_KEY_F2: + keybuffer_push(keybuffer,FUNCTION_KEYS | 2); + buf = count = 0; + return 1; + case MSIM_KEY_F3: + keybuffer_push(keybuffer,FUNCTION_KEYS | 3); + buf = count = 0; + return 1; + case MSIM_KEY_F4: + keybuffer_push(keybuffer,FUNCTION_KEYS | 4); + buf = count = 0; + return 1; + } + + + if((buf & 0xffffff) != (MSIM_KEY_F5 & 0xffffff) + && (buf & 0xffffff) != (MSIM_KEY_F9 & 0xffffff)) { + + keybuffer_push(keybuffer, buf & 0xff); + keybuffer_push(keybuffer, (buf >> 8) & 0xff); + keybuffer_push(keybuffer, (buf >> 16) & 0xff); + buf=count=0; + return 1; + } + + if (count <= 3) + return 1; + + switch (buf) { + case MSIM_KEY_F5: + case MSIM_KEY_F6: + case MSIM_KEY_F7: + case MSIM_KEY_F8: + case MSIM_KEY_F9: + case MSIM_KEY_F10: + case MSIM_KEY_F11: + case MSIM_KEY_F12: + return 1; + default: + keybuffer_push(keybuffer, buf & 0xff); + keybuffer_push(keybuffer, (buf >> 8) &0xff); + keybuffer_push(keybuffer, (buf >> 16) &0xff); + keybuffer_push(keybuffer, (buf >> 24) &0xff); + buf = count = 0; + return 1; + } return 1; } @@ -255,8 +241,6 @@ static int kbd_arch_process_fb(keybuffer_t *keybuffer, int scan_code) { - - static unsigned long buf=0; - static int count=0; - + static unsigned long buf = 0; + static int count = 0; /* Please preserve this code (it can be used to determine scancodes) @@ -270,107 +254,102 @@ */ - if ( scan_code == '\r' ) - scan_code = '\n' ; - - buf|=((unsigned long) scan_code)<<(8*(count++)); - - - if((buf & 0xff)!= (GXEMUL_KEY_F1 & 0xff)) { - - keybuffer_push(keybuffer,buf ); - buf=count=0; - return 1; - } - - if ( count <= 1 ) - return 1; - - if( (buf & 0xffff) != (GXEMUL_KEY_F1 & 0xffff) ) { - - keybuffer_push(keybuffer, buf & 0xff ); - keybuffer_push(keybuffer, (buf >> 8) &0xff ); - buf=count=0; - return 1; - } - - if ( count <= 2) - return 1; - - - if( (buf & 0xffffff) != (GXEMUL_KEY_F1 & 0xffffff) - && (buf & 0xffffff) != (GXEMUL_KEY_F5 & 0xffffff) - && (buf & 0xffffff) != (GXEMUL_KEY_F9 & 0xffffff) ) { - + if (scan_code == '\r') + scan_code = '\n'; + + buf |= ((unsigned long) scan_code)<<(8*(count++)); + + + if ((buf & 0xff) != (GXEMUL_KEY_F1 & 0xff)) { + keybuffer_push(keybuffer, buf); + buf = count = 0; + return 1; + } + + if (count <= 1) + return 1; + + if ((buf & 0xffff) != (GXEMUL_KEY_F1 & 0xffff)) { + keybuffer_push(keybuffer, buf & 0xff); + keybuffer_push(keybuffer, (buf >> 8) &0xff); + buf = count = 0; + return 1; + } + + if (count <= 2) + return 1; + + + if ((buf & 0xffffff) != (GXEMUL_KEY_F1 & 0xffffff) + && (buf & 0xffffff) != (GXEMUL_KEY_F5 & 0xffffff) + && (buf & 0xffffff) != (GXEMUL_KEY_F9 & 0xffffff)) { + + keybuffer_push(keybuffer, buf & 0xff); + keybuffer_push(keybuffer, (buf >> 8) & 0xff); + keybuffer_push(keybuffer, (buf >> 16) & 0xff); + buf = count = 0; + return 1; + } + + if ( count <= 3 ) + return 1; + + + switch (buf) { + case GXEMUL_KEY_F1: + keybuffer_push(keybuffer,FUNCTION_KEYS | 1 ); + buf=count=0; + return 1; + case GXEMUL_KEY_F2: + keybuffer_push(keybuffer,FUNCTION_KEYS | 2 ); + buf=count=0; + return 1; + case GXEMUL_KEY_F3: + keybuffer_push(keybuffer,FUNCTION_KEYS | 3 ); + buf=count=0; + return 1; + case GXEMUL_KEY_F4: + keybuffer_push(keybuffer,FUNCTION_KEYS | 4 ); + buf=count=0; + return 1; + case GXEMUL_KEY_F5: + keybuffer_push(keybuffer,FUNCTION_KEYS | 5 ); + buf=count=0; + return 1; + case GXEMUL_KEY_F6: + keybuffer_push(keybuffer,FUNCTION_KEYS | 6 ); + buf=count=0; + return 1; + case GXEMUL_KEY_F7: + keybuffer_push(keybuffer,FUNCTION_KEYS | 7 ); + buf=count=0; + return 1; + case GXEMUL_KEY_F8: + keybuffer_push(keybuffer,FUNCTION_KEYS | 8 ); + buf=count=0; + return 1; + case GXEMUL_KEY_F9: + keybuffer_push(keybuffer,FUNCTION_KEYS | 9 ); + buf=count=0; + return 1; + case GXEMUL_KEY_F10: + keybuffer_push(keybuffer,FUNCTION_KEYS | 10 ); + buf=count=0; + return 1; + case GXEMUL_KEY_F11: + keybuffer_push(keybuffer,FUNCTION_KEYS | 11 ); + buf=count=0; + return 1; + case GXEMUL_KEY_F12: + keybuffer_push(keybuffer,FUNCTION_KEYS | 12 ); + buf=count=0; + return 1; + default: keybuffer_push(keybuffer, buf & 0xff ); keybuffer_push(keybuffer, (buf >> 8) &0xff ); keybuffer_push(keybuffer, (buf >> 16) &0xff ); - buf=count=0; - return 1; - } - - if ( count <= 3 ) - return 1; - - - switch (buf){ - - case GXEMUL_KEY_F1: - keybuffer_push(keybuffer,FUNCTION_KEYS | 1 ); - buf=count=0; - return 1; - case GXEMUL_KEY_F2: - keybuffer_push(keybuffer,FUNCTION_KEYS | 2 ); - buf=count=0; - return 1; - case GXEMUL_KEY_F3: - keybuffer_push(keybuffer,FUNCTION_KEYS | 3 ); - buf=count=0; - return 1; - case GXEMUL_KEY_F4: - keybuffer_push(keybuffer,FUNCTION_KEYS | 4 ); - buf=count=0; - return 1; - case GXEMUL_KEY_F5: - keybuffer_push(keybuffer,FUNCTION_KEYS | 5 ); - buf=count=0; - return 1; - case GXEMUL_KEY_F6: - keybuffer_push(keybuffer,FUNCTION_KEYS | 6 ); - buf=count=0; - return 1; - case GXEMUL_KEY_F7: - keybuffer_push(keybuffer,FUNCTION_KEYS | 7 ); - buf=count=0; - return 1; - case GXEMUL_KEY_F8: - keybuffer_push(keybuffer,FUNCTION_KEYS | 8 ); - buf=count=0; - return 1; - case GXEMUL_KEY_F9: - keybuffer_push(keybuffer,FUNCTION_KEYS | 9 ); - buf=count=0; - return 1; - case GXEMUL_KEY_F10: - keybuffer_push(keybuffer,FUNCTION_KEYS | 10 ); - buf=count=0; - return 1; - case GXEMUL_KEY_F11: - keybuffer_push(keybuffer,FUNCTION_KEYS | 11 ); - buf=count=0; - return 1; - case GXEMUL_KEY_F12: - keybuffer_push(keybuffer,FUNCTION_KEYS | 12 ); - buf=count=0; - return 1; - - default: - keybuffer_push(keybuffer, buf & 0xff ); - keybuffer_push(keybuffer, (buf >> 8) &0xff ); - keybuffer_push(keybuffer, (buf >> 16) &0xff ); - keybuffer_push(keybuffer, (buf >> 24) &0xff ); - buf=count=0; - return 1; - - } + keybuffer_push(keybuffer, (buf >> 24) &0xff ); + buf=count=0; + return 1; + } return 1; } @@ -381,18 +360,16 @@ static int esc_count=0; - - if ( scan_code == 0x1b ) { + if (scan_code == 0x1b) { esc_count++; - if ( esc_count == 3 ) { + if (esc_count == 3) __SYSCALL0(SYS_DEBUG_ENABLE_CONSOLE); - } } else { esc_count=0; } - if(fb_fb) return kbd_arch_process_fb(keybuffer, scan_code); + if (fb_fb) + return kbd_arch_process_fb(keybuffer, scan_code); + return kbd_arch_process_no_fb(keybuffer, scan_code); - - return 0; } /** @} Index: uspace/kbd/arch/ppc32/include/kbd.h =================================================================== --- uspace/kbd/arch/ppc32/include/kbd.h (revision 9141377d3aec1027ed16cfa6e2085fc028ba13f7) +++ uspace/kbd/arch/ppc32/include/kbd.h (revision 27ab6a7c0ae5ecb4768a58e568c321a2c017a35b) @@ -35,10 +35,6 @@ */ -#ifndef __ppc32_KBD_H__ -#define __ppc32_KBD_H__ - -#include - -int kbd_arch_init(void); +#ifndef KBD_ppc32_KBD_H_ +#define KBD_ppc32_KBD_H_ #endif Index: uspace/kbd/arch/ppc64/include/kbd.h =================================================================== --- uspace/kbd/arch/ppc64/include/kbd.h (revision 9141377d3aec1027ed16cfa6e2085fc028ba13f7) +++ uspace/kbd/arch/ppc64/include/kbd.h (revision 27ab6a7c0ae5ecb4768a58e568c321a2c017a35b) @@ -35,10 +35,6 @@ */ -#ifndef __ppc64_KBD_H__ -#define __ppc64_KBD_H__ - -#include - -int kbd_arch_init(void); +#ifndef KBD_ppc64_KBD_H_ +#define KBD_ppc64_KBD_H_ #endif Index: uspace/kbd/include/kbd.h =================================================================== --- uspace/kbd/include/kbd.h (revision 9141377d3aec1027ed16cfa6e2085fc028ba13f7) +++ uspace/kbd/include/kbd.h (revision 27ab6a7c0ae5ecb4768a58e568c321a2c017a35b) @@ -35,11 +35,12 @@ */ -#ifndef __KBD_H__ -#define __KBD_H__ +#ifndef KBD_KBD_H_ +#define KBD_KBD_H_ #include -int kbd_arch_process(keybuffer_t *keybuffer, ipc_call_t *call); -int mouse_arch_process(int phoneid, ipc_call_t *call); +extern int kbd_arch_init(void); +extern int kbd_arch_process(keybuffer_t *keybuffer, ipc_call_t *call); +extern int mouse_arch_process(int phoneid, ipc_call_t *call); #endif Index: uspace/kbd/include/keys.h =================================================================== --- uspace/kbd/include/keys.h (revision 9141377d3aec1027ed16cfa6e2085fc028ba13f7) +++ uspace/kbd/include/keys.h (revision 27ab6a7c0ae5ecb4768a58e568c321a2c017a35b) @@ -31,7 +31,7 @@ * @{ */ - /** - * @file - */ +/** + * @file + */ #ifndef _KBD_KEYS_H_