Commit 74f292ca authored by Gary Stein's avatar Gary Stein Committed by Jiri Kosina
Browse files

HID: add driver for the Logitech Flight System G940 



Implements a new USB-HID for Force Feedback based on the normal
Logitech Force Feedback code and FF-Memless.

Currently only supports the FF_CONSTANT effect although the joystick
appears to support additional non-standard ones.

Signed-off-by: default avatarGary Stein <LordCnidarian@gmail.com>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent d67dec5b

drivers/hid/Kconfig

+8 −0
Original line number Diff line number Diff line
@@ -189,6 +189,14 @@ config LOGIRUMBLEPAD2_FF 
	  Say Y here if you want to enable force feedback support for Logitech

	  Rumblepad 2 devices.



config LOGIG940_FF

	bool "Logitech Flight System G940 force feedback support"

	depends on HID_LOGITECH

	select INPUT_FF_MEMLESS

	help

	  Say Y here if you want to enable force feedback support for Logitech

	  Flight System G940 devices.



config HID_MICROSOFT

	tristate "Microsoft" if EMBEDDED

	depends on USB_HID

drivers/hid/Makefile

+3 −0
Original line number Diff line number Diff line
@@ -18,6 +18,9 @@ endif 
ifdef CONFIG_LOGIRUMBLEPAD2_FF

	hid-logitech-objs	+= hid-lg2ff.o

endif

ifdef CONFIG_LOGIG940_FF

	hid-logitech-objs	+= hid-lg3ff.o

endif



obj-$(CONFIG_HID_3M_PCT)	+= hid-3m-pct.o

obj-$(CONFIG_HID_A4TECH)	+= hid-a4tech.o

drivers/hid/hid-core.c

+1 −0
Original line number Diff line number Diff line
@@ -1323,6 +1323,7 @@ static const struct hid_device_id hid_blacklist[] = { 
	{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_WINGMAN_F3D) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_WINGMAN_FFG ) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_FORCE3D_PRO) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_FLIGHT_SYSTEM_G940) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_MOMO_WHEEL) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_MOMO_WHEEL2) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_G25_WHEEL) },

drivers/hid/hid-ids.h

+1 −0
Original line number Diff line number Diff line
@@ -300,6 +300,7 @@ 
#define USB_DEVICE_ID_LOGITECH_RUMBLEPAD2_2	0xc219

#define USB_DEVICE_ID_LOGITECH_WINGMAN_F3D	0xc283

#define USB_DEVICE_ID_LOGITECH_FORCE3D_PRO	0xc286

#define USB_DEVICE_ID_LOGITECH_FLIGHT_SYSTEM_G940	0xc287

#define USB_DEVICE_ID_LOGITECH_WHEEL	0xc294

#define USB_DEVICE_ID_LOGITECH_WINGMAN_FFG	0xc293

#define USB_DEVICE_ID_LOGITECH_MOMO_WHEEL	0xc295

drivers/hid/hid-lg.c

+6 −1
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ 
#define LG_FF			0x200

#define LG_FF2			0x400

#define LG_RDESC_REL_ABS	0x800

#define LG_FF3			0x1000



/*

 * Certain Logitech keyboards send in report #3 keys which are far
@@ -266,7 +267,7 @@ static int lg_probe(struct hid_device *hdev, const struct hid_device_id *id) 
		goto err_free;

	}



	if (quirks & (LG_FF | LG_FF2))

	if (quirks & (LG_FF | LG_FF2 | LG_FF3))

		connect_mask &= ~HID_CONNECT_FF;



	ret = hid_hw_start(hdev, connect_mask);
@@ -279,6 +280,8 @@ static int lg_probe(struct hid_device *hdev, const struct hid_device_id *id) 
		lgff_init(hdev);

	if (quirks & LG_FF2)

		lg2ff_init(hdev);

	if (quirks & LG_FF3)

		lg3ff_init(hdev);



	return 0;

err_free:
@@ -331,6 +334,8 @@ static const struct hid_device_id lg_devices[] = { 
		.driver_data = LG_FF },

	{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_RUMBLEPAD2),

		.driver_data = LG_FF2 },

	{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_FLIGHT_SYSTEM_G940),

		.driver_data = LG_FF3 },

	{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_SPACENAVIGATOR),

		.driver_data = LG_RDESC_REL_ABS },

	{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_SPACETRAVELLER),