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

Commit 817a3125 authored by Jiri Kosina's avatar Jiri Kosina
Browse files

Merge branches 'for-4.1/upstream-fixes', 'for-4.2/upstream' and 'for-4.2/logitech' into for-linus 

Conflicts:
	drivers/hid/hid-logitech-hidpp.c
parents 7250dc3f 74a3e0c7 8a09b4fa

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

+4 −4
Original line number Diff line number Diff line 
What:		/sys/module/hid_logitech/drivers/hid:logitech/<dev>/range.

What:		/sys/bus/hid/drivers/logitech/<dev>/range

Date:		July 2011

KernelVersion:	3.2

Contact:	Michal Malý <madcatxster@gmail.com>

Contact:	Michal Malý <madcatxster@devoid-pointer.net>

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.
@@ -9,7 +9,7 @@ Description: Display minimum, maximum and current range of the steering 
What:		/sys/bus/hid/drivers/logitech/<dev>/alternate_modes

Date:		Feb 2015

KernelVersion:	4.1

Contact:	Michal Malý <madcatxster@gmail.com>

Contact:	Michal Malý <madcatxster@devoid-pointer.net>

Description:	Displays a set of alternate modes supported by a wheel. Each

		mode is listed as follows:

		  Tag: Mode Name
@@ -45,7 +45,7 @@ Description: Displays a set of alternate modes supported by a wheel. Each 
What:		/sys/bus/hid/drivers/logitech/<dev>/real_id

Date:		Feb 2015

KernelVersion:	4.1

Contact:	Michal Malý <madcatxster@gmail.com>

Contact:	Michal Malý <madcatxster@devoid-pointer.net>

Description:	Displays the real model of the wheel regardless of any

		alternate mode the wheel might be switched to.

		It is a read-only value.

drivers/hid/hid-core.c

+9 −22
Original line number Diff line number Diff line
@@ -706,7 +706,8 @@ static void hid_scan_collection(struct hid_parser *parser, unsigned type) 


	if (hid->vendor == USB_VENDOR_ID_MICROSOFT &&

	    (hid->product == USB_DEVICE_ID_MS_TYPE_COVER_3 ||

	     hid->product == USB_DEVICE_ID_MS_TYPE_COVER_3_JP) &&

	     hid->product == USB_DEVICE_ID_MS_TYPE_COVER_3_JP ||

	     hid->product == USB_DEVICE_ID_MS_POWER_COVER) &&

	    hid->group == HID_GROUP_MULTITOUCH)

		hid->group = HID_GROUP_GENERIC;
@@ -1061,13 +1062,13 @@ static u32 s32ton(__s32 value, unsigned n) 
 * Search linux-kernel and linux-usb-devel archives for "hid-core extract".

 */



static __u32 extract(const struct hid_device *hid, __u8 *report,

__u32 hid_field_extract(const struct hid_device *hid, __u8 *report,

		     unsigned offset, unsigned n)

{

	u64 x;



	if (n > 32)

		hid_warn(hid, "extract() called with n (%d) > 32! (%s)\n",

		hid_warn(hid, "hid_field_extract() called with n (%d) > 32! (%s)\n",

			 n, current->comm);



	report += offset >> 3;  /* adjust byte index */
@@ -1076,6 +1077,7 @@ static __u32 extract(const struct hid_device *hid, __u8 *report, 
	x = (x >> offset) & ((1ULL << n) - 1);  /* extract bit field */

	return (u32) x;

}

EXPORT_SYMBOL_GPL(hid_field_extract);



/*

 * "implement" : set bits in a little endian bit stream.
@@ -1221,9 +1223,9 @@ static void hid_input_field(struct hid_device *hid, struct hid_field *field, 
	for (n = 0; n < count; n++) {



		value[n] = min < 0 ?

			snto32(extract(hid, data, offset + n * size, size),

			       size) :

			extract(hid, data, offset + n * size, size);

			snto32(hid_field_extract(hid, data, offset + n * size,

			       size), size) :

			hid_field_extract(hid, data, offset + n * size, size);



		/* Ignore report if ErrorRollOver */

		if (!(field->flags & HID_MAIN_ITEM_VARIABLE) &&
@@ -1901,6 +1903,7 @@ static const struct hid_device_id hid_have_special_driver[] = { 
	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_OFFICE_KB) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_3) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_3_JP) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_POWER_COVER) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MONTEREY, USB_DEVICE_ID_GENIUS_KB29E) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MSI, USB_DEVICE_ID_MSI_GT683R_LED_PANEL) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN) },
