diff options
author | Hans de Goede <j.w.r.degoede@hhs.nl> | 2007-07-03 01:55:18 -0400 |
---|---|---|
committer | Dmitry Torokhov <dtor@insightbb.com> | 2007-07-10 00:35:18 -0400 |
commit | 72a42f242cad8f393bb2556f4cc5175c6cea9892 (patch) | |
tree | 9a667e20746c8d8186674041a0457b892b448c56 /drivers | |
parent | df561fcd445c9cf9f4fff98ea795a0e72b7dc1e1 (diff) |
Input: atkbd - change mapping for e032 from KEY_WWW to KEY_HOMEPAGE
WWW/Homepage key on Microsoft-compatible keyboards generates KEY_WWW
when connected via PS/2 port but KEY_HOMEPAGE when connected via USB.
This patch changes mapping in atkbd to match one in HID driver.
Signed-off-by: Hans de Goede <j.w.r.degoede@hhs.nl>
Acked-by: Vojtech Pavlik <vojtech@suse.cz>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/char/keyboard.c | 4 | ||||
-rw-r--r-- | drivers/input/keyboard/atkbd.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/char/keyboard.c b/drivers/char/keyboard.c index 1b094509b1d2..90965b4def5c 100644 --- a/drivers/char/keyboard.c +++ b/drivers/char/keyboard.c | |||
@@ -1005,8 +1005,8 @@ static const unsigned short x86_keycodes[256] = | |||
1005 | 284,285,309, 0,312, 91,327,328,329,331,333,335,336,337,338,339, | 1005 | 284,285,309, 0,312, 91,327,328,329,331,333,335,336,337,338,339, |
1006 | 367,288,302,304,350, 89,334,326,267,126,268,269,125,347,348,349, | 1006 | 367,288,302,304,350, 89,334,326,267,126,268,269,125,347,348,349, |
1007 | 360,261,262,263,268,376,100,101,321,316,373,286,289,102,351,355, | 1007 | 360,261,262,263,268,376,100,101,321,316,373,286,289,102,351,355, |
1008 | 103,104,105,275,287,279,306,106,274,107,294,364,358,363,362,361, | 1008 | 103,104,105,275,287,279,258,106,274,107,294,364,358,363,362,361, |
1009 | 291,108,381,281,290,272,292,305,280, 99,112,257,258,359,113,114, | 1009 | 291,108,381,281,290,272,292,305,280, 99,112,257,306,359,113,114, |
1010 | 264,117,271,374,379,265,266, 93, 94, 95, 85,259,375,260, 90,116, | 1010 | 264,117,271,374,379,265,266, 93, 94, 95, 85,259,375,260, 90,116, |
1011 | 377,109,111,277,278,282,283,295,296,297,299,300,301,293,303,307, | 1011 | 377,109,111,277,278,282,283,295,296,297,299,300,301,293,303,307, |
1012 | 308,310,313,314,315,317,318,319,320,357,322,323,324,325,276,330, | 1012 | 308,310,313,314,315,317,318,319,320,357,322,323,324,325,276,330, |
diff --git a/drivers/input/keyboard/atkbd.c b/drivers/input/keyboard/atkbd.c index 9950fcb33650..41fc3d03b6eb 100644 --- a/drivers/input/keyboard/atkbd.c +++ b/drivers/input/keyboard/atkbd.c | |||
@@ -89,7 +89,7 @@ static unsigned char atkbd_set2_keycode[512] = { | |||
89 | 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, | 89 | 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, |
90 | 217,100,255, 0, 97,165, 0, 0,156, 0, 0, 0, 0, 0, 0,125, | 90 | 217,100,255, 0, 97,165, 0, 0,156, 0, 0, 0, 0, 0, 0,125, |
91 | 173,114, 0,113, 0, 0, 0,126,128, 0, 0,140, 0, 0, 0,127, | 91 | 173,114, 0,113, 0, 0, 0,126,128, 0, 0,140, 0, 0, 0,127, |
92 | 159, 0,115, 0,164, 0, 0,116,158, 0,150,166, 0, 0, 0,142, | 92 | 159, 0,115, 0,164, 0, 0,116,158, 0,172,166, 0, 0, 0,142, |
93 | 157, 0, 0, 0, 0, 0, 0, 0,155, 0, 98, 0, 0,163, 0, 0, | 93 | 157, 0, 0, 0, 0, 0, 0, 0,155, 0, 98, 0, 0,163, 0, 0, |
94 | 226, 0, 0, 0, 0, 0, 0, 0, 0,255, 96, 0, 0, 0,143, 0, | 94 | 226, 0, 0, 0, 0, 0, 0, 0, 0,255, 96, 0, 0, 0,143, 0, |
95 | 0, 0, 0, 0, 0, 0, 0, 0, 0,107, 0,105,102, 0, 0,112, | 95 | 0, 0, 0, 0, 0, 0, 0, 0, 0,107, 0,105,102, 0, 0,112, |
@@ -111,7 +111,7 @@ static unsigned char atkbd_set3_keycode[512] = { | |||
111 | 82, 83, 80, 76, 77, 72, 69, 98, 0, 96, 81, 0, 78, 73, 55,183, | 111 | 82, 83, 80, 76, 77, 72, 69, 98, 0, 96, 81, 0, 78, 73, 55,183, |
112 | 112 | ||
113 | 184,185,186,187, 74, 94, 92, 93, 0, 0, 0,125,126,127,112, 0, | 113 | 184,185,186,187, 74, 94, 92, 93, 0, 0, 0,125,126,127,112, 0, |
114 | 0,139,150,163,165,115,152,150,166,140,160,154,113,114,167,168, | 114 | 0,139,172,163,165,115,152,172,166,140,160,154,113,114,167,168, |
115 | 148,149,147,140 | 115 | 148,149,147,140 |
116 | }; | 116 | }; |
117 | 117 | ||