Commit 606bd0a8 authored by Jiri Slaby's avatar Jiri Slaby Committed by Jiri Kosina
Browse files

HID: move logitech FF processing 



Merge the logitech force feedback processing directly into logitech
driver from the usbhid core.

Signed-off-by: default avatarJiri Slaby <jirislaby@gmail.com>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent 6edfa8dc

drivers/hid/Kconfig

+24 −0
Original line number Diff line number Diff line
@@ -160,6 +160,30 @@ config HID_LOGITECH 
	Support for some Logitech devices which breaks less or more

	HID specification.



config LOGITECH_FF

	bool "Logitech force feedback"

	depends on HID_LOGITECH

	select INPUT_FF_MEMLESS

	help

	  Say Y here if you have one of these devices:

	  - Logitech WingMan Cordless RumblePad

	  - Logitech WingMan Cordless RumblePad 2

	  - Logitech WingMan Force 3D

	  - Logitech Formula Force EX

	  - Logitech MOMO Force wheel



	  and if you want to enable force feedback for them.

	  Note: if you say N here, this device will still be supported, but without

	  force feedback.



config LOGIRUMBLEPAD2_FF

	bool "Logitech Rumblepad 2 force feedback"

	depends on HID_LOGITECH

	select INPUT_FF_MEMLESS

	help

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

	  Rumblepad 2 devices.



config HID_MICROSOFT

	tristate "Microsoft"

	default m

drivers/hid/Makefile

+8 −0
Original line number Diff line number Diff line
@@ -12,6 +12,14 @@ ifdef CONFIG_HID_COMPAT 
obj-m				+= hid-dummy.o

endif



hid-logitech-objs		:= hid-lg.o

ifdef CONFIG_LOGITECH_FF

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

endif

ifdef CONFIG_LOGIRUMBLEPAD2_FF

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

endif



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

obj-$(CONFIG_HID_APPLE)		+= hid-apple.o

obj-$(CONFIG_HID_BELKIN)	+= hid-belkin.o

drivers/hid/hid-core.c

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

	{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_EXTREME_3D) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_WHEEL) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_RUMBLEPAD) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_RUMBLEPAD2_2) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_WINGMAN_F3D) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_FORCE3D_PRO) },

	{ 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_RUMBLEPAD2) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_SIDEWINDER_GV) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_NE4K) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_LK6K) },

drivers/hid/hid-ids.h

+7 −0
Original line number Diff line number Diff line
@@ -263,8 +263,14 @@ 
#define USB_DEVICE_ID_LOGITECH_RECEIVER	0xc101

#define USB_DEVICE_ID_LOGITECH_HARMONY_FIRST  0xc110

#define USB_DEVICE_ID_LOGITECH_HARMONY_LAST 0xc14f

#define USB_DEVICE_ID_LOGITECH_RUMBLEPAD	0xc211

#define USB_DEVICE_ID_LOGITECH_EXTREME_3D	0xc215

#define USB_DEVICE_ID_LOGITECH_RUMBLEPAD2	0xc218

#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_WHEEL	0xc294

#define USB_DEVICE_ID_LOGITECH_MOMO_WHEEL	0xc295

#define USB_DEVICE_ID_LOGITECH_ELITE_KBD	0xc30a

#define USB_DEVICE_ID_LOGITECH_KBD	0xc311

#define USB_DEVICE_ID_S510_RECEIVER	0xc50c
@@ -274,6 +280,7 @@ 
#define USB_DEVICE_ID_DINOVO_DESKTOP	0xc704

#define USB_DEVICE_ID_DINOVO_EDGE	0xc714

#define USB_DEVICE_ID_DINOVO_MINI	0xc71f

#define USB_DEVICE_ID_LOGITECH_MOMO_WHEEL2	0xca03



#define USB_VENDOR_ID_MCC		0x09db

#define USB_DEVICE_ID_MCC_PMD1024LS	0x0076

drivers/hid/hid-logitech.c→drivers/hid/hid-lg.c

+29 −2
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
#include <linux/module.h>



#include "hid-ids.h"

#include "hid-lg.h"



#define LG_RDESC		0x001

#define LG_BAD_RELATIVE_KEYS	0x002
@@ -31,6 +32,8 @@ 
#define LG_WIRELESS		0x040

#define LG_INVERT_HWHEEL	0x080

#define LG_NOGET		0x100

#define LG_FF			0x200

#define LG_FF2			0x400



/*

 * Certain Logitech keyboards send in report #3 keys which are far
@@ -222,6 +225,7 @@ static int lg_event(struct hid_device *hdev, struct hid_field *field, 
static int lg_probe(struct hid_device *hdev, const struct hid_device_id *id)

{

	unsigned long quirks = id->driver_data;

	unsigned int connect_mask = HID_CONNECT_DEFAULT;

	int ret;



	hid_set_drvdata(hdev, (void *)quirks);
@@ -235,7 +239,10 @@ static int lg_probe(struct hid_device *hdev, const struct hid_device_id *id) 
		goto err_free;

	}



	ret = hid_hw_start(hdev, HID_CONNECT_DEFAULT);

	if (quirks & (LG_FF | LG_FF2))

		connect_mask &= ~HID_CONNECT_FF;



	ret = hid_hw_start(hdev, connect_mask);

	if (ret) {

		dev_err(&hdev->dev, "hw start failed\n");

		goto err_free;
@@ -244,6 +251,11 @@ static int lg_probe(struct hid_device *hdev, const struct hid_device_id *id) 
	if (quirks & LG_RESET_LEDS)

		usbhid_set_leds(hdev);



	if (quirks & LG_FF)

		lgff_init(hdev);

	if (quirks & LG_FF2)

		lg2ff_init(hdev);



	return 0;

err_free:

	return ret;
@@ -283,7 +295,22 @@ static const struct hid_device_id lg_devices[] = { 
	{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_EXTREME_3D),

		.driver_data = LG_NOGET },

	{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_WHEEL),

		.driver_data = LG_NOGET },

		.driver_data = LG_NOGET | LG_FF },



	{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_RUMBLEPAD),

		.driver_data = LG_FF },

	{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_RUMBLEPAD2_2),

		.driver_data = LG_FF },

	{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_WINGMAN_F3D),

		.driver_data = LG_FF },

	{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_FORCE3D_PRO),

		.driver_data = LG_FF },

	{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_MOMO_WHEEL),

		.driver_data = LG_FF },

	{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_MOMO_WHEEL2),

		.driver_data = LG_FF },

	{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_RUMBLEPAD2),

		.driver_data = LG_FF2 },

	{ }

};

MODULE_DEVICE_TABLE(hid, lg_devices);