aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhelben Blackstaff <eye.of.the.8eholder@gmail.com>2007-10-04 04:32:03 -0400
committerJiri Kosina <jkosina@suse.cz>2007-10-14 07:40:02 -0400
commite2bca0749c3fef4e3eb39e8aaca7a0c923a70396 (patch)
treedb2c659ec3645946b352cf91a29c46ffcf94124f
parent08f06177f4089abeba904cc12a2a50cffa9ffce6 (diff)
Input: add KEY_LOGOFF
HUT 1.12 defines Logoff usage 0x19c in Consumer page. There are keyboards out there emitting this usage code (for example Microsoft Wireless Laser Keyboard 6000). Add this key so that HID code could map usages to it. Signed-off-by: Khelben Blackstaff <eye.of.the.8eholder@gmail.com> Signed-off-by: Dmitry Torokhov <dtor@mail.ru> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
-rw-r--r--drivers/hid/hid-debug.c1
-rw-r--r--include/linux/input.h1
2 files changed, 2 insertions, 0 deletions
diff --git a/drivers/hid/hid-debug.c b/drivers/hid/hid-debug.c
index 5da9f676b4cf..5c24fe46d8eb 100644
--- a/drivers/hid/hid-debug.c
+++ b/drivers/hid/hid-debug.c
@@ -698,6 +698,7 @@ static const char *keys[KEY_MAX + 1] = {
698 [KEY_SEND] = "Send", [KEY_REPLY] = "Reply", 698 [KEY_SEND] = "Send", [KEY_REPLY] = "Reply",
699 [KEY_FORWARDMAIL] = "ForwardMail", [KEY_SAVE] = "Save", 699 [KEY_FORWARDMAIL] = "ForwardMail", [KEY_SAVE] = "Save",
700 [KEY_DOCUMENTS] = "Documents", [KEY_SPELLCHECK] = "SpellCheck", 700 [KEY_DOCUMENTS] = "Documents", [KEY_SPELLCHECK] = "SpellCheck",
701 [KEY_LOGOFF] = "Logoff",
701 [KEY_FN] = "Fn", [KEY_FN_ESC] = "Fn+ESC", 702 [KEY_FN] = "Fn", [KEY_FN_ESC] = "Fn+ESC",
702 [KEY_FN_1] = "Fn+1", [KEY_FN_2] = "Fn+2", 703 [KEY_FN_1] = "Fn+1", [KEY_FN_2] = "Fn+2",
703 [KEY_FN_B] = "Fn+B", [KEY_FN_D] = "Fn+D", 704 [KEY_FN_B] = "Fn+B", [KEY_FN_D] = "Fn+D",
diff --git a/include/linux/input.h b/include/linux/input.h
index fff34e7ce8e7..52d1bd434a50 100644
--- a/include/linux/input.h
+++ b/include/linux/input.h
@@ -524,6 +524,7 @@ struct input_absinfo {
524#define KEY_MESSENGER 0x1ae /* AL Instant Messaging */ 524#define KEY_MESSENGER 0x1ae /* AL Instant Messaging */
525#define KEY_DISPLAYTOGGLE 0x1af /* Turn display (LCD) on and off */ 525#define KEY_DISPLAYTOGGLE 0x1af /* Turn display (LCD) on and off */
526#define KEY_SPELLCHECK 0x1b0 /* AL Spell Check */ 526#define KEY_SPELLCHECK 0x1b0 /* AL Spell Check */
527#define KEY_LOGOFF 0x1b1 /* AL Logoff */
527 528
528#define KEY_DEL_EOL 0x1c0 529#define KEY_DEL_EOL 0x1c0
529#define KEY_DEL_EOS 0x1c1 530#define KEY_DEL_EOS 0x1c1