mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-22 17:01:14 +00:00
Input: wacom - split out the pad device for Graphire G4 and MO
MSC_SERIAL can be safely removed from pad devices. If it is not here, xf86-input-wacom correctly generates ones for its internal use. Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com> Reviewed-by: Ping Cheng <pingc@wacom.com> Reviewed-by: Jason Gerecke <killertofu@gmail.com> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
This commit is contained in:
parent
422b0314b9
commit
3813810c71
1 changed files with 27 additions and 17 deletions
|
@ -262,6 +262,7 @@ static int wacom_graphire_irq(struct wacom_wac *wacom)
|
||||||
struct wacom_features *features = &wacom->features;
|
struct wacom_features *features = &wacom->features;
|
||||||
unsigned char *data = wacom->data;
|
unsigned char *data = wacom->data;
|
||||||
struct input_dev *input = wacom->input;
|
struct input_dev *input = wacom->input;
|
||||||
|
struct input_dev *pad_input = wacom->pad_input;
|
||||||
int prox;
|
int prox;
|
||||||
int rw = 0;
|
int rw = 0;
|
||||||
int retval = 0;
|
int retval = 0;
|
||||||
|
@ -322,7 +323,6 @@ static int wacom_graphire_irq(struct wacom_wac *wacom)
|
||||||
wacom->id[0] = 0;
|
wacom->id[0] = 0;
|
||||||
input_report_abs(input, ABS_MISC, wacom->id[0]); /* report tool id */
|
input_report_abs(input, ABS_MISC, wacom->id[0]); /* report tool id */
|
||||||
input_report_key(input, wacom->tool[0], prox);
|
input_report_key(input, wacom->tool[0], prox);
|
||||||
input_event(input, EV_MSC, MSC_SERIAL, 1);
|
|
||||||
input_sync(input); /* sync last event */
|
input_sync(input); /* sync last event */
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -332,14 +332,13 @@ static int wacom_graphire_irq(struct wacom_wac *wacom)
|
||||||
prox = data[7] & 0xf8;
|
prox = data[7] & 0xf8;
|
||||||
if (prox || wacom->id[1]) {
|
if (prox || wacom->id[1]) {
|
||||||
wacom->id[1] = PAD_DEVICE_ID;
|
wacom->id[1] = PAD_DEVICE_ID;
|
||||||
input_report_key(input, BTN_BACK, (data[7] & 0x40));
|
input_report_key(pad_input, BTN_BACK, (data[7] & 0x40));
|
||||||
input_report_key(input, BTN_FORWARD, (data[7] & 0x80));
|
input_report_key(pad_input, BTN_FORWARD, (data[7] & 0x80));
|
||||||
rw = ((data[7] & 0x18) >> 3) - ((data[7] & 0x20) >> 3);
|
rw = ((data[7] & 0x18) >> 3) - ((data[7] & 0x20) >> 3);
|
||||||
input_report_rel(input, REL_WHEEL, rw);
|
input_report_rel(pad_input, REL_WHEEL, rw);
|
||||||
if (!prox)
|
if (!prox)
|
||||||
wacom->id[1] = 0;
|
wacom->id[1] = 0;
|
||||||
input_report_abs(input, ABS_MISC, wacom->id[1]);
|
input_report_abs(pad_input, ABS_MISC, wacom->id[1]);
|
||||||
input_event(input, EV_MSC, MSC_SERIAL, 0xf0);
|
|
||||||
retval = 1;
|
retval = 1;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
@ -348,15 +347,14 @@ static int wacom_graphire_irq(struct wacom_wac *wacom)
|
||||||
prox = (data[7] & 0xf8) || data[8];
|
prox = (data[7] & 0xf8) || data[8];
|
||||||
if (prox || wacom->id[1]) {
|
if (prox || wacom->id[1]) {
|
||||||
wacom->id[1] = PAD_DEVICE_ID;
|
wacom->id[1] = PAD_DEVICE_ID;
|
||||||
input_report_key(input, BTN_BACK, (data[7] & 0x08));
|
input_report_key(pad_input, BTN_BACK, (data[7] & 0x08));
|
||||||
input_report_key(input, BTN_LEFT, (data[7] & 0x20));
|
input_report_key(pad_input, BTN_LEFT, (data[7] & 0x20));
|
||||||
input_report_key(input, BTN_FORWARD, (data[7] & 0x10));
|
input_report_key(pad_input, BTN_FORWARD, (data[7] & 0x10));
|
||||||
input_report_key(input, BTN_RIGHT, (data[7] & 0x40));
|
input_report_key(pad_input, BTN_RIGHT, (data[7] & 0x40));
|
||||||
input_report_abs(input, ABS_WHEEL, (data[8] & 0x7f));
|
input_report_abs(pad_input, ABS_WHEEL, (data[8] & 0x7f));
|
||||||
if (!prox)
|
if (!prox)
|
||||||
wacom->id[1] = 0;
|
wacom->id[1] = 0;
|
||||||
input_report_abs(input, ABS_MISC, wacom->id[1]);
|
input_report_abs(pad_input, ABS_MISC, wacom->id[1]);
|
||||||
input_event(input, EV_MSC, MSC_SERIAL, 0xf0);
|
|
||||||
retval = 1;
|
retval = 1;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
@ -1624,10 +1622,6 @@ int wacom_setup_input_capabilities(struct input_dev *input_dev,
|
||||||
/* fall through */
|
/* fall through */
|
||||||
|
|
||||||
case WACOM_G4:
|
case WACOM_G4:
|
||||||
input_set_capability(input_dev, EV_MSC, MSC_SERIAL);
|
|
||||||
|
|
||||||
__set_bit(BTN_BACK, input_dev->keybit);
|
|
||||||
__set_bit(BTN_FORWARD, input_dev->keybit);
|
|
||||||
/* fall through */
|
/* fall through */
|
||||||
|
|
||||||
case GRAPHIRE:
|
case GRAPHIRE:
|
||||||
|
@ -1854,6 +1848,22 @@ int wacom_setup_pad_input_capabilities(struct input_dev *input_dev,
|
||||||
input_set_abs_params(input_dev, ABS_Y, 0, 1, 0, 0);
|
input_set_abs_params(input_dev, ABS_Y, 0, 1, 0, 0);
|
||||||
|
|
||||||
switch (features->type) {
|
switch (features->type) {
|
||||||
|
case WACOM_MO:
|
||||||
|
__set_bit(BTN_BACK, input_dev->keybit);
|
||||||
|
__set_bit(BTN_LEFT, input_dev->keybit);
|
||||||
|
__set_bit(BTN_FORWARD, input_dev->keybit);
|
||||||
|
__set_bit(BTN_RIGHT, input_dev->keybit);
|
||||||
|
input_set_abs_params(input_dev, ABS_WHEEL, 0, 71, 0, 0);
|
||||||
|
break;
|
||||||
|
|
||||||
|
case WACOM_G4:
|
||||||
|
__set_bit(BTN_BACK, input_dev->keybit);
|
||||||
|
__set_bit(BTN_LEFT, input_dev->keybit);
|
||||||
|
__set_bit(BTN_FORWARD, input_dev->keybit);
|
||||||
|
__set_bit(BTN_RIGHT, input_dev->keybit);
|
||||||
|
input_set_capability(input_dev, EV_REL, REL_WHEEL);
|
||||||
|
break;
|
||||||
|
|
||||||
case WACOM_24HD:
|
case WACOM_24HD:
|
||||||
__set_bit(BTN_A, input_dev->keybit);
|
__set_bit(BTN_A, input_dev->keybit);
|
||||||
__set_bit(BTN_B, input_dev->keybit);
|
__set_bit(BTN_B, input_dev->keybit);
|
||||||
|
|
Loading…
Reference in a new issue