summaryrefslogtreecommitdiffstats
path: root/drivers/hid
diff options
context:
space:
mode:
authorStefan Achatz <stefan_achatz@web.de>2012-11-11 06:21:15 +0100
committerJiri Kosina <jkosina@suse.cz>2012-11-12 15:30:28 +0100
commitbb060d65c3bf1d0211262e8229097d9a1beab20d (patch)
treec268654f29419000df520fc67da9c7589973242a /drivers/hid
parentecbfe7aa55a3583238c0126bbc64f9043d390b50 (diff)
downloadop-kernel-dev-bb060d65c3bf1d0211262e8229097d9a1beab20d.zip
op-kernel-dev-bb060d65c3bf1d0211262e8229097d9a1beab20d.tar.gz
HID: roccat: deprecate some Koneplus attributes
Introduced attribute "control" and made profile_settings and profile_buttons readable, which makes profile[1-5]_settings and profile[1-5]_buttons obsolete. Signed-off-by: Stefan Achatz <erazor_de@users.sourceforge.net> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/hid')
-rw-r--r--drivers/hid/hid-roccat-koneplus.c10
-rw-r--r--drivers/hid/hid-roccat-koneplus.h2
2 files changed, 8 insertions, 4 deletions
diff --git a/drivers/hid/hid-roccat-koneplus.c b/drivers/hid/hid-roccat-koneplus.c
index 9fe4450..6a48fa3 100644
--- a/drivers/hid/hid-roccat-koneplus.c
+++ b/drivers/hid/hid-roccat-koneplus.c
@@ -177,14 +177,15 @@ KONEPLUS_SYSFS_R(thingy, THINGY)
.write = koneplus_sysfs_write_ ## thingy \
}
+KONEPLUS_SYSFS_W(control, CONTROL)
KONEPLUS_SYSFS_RW(info, INFO)
KONEPLUS_SYSFS_W(talk, TALK)
KONEPLUS_SYSFS_W(macro, MACRO)
KONEPLUS_SYSFS_RW(sensor, SENSOR)
KONEPLUS_SYSFS_RW(tcu, TCU)
KONEPLUS_SYSFS_R(tcu_image, TCU_IMAGE)
-KONEPLUS_SYSFS_W(profile_settings, PROFILE_SETTINGS)
-KONEPLUS_SYSFS_W(profile_buttons, PROFILE_BUTTONS)
+KONEPLUS_SYSFS_RW(profile_settings, PROFILE_SETTINGS)
+KONEPLUS_SYSFS_RW(profile_buttons, PROFILE_BUTTONS)
static ssize_t koneplus_sysfs_read_profilex_settings(struct file *fp,
struct kobject *kobj, struct bin_attribute *attr, char *buf,
@@ -306,14 +307,15 @@ static struct device_attribute koneplus_attributes[] = {
};
static struct bin_attribute koneplus_bin_attributes[] = {
+ KONEPLUS_BIN_ATTRIBUTE_W(control, CONTROL),
KONEPLUS_BIN_ATTRIBUTE_RW(info, INFO),
KONEPLUS_BIN_ATTRIBUTE_W(talk, TALK),
KONEPLUS_BIN_ATTRIBUTE_W(macro, MACRO),
KONEPLUS_BIN_ATTRIBUTE_RW(sensor, SENSOR),
KONEPLUS_BIN_ATTRIBUTE_RW(tcu, TCU),
KONEPLUS_BIN_ATTRIBUTE_R(tcu_image, TCU_IMAGE),
- KONEPLUS_BIN_ATTRIBUTE_W(profile_settings, PROFILE_SETTINGS),
- KONEPLUS_BIN_ATTRIBUTE_W(profile_buttons, PROFILE_BUTTONS),
+ KONEPLUS_BIN_ATTRIBUTE_RW(profile_settings, PROFILE_SETTINGS),
+ KONEPLUS_BIN_ATTRIBUTE_RW(profile_buttons, PROFILE_BUTTONS),
{
.attr = { .name = "profile1_settings", .mode = 0440 },
.size = KONEPLUS_SIZE_PROFILE_SETTINGS,
diff --git a/drivers/hid/hid-roccat-koneplus.h b/drivers/hid/hid-roccat-koneplus.h
index 563b9d3..d2b55f2 100644
--- a/drivers/hid/hid-roccat-koneplus.h
+++ b/drivers/hid/hid-roccat-koneplus.h
@@ -16,6 +16,7 @@
enum {
KONEPLUS_SIZE_ACTUAL_PROFILE = 0x03,
+ KONEPLUS_SIZE_CONTROL = 0x03,
KONEPLUS_SIZE_FIRMWARE_WRITE = 0x0402,
KONEPLUS_SIZE_INFO = 0x06,
KONEPLUS_SIZE_MACRO = 0x0822,
@@ -47,6 +48,7 @@ struct koneplus_info {
enum koneplus_commands {
KONEPLUS_COMMAND_ACTUAL_PROFILE = 0x5,
+ KONEPLUS_COMMAND_CONTROL = 0x4,
KONEPLUS_COMMAND_PROFILE_SETTINGS = 0x6,
KONEPLUS_COMMAND_PROFILE_BUTTONS = 0x7,
KONEPLUS_COMMAND_MACRO = 0x8,
OpenPOWER on IntegriCloud