Merge branches 'acrux', 'logitech', 'multitouch', 'roccat' and 'wiimote' into for-linus (b0eae38c) · Commits · e / devices / android_kernel_fairphone_FP4

Documentation/ABI/testing/sysfs-driver-hid-logitech-lg4ff

0 → 100644

+7 −0

Original line number	Diff line number	Diff line
		What: /sys/module/hid_logitech/drivers/hid:logitech/<dev>/range.
		Date: July 2011
		KernelVersion: 3.2
		Contact: Michal Malý <madcatxster@gmail.com>
		Description: Display minimum, maximum and current range of the steering
		wheel. Writing a value within min and max boundaries sets the
		range of the wheel.

MAINTAINERS

+6 −0

Original line number	Diff line number	Diff line
		@@ -7142,6 +7142,12 @@ L: linux-scsi@vger.kernel.org
		S: Maintained
		F: drivers/scsi/wd7000.c

		WIIMOTE HID DRIVER
		M: David Herrmann <dh.herrmann@googlemail.com>
		L: linux-input@vger.kernel.org
		S: Maintained
		F: drivers/hid/hid-wiimote*

		WINBOND CIR DRIVER
		M: David Härdeman <david@hardeman.nu>
		S: Maintained

drivers/hid/Kconfig

+24 −5

Original line number	Diff line number	Diff line
		@@ -69,7 +69,7 @@ config HID_ACRUX
		Say Y here if you want to enable support for ACRUX game controllers.

		config HID_ACRUX_FF
		tristate "ACRUX force feedback support"
		bool "ACRUX force feedback support"
		depends on HID_ACRUX
		select INPUT_FF_MEMLESS
		---help---
		@@ -245,6 +245,15 @@ config HID_LOGITECH
		---help---
		Support for Logitech devices that are not fully compliant with HID standard.

		config HID_LOGITECH_DJ
		tristate "Logitech Unifying receivers full support"
		depends on HID_LOGITECH
		default m
		---help---
		Say Y if you want support for Logitech Unifying receivers and devices.
		Unifying receivers are capable of pairing up to 6 Logitech compliant
		devices to the same receiver.

		config LOGITECH_FF
		bool "Logitech force feedback support"
		depends on HID_LOGITECH
		@@ -278,13 +287,21 @@ config LOGIG940_FF
		Say Y here if you want to enable force feedback support for Logitech
		Flight System G940 devices.

		config LOGIWII_FF
		bool "Logitech Speed Force Wireless force feedback support"
		config LOGIWHEELS_FF
		bool "Logitech wheels configuration and force feedback support"
		depends on HID_LOGITECH
		select INPUT_FF_MEMLESS
		default LOGITECH_FF
		help
		Say Y here if you want to enable force feedback support for Logitech
		Speed Force Wireless (Wii) devices.
		Say Y here if you want to enable force feedback and range setting
		support for following Logitech wheels:
		- Logitech Driving Force
		- Logitech Driving Force Pro
		- Logitech Driving Force GT
		- Logitech G25
		- Logitech G27
		- Logitech MOMO/MOMO 2
		- Logitech Formula Force EX

		config HID_MAGICMOUSE
		tristate "Apple MagicMouse multi-touch support"
		@@ -328,6 +345,7 @@ config HID_MULTITOUCH
		- Hanvon dual touch panels
		- Ilitek dual touch panels
		- IrTouch Infrared USB panels
		- LG Display panels (Dell ST2220Tc)
		- Lumio CrystalTouch panels
		- MosArt dual-touch panels
		- PenMount dual touch panels
		@@ -590,6 +608,7 @@ config HID_WIIMOTE
		tristate "Nintendo Wii Remote support"
		depends on BT_HIDP
		depends on LEDS_CLASS
		select POWER_SUPPLY
		---help---
		Support for the Nintendo Wii Remote bluetooth device.

drivers/hid/Makefile

+2 −1

