diff options
author | Stefan Achatz <erazor_de@users.sourceforge.net> | 2011-01-30 07:38:25 -0500 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2011-02-03 10:37:28 -0500 |
commit | 8211e46004518c977f70f2661da961d5ba617399 (patch) | |
tree | b2ae1cdc75fad9dbdece7b1dd5fc23ce0624f3c2 /drivers/hid/hid-roccat-koneplus.c | |
parent | 432762e28b8146d0feff61cc8063b26c517acf26 (diff) |
HID: roccat: Add ioctl command to retreive report size from chardev
Roccat chardev was reworked to support only a defined report size per
device and this can be retreived by an ioctl now to enable future changes
in report definitions.
Header was moved/renamed from drivers/hid to include/linux for accessibility.
Signed-off-by: Stefan Achatz <erazor_de@users.sourceforge.net>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/hid/hid-roccat-koneplus.c')
-rw-r--r-- | drivers/hid/hid-roccat-koneplus.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/hid/hid-roccat-koneplus.c b/drivers/hid/hid-roccat-koneplus.c index df85ed8a3397..7367e4edfa6c 100644 --- a/drivers/hid/hid-roccat-koneplus.c +++ b/drivers/hid/hid-roccat-koneplus.c | |||
@@ -21,8 +21,8 @@ | |||
21 | #include <linux/hid.h> | 21 | #include <linux/hid.h> |
22 | #include <linux/module.h> | 22 | #include <linux/module.h> |
23 | #include <linux/slab.h> | 23 | #include <linux/slab.h> |
24 | #include <linux/roccat.h> | ||
24 | #include "hid-ids.h" | 25 | #include "hid-ids.h" |
25 | #include "hid-roccat.h" | ||
26 | #include "hid-roccat-common.h" | 26 | #include "hid-roccat-common.h" |
27 | #include "hid-roccat-koneplus.h" | 27 | #include "hid-roccat-koneplus.h" |
28 | 28 | ||
@@ -612,7 +612,8 @@ static int koneplus_init_specials(struct hid_device *hdev) | |||
612 | goto exit_free; | 612 | goto exit_free; |
613 | } | 613 | } |
614 | 614 | ||
615 | retval = roccat_connect(koneplus_class, hdev); | 615 | retval = roccat_connect(koneplus_class, hdev, |
616 | sizeof(struct koneplus_roccat_report)); | ||
616 | if (retval < 0) { | 617 | if (retval < 0) { |
617 | hid_err(hdev, "couldn't init char dev\n"); | 618 | hid_err(hdev, "couldn't init char dev\n"); |
618 | } else { | 619 | } else { |
@@ -718,8 +719,7 @@ static void koneplus_report_to_chrdev(struct koneplus_device const *koneplus, | |||
718 | roccat_report.data2 = button_report->data2; | 719 | roccat_report.data2 = button_report->data2; |
719 | roccat_report.profile = koneplus->actual_profile + 1; | 720 | roccat_report.profile = koneplus->actual_profile + 1; |
720 | roccat_report_event(koneplus->chrdev_minor, | 721 | roccat_report_event(koneplus->chrdev_minor, |
721 | (uint8_t const *)&roccat_report, | 722 | (uint8_t const *)&roccat_report); |
722 | sizeof(struct koneplus_roccat_report)); | ||
723 | } | 723 | } |
724 | 724 | ||
725 | static int koneplus_raw_event(struct hid_device *hdev, | 725 | static int koneplus_raw_event(struct hid_device *hdev, |