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

Commit 0adb9c2c authored by Benjamin Tissoires's avatar Benjamin Tissoires Committed by Jiri Kosina
Browse files

HID: kye: Add report fixup for Genius Gx Imperator Keyboard 

Genius Gx Imperator Keyboard presents the same problem in its report
descriptors than Genius Gila Gaming Mouse.
Use the same fixup for both.

Fixes:
https://bugzilla.redhat.com/show_bug.cgi?id=928561



Reported-and-tested-by: default avatarHonza Brazdil <jbrazdil@redhat.com>
Signed-off-by: default avatarBenjamin Tissoires <benjamin.tissoires@redhat.com>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent 38ead6ef

drivers/hid/hid-core.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -1594,6 +1594,7 @@ static const struct hid_device_id hid_have_special_driver[] = { 
	{ HID_USB_DEVICE(USB_VENDOR_ID_KENSINGTON, USB_DEVICE_ID_KS_SLIMBLADE) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_KENSINGTON, USB_DEVICE_ID_KS_SLIMBLADE) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_KEYTOUCH, USB_DEVICE_ID_KEYTOUCH_IEC) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_KEYTOUCH, USB_DEVICE_ID_KEYTOUCH_IEC) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_KYE, USB_DEVICE_ID_GENIUS_GILA_GAMING_MOUSE) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_KYE, USB_DEVICE_ID_GENIUS_GILA_GAMING_MOUSE) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_KYE, USB_DEVICE_ID_GENIUS_GX_IMPERATOR) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_KYE, USB_DEVICE_ID_KYE_ERGO_525V) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_KYE, USB_DEVICE_ID_KYE_ERGO_525V) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_KYE, USB_DEVICE_ID_KYE_EASYPEN_I405X) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_KYE, USB_DEVICE_ID_KYE_EASYPEN_I405X) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_KYE, USB_DEVICE_ID_KYE_MOUSEPEN_I608X) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_KYE, USB_DEVICE_ID_KYE_MOUSEPEN_I608X) },

drivers/hid/hid-ids.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -479,6 +479,7 @@ 
#define USB_VENDOR_ID_KYE		0x0458

#define USB_VENDOR_ID_KYE		0x0458

#define USB_DEVICE_ID_KYE_ERGO_525V	0x0087

#define USB_DEVICE_ID_KYE_ERGO_525V	0x0087

#define USB_DEVICE_ID_GENIUS_GILA_GAMING_MOUSE	0x0138

#define USB_DEVICE_ID_GENIUS_GILA_GAMING_MOUSE	0x0138

#define USB_DEVICE_ID_GENIUS_GX_IMPERATOR	0x4018

#define USB_DEVICE_ID_KYE_GPEN_560	0x5003

#define USB_DEVICE_ID_KYE_GPEN_560	0x5003

#define USB_DEVICE_ID_KYE_EASYPEN_I405X	0x5010

#define USB_DEVICE_ID_KYE_EASYPEN_I405X	0x5010

#define USB_DEVICE_ID_KYE_MOUSEPEN_I608X	0x5011

#define USB_DEVICE_ID_KYE_MOUSEPEN_I608X	0x5011

drivers/hid/hid-kye.c

+28 −17
Original line number Original line Diff line number Diff line
@@ -268,6 +268,26 @@ static __u8 easypen_m610x_rdesc_fixed[] = { 
	0xC0                          /*  End Collection                  */

	0xC0                          /*  End Collection                  */

};

};





static __u8 *kye_consumer_control_fixup(struct hid_device *hdev, __u8 *rdesc,

		unsigned int *rsize, int offset, const char *device_name) {

	/*

	 * the fixup that need to be done:

	 *   - change Usage Maximum in the Comsumer Control

	 *     (report ID 3) to a reasonable value

	 */

	if (*rsize >= offset + 31 &&

	    /* Usage Page (Consumer Devices) */

	    rdesc[offset] == 0x05 && rdesc[offset + 1] == 0x0c &&

	    /* Usage (Consumer Control) */

	    rdesc[offset + 2] == 0x09 && rdesc[offset + 3] == 0x01 &&

	    /*   Usage Maximum > 12287 */

	    rdesc[offset + 10] == 0x2a && rdesc[offset + 12] > 0x2f) {

		hid_info(hdev, "fixing up %s report descriptor\n", device_name);

		rdesc[offset + 12] = 0x2f;

	}

	return rdesc;

}



static __u8 *kye_report_fixup(struct hid_device *hdev, __u8 *rdesc,

static __u8 *kye_report_fixup(struct hid_device *hdev, __u8 *rdesc,

		unsigned int *rsize)

		unsigned int *rsize)

{

{
@@ -315,23 +335,12 @@ static __u8 *kye_report_fixup(struct hid_device *hdev, __u8 *rdesc, 
		}

		}

		break;

		break;

	case USB_DEVICE_ID_GENIUS_GILA_GAMING_MOUSE:

	case USB_DEVICE_ID_GENIUS_GILA_GAMING_MOUSE:

		/*

		rdesc = kye_consumer_control_fixup(hdev, rdesc, rsize, 104,

		 * the fixup that need to be done:

					"Genius Gila Gaming Mouse");

		 *   - change Usage Maximum in the Comsumer Control

		break;

		 *     (report ID 3) to a reasonable value

	case USB_DEVICE_ID_GENIUS_GX_IMPERATOR:

		 */

		rdesc = kye_consumer_control_fixup(hdev, rdesc, rsize, 83,

		if (*rsize >= 135 &&

					"Genius Gx Imperator Keyboard");

			/* Usage Page (Consumer Devices) */

			rdesc[104] == 0x05 && rdesc[105] == 0x0c &&

			/* Usage (Consumer Control) */

			rdesc[106] == 0x09 && rdesc[107] == 0x01 &&

			/*   Usage Maximum > 12287 */

			rdesc[114] == 0x2a && rdesc[116] > 0x2f) {

			hid_info(hdev,

				 "fixing up Genius Gila Gaming Mouse "

				 "report descriptor\n");

			rdesc[116] = 0x2f;

		}

		break;

		break;

	}

	}

	return rdesc;

	return rdesc;
@@ -428,6 +437,8 @@ static const struct hid_device_id kye_devices[] = { 
				USB_DEVICE_ID_KYE_EASYPEN_M610X) },

				USB_DEVICE_ID_KYE_EASYPEN_M610X) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_KYE,

	{ HID_USB_DEVICE(USB_VENDOR_ID_KYE,

				USB_DEVICE_ID_GENIUS_GILA_GAMING_MOUSE) },

				USB_DEVICE_ID_GENIUS_GILA_GAMING_MOUSE) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_KYE,

				USB_DEVICE_ID_GENIUS_GX_IMPERATOR) },

	{ }

	{ }

};

};

MODULE_DEVICE_TABLE(hid, kye_devices);

MODULE_DEVICE_TABLE(hid, kye_devices);