diff options
author | Nikolai Kondrashov <spbnick@gmail.com> | 2010-08-06 15:03:06 -0400 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2010-08-09 13:52:42 -0400 |
commit | 73e4008ddddc84d5f2499c17012b340a0dae153e (patch) | |
tree | d3adfa8c5792e71c21cb7a9cd18517cce9c92685 /drivers/hid/hid-sunplus.c | |
parent | 3cfc2c42c1cbc8e238bb9c0612c0df4565e3a8b4 (diff) |
HID: allow resizing and replacing report descriptors
Update hid_driver's report_fixup prototype to allow changing report
descriptor size and/or returning completely different report descriptor.
Update existing usage accordingly.
This is to give more freedom in descriptor fixup and to allow having a whole
fixed descriptor in the code for the sake of readability.
Signed-off-by: Nikolai Kondrashov <spbnick@gmail.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/hid/hid-sunplus.c')
-rw-r--r-- | drivers/hid/hid-sunplus.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/hid/hid-sunplus.c b/drivers/hid/hid-sunplus.c index 438107d9f1b2..164ed568f6cf 100644 --- a/drivers/hid/hid-sunplus.c +++ b/drivers/hid/hid-sunplus.c | |||
@@ -22,16 +22,17 @@ | |||
22 | 22 | ||
23 | #include "hid-ids.h" | 23 | #include "hid-ids.h" |
24 | 24 | ||
25 | static void sp_report_fixup(struct hid_device *hdev, __u8 *rdesc, | 25 | static __u8 *sp_report_fixup(struct hid_device *hdev, __u8 *rdesc, |
26 | unsigned int rsize) | 26 | unsigned int *rsize) |
27 | { | 27 | { |
28 | if (rsize >= 107 && rdesc[104] == 0x26 && rdesc[105] == 0x80 && | 28 | if (*rsize >= 107 && rdesc[104] == 0x26 && rdesc[105] == 0x80 && |
29 | rdesc[106] == 0x03) { | 29 | rdesc[106] == 0x03) { |
30 | dev_info(&hdev->dev, "fixing up Sunplus Wireless Desktop " | 30 | dev_info(&hdev->dev, "fixing up Sunplus Wireless Desktop " |
31 | "report descriptor\n"); | 31 | "report descriptor\n"); |
32 | rdesc[105] = rdesc[110] = 0x03; | 32 | rdesc[105] = rdesc[110] = 0x03; |
33 | rdesc[106] = rdesc[111] = 0x21; | 33 | rdesc[106] = rdesc[111] = 0x21; |
34 | } | 34 | } |
35 | return rdesc; | ||
35 | } | 36 | } |
36 | 37 | ||
37 | #define sp_map_key_clear(c) hid_map_usage_clear(hi, usage, bit, max, \ | 38 | #define sp_map_key_clear(c) hid_map_usage_clear(hi, usage, bit, max, \ |