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

Commit 987fbc1f authored Sep 18, 2008 by Jiri Slaby Committed by Jiri Kosina Oct 14, 2008

HID: move zeroplus FF processing



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

parent 10e41a71

drivers/hid/Kconfig

+8 −0

Original line number	Original line	Diff line number	Diff line
	@@ -252,6 +252,14 @@ config THRUSTMASTER_FF
	Say Y here if you have a THRUSTMASTER FireStore Dual Power 2 or		Say Y here if you have a THRUSTMASTER FireStore Dual Power 2 or
	a THRUSTMASTER Ferrari GT Rumble Force or Force Feedback Wheel.		a THRUSTMASTER Ferrari GT Rumble Force or Force Feedback Wheel.

			config ZEROPLUS_FF
			tristate "Zeroplus based game controller support"
			default m
			depends on USB_HID
			select INPUT_FF_MEMLESS
			help
			Say Y here if you have a Zeroplus based game controller.

	endmenu		endmenu

	endif # HID_SUPPORT		endif # HID_SUPPORT

drivers/hid/Makefile

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -38,6 +38,7 @@ 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_THRUSTMASTER_FF) += hid-tmff.o
			obj-$(CONFIG_ZEROPLUS_FF) += hid-zpff.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
	@@ -1530,6 +1530,8 @@ static const struct hid_device_id hid_ignore_list[] = {
	{ HID_USB_DEVICE(USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_1_PHIDGETSERVO_20) },		{ HID_USB_DEVICE(USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_1_PHIDGETSERVO_20) },
	{ HID_USB_DEVICE(USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_8_8_4_IF_KIT) },		{ HID_USB_DEVICE(USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_8_8_4_IF_KIT) },
	{ HID_USB_DEVICE(USB_VENDOR_ID_YEALINK, USB_DEVICE_ID_YEALINK_P1K_P4K_B2K) },		{ HID_USB_DEVICE(USB_VENDOR_ID_YEALINK, USB_DEVICE_ID_YEALINK_P1K_P4K_B2K) },
			{ HID_USB_DEVICE(USB_VENDOR_ID_ZEROPLUS, 0x0005) },
			{ HID_USB_DEVICE(USB_VENDOR_ID_ZEROPLUS, 0x0030) },
	{ }		{ }
	};		};

drivers/hid/hid-dummy.c

+3 −0

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

	return -EIO;		return -EIO;
	}		}

drivers/hid/hid-ids.h

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -388,6 +388,8 @@
	#define USB_VENDOR_ID_YEALINK 0x6993		#define USB_VENDOR_ID_YEALINK 0x6993
	#define USB_DEVICE_ID_YEALINK_P1K_P4K_B2K 0xb001		#define USB_DEVICE_ID_YEALINK_P1K_P4K_B2K 0xb001

			#define USB_VENDOR_ID_ZEROPLUS 0x0c12

	#define USB_VENDOR_ID_KYE 0x0458		#define USB_VENDOR_ID_KYE 0x0458
	#define USB_DEVICE_ID_KYE_GPEN_560 0x5003		#define USB_DEVICE_ID_KYE_GPEN_560 0x5003