Support keyboard and mouse input.

  - Add CONFIG_TABLET_USB_WACOM symbol to support Wacom Intuos/Graphire tablet.
  - Disable CONFIG_INPUT_MOUSE symbol.
  - Modify drivers/input/keyboard/atkbd.c for keyboard scancodes.

diff --git a/arch/x86/configs/i386_defconfig b/arch/x86/configs/i386_defconfig
index 5b6237d4883c4942d4128f8e3279cb5926538d4f..96fca3a6d6f78d2f570c2775cf467bcab7701909 100644 (file)
--- a/arch/x86/configs/i386_defconfig
+++ b/arch/x86/configs/i386_defconfig
@@ -934,7 +934,7 @@ CONFIG_PATA_OLDPIIX=y
 # CONFIG_PATA_VIA is not set
 # CONFIG_PATA_WINBOND is not set
 CONFIG_PATA_SCH=y
-CONFIG_MD=y
+#CONFIG_MD=y
 CONFIG_BLK_DEV_MD=y
 CONFIG_MD_AUTODETECT=y
 # CONFIG_MD_LINEAR is not set
@@ -1203,7 +1203,7 @@ CONFIG_KEYBOARD_ATKBD=y
 # CONFIG_KEYBOARD_XTKBD is not set
 # CONFIG_KEYBOARD_NEWTON is not set
 # CONFIG_KEYBOARD_STOWAWAY is not set
-CONFIG_INPUT_MOUSE=y
+CONFIG_INPUT_MOUSE=n
 CONFIG_MOUSE_PS2=y
 CONFIG_MOUSE_PS2_ALPS=y
 CONFIG_MOUSE_PS2_LOGIPS2PP=y
@@ -1243,7 +1243,7 @@ CONFIG_INPUT_TABLET=y
 # CONFIG_TABLET_USB_AIPTEK is not set
 # CONFIG_TABLET_USB_GTCO is not set
 # CONFIG_TABLET_USB_KBTAB is not set
-# CONFIG_TABLET_USB_WACOM is not set
+CONFIG_TABLET_USB_WACOM=y 
 CONFIG_INPUT_TOUCHSCREEN=y
 # CONFIG_TOUCHSCREEN_AD7879_I2C is not set
 # CONFIG_TOUCHSCREEN_AD7879 is not set
@@ -1608,7 +1608,7 @@ CONFIG_DAB=y
 #
 # Graphics support
 #
-CONFIG_AGP=y
+#CONFIG_AGP=y
 # CONFIG_AGP_ALI is not set
 # CONFIG_AGP_ATI is not set
 # CONFIG_AGP_AMD is not set

