AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

HID: wacom: leds: handle Cintiq 24HD leds buttons

Browse Source 
The 24HD has 1 button per LED (first three buttons of each group).
We need a special treatment for them as it's not a uniq button that
switches between the LEDs.

Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
Acked-by: Ping Cheng <pingc@wacom.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
This commit is contained in:
Benjamin Tissoires 2016-07-13 18:06:14 +02:00 committed by Jiri Kosina
parent 5a0fe8abd1
commit 6a06281e2b
1 changed files with 35 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
drivers/hid/wacom_wac.c
View File

@ -2763,18 +2763,47 @@ static void wacom_setup_numbered_buttons(struct input_dev *input_dev,
__set_bit(BTN_BASE + (i-16), input_dev->keybit); __set_bit(BTN_BASE + (i-16), input_dev->keybit);
} }
static void wacom_24hd_update_leds(struct wacom *wacom, int mask, int group)
{
struct wacom_led *led;
int i;
bool updated = false;
/*
* 24HD has LED group 1 to the left and LED group 0 to the right.
* So group 0 matches the second half of the buttons and thus the mask
* needs to be shifted.
*/
if (group == 0)
mask >>= 8;
for (i = 0; i < 3; i++) {
led = wacom_led_find(wacom, group, i);
if (!led) {
hid_err(wacom->hdev, "can't find LED %d in group %d\n",
i, group);
continue;
}
if (!updated && mask & BIT(i)) {
led->held = true;
led_trigger_event(&led->trigger, LED_FULL);
} else {
led->held = false;
}
}
}
static bool wacom_is_led_toggled(struct wacom *wacom, int button_count, static bool wacom_is_led_toggled(struct wacom *wacom, int button_count,
int mask, int group) int mask, int group)
{ {
int button_per_group; int button_per_group;
/* /*
* 24HD and 21UX2 have LED group 1 to the left and LED group 0 * 21UX2 has LED group 1 to the left and LED group 0
* to the right. We need to reverse the group to match this * to the right. We need to reverse the group to match this
* historical behavior. * historical behavior.
*/ */
if (wacom->wacom_wac.features.type == WACOM_24HD || if (wacom->wacom_wac.features.type == WACOM_21UX2)
wacom->wacom_wac.features.type == WACOM_21UX2)
group = 1 - group; group = 1 - group;
button_per_group = button_count/wacom->led.count; button_per_group = button_count/wacom->led.count;
@ -2789,6 +2818,9 @@ static void wacom_update_led(struct wacom *wacom, int button_count, int mask,
int cur; int cur;
bool pressed; bool pressed;
if (wacom->wacom_wac.features.type == WACOM_24HD)
return wacom_24hd_update_leds(wacom, mask, group);
pressed = wacom_is_led_toggled(wacom, button_count, mask, group); pressed = wacom_is_led_toggled(wacom, button_count, mask, group);
cur = wacom->led.groups[group].select; cur = wacom->led.groups[group].select;