summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Achatz <erazor_de@users.sourceforge.net>2012-10-17 18:35:42 +0400
committerJiri Kosina <jkosina@suse.cz>2012-10-17 19:37:21 +0400
commit5277e97c2474a85eb0325ac6fff71910a4e6c134 (patch)
tree076e5448a8e733d5bd8057cbc94202ed93864eeb
parent4424f616e48e0a48ac31de8d223ba1bdb46a84f1 (diff)
downloadlinux-5277e97c2474a85eb0325ac6fff71910a4e6c134.tar.xz
HID: roccat: allow readout of koneplus sensor register data
tcu sysfs attr was used to only control calibration process so far. Direct sensor register access possibility has been revealed. Allowing readout of tcu permits usage of this feature. Signed-off-by: Stefan Achatz <erazor_de@users.sourceforge.net> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
-rw-r--r--Documentation/ABI/testing/sysfs-driver-hid-roccat-koneplus6
-rw-r--r--drivers/hid/hid-roccat-koneplus.c11
2 files changed, 13 insertions, 4 deletions
diff --git a/Documentation/ABI/testing/sysfs-driver-hid-roccat-koneplus b/Documentation/ABI/testing/sysfs-driver-hid-roccat-koneplus
index 65e6e5dd67e8..f9e2a61900e5 100644
--- a/Documentation/ABI/testing/sysfs-driver-hid-roccat-koneplus
+++ b/Documentation/ABI/testing/sysfs-driver-hid-roccat-koneplus
@@ -104,9 +104,9 @@ What: /sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/<hid-
Date: October 2010
Contact: Stefan Achatz <erazor_de@users.sourceforge.net>
Description: When written a calibration process for the tracking control unit
- can be initiated/cancelled.
- The data has to be 3 bytes long.
- This file is writeonly.
+ can be initiated/cancelled. Also lets one read/write sensor
+ registers.
+ The data has to be 4 bytes long.
Users: http://roccat.sourceforge.net
What: /sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/<hid-bus>:<vendor-id>:<product-id>.<num>/koneplus/roccatkoneplus<minor>/tcu_image
diff --git a/drivers/hid/hid-roccat-koneplus.c b/drivers/hid/hid-roccat-koneplus.c
index f5602fec4865..c47540a5d4f3 100644
--- a/drivers/hid/hid-roccat-koneplus.c
+++ b/drivers/hid/hid-roccat-koneplus.c
@@ -222,6 +222,14 @@ static ssize_t koneplus_sysfs_write_tcu(struct file *fp,
sizeof(struct koneplus_tcu), KONEPLUS_COMMAND_TCU);
}
+static ssize_t koneplus_sysfs_read_tcu(struct file *fp,
+ struct kobject *kobj, struct bin_attribute *attr, char *buf,
+ loff_t off, size_t count)
+{
+ return koneplus_sysfs_read(fp, kobj, buf, off, count,
+ sizeof(struct koneplus_tcu), KONEPLUS_COMMAND_TCU);
+}
+
static ssize_t koneplus_sysfs_read_tcu_image(struct file *fp,
struct kobject *kobj, struct bin_attribute *attr, char *buf,
loff_t off, size_t count)
@@ -426,8 +434,9 @@ static struct bin_attribute koneplus_bin_attributes[] = {
.write = koneplus_sysfs_write_sensor
},
{
- .attr = { .name = "tcu", .mode = 0220 },
+ .attr = { .name = "tcu", .mode = 0660 },
.size = sizeof(struct koneplus_tcu),
+ .read = koneplus_sysfs_read_tcu,
.write = koneplus_sysfs_write_tcu
},
{