diff options
author | Nikolai Kondrashov <spbnick@gmail.com> | 2010-08-06 23:03:06 +0400 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2010-08-09 19:52:42 +0200 |
commit | 73e4008ddddc84d5f2499c17012b340a0dae153e (patch) | |
tree | d3adfa8c5792e71c21cb7a9cd18517cce9c92685 /drivers/hid/hid-cherry.c | |
parent | 3cfc2c42c1cbc8e238bb9c0612c0df4565e3a8b4 (diff) | |
download | linux-73e4008ddddc84d5f2499c17012b340a0dae153e.tar.gz linux-73e4008ddddc84d5f2499c17012b340a0dae153e.tar.bz2 linux-73e4008ddddc84d5f2499c17012b340a0dae153e.zip |
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-cherry.c')
-rw-r--r-- | drivers/hid/hid-cherry.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/hid/hid-cherry.c b/drivers/hid/hid-cherry.c index 24663a8717b1..e880086c2311 100644 --- a/drivers/hid/hid-cherry.c +++ b/drivers/hid/hid-cherry.c @@ -26,15 +26,16 @@ * Cherry Cymotion keyboard have an invalid HID report descriptor, * that needs fixing before we can parse it. */ -static void ch_report_fixup(struct hid_device *hdev, __u8 *rdesc, - unsigned int rsize) +static __u8 *ch_report_fixup(struct hid_device *hdev, __u8 *rdesc, + unsigned int *rsize) { - if (rsize >= 17 && rdesc[11] == 0x3c && rdesc[12] == 0x02) { + if (*rsize >= 17 && rdesc[11] == 0x3c && rdesc[12] == 0x02) { dev_info(&hdev->dev, "fixing up Cherry Cymotion report " "descriptor\n"); rdesc[11] = rdesc[16] = 0xff; rdesc[12] = rdesc[17] = 0x03; } + return rdesc; } #define ch_map_key_clear(c) hid_map_usage_clear(hi, usage, bit, max, \ |