Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 72a46344 authored Aug 20, 2010 by Nikolai Kondrashov Committed by Jiri Kosina Aug 23, 2010

HID: add support for two Waltop tablets



Add support for Waltop Slim Tablet 5.8 inch and Media Tablet 10.6 inch.

These (and other Waltop) tablets are usually sold by different companies
(such as Genius and Trust) and with different names, but with the same USB
vendor/product IDs.

Slim Tablet 5.8 inch is known to also be sold as Genius G-Pen F350 and Trust
Widescreen Mini Tablet (item no 16485).

Media Tablet 10.6 inch is known to also be sold as Genius G-Pen M609 and
M609X. Of these only the latter is known to be supported.

Signed-off-by: Nikolai Kondrashov <spbnick@gmail.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>

parent f36ee074

drivers/hid/Kconfig

+6 −0

Original line number	Original line	Diff line number	Diff line
	@@ -182,6 +182,12 @@ config HID_UCLOGIC
	---help---		---help---
	Support for UC-Logic tablets.		Support for UC-Logic tablets.

			config HID_WALTOP
			tristate "Waltop"
			depends on USB_HID
			---help---
			Support for Waltop tablets.

	config HID_GYRATION		config HID_GYRATION
	tristate "Gyration"		tristate "Gyration"
	depends on USB_HID		depends on USB_HID

drivers/hid/Makefile

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -65,6 +65,7 @@ obj-$(CONFIG_HID_UCLOGIC) += hid-uclogic.o
	obj-$(CONFIG_HID_ZEROPLUS) += hid-zpff.o		obj-$(CONFIG_HID_ZEROPLUS) += hid-zpff.o
	obj-$(CONFIG_HID_ZYDACRON) += hid-zydacron.o		obj-$(CONFIG_HID_ZYDACRON) += hid-zydacron.o
	obj-$(CONFIG_HID_WACOM) += hid-wacom.o		obj-$(CONFIG_HID_WACOM) += hid-wacom.o
			obj-$(CONFIG_HID_WALTOP) += hid-waltop.o

	obj-$(CONFIG_USB_HID) += usbhid/		obj-$(CONFIG_USB_HID) += usbhid/
	obj-$(CONFIG_USB_MOUSE) += usbhid/		obj-$(CONFIG_USB_MOUSE) += usbhid/

drivers/hid/hid-core.c

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1388,6 +1388,8 @@ static const struct hid_device_id hid_blacklist[] = {
	{ HID_USB_DEVICE(USB_VENDOR_ID_UCLOGIC, USB_DEVICE_ID_UCLOGIC_TABLET_WP8060U) },		{ HID_USB_DEVICE(USB_VENDOR_ID_UCLOGIC, USB_DEVICE_ID_UCLOGIC_TABLET_WP8060U) },
	{ HID_USB_DEVICE(USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_SMARTJOY_PLUS) },		{ HID_USB_DEVICE(USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_SMARTJOY_PLUS) },
	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_WACOM, USB_DEVICE_ID_WACOM_GRAPHIRE_BLUETOOTH) },		{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_WACOM, USB_DEVICE_ID_WACOM_GRAPHIRE_BLUETOOTH) },
			{ HID_USB_DEVICE(USB_VENDOR_ID_WALTOP, USB_DEVICE_ID_WALTOP_SLIM_TABLET_5_8_INCH) },
			{ HID_USB_DEVICE(USB_VENDOR_ID_WALTOP, USB_DEVICE_ID_WALTOP_MEDIA_TABLET_10_6_INCH) },
	{ HID_USB_DEVICE(USB_VENDOR_ID_ZEROPLUS, 0x0005) },		{ HID_USB_DEVICE(USB_VENDOR_ID_ZEROPLUS, 0x0005) },
	{ HID_USB_DEVICE(USB_VENDOR_ID_ZEROPLUS, 0x0030) },		{ HID_USB_DEVICE(USB_VENDOR_ID_ZEROPLUS, 0x0030) },
	{ HID_USB_DEVICE(USB_VENDOR_ID_ZYDACRON, USB_DEVICE_ID_ZYDACRON_REMOTE_CONTROL) },		{ HID_USB_DEVICE(USB_VENDOR_ID_ZYDACRON, USB_DEVICE_ID_ZYDACRON_REMOTE_CONTROL) },

drivers/hid/hid-ids.h

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -519,6 +519,10 @@
	#define USB_VENDOR_ID_WACOM 0x056a		#define USB_VENDOR_ID_WACOM 0x056a
	#define USB_DEVICE_ID_WACOM_GRAPHIRE_BLUETOOTH 0x81		#define USB_DEVICE_ID_WACOM_GRAPHIRE_BLUETOOTH 0x81

			#define USB_VENDOR_ID_WALTOP 0x172f
			#define USB_DEVICE_ID_WALTOP_SLIM_TABLET_5_8_INCH 0x0032
			#define USB_DEVICE_ID_WALTOP_MEDIA_TABLET_10_6_INCH 0x0501

	#define USB_VENDOR_ID_WISEGROUP 0x0925		#define USB_VENDOR_ID_WISEGROUP 0x0925
	#define USB_DEVICE_ID_SMARTJOY_PLUS 0x0005		#define USB_DEVICE_ID_SMARTJOY_PLUS 0x0005
	#define USB_DEVICE_ID_1_PHIDGETSERVO_20 0x8101		#define USB_DEVICE_ID_1_PHIDGETSERVO_20 0x8101

drivers/hid/hid-waltop.c

0 → 100644

+558 −0

File added.

Preview size limit exceeded, changes collapsed.