Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
tjh.dev
kernel
os
linux
Input: wacom - fix compile on PowerPC
Rename G4 (new Graphire4) to WACOM_G4 to avoid clashes on PowerPC
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
+7
-7
drivers/usb/input/wacom.c
+7
-7
drivers/usb/input/wacom.c
···
95
enum {
96
PENPARTNER = 0,
97
GRAPHIRE,
98
-
G4,
99
PL,
100
INTUOS,
101
INTUOS3,
···
373
374
case 2: /* Mouse with wheel */
375
input_report_key(dev, BTN_MIDDLE, data[1] & 0x04);
376
-
if (wacom->features->type == G4) {
377
rw = data[7] & 0x04 ? -(data[7] & 0x03) : (data[7] & 0x03);
378
input_report_rel(dev, REL_WHEEL, rw);
379
} else
···
385
id = CURSOR_DEVICE_ID;
386
input_report_key(dev, BTN_LEFT, data[1] & 0x01);
387
input_report_key(dev, BTN_RIGHT, data[1] & 0x02);
388
-
if (wacom->features->type == G4)
389
input_report_abs(dev, ABS_DISTANCE, data[6]);
390
else
391
input_report_abs(dev, ABS_DISTANCE, data[7]);
···
410
input_sync(dev);
411
412
/* send pad data */
413
-
if (wacom->features->type == G4) {
414
/* fist time sending pad data */
415
if (wacom->tool[1] != BTN_TOOL_FINGER) {
416
wacom->id[1] = 0;
···
713
{ "Wacom Graphire2 5x7", 8, 13918, 10206, 511, 32, GRAPHIRE, wacom_graphire_irq },
714
{ "Wacom Graphire3", 8, 10208, 7424, 511, 32, GRAPHIRE, wacom_graphire_irq },
715
{ "Wacom Graphire3 6x8", 8, 16704, 12064, 511, 32, GRAPHIRE, wacom_graphire_irq },
716
-
{ "Wacom Graphire4 4x5", 8, 10208, 7424, 511, 32, G4, wacom_graphire_irq },
717
-
{ "Wacom Graphire4 6x8", 8, 16704, 12064, 511, 32, G4, wacom_graphire_irq },
718
{ "Wacom Volito", 8, 5104, 3712, 511, 32, GRAPHIRE, wacom_graphire_irq },
719
{ "Wacom PenStation2", 8, 3250, 2320, 255, 32, GRAPHIRE, wacom_graphire_irq },
720
{ "Wacom Volito2 4x5", 8, 5104, 3712, 511, 32, GRAPHIRE, wacom_graphire_irq },
···
859
input_set_abs_params(input_dev, ABS_PRESSURE, 0, wacom->features->pressure_max, 0, 0);
860
861
switch (wacom->features->type) {
862
-
case G4:
863
input_dev->evbit[0] |= BIT(EV_MSC);
864
input_dev->mscbit[0] |= BIT(MSC_SERIAL);
865
input_dev->keybit[LONG(BTN_DIGI)] |= BIT(BTN_TOOL_FINGER);
···
95
enum {
96
PENPARTNER = 0,
97
GRAPHIRE,
98
+
WACOM_G4,
99
PL,
100
INTUOS,
101
INTUOS3,
···
373
374
case 2: /* Mouse with wheel */
375
input_report_key(dev, BTN_MIDDLE, data[1] & 0x04);
376
+
if (wacom->features->type == WACOM_G4) {
377
rw = data[7] & 0x04 ? -(data[7] & 0x03) : (data[7] & 0x03);
378
input_report_rel(dev, REL_WHEEL, rw);
379
} else
···
385
id = CURSOR_DEVICE_ID;
386
input_report_key(dev, BTN_LEFT, data[1] & 0x01);
387
input_report_key(dev, BTN_RIGHT, data[1] & 0x02);
388
+
if (wacom->features->type == WACOM_G4)
389
input_report_abs(dev, ABS_DISTANCE, data[6]);
390
else
391
input_report_abs(dev, ABS_DISTANCE, data[7]);
···
410
input_sync(dev);
411
412
/* send pad data */
413
+
if (wacom->features->type == WACOM_G4) {
414
/* fist time sending pad data */
415
if (wacom->tool[1] != BTN_TOOL_FINGER) {
416
wacom->id[1] = 0;
···
713
{ "Wacom Graphire2 5x7", 8, 13918, 10206, 511, 32, GRAPHIRE, wacom_graphire_irq },
714
{ "Wacom Graphire3", 8, 10208, 7424, 511, 32, GRAPHIRE, wacom_graphire_irq },
715
{ "Wacom Graphire3 6x8", 8, 16704, 12064, 511, 32, GRAPHIRE, wacom_graphire_irq },
716
+
{ "Wacom Graphire4 4x5", 8, 10208, 7424, 511, 32, WACOM_G4, wacom_graphire_irq },
717
+
{ "Wacom Graphire4 6x8", 8, 16704, 12064, 511, 32, WACOM_G4, wacom_graphire_irq },
718
{ "Wacom Volito", 8, 5104, 3712, 511, 32, GRAPHIRE, wacom_graphire_irq },
719
{ "Wacom PenStation2", 8, 3250, 2320, 255, 32, GRAPHIRE, wacom_graphire_irq },
720
{ "Wacom Volito2 4x5", 8, 5104, 3712, 511, 32, GRAPHIRE, wacom_graphire_irq },
···
859
input_set_abs_params(input_dev, ABS_PRESSURE, 0, wacom->features->pressure_max, 0, 0);
860
861
switch (wacom->features->type) {
862
+
case WACOM_G4:
863
input_dev->evbit[0] |= BIT(EV_MSC);
864
input_dev->mscbit[0] |= BIT(MSC_SERIAL);
865
input_dev->keybit[LONG(BTN_DIGI)] |= BIT(BTN_TOOL_FINGER);