Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 268557
b: refs/heads/master
c: 162c7d8
h: refs/heads/master
i:
  268555: 39203b7
v: v3
  • Loading branch information
Marc Dietrich authored and Greg Kroah-Hartman committed Sep 30, 2011
1 parent e67673b commit c3a2c91
Show file tree
Hide file tree
Showing 8 changed files with 522 additions and 421 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 7974035c008d98ec23ec76d9f10bff2dfd866ecf
refs/heads/master: 162c7d8c4be2d599583c42c2a8fe99bed6d87f67
5 changes: 1 addition & 4 deletions trunk/drivers/staging/nvec/TODO
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
ToDo list (incomplete, unordered)
- convert mouse, keyboard, and power to platform devices
- add copyright / driver author / license
- add compile as module support
- move nvec devices to mfd cells?
- adjust to kernel style
- fix clk usage
should not be using clk_get_sys(), but clk_get(&pdev->dev, conn)
where conn is either NULL if the device only has one clock, or
the device specific name if it has multiple clocks.
- move half of the nvec init stuff to i2c-tegra.c
225 changes: 133 additions & 92 deletions trunk/drivers/staging/nvec/nvec-keytable.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@
*/

static unsigned short code_tab_102us[] = {
KEY_GRAVE, // 0x00
/* 0x00 */
KEY_GRAVE,
KEY_ESC,
KEY_1,
KEY_2,
Expand All @@ -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,
Expand All @@ -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,
Expand All @@ -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,
Expand All @@ -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,
Expand All @@ -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[] = {
Expand All @@ -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,
Expand All @@ -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,
Expand All @@ -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 };
Loading

0 comments on commit c3a2c91

Please sign in to comment.