Merge branch 'for-linus' of git://git.selinuxproject.org/~jmorris/linux-security

[pandora-kernel.git] / drivers / staging / nvec / nvec-keytable.h

diff --git a/drivers/staging/nvec/nvec-keytable.h b/drivers/staging/nvec/nvec-keytable.h
index 6a1c4f7..1dc22cb 100644 (file)
--- a/drivers/staging/nvec/nvec-keytable.h
+++ b/drivers/staging/nvec/nvec-keytable.h
@@ -22,7 +22,8 @@
  */
 
 static unsigned short code_tab_102us[] = {
-       KEY_GRAVE,      // 0x00
+       /* 0x00 */
+       KEY_GRAVE,
        KEY_ESC,
        KEY_1,
        KEY_2,
@@ -38,7 +39,8 @@ static unsigned short code_tab_102us[] = {
        KEY_EQUAL,
        KEY_BACKSPACE,
        KEY_TAB,
-       KEY_Q,          // 0x10
+       /* 0x10 */
+       KEY_Q,
        KEY_W,
        KEY_E,
        KEY_R,
@@ -54,7 +56,8 @@ static unsigned short code_tab_102us[] = {
        KEY_LEFTCTRL,
        KEY_A,
        KEY_S,
-       KEY_D,          // 0x20
+       /* 0x20 */
+       KEY_D,
        KEY_F,
        KEY_G,
        KEY_H,
@@ -70,7 +73,8 @@ static unsigned short code_tab_102us[] = {
        KEY_X,
        KEY_C,
        KEY_V,
-       KEY_B,          // 0x30
+       /* 0x30 */
+       KEY_B,
        KEY_N,
        KEY_M,
        KEY_COMMA,
@@ -86,13 +90,15 @@ static unsigned short code_tab_102us[] = {
        KEY_F3,
        KEY_F4,
        KEY_F5,
-       KEY_F6,         // 0x40
+       /* 0x40 */
+       KEY_F6,
        KEY_F7,
        KEY_F8,
        KEY_F9,
        KEY_F10,
        KEY_FN,
-       0,              //VK_SCROLL
+       /* VK_SCROLL */
+       0,
        KEY_KP7,
        KEY_KP8,
        KEY_KP9,
@@ -102,52 +108,57 @@ static unsigned short code_tab_102us[] = {
        KEY_KP6,
        KEY_KPPLUS,
        KEY_KP1,
-       KEY_KP2,        // 0x50
+       /* 0x50 */
+       KEY_KP2,
        KEY_KP3,
        KEY_KP0,
        KEY_KPDOT,
-       KEY_MENU,               //VK_SNAPSHOT
+       /* VK_SNAPSHOT */
+       KEY_MENU,
        KEY_POWER,
-       KEY_102ND,              //VK_OEM_102   henry+ 0x2B (43) BACKSLASH have been used,change to use 0X56 (86)
-       KEY_F11,                //VK_F11
-       KEY_F12,                //VK_F12
-       0, 
-       0, 
-       0, 
-       0, 
-       0, 
-       0, 
-       0, 
-       0, // 60 
-       0,
-       0,
-       KEY_SEARCH, // add search key map 
-       0,              
-       0,
-       0,
-       0,      
-       0,              
-       0, 
-       0, 
-       0, 
-       0, 
-       0, 
-       0, 
-       0, 
-       0, // 70 
-       0,
-       0,
-       KEY_KP5,  //73 for JP keyboard '\' key, report 0x4c
-       0,              
-       0,
-       0,
-       0,      
-       0,              
-       0, 
-       0, 
-    0, 
-       0, 
-       KEY_KP9, //7d  for JP keyboard '|' key, report 0x49
+       /* VK_OEM_102 */
+       KEY_102ND,
+       KEY_F11,
+       KEY_F12,
+       0,
+       0,
+       0,
+       0,
+       0,
+       0,
+       0,
+       /* 0x60 */
+       0,
+       0,
+       0,
+       KEY_SEARCH,
+       0,
+       0,
+       0,
+       0,
+       0,
+       0,
+       0,
+       0,
+       0,
+       0,
+       0,
+       0,
+       /* 0x70 */
+       0,
+       0,
+       0,
+       KEY_KP5,
+       0,
+       0,
+       0,
+       0,
+       0,
+       0,
+       0,
+       0,
+       0,
+       KEY_KP9,
 };
 
 static unsigned short extcode_tab_us102[] = {
@@ -167,27 +178,35 @@ static unsigned short extcode_tab_us102[] = {
        0,
        0,
        0,
-       0,              // 0xE0 0x10
+       /* 0x10 */
+       0,
+       0,
+       0,
+       0,
+       0,
+       0,
+       0,
        0,
        0,
+       /* VK_MEDIA_NEXT_TRACK */
        0,
        0,
        0,
+       /* VK_RETURN */
        0,
+       KEY_RIGHTCTRL,
        0,
        0,
-       0,              //VK_MEDIA_NEXT_TRACK,
+       /* 0x20 */
+       KEY_MUTE,
+       /* VK_LAUNCH_APP1 */
        0,
+       /* VK_MEDIA_PLAY_PAUSE */
        0,
-       0,              //VK_RETURN,
-       KEY_RIGHTCTRL,          //VK_RCONTROL,
        0,
+       /* VK_MEDIA_STOP */
        0,
-       KEY_MUTE,       // 0xE0 0x20
-       0,              //VK_LAUNCH_APP1
-       0,              //VK_MEDIA_PLAY_PAUSE
        0,
-       0,              //VK_MEDIA_STOP
        0,
        0,
        0,
@@ -198,41 +217,54 @@ static unsigned short extcode_tab_us102[] = {
        0,
        0,
        0,
+       /* 0x30 */
+       KEY_VOLUMEUP,
        0,
-       KEY_VOLUMEUP,   // 0xE0 0x30
+       /* VK_BROWSER_HOME */
+       0,
+       0,
+       0,
+       /* VK_DIVIDE */
+       KEY_KPSLASH,
+       0,
+       /* VK_SNAPSHOT */
+       KEY_SYSRQ,
+       /* VK_RMENU */
+       KEY_RIGHTALT,
+       /* VK_OEM_NV_BACKLIGHT_UP */
+       0,
+       /* VK_OEM_NV_BACKLIGHT_DN */
+       0,
+       /* VK_OEM_NV_BACKLIGHT_AUTOTOGGLE */
+       0,
+       /* VK_OEM_NV_POWER_INFO */
+       0,
+       /* VK_OEM_NV_WIFI_TOGGLE */
+       0,
+       /* VK_OEM_NV_DISPLAY_SELECT */
+       0,
+       /* VK_OEM_NV_AIRPLANE_TOGGLE */
+       0,
+       /* 0x40 */
+       0,
+       KEY_LEFT,
        0,
-       0,              //VK_BROWSER_HOME
        0,
        0,
-       KEY_KPSLASH,    //VK_DIVIDE
        0,
-       KEY_SYSRQ,              //VK_SNAPSHOT
-       KEY_RIGHTALT,           //VK_RMENU
-       0,              //VK_OEM_NV_BACKLIGHT_UP
-       0,              //VK_OEM_NV_BACKLIGHT_DN
-       0,              //VK_OEM_NV_BACKLIGHT_AUTOTOGGLE
-       0,              //VK_OEM_NV_POWER_INFO
-       0,              //VK_OEM_NV_WIFI_TOGGLE
-       0,              //VK_OEM_NV_DISPLAY_SELECT
-       0,              //VK_OEM_NV_AIRPLANE_TOGGLE
-       0,              //0xE0 0x40
-       KEY_LEFT,               //VK_OEM_NV_RESERVED    henry+ for JP keyboard
-       0,              //VK_OEM_NV_RESERVED
-       0,              //VK_OEM_NV_RESERVED
-       0,              //VK_OEM_NV_RESERVED
-       0,              //VK_OEM_NV_RESERVED
        KEY_CANCEL,
        KEY_HOME,
        KEY_UP,
-       KEY_PAGEUP,             //VK_PRIOR
+       KEY_PAGEUP,
        0,
        KEY_LEFT,
        0,
        KEY_RIGHT,
        0,
        KEY_END,
-       KEY_DOWN,       // 0xE0 0x50
-       KEY_PAGEDOWN,           //VK_NEXT
+       /* 0x50 */
+       KEY_DOWN,
+       KEY_PAGEDOWN,
        KEY_INSERT,
        KEY_DELETE,
        0,
@@ -242,25 +274,34 @@ static unsigned short extcode_tab_us102[] = {
        0,
        0,
        0,
-       KEY_LEFTMETA,   //VK_LWIN
-       0,              //VK_RWIN
-       KEY_ESC,        //VK_APPS
-       KEY_KPMINUS, //for power button workaround
-       0, 
+       KEY_LEFTMETA,
+       0,
+       KEY_ESC,
+       KEY_KPMINUS,
+       0,
+       0,
+       0,
+       0,
+       0,
+       0,
+       /* VK_BROWSER_SEARCH */
+       0,
+       /* VK_BROWSER_FAVORITES */
+       0,
+       /* VK_BROWSER_REFRESH */
+       0,
+       /* VK_BROWSER_STOP */
+       0,
+       /* VK_BROWSER_FORWARD */
        0,
+       /* VK_BROWSER_BACK */
        0,
+       /* VK_LAUNCH_APP2 */
        0,
+       /* VK_LAUNCH_MAIL */
        0,
+       /* VK_LAUNCH_MEDIA_SELECT */
        0,
-       0,              //VK_BROWSER_SEARCH
-       0,              //VK_BROWSER_FAVORITES
-       0,              //VK_BROWSER_REFRESH
-       0,              //VK_BROWSER_STOP
-       0,              //VK_BROWSER_FORWARD
-       0,              //VK_BROWSER_BACK
-       0,              //VK_LAUNCH_APP2
-       0,              //VK_LAUNCH_MAIL
-       0,              //VK_LAUNCH_MEDIA_SELECT
 };
 
-static unsigned short* code_tabs[] = {code_tab_102us, extcode_tab_us102 };
+static unsigned short *code_tabs[] = { code_tab_102us, extcode_tab_us102 };