From: Ping Cheng <pingli...@gmail.com>
Make sure everything reported from pad are registered
Signed-off-by: Ping Cheng <ping.ch...@wacom.com>
Reviewed-By: Jason Gerecke <jason.gere...@wacom.com>
Signed-off-by: Jiri Kosina <jkos...@suse.cz>
[jason.gere...@wacom.com: Imported into input-wacom repository (f3f24e7)]
Signed-off-by: Jason Gerecke <jason.gere...@wacom.com>
[jason.gere...@wacom.com: Backported from input-wacom repository (52f3133)]
Signed-off-by: Jason Gerecke <jason.gere...@wacom.com>
---
3.17/wacom_wac.c | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/3.17/wacom_wac.c b/3.17/wacom_wac.c
index d0acd1d..4e042b6 100644
--- a/3.17/wacom_wac.c
+++ b/3.17/wacom_wac.c
@@ -1546,14 +1546,17 @@ static void wacom_wac_pad_usage_mapping(struct
hid_device *hdev,
case WACOM_HID_WD_ACCELEROMETER_X:
__set_bit(INPUT_PROP_ACCELEROMETER, input->propbit);
wacom_map_usage(input, usage, field, EV_ABS, ABS_X, 0);
+ features->device_type |= WACOM_DEVICETYPE_PAD;
break;
case WACOM_HID_WD_ACCELEROMETER_Y:
__set_bit(INPUT_PROP_ACCELEROMETER, input->propbit);
wacom_map_usage(input, usage, field, EV_ABS, ABS_Y, 0);
+ features->device_type |= WACOM_DEVICETYPE_PAD;
break;
case WACOM_HID_WD_ACCELEROMETER_Z:
__set_bit(INPUT_PROP_ACCELEROMETER, input->propbit);
wacom_map_usage(input, usage, field, EV_ABS, ABS_Z, 0);
+ features->device_type |= WACOM_DEVICETYPE_PAD;
break;
case WACOM_HID_WD_BUTTONHOME:
case WACOM_HID_WD_BUTTONUP:
@@ -1565,18 +1568,23 @@ static void wacom_wac_pad_usage_mapping(struct
hid_device *hdev,
wacom_numbered_button_to_key(features->numbered_buttons),
0);
features->numbered_buttons++;
+ features->device_type |= WACOM_DEVICETYPE_PAD;
break;
case WACOM_HID_WD_TOUCHONOFF:
wacom_map_usage(input, usage, field, EV_SW, SW_MUTE_DEVICE, 0);
+ features->device_type |= WACOM_DEVICETYPE_PAD;
break;
case WACOM_HID_WD_TOUCHSTRIP:
wacom_map_usage(input, usage, field, EV_ABS, ABS_RX, 0);
+ features->device_type |= WACOM_DEVICETYPE_PAD;
break;
case WACOM_HID_WD_TOUCHSTRIP2:
wacom_map_usage(input, usage, field, EV_ABS, ABS_RY, 0);
+ features->device_type |= WACOM_DEVICETYPE_PAD;
break;
case WACOM_HID_WD_TOUCHRING:
wacom_map_usage(input, usage, field, EV_ABS, ABS_WHEEL, 0);
+ features->device_type |= WACOM_DEVICETYPE_PAD;
break;
}
@@ -1586,6 +1594,7 @@ static void wacom_wac_pad_usage_mapping(struct hid_device
*hdev,
wacom_numbered_button_to_key(features->numbered_buttons),
0);
features->numbered_buttons++;
+ features->device_type |= WACOM_DEVICETYPE_PAD;
break;
}
}
--
2.11.0
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, SlashDot.org! http://sdm.link/slashdot
_______________________________________________
Linuxwacom-devel mailing list
Linuxwacom-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel
