aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2007-08-20 06:13:34 -0400
committerJiri Kosina <jkosina@suse.cz>2007-10-14 07:40:01 -0400
commitc01d50d181f074a60bf3ed54eb055ce1679afb98 (patch)
tree5fc0bbf7c474160218b1159caf6db3bf76dad42b
parent82eb121989c06e3de33b56ade1fa52c9e86c014e (diff)
HID: Report usage codes of keys as EV_MSC scancode events
Current HID layer does not report usage codes to the input layer. This feature was previously removed, because it caused unnecessary storm of events in cases of positioning devices, etc. This patch adds reporting of usage codes as EV_MSC events only for key events. We issue the EV_MSC event only if the state of the key corresponding to the given code has changed, so that we don't report usages that are sent in every report even if the state hasn't changed (for example Shift/Caps Lock/... states as sent by various keyboards). This functionality is required at least by KeyTouch in order to provide convenient means for remapping the usage codes. Cc: Marvin Raaijmakers <marvin.nospam@gmail.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
-rw-r--r--drivers/hid/hid-input.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/hid/hid-input.c b/drivers/hid/hid-input.c
index f80b57142cd..36be431888f 100644
--- a/drivers/hid/hid-input.c
+++ b/drivers/hid/hid-input.c
@@ -921,6 +921,11 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel
921 set_bit(KEY_VOLUMEDOWN, input->keybit); 921 set_bit(KEY_VOLUMEDOWN, input->keybit);
922 } 922 }
923 923
924 if (usage->type == EV_KEY) {
925 set_bit(EV_MSC, input->evbit);
926 set_bit(MSC_SCAN, input->mscbit);
927 }
928
924 hid_resolv_event(usage->type, usage->code); 929 hid_resolv_event(usage->type, usage->code);
925 930
926 dbg_hid_line("\n"); 931 dbg_hid_line("\n");
@@ -1043,6 +1048,9 @@ void hidinput_hid_event(struct hid_device *hid, struct hid_field *field, struct
1043 input_event(input, usage->type, last_key, 0); 1048 input_event(input, usage->type, last_key, 0);
1044 } 1049 }
1045 } 1050 }
1051 /* report the usage code as scancode if the key status has changed */
1052 if (usage->type == EV_KEY && !!test_bit(usage->code, input->key) != value)
1053 input_event(input, EV_MSC, MSC_SCAN, usage->hid);
1046 1054
1047 input_event(input, usage->type, usage->code, value); 1055 input_event(input, usage->type, usage->code, value);
1048 1056