Original line number	Diff line number	Diff line
		@@ -21,7 +21,7 @@ endif
		ifdef CONFIG_LOGIG940_FF
		hid-logitech-y += hid-lg3ff.o
		endif
		ifdef CONFIG_LOGIWII_FF
		ifdef CONFIG_LOGIWHEELS_FF
		hid-logitech-y += hid-lg4ff.o
		endif

		@@ -43,6 +43,7 @@ obj-$(CONFIG_HID_KEYTOUCH) += hid-keytouch.o
		obj-$(CONFIG_HID_KYE) += hid-kye.o
		obj-$(CONFIG_HID_LCPOWER) += hid-lcpower.o
		obj-$(CONFIG_HID_LOGITECH) += hid-logitech.o
		obj-$(CONFIG_HID_LOGITECH_DJ) += hid-logitech-dj.o
		obj-$(CONFIG_HID_MAGICMOUSE) += hid-magicmouse.o
		obj-$(CONFIG_HID_MICROSOFT) += hid-microsoft.o
		obj-$(CONFIG_HID_MONTEREY) += hid-monterey.o

drivers/hid/hid-axff.c

+24 −12

Original line number	Diff line number	Diff line
		@@ -6,7 +6,7 @@
		* Xbox 360 controller.
		*
		* 1a34:0802 "ACRUX USB GAMEPAD 8116"
		* - tested with a EXEQ EQ-PCU-02090 game controller.
		* - tested with an EXEQ EQ-PCU-02090 game controller.
		*
		* Copyright (c) 2010 Sergei Kolzun <x0r@dv-life.ru>
		*/
		@@ -45,7 +45,10 @@ static int axff_play(struct input_dev dev, void data, struct ff_effect *effect
		{
		struct hid_device *hid = input_get_drvdata(dev);
		struct axff_device *axff = data;
		struct hid_report *report = axff->report;
		int field_count = 0;
		int left, right;
		int i, j;

		left = effect->u.rumble.strong_magnitude;
		right = effect->u.rumble.weak_magnitude;
		@@ -55,10 +58,14 @@ static int axff_play(struct input_dev dev, void data, struct ff_effect *effect
		left = left * 0xff / 0xffff;
		right = right * 0xff / 0xffff;

		axff->report->field[0]->value[0] = left;
		axff->report->field[1]->value[0] = right;
		axff->report->field[2]->value[0] = left;
		axff->report->field[3]->value[0] = right;
		for (i = 0; i < report->maxfield; i++) {
		for (j = 0; j < report->field[i]->report_count; j++) {
		report->field[i]->value[j] =
		field_count % 2 ? right : left;
		field_count++;
		}
		}

		dbg_hid("running with 0x%02x 0x%02x", left, right);
		usbhid_submit_report(hid, axff->report, USB_DIR_OUT);

		@@ -72,6 +79,8 @@ static int axff_init(struct hid_device *hid)
		struct hid_input *hidinput = list_first_entry(&hid->inputs, struct hid_input, list);
		struct list_head *report_list =&hid->report_enum[HID_OUTPUT_REPORT].report_list;
		struct input_dev *dev = hidinput->input;
		int field_count = 0;
		int i, j;
		int error;

		if (list_empty(report_list)) {
		@@ -80,9 +89,16 @@ static int axff_init(struct hid_device *hid)
		}

		report = list_first_entry(report_list, struct hid_report, list);
		for (i = 0; i < report->maxfield; i++) {
		for (j = 0; j < report->field[i]->report_count; j++) {
		report->field[i]->value[j] = 0x00;
		field_count++;
		}
		}

		if (report->maxfield < 4) {
		hid_err(hid, "no fields in the report: %d\n", report->maxfield);
		if (field_count < 4) {
		hid_err(hid, "not enough fields in the report: %d\n",
		field_count);
		return -ENODEV;
		}

		@@ -97,10 +113,6 @@ static int axff_init(struct hid_device *hid)
		goto err_free_mem;

		axff->report = report;
		axff->report->field[0]->value[0] = 0x00;
		axff->report->field[1]->value[0] = 0x00;
		axff->report->field[2]->value[0] = 0x00;
		axff->report->field[3]->value[0] = 0x00;
		usbhid_submit_report(hid, axff->report, USB_DIR_OUT);

		hid_info(hid, "Force Feedback for ACRUX game controllers by Sergei Kolzun <x0r@dv-life.ru>\n");