diff options
| author | Jeremy Katz <katzj@redhat.com> | 2007-10-15 16:45:10 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-15 16:54:40 -0400 |
| commit | fba956c46a72f9e7503fd464ffee43c632307e31 (patch) | |
| tree | cfed8db36957085c6d7243a9c054f1f516bddaa6 /drivers/misc | |
| parent | f2e1d89f9b349b3cd914b7c6ec6368632f4ad048 (diff) | |
Map volume and brightness events on thinkpads
There are standard keycodes for brightness and volume; map the events to
emit them so that things work properly
Signed-off-by: Jeremy Katz <katzj@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/misc')
| -rw-r--r-- | drivers/misc/thinkpad_acpi.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/misc/thinkpad_acpi.c b/drivers/misc/thinkpad_acpi.c index 216948dd71a5..81e068fa7ac5 100644 --- a/drivers/misc/thinkpad_acpi.c +++ b/drivers/misc/thinkpad_acpi.c | |||
| @@ -945,15 +945,15 @@ static int __init hotkey_init(struct ibm_init_struct *iibm) | |||
| 945 | KEY_UNKNOWN, /* 0x0C: FN+BACKSPACE */ | 945 | KEY_UNKNOWN, /* 0x0C: FN+BACKSPACE */ |
| 946 | KEY_UNKNOWN, /* 0x0D: FN+INSERT */ | 946 | KEY_UNKNOWN, /* 0x0D: FN+INSERT */ |
| 947 | KEY_UNKNOWN, /* 0x0E: FN+DELETE */ | 947 | KEY_UNKNOWN, /* 0x0E: FN+DELETE */ |
| 948 | KEY_RESERVED, /* 0x0F: FN+HOME (brightness up) */ | 948 | KEY_BRIGHTNESSUP, /* 0x0F: FN+HOME (brightness up) */ |
| 949 | /* Scan codes 0x10 to 0x1F: Extended ACPI HKEY hot keys */ | 949 | /* Scan codes 0x10 to 0x1F: Extended ACPI HKEY hot keys */ |
| 950 | KEY_RESERVED, /* 0x10: FN+END (brightness down) */ | 950 | KEY_BRIGHTNESSDOWN, /* 0x10: FN+END (brightness down) */ |
| 951 | KEY_RESERVED, /* 0x11: FN+PGUP (thinklight toggle) */ | 951 | KEY_RESERVED, /* 0x11: FN+PGUP (thinklight toggle) */ |
| 952 | KEY_UNKNOWN, /* 0x12: FN+PGDOWN */ | 952 | KEY_UNKNOWN, /* 0x12: FN+PGDOWN */ |
| 953 | KEY_ZOOM, /* 0x13: FN+SPACE (zoom) */ | 953 | KEY_ZOOM, /* 0x13: FN+SPACE (zoom) */ |
| 954 | KEY_RESERVED, /* 0x14: VOLUME UP */ | 954 | KEY_VOLUMEUP, /* 0x14: VOLUME UP */ |
| 955 | KEY_RESERVED, /* 0x15: VOLUME DOWN */ | 955 | KEY_VOLUMEDOWN, /* 0x15: VOLUME DOWN */ |
| 956 | KEY_RESERVED, /* 0x16: MUTE */ | 956 | KEY_MUTE, /* 0x16: MUTE */ |
| 957 | KEY_VENDOR, /* 0x17: Thinkpad/AccessIBM/Lenovo */ | 957 | KEY_VENDOR, /* 0x17: Thinkpad/AccessIBM/Lenovo */ |
| 958 | /* (assignments unknown, please report if found) */ | 958 | /* (assignments unknown, please report if found) */ |
| 959 | KEY_UNKNOWN, KEY_UNKNOWN, KEY_UNKNOWN, KEY_UNKNOWN, | 959 | KEY_UNKNOWN, KEY_UNKNOWN, KEY_UNKNOWN, KEY_UNKNOWN, |
| @@ -974,9 +974,9 @@ static int __init hotkey_init(struct ibm_init_struct *iibm) | |||
| 974 | KEY_RESERVED, /* 0x11: FN+PGUP (thinklight toggle) */ | 974 | KEY_RESERVED, /* 0x11: FN+PGUP (thinklight toggle) */ |
| 975 | KEY_UNKNOWN, /* 0x12: FN+PGDOWN */ | 975 | KEY_UNKNOWN, /* 0x12: FN+PGDOWN */ |
| 976 | KEY_ZOOM, /* 0x13: FN+SPACE (zoom) */ | 976 | KEY_ZOOM, /* 0x13: FN+SPACE (zoom) */ |
| 977 | KEY_RESERVED, /* 0x14: VOLUME UP */ | 977 | KEY_VOLUMEUP, /* 0x14: VOLUME UP */ |
| 978 | KEY_RESERVED, /* 0x15: VOLUME DOWN */ | 978 | KEY_VOLUMEDOWN, /* 0x15: VOLUME DOWN */ |
| 979 | KEY_RESERVED, /* 0x16: MUTE */ | 979 | KEY_MUTE, /* 0x16: MUTE */ |
| 980 | KEY_VENDOR, /* 0x17: Thinkpad/AccessIBM/Lenovo */ | 980 | KEY_VENDOR, /* 0x17: Thinkpad/AccessIBM/Lenovo */ |
| 981 | /* (assignments unknown, please report if found) */ | 981 | /* (assignments unknown, please report if found) */ |
| 982 | KEY_UNKNOWN, KEY_UNKNOWN, KEY_UNKNOWN, KEY_UNKNOWN, | 982 | KEY_UNKNOWN, KEY_UNKNOWN, KEY_UNKNOWN, KEY_UNKNOWN, |