[v2,2.6.38] Mode button quirk for Saitek Cyborg R.A.T. 7

Commit Message

Darren Salt March 22, 2011, 8:29 p.m. UTC

None

Patch

diff -ur linux-2.6.38.orig/drivers/hid/hid-ids.h linux-2.6.38/drivers/hid/hid-ids.h
--- linux-2.6.38.orig/drivers/hid/hid-ids.h	2011-03-22 17:27:45.628320449 +0000
+++ linux-2.6.38/drivers/hid/hid-ids.h	2011-03-22 17:29:01.844925858 +0000
@@ -502,6 +502,7 @@ 
 #define USB_DEVICE_ID_ROCCAT_PYRA_WIRELESS	0x2cf6
 
 #define USB_VENDOR_ID_SAITEK		0x06a3
+#define USB_DEVICE_ID_SAITEK_RAT7	0x0ccb
 #define USB_DEVICE_ID_SAITEK_RUMBLEPAD	0xff17
 
 #define USB_VENDOR_ID_SAMSUNG		0x0419
diff -ur linux-2.6.38.orig/drivers/hid/hid-input.c linux-2.6.38/drivers/hid/hid-input.c
--- linux-2.6.38.orig/drivers/hid/hid-input.c	2011-03-22 17:27:45.644319741 +0000
+++ linux-2.6.38/drivers/hid/hid-input.c	2011-03-22 20:07:20.254290914 +0000
@@ -790,6 +790,22 @@ 
 
 	if ((field->flags & HID_MAIN_ITEM_RELATIVE) && (usage->type == EV_KEY))
 		input_event(input, usage->type, usage->code, 0);
+
+        /* hack for Saitek RAT mice which report release events for their
+         * mode button on the NEXT press event: instant release
+         */
+	if ((*quirks & HID_QUIRK_RAT_BROKEN_BUTTON_RELEASE) &&
+	    value && usage->type == EV_KEY &&
+	    usage->code >= BTN_MOUSE + 8 && usage->code <= BTN_MOUSE + 10 &&
+	    test_bit(usage->code, input->key)) {
+		input_event(input, usage->type, usage->code, 0);
+		/* we'll get a real release event from the mouse anyway, and
+		 * userspace should cope with the extra input-layer
+		 * button-up events anyway; just re-set the bit to stop
+		 * spurious button-down events
+		 */
+		set_bit(usage->code, input->key);
+	}
 }
 
 void hidinput_report_event(struct hid_device *hid, struct hid_report *report)
diff -ur linux-2.6.38.orig/drivers/hid/usbhid/hid-quirks.c linux-2.6.38/drivers/hid/usbhid/hid-quirks.c
--- linux-2.6.38.orig/drivers/hid/usbhid/hid-quirks.c	2011-03-22 17:27:45.652319385 +0000
+++ linux-2.6.38/drivers/hid/usbhid/hid-quirks.c	2011-03-22 17:29:01.844925858 +0000
@@ -85,6 +85,8 @@ 
 
 	{ USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_MULTI_TOUCH, HID_QUIRK_MULTI_INPUT },
 	{ USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_WIRELESS, HID_QUIRK_MULTI_INPUT },
+
+	{ USB_VENDOR_ID_SAITEK, USB_DEVICE_ID_SAITEK_RAT7, HID_QUIRK_RAT_BROKEN_BUTTON_RELEASE },
 	{ 0, 0 }
 };
 
diff -ur linux-2.6.38.orig/include/linux/hid.h linux-2.6.38/include/linux/hid.h
--- linux-2.6.38.orig/include/linux/hid.h	2011-03-22 17:27:45.692317595 +0000
+++ linux-2.6.38/include/linux/hid.h	2011-03-22 17:29:01.884924059 +0000
@@ -312,6 +312,7 @@ 
 #define HID_QUIRK_BADPAD			0x00000020
 #define HID_QUIRK_MULTI_INPUT			0x00000040
 #define HID_QUIRK_HIDINPUT_FORCE		0x00000080
+#define HID_QUIRK_RAT_BROKEN_BUTTON_RELEASE	0x00000100
 #define HID_QUIRK_SKIP_OUTPUT_REPORTS		0x00010000
 #define HID_QUIRK_FULLSPEED_INTERVAL		0x10000000
 #define HID_QUIRK_NO_INIT_REPORTS		0x20000000