@@ -2265,14 +2268,6 @@ static const struct hid_device_id hid_ignore_list[] = { 
	{ HID_USB_DEVICE(USB_VENDOR_ID_GENERAL_TOUCH, 0x0001) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_GENERAL_TOUCH, 0x0002) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_GENERAL_TOUCH, 0x0004) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_GLAB, USB_DEVICE_ID_4_PHIDGETSERVO_30) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_GLAB, USB_DEVICE_ID_1_PHIDGETSERVO_30) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_GLAB, USB_DEVICE_ID_0_0_4_IF_KIT) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_GLAB, USB_DEVICE_ID_0_16_16_IF_KIT) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_GLAB, USB_DEVICE_ID_8_8_8_IF_KIT) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_GLAB, USB_DEVICE_ID_0_8_7_IF_KIT) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_GLAB, USB_DEVICE_ID_0_8_8_IF_KIT) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_GLAB, USB_DEVICE_ID_PHIDGET_MOTORCONTROL) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_GOTOP, USB_DEVICE_ID_SUPER_Q2) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_GOTOP, USB_DEVICE_ID_GOGOPEN) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_GOTOP, USB_DEVICE_ID_PENPOWER) },
@@ -2399,14 +2394,6 @@ static const struct hid_device_id hid_ignore_list[] = { 
	{ HID_USB_DEVICE(USB_VENDOR_ID_SYNAPTICS, USB_DEVICE_ID_SYNAPTICS_WTP) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_SYNAPTICS, USB_DEVICE_ID_SYNAPTICS_DPAD) },

#endif

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

	{ HID_USB_DEVICE(USB_VENDOR_ID_VERNIER, USB_DEVICE_ID_VERNIER_CYCLOPS) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_VERNIER, USB_DEVICE_ID_VERNIER_LCSPEC) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_4_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_YEALINK, USB_DEVICE_ID_YEALINK_P1K_P4K_B2K) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_RISO_KAGAKU, USB_DEVICE_ID_RI_KA_WEBMAIL) },

	{ }

drivers/hid/hid-cypress.c

+1 −5
Original line number Diff line number Diff line
@@ -41,13 +41,9 @@ static __u8 *cp_report_fixup(struct hid_device *hdev, __u8 *rdesc, 


	for (i = 0; i < *rsize - 4; i++)

		if (rdesc[i] == 0x29 && rdesc[i + 2] == 0x19) {

			__u8 tmp;



			rdesc[i] = 0x19;

			rdesc[i + 2] = 0x29;

			tmp = rdesc[i + 3];

			rdesc[i + 3] = rdesc[i + 1];

			rdesc[i + 1] = tmp;

			swap(rdesc[i + 3], rdesc[i + 1]);

		}

	return rdesc;

}

drivers/hid/hid-ids.h

+8 −20
Original line number Diff line number Diff line
@@ -364,16 +364,6 @@ 
#define USB_DEVICE_ID_GENERAL_TOUCH_WIN8_PIT_010A 0x010a

#define USB_DEVICE_ID_GENERAL_TOUCH_WIN8_PIT_E100 0xe100



#define USB_VENDOR_ID_GLAB		0x06c2

#define USB_DEVICE_ID_4_PHIDGETSERVO_30	0x0038

#define USB_DEVICE_ID_1_PHIDGETSERVO_30	0x0039

#define USB_DEVICE_ID_0_0_4_IF_KIT	0x0040

