Skip to contentSkip to conversation

USB Joypad quirk

PATCH Applied mdew 3 participants 5 messages Dec 22, 2002 – Dec 23, 2002 USB

lore
Share & tools
lore

mdew

author
#0 lore raw

PATCH 1/1 USB Joypad quirk

Orginally from Vojtech Pavlik (16th June 2002 via email), to fix my 'broken' USB joypad, Fully tested in both 2.4.x and 2.5.52 (and 2.5.52-bk).

-mdew

diff -Naur a/drivers/usb/input/hid-core.c
mdew/drivers/usb/input/hid-core.c
--- a/drivers/usb/input/hid-core.c 2002-11-28 11:36:04.000000000 +1300
+++ mdew/drivers/usb/input/hid-core.c 2002-12-22 23:37:51.000000000
+1300
@@ -1317,6 +1317,9 @@
#define USB_DEVICE_ID_ATEN_2PORTKVM 0x2204
#define USB_DEVICE_ID_ATEN_4PORTKVM 0x2205

+#define USB_VENDOR_ID_TOPMAX 0x0663
+#define USB_DEVICE_ID_TOPMAX_COBRAPAD 0x0103
+

 #define USB_VENDOR_ID_MGE              0x0463
 #define USB_DEVICE_ID_MGE_UPS          0xffff
 #define USB_DEVICE_ID_MGE_UPS1         0x0001

@@ -1355,6 +1358,7 @@
{ USB_VENDOR_ID_ATEN, USB_DEVICE_ID_ATEN_4PORTKVM, HID_QUIRK_NOGET }, { USB_VENDOR_ID_MGE, USB_DEVICE_ID_MGE_UPS, HID_QUIRK_HIDDEV }, { USB_VENDOR_ID_MGE, USB_DEVICE_ID_MGE_UPS1, HID_QUIRK_HIDDEV },
+ { USB_VENDOR_ID_TOPMAX, USB_DEVICE_ID_TOPMAX_COBRAPAD,
HID_QUIRK_BADPAD },
{ 0, 0 }
};

diff -Naur a/drivers/usb/input/hid-input.c
mdew/drivers/usb/input/hid-input.c
--- a/drivers/usb/input/hid-input.c 2002-11-28 11:35:59.000000000 +1300
+++ mdew/drivers/usb/input/hid-input.c 2002-12-22 23:41:25.000000000
+1300
@@ -357,6 +357,11 @@
int a = field->logical_minimum;
int b = field->logical_maximum;

+ if ((device->quirks & HID_QUIRK_BADPAD) && (usage->code == ABS_X ||
usage->code == ABS_Y)) {
+ a = field->logical_minimum = 0;
+ b = field->logical_maximum = 255;
+ }
+
input->absmin[usage->code] = a; input->absmax[usage->code] = b; input->absfuzz[usage->code] = (b - a) >> 8;

drivers/usb/input/hid.h +1 -0
diff -Naur a/drivers/usb/input/hid.h mdew/drivers/usb/input/hid.h
@@ -206,6 +206,7 @@
 #define HID_QUIRK_IGNORE	0x04
 #define HID_QUIRK_NOGET		0x08
 #define HID_QUIRK_HIDDEV	0x10
