summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Achatz <erazor_de@users.sourceforge.net>2010-05-19 13:53:22 +0200
committerJiri Kosina <jkosina@suse.cz>2010-05-19 13:53:22 +0200
commit73b3577d5dc80bf5f079ddd5c0449459a1997765 (patch)
treec8d5c87fcbeeddc91a2165b25b582d2f5a6aa0a1
parent00237bc5204c43f67b2e68546012d7bd27efc1b6 (diff)
HID: roccat: fix special button support
Added new data and changed workaround for abnormal button behaviour according to new gained knowledge about Roccat Kone device. Signed-off-by: Stefan Achatz <erazor_de@users.sourceforge.net> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
-rw-r--r--drivers/hid/hid-roccat-kone.c11
-rw-r--r--drivers/hid/hid-roccat-kone.h19
2 files changed, 22 insertions, 8 deletions
diff --git a/drivers/hid/hid-roccat-kone.c b/drivers/hid/hid-roccat-kone.c
index a41df9ab2877..5d9ced0defa5 100644
--- a/drivers/hid/hid-roccat-kone.c
+++ b/drivers/hid/hid-roccat-kone.c
@@ -928,14 +928,15 @@ static int kone_raw_event(struct hid_device *hdev, struct hid_report *report,
return 0;
/*
- * Firmware 1.38 introduced new behaviour for tilt buttons.
- * Pressed tilt button is reported in each movement event.
+ * Firmware 1.38 introduced new behaviour for tilt and special buttons.
+ * Pressed button is reported in each movement event.
* Workaround sends only one event per press.
*/
- if (kone->last_tilt_state == event->tilt)
- event->tilt = 0;
+ if (memcmp(&kone->last_mouse_event.tilt, &event->tilt, 5))
+ memcpy(&kone->last_mouse_event, event,
+ sizeof(struct kone_mouse_event));
else
- kone->last_tilt_state = event->tilt;
+ memset(&event->tilt, 0, 5);
/*
* handle special events and keep actual profile and dpi values
diff --git a/drivers/hid/hid-roccat-kone.h b/drivers/hid/hid-roccat-kone.h
index ee6898c9d92c..13309544b6fa 100644
--- a/drivers/hid/hid-roccat-kone.h
+++ b/drivers/hid/hid-roccat-kone.h
@@ -83,6 +83,17 @@ enum kone_button_info_types {
kone_button_info_type_multimedia_volume_down = 0x27
};
+enum kone_button_info_numbers {
+ kone_button_top = 1,
+ kone_button_wheel_tilt_left = 2,
+ kone_button_wheel_tilt_right = 3,
+ kone_button_forward = 4,
+ kone_button_backward = 5,
+ kone_button_middle = 6,
+ kone_button_plus = 7,
+ kone_button_minus = 8,
+};
+
struct kone_light_info {
uint8_t number; /* number of light 1-5 */
uint8_t mod; /* 1 = on, 2 = off */
@@ -120,6 +131,7 @@ struct kone_profile {
uint8_t light_effect_speed; /* range 0-255 */
struct kone_light_info light_infos[5];
+ /* offset is kone_button_info_numbers - 1 */
struct kone_button_info button_infos[8];
uint16_t checksum; /* \brief holds checksum of struct */
@@ -165,7 +177,7 @@ enum kone_mouse_events {
/* TODO clarify meaning and occurence of kone_mouse_event_calibration */
kone_mouse_event_calibration = 0xc0,
kone_mouse_event_call_overlong_macro = 0xe0,
- /* switch events notify if user changed values wiht mousebutton click */
+ /* switch events notify if user changed values with mousebutton click */
kone_mouse_event_switch_dpi = 0xf0,
kone_mouse_event_switch_profile = 0xf1
};
@@ -188,8 +200,9 @@ struct kone_device {
* is no way of getting this information from the device on demand
*/
int actual_profile, actual_dpi;
- /* Used for neutralizing abnormal tilt button behaviour */
- int last_tilt_state;
+ /* Used for neutralizing abnormal button behaviour */
+ struct kone_mouse_event last_mouse_event;
+
/*
* It's unlikely that multiple sysfs attributes are accessed at a time,
* so only one mutex is used to secure hardware access and profiles and