Merge branch 'for-5.1/hid-logitech' into for-linus (ae18691a) · Commits · 戴 / test

drivers/hid/hid-ids.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -745,6 +745,7 @@
		#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_WINGMAN_FG 0xc20e
		#define USB_DEVICE_ID_LOGITECH_WINGMAN_FFG 0xc293
		#define USB_DEVICE_ID_LOGITECH_WHEEL 0xc294
		#define USB_DEVICE_ID_LOGITECH_MOMO_WHEEL 0xc295

drivers/hid/hid-lg.c

+60 −0

Original line number	Diff line number	Diff line
		@@ -50,6 +50,7 @@
		#define MOMO_RDESC_ORIG_SIZE 87
		#define MOMO2_RDESC_ORIG_SIZE 87
		#define FFG_RDESC_ORIG_SIZE 85
		#define FG_RDESC_ORIG_SIZE 82

		/* Fixed report descriptors for Logitech Driving Force (and Pro)
		* wheel controllers
		@@ -381,6 +382,49 @@ static __u8 ffg_rdesc_fixed[] = {
		0xC0 /* End Collection */
		};

		static __u8 fg_rdesc_fixed[] = {
		0x05, 0x01, /* Usage Page (Desktop), */
		0x09, 0x04, /* Usage (Joystik), */
		0xA1, 0x01, /* Collection (Application), */
		0xA1, 0x02, /* Collection (Logical), */
		0x15, 0x00, /* Logical Minimum (0), */
		0x26, 0xFF, 0x00, /* Logical Maximum (255), */
		0x35, 0x00, /* Physical Minimum (0), */
		0x46, 0xFF, 0x00, /* Physical Maximum (255), */
		0x75, 0x08, /* Report Size (8), */
		0x95, 0x01, /* Report Count (1), */
		0x09, 0x30, /* Usage (X), */
		0x81, 0x02, /* Input (Variable), */
		0xA4, /* Push, */
		0x25, 0x01, /* Logical Maximum (1), */
		0x45, 0x01, /* Physical Maximum (1), */
		0x75, 0x01, /* Report Size (1), */
		0x95, 0x02, /* Report Count (2), */
		0x81, 0x01, /* Input (Constant), */
		0x95, 0x06, /* Report Count (6), */
		0x05, 0x09, /* Usage Page (Button), */
		0x19, 0x01, /* Usage Minimum (01h), */
		0x29, 0x06, /* Usage Maximum (06h), */
		0x81, 0x02, /* Input (Variable), */
		0x05, 0x01, /* Usage Page (Desktop), */
		0xB4, /* Pop, */
		0x81, 0x02, /* Input (Constant), */
		0x09, 0x31, /* Usage (Y), */
		0x81, 0x02, /* Input (Variable), */
		0x09, 0x32, /* Usage (Z), */
		0x81, 0x02, /* Input (Variable), */
		0xC0, /* End Collection, */
		0xA1, 0x02, /* Collection (Logical), */
		0x26, 0xFF, 0x00, /* Logical Maximum (255), */
		0x46, 0xFF, 0x00, /* Physical Maximum (255), */
		0x75, 0x08, /* Report Size (8), */
		0x95, 0x04, /* Report Count (4), */
		0x09, 0x02, /* Usage (02h), */
		0xB1, 0x02, /* Feature (Variable), */
		0xC0, /* End Collection, */
		0xC0 /* End Collection, */
		};

		/*
		* Certain Logitech keyboards send in report #3 keys which are far
		* above the logical maximum described in descriptor. This extends
		@@ -408,6 +452,19 @@ static __u8 lg_report_fixup(struct hid_device hdev, __u8 *rdesc,

		switch (hdev->product) {

		case USB_DEVICE_ID_LOGITECH_WINGMAN_FG:
		if (*rsize == FG_RDESC_ORIG_SIZE) {
		hid_info(hdev,
		"fixing up Logitech Wingman Formula GP report descriptor\n");
		rdesc = fg_rdesc_fixed;
		*rsize = sizeof(fg_rdesc_fixed);
		} else {
		hid_info(hdev,
		"rdesc size test failed for formula gp\n");
		}
		break;


		case USB_DEVICE_ID_LOGITECH_WINGMAN_FFG:
		if (*rsize == FFG_RDESC_ORIG_SIZE) {
		hid_info(hdev,
		@@ -664,6 +721,7 @@ static int lg_input_mapped(struct hid_device hdev, struct hid_input hi,
		usage->code == ABS_RZ)) {
		switch (hdev->product) {
		case USB_DEVICE_ID_LOGITECH_G29_WHEEL:
		case USB_DEVICE_ID_LOGITECH_WINGMAN_FG:
		case USB_DEVICE_ID_LOGITECH_WINGMAN_FFG:
		case USB_DEVICE_ID_LOGITECH_WHEEL:
		case USB_DEVICE_ID_LOGITECH_MOMO_WHEEL:
		@@ -871,6 +929,8 @@ static const struct hid_device_id lg_devices[] = {
		.driver_data = LG_NOGET \| LG_FF4 },
		{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_WII_WHEEL),
		.driver_data = LG_FF4 },
		{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_WINGMAN_FG),
		.driver_data = LG_NOGET },
		{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_WINGMAN_FFG),
		.driver_data = LG_NOGET \| LG_FF4 },
		{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_RUMBLEPAD2),

drivers/hid/hid-lg4ff.c

+6 −0

Original line number	Diff line number	Diff line
		@@ -103,6 +103,10 @@ static const signed short lg4ff_wheel_effects[] = {
		-1
		};

		static const signed short no_wheel_effects[] = {
		-1
		};

		struct lg4ff_wheel {
		const u32 product_id;
		const signed short *ff_effects;
		@@ -137,6 +141,7 @@ struct lg4ff_alternate_mode {
		};

		static const struct lg4ff_wheel lg4ff_devices[] = {
		{USB_DEVICE_ID_LOGITECH_WINGMAN_FG, no_wheel_effects, 40, 180, NULL},
		{USB_DEVICE_ID_LOGITECH_WINGMAN_FFG, lg4ff_wheel_effects, 40, 180, NULL},
		{USB_DEVICE_ID_LOGITECH_WHEEL, lg4ff_wheel_effects, 40, 270, NULL},
		{USB_DEVICE_ID_LOGITECH_MOMO_WHEEL, lg4ff_wheel_effects, 40, 270, NULL},
		@@ -346,6 +351,7 @@ int lg4ff_raw_event(struct hid_device hdev, struct hid_report report,
		rd[5] = rd[3];
		rd[6] = 0x7F;
		return 1;
		case USB_DEVICE_ID_LOGITECH_WINGMAN_FG:
		case USB_DEVICE_ID_LOGITECH_WINGMAN_FFG:
		case USB_DEVICE_ID_LOGITECH_MOMO_WHEEL:
		case USB_DEVICE_ID_LOGITECH_MOMO_WHEEL2:

drivers/hid/hid-quirks.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -451,6 +451,7 @@ static const struct hid_device_id hid_have_special_driver[] = {
		{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_RUMBLEPAD2_2) },
		{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_G29_WHEEL) },
		{ 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_FG) },
		{ 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) },

Admin message