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

Commit 10e41a71 authored Sep 18, 2008 by Jiri Slaby Committed by Jiri Kosina Oct 14, 2008

HID: move thrustmaster FF processing



Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>

parent 5f022298

drivers/hid/Kconfig

+9 −0

Original line number	Original line	Diff line number	Diff line
	@@ -243,6 +243,15 @@ config HID_SUNPLUS
	---help---		---help---
	Support for Sunplus WDesktop input device.		Support for Sunplus WDesktop input device.

			config THRUSTMASTER_FF
			tristate "ThrustMaster devices support"
			default m
			depends on USB_HID
			select INPUT_FF_MEMLESS
			help
			Say Y here if you have a THRUSTMASTER FireStore Dual Power 2 or
			a THRUSTMASTER Ferrari GT Rumble Force or Force Feedback Wheel.

	endmenu		endmenu

	endif # HID_SUPPORT		endif # HID_SUPPORT

drivers/hid/Makefile

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -37,6 +37,7 @@ obj-$(CONFIG_HID_PETALYNX) += hid-petalynx.o
	obj-$(CONFIG_HID_SAMSUNG) += hid-samsung.o		obj-$(CONFIG_HID_SAMSUNG) += hid-samsung.o
	obj-$(CONFIG_HID_SONY) += hid-sony.o		obj-$(CONFIG_HID_SONY) += hid-sony.o
	obj-$(CONFIG_HID_SUNPLUS) += hid-sunplus.o		obj-$(CONFIG_HID_SUNPLUS) += hid-sunplus.o
			obj-$(CONFIG_THRUSTMASTER_FF) += hid-tmff.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

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1516,6 +1516,10 @@ static const struct hid_device_id hid_ignore_list[] = {
	{ HID_USB_DEVICE(USB_VENDOR_ID_SOUNDGRAPH, USB_DEVICE_ID_SOUNDGRAPH_IMON_LCD) },		{ HID_USB_DEVICE(USB_VENDOR_ID_SOUNDGRAPH, USB_DEVICE_ID_SOUNDGRAPH_IMON_LCD) },
	{ HID_USB_DEVICE(USB_VENDOR_ID_TENX, USB_DEVICE_ID_TENX_IBUDDY1) },		{ HID_USB_DEVICE(USB_VENDOR_ID_TENX, USB_DEVICE_ID_TENX_IBUDDY1) },
	{ HID_USB_DEVICE(USB_VENDOR_ID_TENX, USB_DEVICE_ID_TENX_IBUDDY2) },		{ HID_USB_DEVICE(USB_VENDOR_ID_TENX, USB_DEVICE_ID_TENX_IBUDDY2) },
			{ HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb300) },
			{ HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb304) },
			{ HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb651) },
			{ HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb654) },
	{ HID_USB_DEVICE(USB_VENDOR_ID_VERNIER, USB_DEVICE_ID_VERNIER_LABPRO) },		{ HID_USB_DEVICE(USB_VENDOR_ID_VERNIER, USB_DEVICE_ID_VERNIER_LABPRO) },
	{ HID_USB_DEVICE(USB_VENDOR_ID_VERNIER, USB_DEVICE_ID_VERNIER_GOTEMP) },		{ HID_USB_DEVICE(USB_VENDOR_ID_VERNIER, USB_DEVICE_ID_VERNIER_GOTEMP) },
	{ HID_USB_DEVICE(USB_VENDOR_ID_VERNIER, USB_DEVICE_ID_VERNIER_SKIP) },		{ HID_USB_DEVICE(USB_VENDOR_ID_VERNIER, USB_DEVICE_ID_VERNIER_SKIP) },

drivers/hid/hid-dummy.c

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -55,6 +55,9 @@ static int __init hid_dummy_init(void)
	#ifdef CONFIG_HID_SUNPLUS_MODULE		#ifdef CONFIG_HID_SUNPLUS_MODULE
	HID_COMPAT_CALL_DRIVER(sunplus);		HID_COMPAT_CALL_DRIVER(sunplus);
	#endif		#endif
			#ifdef CONFIG_THRUSTMASTER_FF_MODULE
			HID_COMPAT_CALL_DRIVER(thrustmaster);
			#endif

	return -EIO;		return -EIO;
	}		}

drivers/hid/hid-ids.h

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -357,6 +357,8 @@
	#define USB_DEVICE_ID_TENX_IBUDDY1 0x0001		#define USB_DEVICE_ID_TENX_IBUDDY1 0x0001
	#define USB_DEVICE_ID_TENX_IBUDDY2 0x0002		#define USB_DEVICE_ID_TENX_IBUDDY2 0x0002

			#define USB_VENDOR_ID_THRUSTMASTER 0x044f

	#define USB_VENDOR_ID_TOPMAX 0x0663		#define USB_VENDOR_ID_TOPMAX 0x0663
	#define USB_DEVICE_ID_TOPMAX_COBRAPAD 0x0103		#define USB_DEVICE_ID_TOPMAX_COBRAPAD 0x0103