diff --git a/drivers/input/keyboard/atkbd.c b/drivers/input/keyboard/atkbd.c
index 28e6110d1ff8a51c3eed113f49f6410a1db8784d..099c88c14827ba9b807fcf1798fc101e2ab9942d 100644 (file)
--- a/drivers/input/keyboard/atkbd.c
+++ b/drivers/input/keyboard/atkbd.c
@@ -78,6 +78,29 @@ static const unsigned short atkbd_set2_keycode[ATKBD_KEYMAP_SIZE] = {
 
 #include "hpps2atkbd.h"        /* include the keyboard scancodes */
 
+#else
+
+/* conversion skincode by cosmos in 20090627 */
+#ifndef SIM_SKINCODE 
+         0, 67, 65, 63, 61, 59, 60, 88,  169, 68, 66, 64, 62, 15, 41,117,
+         132, 56, 42, 93, 29, 16,  2,  0,  174,  0, 44, 31, 30, 17,  3,  0,
+         212, 46, 45, 32, 18,  5,  4, 95,  217, 57, 47, 33, 20, 19,  6,183,
+         356, 49, 48, 35, 34, 21,  7,184,  0,  114, 50, 36, 22,  8,  9,185,
+         0, 51, 37, 23, 24, 11, 10,  0,  0, 52, 53, 38, 39, 25, 12,  0,
+         0, 115, 40,  0, 26, 13,  0,  0, 58, 54, 28, 27,  0, 43,  0, 85,
+         0, 86, 91, 90, 92,  0, 14, 94,  0, 79,124, 75, 71,121,  0,  0,
+        82, 83, 80, 76, 77, 72,  1, 69, 87, 78, 81, 74, 55, 73, 70, 99,
+
+         0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+       217,100,255,  0, 97,165,  0,  0,156,  0,  0,  0,  0,  0,  0,125,
+       173,114,  0,113,  0,  0,  0,126,128,  0,  0,140,  0,  0,  0,127,
+       159,  0,115,  0,164,  0,  0,116,158,  0,172,166,  0,  0,  0,142,
+       157,  0,  0,  0,  0,  0,  0,  0,155,  0, 98,  0,  0,163,  0,  0,
+       226,  0,  0,  0,  0,  0,  0,  0,  0,255, 96,  0,  0,  0,143,  0,
+         0,  0,  0,  0,  0,  0,  0,  0,  0,107,  0,105,102,  0,  0,112,
+       110,111,108,112,106,103,  0,119,  0,118,109,  0, 99,104,119,  0,
+
+         0,  0,  0, 65, 99,
 #else
          0, 67, 65, 63, 61, 59, 60, 88,  0, 68, 66, 64, 62, 15, 41,117,
          0, 56, 42, 93, 29, 16,  2,  0,  0,  0, 44, 31, 30, 17,  3,  0,
@@ -98,6 +121,9 @@ static const unsigned short atkbd_set2_keycode[ATKBD_KEYMAP_SIZE] = {
        110,111,108,112,106,103,  0,119,  0,118,109,  0, 99,104,119,  0,
 
          0,  0,  0, 65, 99,
+
+#endif
+
 #endif
 };
 
@@ -443,6 +469,16 @@ static irqreturn_t atkbd_interrupt(struct serio *serio, unsigned char data,
                goto out;
 
        keycode = atkbd->keycode[code];
+       
+/* conversion skincode by cosmos in 20090627 */
+#ifndef SIM_SKINCODE
+       if (code == 100) code = 169;
+       else if (code == 101) code = 132;
+       else if (code == 102) code = 174;
+       else if (code == 103) code = 212;
+       else if (code == 104) code = 217;
+       else if (code == 105) code = 356;               
+#endif
 
        if (keycode != ATKBD_KEY_NULL)
                input_event(dev, EV_MSC, MSC_SCAN, code);
@@ -495,6 +531,10 @@ static irqreturn_t atkbd_interrupt(struct serio *serio, unsigned char data,
                                atkbd->time = jiffies + msecs_to_jiffies(dev->rep[REP_DELAY]) / 2;
                        }
 
+#ifndef SIM_SKINCODE
+                       printk(KERN_DEBUG "atkbd.c: Conversion Received code = (%d)%03x, keycode = (%d)%03x\n", 
+                                       code, code, keycode, keycode);
+#endif
                        input_event(dev, EV_KEY, keycode, value);
                        input_sync(dev);
 
@@ -959,6 +999,10 @@ static void atkbd_set_keycode_table(struct atkbd *atkbd)
                for (i = 0; i < 128; i++) {
                        scancode = atkbd_unxlate_table[i];
                        atkbd->keycode[i] = atkbd_set2_keycode[scancode];
+#ifndef SIM_SKINCODE                   
+//                     printk("i = %d, scancode = %d(%x), atkbd->keycode[i] = %d(%x)\n", 
+//                             i, scancode, scancode, atkbd->keycode[i], atkbd->keycode[i]);
+#endif
                        atkbd->keycode[i | 0x80] = atkbd_set2_keycode[scancode | 0x80];
                        if (atkbd->scroll)
                                for (j = 0; j < ARRAY_SIZE(atkbd_scroll_keys); j++)