Commit ccad85cc authored by Jason Gerecke's avatar Jason Gerecke Committed by Jiri Kosina
Browse files

HID: wacom: Replace WACOM_QUIRK_MONITOR with WACOM_DEVICETYPE_WL_MONITOR 



The monitor interface on the wireless receiver is more logically expressed
as a type of device instead of a quirk.

Signed-off-by: default avatarJason Gerecke <jason.gerecke@wacom.com>
Reviewed-by: default avatarBenjamin Tissoires <benjamin.tissoires@redhat.com>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.com>
parent 8dc8641e

drivers/hid/wacom_sys.c

+3 −3
Original line number Diff line number Diff line
@@ -454,7 +454,7 @@ static void wacom_retrieve_hid_descriptor(struct hid_device *hdev, 
	 */

	if (features->type == WIRELESS) {

		if (intf->cur_altsetting->desc.bInterfaceNumber == 0) {

			features->device_type = WACOM_DEVICETYPE_NONE;

			features->device_type = WACOM_DEVICETYPE_WL_MONITOR;

		} else if (intf->cur_altsetting->desc.bInterfaceNumber == 2) {

			features->device_type |= WACOM_DEVICETYPE_TOUCH;

		}
@@ -1581,7 +1581,7 @@ static int wacom_probe(struct hid_device *hdev, 
	if (error)

		goto fail_shared_data;



	if (!(features->quirks & WACOM_QUIRK_MONITOR) &&

	if (!(features->device_type & WACOM_DEVICETYPE_WL_MONITOR) &&

	     (features->quirks & WACOM_QUIRK_BATTERY)) {

		error = wacom_initialize_battery(wacom);

		if (error)
@@ -1615,7 +1615,7 @@ static int wacom_probe(struct hid_device *hdev, 
	/* Note that if query fails it is not a hard failure */

	wacom_query_tablet_data(hdev, features);



	if (features->quirks & WACOM_QUIRK_MONITOR)

	if (features->device_type & WACOM_DEVICETYPE_WL_MONITOR)

		error = hid_hw_open(hdev);



	if (wacom_wac->features.type == INTUOSHT &&

drivers/hid/wacom_wac.c

+1 −3
Original line number Diff line number Diff line
@@ -2330,9 +2330,7 @@ void wacom_setup_device_quirks(struct wacom *wacom) 
		/* monitor never has input and pen/touch have delayed create */

		features->quirks |= WACOM_QUIRK_NO_INPUT;



		/* must be monitor interface if no device_type set */

		if (features->device_type == WACOM_DEVICETYPE_NONE) {

			features->quirks |= WACOM_QUIRK_MONITOR;

		if (features->device_type == WACOM_DEVICETYPE_WL_MONITOR) {

			features->quirks |= WACOM_QUIRK_BATTERY;

		}

	}

drivers/hid/wacom_wac.h

+1 −1
Original line number Diff line number Diff line
@@ -69,7 +69,6 @@ 
/* device quirks */

#define WACOM_QUIRK_BBTOUCH_LOWRES	0x0001

#define WACOM_QUIRK_NO_INPUT		0x0002

#define WACOM_QUIRK_MONITOR		0x0004

#define WACOM_QUIRK_BATTERY		0x0008



/* device types */
@@ -77,6 +76,7 @@ 
#define WACOM_DEVICETYPE_PEN            0x0001

#define WACOM_DEVICETYPE_TOUCH          0x0002

#define WACOM_DEVICETYPE_PAD            0x0004

#define WACOM_DEVICETYPE_WL_MONITOR     0x0008



#define WACOM_VENDORDEFINED_PEN		0xff0d0001