Changeset dd641e3 in mainline for kbd/arch/ia32/src/kbd.c

Timestamp:

2006-06-04T12:22:54Z (20 years ago)

Author:

Jakub Vana <jakub.vana@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

26f48570

Parents:

67ec84b

Message:

fb make changes neaded by ega driver and console switching by function keys

File:

• kbd/arch/ia32/src/kbd.c (modified) (4 diffs)

kbd/arch/ia32/src/kbd.c

@@ -58 +58 @@
 #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 char sc_primary_map[] = {
+static int sc_primary_map[] = {
         SPECIAL, /* 0x00 */
         SPECIAL, /* 0x01 - Esc */
@@ -79 +81 @@
         ' ',
         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 */
+        (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 */
@@ -98 +100 @@
         SPECIAL, /* 0x55 - F11/F12/PF1/FN */
         SPECIAL, /* 0x56 - unlabelled key next to LAlt */
-        SPECIAL, /* 0x57 - F11 */
-        SPECIAL, /* 0x58 - F12 */
+        FUNCTION_KEYS | 11, /* 0x57 - F11 */
+        FUNCTION_KEYS | 12, /* 0x58 - F12 */
         SPECIAL, /* 0x59 */
         SPECIAL, /* 0x5a */
@@ -251 +253 @@
 static int key_pressed(keybuffer_t *keybuffer, unsigned char key)
 {
-        char *map = sc_primary_map;
-        char ascii = sc_primary_map[key];
-        char shift, capslock;
-        char letter = 0;
+        int *map = sc_primary_map;
+        int ascii = sc_primary_map[key];
+        int shift, capslock;
+        int letter = 0;
 
         switch (key) {