#define USB_DEVICE_ID_0_16_16_IF_KIT	0x0044

#define USB_DEVICE_ID_8_8_8_IF_KIT	0x0045

#define USB_DEVICE_ID_0_8_7_IF_KIT	0x0051

#define USB_DEVICE_ID_0_8_8_IF_KIT	0x0053

#define USB_DEVICE_ID_PHIDGET_MOTORCONTROL	0x0058



#define USB_VENDOR_ID_GOODTOUCH		0x1aad

#define USB_DEVICE_ID_GOODTOUCH_000f	0x000f
@@ -674,6 +664,7 @@ 
#define USB_DEVICE_ID_MS_TYPE_COVER_2    0x07a9

#define USB_DEVICE_ID_MS_TYPE_COVER_3    0x07dc

#define USB_DEVICE_ID_MS_TYPE_COVER_3_JP 0x07dd

#define USB_DEVICE_ID_MS_POWER_COVER     0x07da



#define USB_VENDOR_ID_MOJO		0x8282

#define USB_DEVICE_ID_RETRO_ADAPTER	0x3201
@@ -959,13 +950,6 @@ 
#define USB_DEVICE_ID_VELLEMAN_K8061_FIRST	0x8061

#define USB_DEVICE_ID_VELLEMAN_K8061_LAST	0x8068



#define USB_VENDOR_ID_VERNIER		0x08f7

#define USB_DEVICE_ID_VERNIER_LABPRO	0x0001

#define USB_DEVICE_ID_VERNIER_GOTEMP	0x0002

#define USB_DEVICE_ID_VERNIER_SKIP	0x0003

#define USB_DEVICE_ID_VERNIER_CYCLOPS	0x0004

#define USB_DEVICE_ID_VERNIER_LCSPEC	0x0006



#define USB_VENDOR_ID_VTL		0x0306

#define USB_DEVICE_ID_VTL_MULTITOUCH_FF3F	0xff3f
@@ -984,9 +968,6 @@ 


#define USB_VENDOR_ID_WISEGROUP		0x0925

#define USB_DEVICE_ID_SMARTJOY_PLUS	0x0005

#define USB_DEVICE_ID_1_PHIDGETSERVO_20	0x8101

#define USB_DEVICE_ID_4_PHIDGETSERVO_20	0x8104

#define USB_DEVICE_ID_8_8_4_IF_KIT	0x8201

#define USB_DEVICE_ID_SUPER_JOY_BOX_3	0x8888

#define USB_DEVICE_ID_QUAD_USB_JOYPAD	0x8800

#define USB_DEVICE_ID_DUAL_USB_JOYPAD	0x8866
@@ -1040,4 +1021,11 @@ 
#define USB_VENDOR_ID_RISO_KAGAKU	0x1294	/* Riso Kagaku Corp. */

#define USB_DEVICE_ID_RI_KA_WEBMAIL	0x1320	/* Webmail Notifier */



#define USB_VENDOR_ID_MULTIPLE_1781	0x1781

#define USB_DEVICE_ID_RAPHNET_4NES4SNES_OLD	0x0a8d



#define USB_VENDOR_ID_DRACAL_RAPHNET	0x289b

#define USB_DEVICE_ID_RAPHNET_2NES2SNES	0x0002

#define USB_DEVICE_ID_RAPHNET_4NES4SNES	0x0003



#endif

drivers/hid/hid-input.c

+2 −1
Original line number Diff line number Diff line
@@ -1157,7 +1157,8 @@ void hidinput_hid_event(struct hid_device *hid, struct hid_field *field, struct 
		return;



	/* report the usage code as scancode if the key status has changed */

	if (usage->type == EV_KEY && !!test_bit(usage->code, input->key) != value)

	if (usage->type == EV_KEY &&

	    (!test_bit(usage->code, input->key)) == value)

		input_event(input, EV_MSC, MSC_SCAN, usage->hid);



	input_event(input, usage->type, usage->code, value);