Commit e36f690b authored by Benjamin Tissoires's avatar Benjamin Tissoires Committed by Jiri Kosina
Browse files

HID: multitouch: cleanup with eGalax PID definitions 



This is just a renaming of USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH{N}
to USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_{PID} to handle more eGalax
devices.

Signed-off-by: default avatarBenjamin Tissoires <benjamin.tissoires@enac.fr>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent 26a2abe1

drivers/hid/hid-core.c

+6 −6
Original line number Diff line number Diff line
@@ -1404,12 +1404,12 @@ static const struct hid_device_id hid_have_special_driver[] = { 
	{ HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_TRUETOUCH) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_DRAGONRISE, 0x0006) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_DRAGONRISE, 0x0011) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH1) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH2) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH3) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH4) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH5) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_480D) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_480E) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_720C) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_726B) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_72A1) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_A001) },

	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_ELECOM, USB_DEVICE_ID_ELECOM_BM084) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_ELO, USB_DEVICE_ID_ELO_TS2515) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_EMS, USB_DEVICE_ID_EMS_TRIO_LINKER_PLUS_II) },

drivers/hid/hid-ids.h

+6 −6
Original line number Diff line number Diff line
@@ -230,12 +230,12 @@ 


#define USB_VENDOR_ID_DWAV		0x0eef

#define USB_DEVICE_ID_EGALAX_TOUCHCONTROLLER	0x0001

#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH	0x480d

#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH1	0x720c

#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH2	0x72a1

#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH3	0x480e

#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH4	0x726b

#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH5	0xa001

#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_480D	0x480d

#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_480E	0x480e

#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_720C	0x720c

#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_726B	0x726b

#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_72A1	0x72a1

#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_A001	0xa001



#define USB_VENDOR_ID_ELECOM		0x056e

#define USB_DEVICE_ID_ELECOM_BM084	0x0061

drivers/hid/hid-multitouch.c

+12 −12
Original line number Diff line number Diff line
@@ -684,24 +684,24 @@ static const struct hid_device_id mt_devices[] = { 
	/* eGalax devices (resistive) */

	{ .driver_data = MT_CLS_EGALAX,

		HID_USB_DEVICE(USB_VENDOR_ID_DWAV,

			USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH) },

			USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_480D) },

	{ .driver_data = MT_CLS_EGALAX,

		HID_USB_DEVICE(USB_VENDOR_ID_DWAV,

			USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH3) },

			USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_480E) },



	/* eGalax devices (capacitive) */

	{ .driver_data = MT_CLS_EGALAX,

		HID_USB_DEVICE(USB_VENDOR_ID_DWAV,

			USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH1) },

			USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_720C) },

	{ .driver_data = MT_CLS_EGALAX,

		HID_USB_DEVICE(USB_VENDOR_ID_DWAV,

			USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH2) },

			USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_726B) },

	{ .driver_data = MT_CLS_EGALAX,

		HID_USB_DEVICE(USB_VENDOR_ID_DWAV,

			USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH4) },

			USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_72A1) },

	{ .driver_data = MT_CLS_EGALAX,

		HID_USB_DEVICE(USB_VENDOR_ID_DWAV,

			USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH5) },

			USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_A001) },



	/* Elo TouchSystems IntelliTouch Plus panel */

	{ .driver_data = MT_CLS_DUAL_NSMU_CONTACTID,

CRA Git | Maintained and supported by SUSTech CRA and CCSE