+#define HID_QUIRK_BADPAD        0x12
 
 /*
  * This is the global enviroment of the parser. This information is
drivers/usb/input/hid-core.c +4 -0
diff -Naur a/drivers/usb/input/hid-core.c mdew/drivers/usb/input/hid-core.c
@@ -1317,6 +1317,9 @@
 #define USB_DEVICE_ID_ATEN_2PORTKVM    0x2204
 #define USB_DEVICE_ID_ATEN_4PORTKVM    0x2205
 
+#define USB_VENDOR_ID_TOPMAX           0x0663
+#define USB_DEVICE_ID_TOPMAX_COBRAPAD  0x0103
+
 #define USB_VENDOR_ID_MGE              0x0463
 #define USB_DEVICE_ID_MGE_UPS          0xffff
 #define USB_DEVICE_ID_MGE_UPS1         0x0001

@@ -1355,6 +1358,7 @@
 	{ USB_VENDOR_ID_ATEN, USB_DEVICE_ID_ATEN_4PORTKVM, HID_QUIRK_NOGET },
 	{ USB_VENDOR_ID_MGE, USB_DEVICE_ID_MGE_UPS, HID_QUIRK_HIDDEV },
 	{ USB_VENDOR_ID_MGE, USB_DEVICE_ID_MGE_UPS1, HID_QUIRK_HIDDEV },
+	{ USB_VENDOR_ID_TOPMAX, USB_DEVICE_ID_TOPMAX_COBRAPAD, HID_QUIRK_BADPAD },
 	{ 0, 0 }
 };
drivers/usb/input/hid-input.c +5 -0
diff -Naur a/drivers/usb/input/hid-input.c mdew/drivers/usb/input/hid-input.c
@@ -357,6 +357,11 @@
 		int a = field->logical_minimum;
 		int b = field->logical_maximum;
 
+		if ((device->quirks & HID_QUIRK_BADPAD) && (usage->code == ABS_X || usage->code == ABS_Y)) {
+			a = field->logical_minimum = 0;
+			b = field->logical_maximum = 255;
+		}
+		
 		input->absmin[usage->code] = a;
 		input->absmax[usage->code] = b;
 		input->absfuzz[usage->code] = (b - a) >> 8;
drivers/usb/input/hid.h +1 -0
diff -Naur a/drivers/usb/input/hid.h mdew/drivers/usb/input/hid.h
@@ -206,6 +206,7 @@
 #define HID_QUIRK_IGNORE	0x04
 #define HID_QUIRK_NOGET		0x08
 #define HID_QUIRK_HIDDEV	0x10
+#define HID_QUIRK_BADPAD        0x12
 
 /*
  * This is the global enviroment of the parser. This information is
#1 lore raw
Quoted 3 lines · mdew

Orginally from Vojtech Pavlik (16th June 2002 via email), to fix my 'broken' USB joypad, Fully tested in both 2.4.x and 2.5.52 (and 2.5.52-bk).

Yes, Greg, this can go in.

Quoted 59 lines

-mdew

diff -Naur a/drivers/usb/input/hid-core.c
mdew/drivers/usb/input/hid-core.c

drivers/usb/input/hid-core.c +5 -0
+1300

@@ -1317,6 +1317,9 @@
 #define USB_DEVICE_ID_ATEN_2PORTKVM    0x2204
 #define USB_DEVICE_ID_ATEN_4PORTKVM    0x2205
 
+#define USB_VENDOR_ID_TOPMAX           0x0663
+#define USB_DEVICE_ID_TOPMAX_COBRAPAD  0x0103
+
 #define USB_VENDOR_ID_MGE              0x0463
 #define USB_DEVICE_ID_MGE_UPS          0xffff
 #define USB_DEVICE_ID_MGE_UPS1         0x0001

@@ -1355,6 +1358,7 @@
 	{ USB_VENDOR_ID_ATEN, USB_DEVICE_ID_ATEN_4PORTKVM, HID_QUIRK_NOGET },
 	{ USB_VENDOR_ID_MGE, USB_DEVICE_ID_MGE_UPS, HID_QUIRK_HIDDEV },
 	{ USB_VENDOR_ID_MGE, USB_DEVICE_ID_MGE_UPS1, HID_QUIRK_HIDDEV },
+	{ USB_VENDOR_ID_TOPMAX, USB_DEVICE_ID_TOPMAX_COBRAPAD,
 HID_QUIRK_BADPAD },
 	{ 0, 0 }
 };

diff -Naur a/drivers/usb/input/hid-input.c
mdew/drivers/usb/input/hid-input.c

drivers/usb/input/hid-input.c +6 -0
+1300

@@ -357,6 +357,11 @@
 		int a = field->logical_minimum;
 		int b = field->logical_maximum;
 
+		if ((device->quirks & HID_QUIRK_BADPAD) && (usage->code == ABS_X ||
 usage->code == ABS_Y)) {
+			a = field->logical_minimum = 0;
+			b = field->logical_maximum = 255;
+		}
+		
 		input->absmin[usage->code] = a;
 		input->absmax[usage->code] = b;

input->absfuzz[usage->code] = (b - a) >> 8;
diff -Naur a/drivers/usb/input/hid.h mdew/drivers/usb/input/hid.h

drivers/usb/input/hid.h +1 -0
@@ -206,6 +206,7 @@
 #define HID_QUIRK_IGNORE	0x04
 #define HID_QUIRK_NOGET		0x08
 #define HID_QUIRK_HIDDEV	0x10
+#define HID_QUIRK_BADPAD        0x12
 
 /*
  * This is the global enviroment of the parser. This information is
Signature · 2 lines
Vojtech Pavlik
SuSE Labs
Applied
#2 lore raw
In reply to mdew
Quoted 3 lines · mdew

Orginally from Vojtech Pavlik (16th June 2002 via email), to fix my 'broken' USB joypad, Fully tested in both 2.4.x and 2.5.52 (and 2.5.52-bk).

Applied to my 2.5 tree, thanks.

Can you also send a 2.4 version, as this one does not work for that tree?

thanks,

greg k-h

author
#3 lore raw
Quoted 9 lines · Greg KH
Quoted 3 lines · mdew

Orginally from Vojtech Pavlik (16th June 2002 via email), to fix my 'broken' USB joypad, Fully tested in both 2.4.x and 2.5.52 (and 2.5.52-bk).

Applied to my 2.5 tree, thanks.

Can you also send a 2.4 version, as this one does not work for that tree?

sure

diff -Naur linux-2.4.19/drivers/usb/hid-core.c mdew/drivers/usb/hid-core.c
--- linux-2.4.19/drivers/usb/hid-core.c 2002-08-03 12:39:44.000000000 +1200
+++ mdew/drivers/usb/hid-core.c 2002-12-24 09:53:52.000000000 +1300 @@ -1086,6 +1086,9 @@
#define USB_DEVICE_ID_ATEN_2PORTKVM 0x2204
#define USB_DEVICE_ID_ATEN_4PORTKVM 0x2205

+#define USB_VENDOR_ID_TOPMAX 0x0663
+#define USB_DEVICE_ID_TOPMAX_COBRAPAD 0x0103
+

 struct hid_blacklist {
        __u16 idVendor;
        __u16 idProduct;

@@ -1115,6 +1118,7 @@
{ USB_VENDOR_ID_ATEN, USB_DEVICE_ID_ATEN_CS124U, HID_QUIRK_NOGET
},
{ USB_VENDOR_ID_ATEN, USB_DEVICE_ID_ATEN_2PORTKVM,
HID_QUIRK_NOGET },
{ USB_VENDOR_ID_ATEN, USB_DEVICE_ID_ATEN_4PORTKVM,
HID_QUIRK_NOGET },
+ { USB_VENDOR_ID_TOPMAX, USB_DEVICE_ID_TOPMAX_COBRAPAD,
HID_QUIRK_BADPAD },

        { 0, 0 }

};

diff -Naur linux-2.4.19/drivers/usb/hid-input.c
mdew/drivers/usb/hid-input.c
--- linux-2.4.19/drivers/usb/hid-input.c 2001-11-12
07:09:37.000000000 +1300
+++ mdew/drivers/usb/hid-input.c 2002-12-24 09:53:52.000000000
+1300
@@ -280,6 +280,11 @@

                int a = field->logical_minimum;
                int b = field->logical_maximum;

+ if ((device->quirks & HID_QUIRK_BADPAD) && (usage->code
== ABS_X || usage->code == ABS_Y)) {
+ a = field->logical_minimum = 0;
+ b = field->logical_maximum = 255;
+ }
+

                input->absmin[usage->code] = a;
                input->absmax[usage->code] = b;
                input->absfuzz[usage->code] = (b - a) >> 8;

diff -Naur linux-2.4.19/drivers/usb/hid.h mdew/drivers/usb/hid.h
--- linux-2.4.19/drivers/usb/hid.h 2002-08-03 12:39:44.000000000
+1200
+++ mdew/drivers/usb/hid.h 2002-12-24 09:53:47.000000000 +1300
@@ -186,6 +186,7 @@
#define HID_QUIRK_NOTOUCH 0x02
#define HID_QUIRK_IGNORE 0x04
#define HID_QUIRK_NOGET 0x08
+#define HID_QUIRK_BADPAD 0x10

/*
* This is the global enviroment of the parser. This information is

drivers/usb/hid-core.c +4 -0
diff -Naur linux-2.4.19/drivers/usb/hid-core.c mdew/drivers/usb/hid-core.c
@@ -1086,6 +1086,9 @@
 #define USB_DEVICE_ID_ATEN_2PORTKVM	0x2204
 #define USB_DEVICE_ID_ATEN_4PORTKVM	0x2205
 
+#define USB_VENDOR_ID_TOPMAX		0x0663
+#define USB_DEVICE_ID_TOPMAX_COBRAPAD	0x0103
+
 struct hid_blacklist {
 	__u16 idVendor;
 	__u16 idProduct;

@@ -1115,6 +1118,7 @@
 	{ USB_VENDOR_ID_ATEN, USB_DEVICE_ID_ATEN_CS124U, HID_QUIRK_NOGET },
 	{ USB_VENDOR_ID_ATEN, USB_DEVICE_ID_ATEN_2PORTKVM, HID_QUIRK_NOGET },
 	{ USB_VENDOR_ID_ATEN, USB_DEVICE_ID_ATEN_4PORTKVM, HID_QUIRK_NOGET },
+	{ USB_VENDOR_ID_TOPMAX, USB_DEVICE_ID_TOPMAX_COBRAPAD, HID_QUIRK_BADPAD },
 	{ 0, 0 }
 };
drivers/usb/hid-input.c +5 -0
diff -Naur linux-2.4.19/drivers/usb/hid-input.c mdew/drivers/usb/hid-input.c
@@ -280,6 +280,11 @@
 		int a = field->logical_minimum;
 		int b = field->logical_maximum;
 
+		if ((device->quirks & HID_QUIRK_BADPAD) && (usage->code == ABS_X || usage->code == ABS_Y)) {
+                       	a = field->logical_minimum = 0;
+                       	b = field->logical_maximum = 255;
+                 }      
+
 		input->absmin[usage->code] = a;
 		input->absmax[usage->code] = b;
 		input->absfuzz[usage->code] = (b - a) >> 8;
drivers/usb/hid.h +1 -0
diff -Naur linux-2.4.19/drivers/usb/hid.h mdew/drivers/usb/hid.h
@@ -186,6 +186,7 @@
 #define HID_QUIRK_NOTOUCH	0x02
 #define HID_QUIRK_IGNORE	0x04
 #define HID_QUIRK_NOGET		0x08
+#define HID_QUIRK_BADPAD	0x10
 
 /*
  * This is the global enviroment of the parser. This information is
#4 lore raw
Quoted 6 lines · mdew
Quoted 5 lines · Greg KH
Quoted 3 lines · mdew

Orginally from Vojtech Pavlik (16th June 2002 via email), to fix my 'broken' USB joypad, Fully tested in both 2.4.x and 2.5.52 (and 2.5.52-bk).

Quoted 6 lines
Quoted 4 lines

Applied to my 2.5 tree, thanks.

Can you also send a 2.4 version, as this one does not work for that tree?

sure

Sorry, but this does not apply to 2.4.21-pre2, can you try again?

thanks,

greg k-h