Changeset b006a2c8 in mainline

Timestamp:

2006-08-04T15:52:02Z (18 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

cfffb290

Parents:

b4fa652

Message:

Add scan code map for Sun keyboard.

Location:

kernel

Files:

• arch/amd64/Makefile.inc (modified) (1 diff)
• arch/ia32/Makefile.inc (modified) (1 diff)
• arch/sparc64/Makefile.inc (modified) (1 diff)
• genarch/Makefile.inc (modified) (1 diff)
• genarch/include/i8042/i8042.h (modified) (3 diffs)
• genarch/include/i8042/scanc_pc.h (added)
• genarch/include/i8042/scanc_sun.h (added)
• genarch/src/i8042/i8042.c (modified) (2 diffs)
• genarch/src/i8042/scanc_pc.c (added)
• genarch/src/i8042/scanc_sun.c (added)

kernel/arch/amd64/Makefile.inc

@@ -62 +62 @@
 
 CONFIG_I8042 = y
+CONFIG_I8042_PC = y
+DEFS += -DCONFIG_I8042_PC
 
 ## Accepted configuration directives

kernel/arch/ia32/Makefile.inc

@@ -81 +81 @@
 
 CONFIG_I8042 = y
-
+CONFIG_I8042_PC = y
+DEFS += -DCONFIG_I8042_PC
 
 ## Accepted configuration directives

kernel/arch/sparc64/Makefile.inc

@@ -65 +65 @@
 
 CONFIG_I8042 = y
+CONFIG_I8042_SUN = y
+DEFS += -DCONFIG_I8042_SUN
 
 ARCH_SOURCES = \

kernel/genarch/Makefile.inc

@@ -69 +69 @@
         GENARCH_SOURCES += \
                 genarch/src/i8042/i8042.c
+                
+        ifeq ($(CONFIG_I8042_PC),y)
+                GENARCH_SOURCES += \
+                        genarch/src/i8042/scanc_pc.c
+        endif
+        ifeq ($(CONFIG_I8042_SUN),y)
+                GENARCH_SOURCES += \
+                        genarch/src/i8042/scanc_sun.c
+        endif
+        
 endif

kernel/genarch/include/i8042/i8042.h

@@ -27 +27 @@
  */
 
- /** @addtogroup genarch        
+/** @addtogroup genarch 
  * @{
  */
@@ -36 +36 @@
 #define __I8042_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
+#ifdef CONFIG_I8042_PC
+#include <genarch/i8042/scanc_pc.h>
+#endif
+#ifdef CONFIG_I8042_SUN
+#include <genarch/i8042/scanc_sun.h>
+#endif
+
+#define SPECIAL         '?'
+
+extern char sc_primary_map[];
+extern char sc_secondary_map[];
 
 extern void i8042_init(void);
@@ -58 +55 @@
 #endif
 
- /** @}
+/** @}
  */
-

kernel/genarch/src/i8042/i8042.c

@@ -77 +77 @@
 #define i8042_MOUSE_DATA        0x20
 
-#define SPECIAL         '?'
 #define KEY_RELEASE     0x80
 
@@ -109 +108 @@
         .resume = i8042_resume,
         .read = key_read
-};
-
-/** Primary meaning of scancodes. */
-static char 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 */
-        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 */
-};
-
-/** Secondary meaning of scancodes. */
-static char sc_secondary_map[] = {
-        SPECIAL, /* 0x00 */
-        SPECIAL, /* 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 */     
 };