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-kye.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-kye.c')
| -rw-r--r-- | drivers/hid/hid-kye.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/hid/hid-kye.c b/drivers/hid/hid-kye.c index f8871712b7b5..817247ee006c 100644 --- a/drivers/hid/hid-kye.c +++ b/drivers/hid/hid-kye.c @@ -23,10 +23,10 @@ * - report size 8 count 1 must be size 1 count 8 for button bitfield * - change the button usage range to 4-7 for the extra buttons */ -static void kye_report_fixup(struct hid_device *hdev, __u8 *rdesc, - unsigned int rsize) +static __u8 *kye_report_fixup(struct hid_device *hdev, __u8 *rdesc, + unsigned int *rsize) { - if (rsize >= 74 && + if (*rsize >= 74 && rdesc[61] == 0x05 && rdesc[62] == 0x08 && rdesc[63] == 0x19 && rdesc[64] == 0x08 && rdesc[65] == 0x29 && rdesc[66] == 0x0f && @@ -40,6 +40,7 @@ static void kye_report_fixup(struct hid_device *hdev, __u8 *rdesc, rdesc[72] = 0x01; rdesc[74] = 0x08; } + return rdesc; } static const struct hid_device_id kye_devices[] = { |