* [PATCH 1/1] Input: xpad - Add a variation of Mad Catz Beat Pad
2012-07-06 16:32 [PATCH 0/1] Input: xpad - Add a variation of Mad Catz Beat Pad Yuri Khan
@ 2012-07-06 16:32 ` Yuri Khan
2012-07-06 16:57 ` [PATCH 0/1] " Yuri Khan
` (3 subsequent siblings)
4 siblings, 0 replies; 13+ messages in thread
From: Yuri Khan @ 2012-07-06 16:32 UTC (permalink / raw)
To: Dmitry Torokhov
Cc: Jiri Kosina, linux-input, linux-kernel, linux-usb, Yuri Khan
* Add a quirk to usbhid to ignore this device
Signed-off-by: Yuri Khan <yurivkhan@gmail.com>
---
drivers/hid/hid-ids.h | 3 +++
drivers/hid/usbhid/hid-quirks.c | 2 ++
drivers/input/joystick/xpad.c | 2 ++
3 files changed, 7 insertions(+)
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
index d1cdd2d..43c3d75 100644
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@ -518,6 +518,9 @@
#define USB_DEVICE_ID_CRYSTALTOUCH 0x0006
#define USB_DEVICE_ID_CRYSTALTOUCH_DUAL 0x0007
+#define USB_VENDOR_ID_MADCATZ 0x0738
+#define USB_DEVICE_ID_MADCATZ_BEATPAD 0x4540
+
#define USB_VENDOR_ID_MCC 0x09db
#define USB_DEVICE_ID_MCC_PMD1024LS 0x0076
#define USB_DEVICE_ID_MCC_PMD1208LS 0x007a
diff --git a/drivers/hid/usbhid/hid-quirks.c b/drivers/hid/usbhid/hid-quirks.c
index 0597ee6..8726d33 100644
--- a/drivers/hid/usbhid/hid-quirks.c
+++ b/drivers/hid/usbhid/hid-quirks.c
@@ -45,6 +45,8 @@ static const struct hid_blacklist {
{ USB_VENDOR_ID_SAITEK, USB_DEVICE_ID_SAITEK_RUMBLEPAD, HID_QUIRK_BADPAD },
{ USB_VENDOR_ID_TOPMAX, USB_DEVICE_ID_TOPMAX_COBRAPAD, HID_QUIRK_BADPAD },
+ { USB_VENDOR_ID_MADCATZ, USB_DEVICE_ID_MADCATZ_BEATPAD, HID_QUIRK_IGNORE },
+
{ USB_VENDOR_ID_AFATECH, USB_DEVICE_ID_AFATECH_AF9016, HID_QUIRK_FULLSPEED_INTERVAL },
{ USB_VENDOR_ID_EMS, USB_DEVICE_ID_EMS_TRIO_LINKER_PLUS_II, HID_QUIRK_MULTI_INPUT },
diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c
index ee16fb6..1cffd91 100644
--- a/drivers/input/joystick/xpad.c
+++ b/drivers/input/joystick/xpad.c
@@ -238,6 +238,8 @@ static struct usb_device_id xpad_table [] = {
XPAD_XBOX360_VENDOR(0x045e), /* Microsoft X-Box 360 controllers */
XPAD_XBOX360_VENDOR(0x046d), /* Logitech X-Box 360 style controllers */
XPAD_XBOX360_VENDOR(0x0738), /* Mad Catz X-Box 360 controllers */
+ { USB_DEVICE_AND_INTERFACE_INFO(0x0738, 0x4540,
+ USB_CLASS_HID, 0, 0) }, /* Mad Catz Beat Pad */
XPAD_XBOX360_VENDOR(0x0e6f), /* 0x0e6f X-Box 360 controllers */
XPAD_XBOX360_VENDOR(0x12ab), /* X-Box 360 dance pads */
XPAD_XBOX360_VENDOR(0x1430), /* RedOctane X-Box 360 controllers */
--
1.7.9.5
^ permalink raw reply related [flat|nested] 13+ messages in thread
* Re: [PATCH 0/1] Input: xpad - Add a variation of Mad Catz Beat Pad
2012-07-06 16:32 [PATCH 0/1] Input: xpad - Add a variation of Mad Catz Beat Pad Yuri Khan
2012-07-06 16:32 ` [PATCH 1/1] " Yuri Khan
@ 2012-07-06 16:57 ` Yuri Khan
2012-07-06 17:03 ` Dmitry Torokhov
2012-07-08 5:49 ` [PATCH v2 1/1] Input: xpad - Handle all variations " Yuri Khan
` (2 subsequent siblings)
4 siblings, 1 reply; 13+ messages in thread
From: Yuri Khan @ 2012-07-06 16:57 UTC (permalink / raw)
To: Dmitry Torokhov
Cc: Jiri Kosina, linux-input, linux-kernel, linux-usb, Yuri Khan
On Fri, Jul 6, 2012 at 11:32 PM, Yuri Khan <yurivkhan@gmail.com> wrote:
> When I add a usbhid option quirks=0x0738:0x4540:0x4 (so that usbhid does
> not attempt to handle this device) and rebuild the xpad module with the
> following patch, the device works as expected. Dmitry Torokhov, the
> current maintainer of input drivers, suggested that I include a change
> to add the usbhid quirk in my patch.
Of course the good idea only ever comes after the fact. If I change
usbhid to ignore this vendor:device unconditionally, then xpad should
also always handle it regardless of interface class/subclass/protocol,
right?
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH 0/1] Input: xpad - Add a variation of Mad Catz Beat Pad
2012-07-06 16:57 ` [PATCH 0/1] " Yuri Khan
@ 2012-07-06 17:03 ` Dmitry Torokhov
0 siblings, 0 replies; 13+ messages in thread
From: Dmitry Torokhov @ 2012-07-06 17:03 UTC (permalink / raw)
To: Yuri Khan; +Cc: Jiri Kosina, linux-input, linux-kernel, linux-usb
On Fri, Jul 06, 2012 at 11:57:44PM +0700, Yuri Khan wrote:
> On Fri, Jul 6, 2012 at 11:32 PM, Yuri Khan <yurivkhan@gmail.com> wrote:
>
> > When I add a usbhid option quirks=0x0738:0x4540:0x4 (so that usbhid does
> > not attempt to handle this device) and rebuild the xpad module with the
> > following patch, the device works as expected. Dmitry Torokhov, the
> > current maintainer of input drivers, suggested that I include a change
> > to add the usbhid quirk in my patch.
>
> Of course the good idea only ever comes after the fact. If I change
> usbhid to ignore this vendor:device unconditionally, then xpad should
> also always handle it regardless of interface class/subclass/protocol,
> right?
Yes.
--
Dmitry
^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH v2 1/1] Input: xpad - Handle all variations of Mad Catz Beat Pad
2012-07-06 16:32 [PATCH 0/1] Input: xpad - Add a variation of Mad Catz Beat Pad Yuri Khan
2012-07-06 16:32 ` [PATCH 1/1] " Yuri Khan
2012-07-06 16:57 ` [PATCH 0/1] " Yuri Khan
@ 2012-07-08 5:49 ` Yuri Khan
2012-07-09 14:08 ` Jiri Kosina
2012-07-10 17:33 ` [PATCH v3 " Yuri Khan
2012-07-11 7:02 ` Yuri Khan
4 siblings, 1 reply; 13+ messages in thread
From: Yuri Khan @ 2012-07-08 5:49 UTC (permalink / raw)
To: Dmitry Torokhov
Cc: Jiri Kosina, linux-input, linux-kernel, linux-usb, Yuri Khan
* Add a quirk to usbhid to ignore this device
---
drivers/hid/hid-ids.h | 3 +++
drivers/hid/usbhid/hid-quirks.c | 2 ++
drivers/input/joystick/xpad.c | 1 +
3 files changed, 6 insertions(+)
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
index d1cdd2d..43c3d75 100644
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@ -518,6 +518,9 @@
#define USB_DEVICE_ID_CRYSTALTOUCH 0x0006
#define USB_DEVICE_ID_CRYSTALTOUCH_DUAL 0x0007
+#define USB_VENDOR_ID_MADCATZ 0x0738
+#define USB_DEVICE_ID_MADCATZ_BEATPAD 0x4540
+
#define USB_VENDOR_ID_MCC 0x09db
#define USB_DEVICE_ID_MCC_PMD1024LS 0x0076
#define USB_DEVICE_ID_MCC_PMD1208LS 0x007a
diff --git a/drivers/hid/usbhid/hid-quirks.c b/drivers/hid/usbhid/hid-quirks.c
index 0597ee6..8726d33 100644
--- a/drivers/hid/usbhid/hid-quirks.c
+++ b/drivers/hid/usbhid/hid-quirks.c
@@ -45,6 +45,8 @@ static const struct hid_blacklist {
{ USB_VENDOR_ID_SAITEK, USB_DEVICE_ID_SAITEK_RUMBLEPAD, HID_QUIRK_BADPAD },
{ USB_VENDOR_ID_TOPMAX, USB_DEVICE_ID_TOPMAX_COBRAPAD, HID_QUIRK_BADPAD },
+ { USB_VENDOR_ID_MADCATZ, USB_DEVICE_ID_MADCATZ_BEATPAD, HID_QUIRK_IGNORE },
+
{ USB_VENDOR_ID_AFATECH, USB_DEVICE_ID_AFATECH_AF9016, HID_QUIRK_FULLSPEED_INTERVAL },
{ USB_VENDOR_ID_EMS, USB_DEVICE_ID_EMS_TRIO_LINKER_PLUS_II, HID_QUIRK_MULTI_INPUT },
diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c
index ee16fb6..16974ef 100644
--- a/drivers/input/joystick/xpad.c
+++ b/drivers/input/joystick/xpad.c
@@ -238,6 +238,7 @@ static struct usb_device_id xpad_table [] = {
XPAD_XBOX360_VENDOR(0x045e), /* Microsoft X-Box 360 controllers */
XPAD_XBOX360_VENDOR(0x046d), /* Logitech X-Box 360 style controllers */
XPAD_XBOX360_VENDOR(0x0738), /* Mad Catz X-Box 360 controllers */
+ { USB_DEVICE(0x0738, 0x4540) }, /* Mad Catz Beat Pad */
XPAD_XBOX360_VENDOR(0x0e6f), /* 0x0e6f X-Box 360 controllers */
XPAD_XBOX360_VENDOR(0x12ab), /* X-Box 360 dance pads */
XPAD_XBOX360_VENDOR(0x1430), /* RedOctane X-Box 360 controllers */
--
1.7.9.5
^ permalink raw reply related [flat|nested] 13+ messages in thread
* Re: [PATCH v2 1/1] Input: xpad - Handle all variations of Mad Catz Beat Pad
2012-07-08 5:49 ` [PATCH v2 1/1] Input: xpad - Handle all variations " Yuri Khan
@ 2012-07-09 14:08 ` Jiri Kosina
2012-07-09 15:52 ` Yuri Khan
0 siblings, 1 reply; 13+ messages in thread
From: Jiri Kosina @ 2012-07-09 14:08 UTC (permalink / raw)
To: Yuri Khan; +Cc: Dmitry Torokhov, linux-input, linux-kernel, linux-usb
On Sun, 8 Jul 2012, Yuri Khan wrote:
> * Add a quirk to usbhid to ignore this device
> ---
> drivers/hid/hid-ids.h | 3 +++
> drivers/hid/usbhid/hid-quirks.c | 2 ++
> drivers/input/joystick/xpad.c | 1 +
> 3 files changed, 6 insertions(+)
>
> diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
> index d1cdd2d..43c3d75 100644
> --- a/drivers/hid/hid-ids.h
> +++ b/drivers/hid/hid-ids.h
> @@ -518,6 +518,9 @@
> #define USB_DEVICE_ID_CRYSTALTOUCH 0x0006
> #define USB_DEVICE_ID_CRYSTALTOUCH_DUAL 0x0007
>
> +#define USB_VENDOR_ID_MADCATZ 0x0738
> +#define USB_DEVICE_ID_MADCATZ_BEATPAD 0x4540
> +
> #define USB_VENDOR_ID_MCC 0x09db
> #define USB_DEVICE_ID_MCC_PMD1024LS 0x0076
> #define USB_DEVICE_ID_MCC_PMD1208LS 0x007a
> diff --git a/drivers/hid/usbhid/hid-quirks.c b/drivers/hid/usbhid/hid-quirks.c
> index 0597ee6..8726d33 100644
> --- a/drivers/hid/usbhid/hid-quirks.c
> +++ b/drivers/hid/usbhid/hid-quirks.c
> @@ -45,6 +45,8 @@ static const struct hid_blacklist {
> { USB_VENDOR_ID_SAITEK, USB_DEVICE_ID_SAITEK_RUMBLEPAD, HID_QUIRK_BADPAD },
> { USB_VENDOR_ID_TOPMAX, USB_DEVICE_ID_TOPMAX_COBRAPAD, HID_QUIRK_BADPAD },
>
> + { USB_VENDOR_ID_MADCATZ, USB_DEVICE_ID_MADCATZ_BEATPAD, HID_QUIRK_IGNORE },
> +
Please put it in drivers/hid/hid-core.c, hid_ignore_list[] array instead.
HID_QUIRK_IGNORE is there solely for allowing specification as a module
parameter.
Thanks,
--
Jiri Kosina
SUSE Labs
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH v2 1/1] Input: xpad - Handle all variations of Mad Catz Beat Pad
2012-07-09 14:08 ` Jiri Kosina
@ 2012-07-09 15:52 ` Yuri Khan
0 siblings, 0 replies; 13+ messages in thread
From: Yuri Khan @ 2012-07-09 15:52 UTC (permalink / raw)
To: Jiri Kosina; +Cc: Dmitry Torokhov, linux-input, linux-kernel, linux-usb
On Mon, Jul 9, 2012 at 9:08 PM, Jiri Kosina <jkosina@suse.cz> wrote:
>> --- a/drivers/hid/usbhid/hid-quirks.c
>> +++ b/drivers/hid/usbhid/hid-quirks.c
>> + { USB_VENDOR_ID_MADCATZ, USB_DEVICE_ID_MADCATZ_BEATPAD, HID_QUIRK_IGNORE },
>
> Please put it in drivers/hid/hid-core.c, hid_ignore_list[] array instead.
> HID_QUIRK_IGNORE is there solely for allowing specification as a module
> parameter.
I knew something was not right as there were no prior HID_QUIRK_IGNORE
entries. Thanks for the guidance, will send a revised patch tomorrow.
^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH v3 1/1] Input: xpad - Handle all variations of Mad Catz Beat Pad
2012-07-06 16:32 [PATCH 0/1] Input: xpad - Add a variation of Mad Catz Beat Pad Yuri Khan
` (2 preceding siblings ...)
2012-07-08 5:49 ` [PATCH v2 1/1] Input: xpad - Handle all variations " Yuri Khan
@ 2012-07-10 17:33 ` Yuri Khan
2012-07-10 20:05 ` Jiri Kosina
2012-07-10 20:42 ` Dmitry Torokhov
2012-07-11 7:02 ` Yuri Khan
4 siblings, 2 replies; 13+ messages in thread
From: Yuri Khan @ 2012-07-10 17:33 UTC (permalink / raw)
To: Dmitry Torokhov
Cc: Jiri Kosina, linux-input, linux-kernel, linux-usb, Yuri Khan
* Add this device to usbhid ignore list
---
drivers/hid/hid-core.c | 1 +
drivers/hid/hid-ids.h | 3 +++
drivers/input/joystick/xpad.c | 1 +
3 files changed, 5 insertions(+)
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
index 6ac0286..1540934 100644
--- a/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@ -1995,6 +1995,7 @@ static const struct hid_device_id hid_ignore_list[] = {
{ HID_USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_MCT) },
{ HID_USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_HYBRID) },
{ HID_USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_HEATCONTROL) },
+ { HID_USB_DEVICE(USB_VENDOR_ID_MADCATZ, USB_DEVICE_ID_MADCATZ_BEATPAD) },
{ HID_USB_DEVICE(USB_VENDOR_ID_MCC, USB_DEVICE_ID_MCC_PMD1024LS) },
{ HID_USB_DEVICE(USB_VENDOR_ID_MCC, USB_DEVICE_ID_MCC_PMD1208LS) },
{ HID_USB_DEVICE(USB_VENDOR_ID_MICROCHIP, USB_DEVICE_ID_PICKIT1) },
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
index d1cdd2d..43c3d75 100644
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@ -518,6 +518,9 @@
#define USB_DEVICE_ID_CRYSTALTOUCH 0x0006
#define USB_DEVICE_ID_CRYSTALTOUCH_DUAL 0x0007
+#define USB_VENDOR_ID_MADCATZ 0x0738
+#define USB_DEVICE_ID_MADCATZ_BEATPAD 0x4540
+
#define USB_VENDOR_ID_MCC 0x09db
#define USB_DEVICE_ID_MCC_PMD1024LS 0x0076
#define USB_DEVICE_ID_MCC_PMD1208LS 0x007a
diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c
index ee16fb6..16974ef 100644
--- a/drivers/input/joystick/xpad.c
+++ b/drivers/input/joystick/xpad.c
@@ -238,6 +238,7 @@ static struct usb_device_id xpad_table [] = {
XPAD_XBOX360_VENDOR(0x045e), /* Microsoft X-Box 360 controllers */
XPAD_XBOX360_VENDOR(0x046d), /* Logitech X-Box 360 style controllers */
XPAD_XBOX360_VENDOR(0x0738), /* Mad Catz X-Box 360 controllers */
+ { USB_DEVICE(0x0738, 0x4540) }, /* Mad Catz Beat Pad */
XPAD_XBOX360_VENDOR(0x0e6f), /* 0x0e6f X-Box 360 controllers */
XPAD_XBOX360_VENDOR(0x12ab), /* X-Box 360 dance pads */
XPAD_XBOX360_VENDOR(0x1430), /* RedOctane X-Box 360 controllers */
--
1.7.9.5
^ permalink raw reply related [flat|nested] 13+ messages in thread
* Re: [PATCH v3 1/1] Input: xpad - Handle all variations of Mad Catz Beat Pad
2012-07-10 17:33 ` [PATCH v3 " Yuri Khan
@ 2012-07-10 20:05 ` Jiri Kosina
2012-07-10 20:42 ` Dmitry Torokhov
1 sibling, 0 replies; 13+ messages in thread
From: Jiri Kosina @ 2012-07-10 20:05 UTC (permalink / raw)
To: Yuri Khan; +Cc: Dmitry Torokhov, linux-input, linux-kernel, linux-usb
On Wed, 11 Jul 2012, Yuri Khan wrote:
> * Add this device to usbhid ignore list
> ---
> drivers/hid/hid-core.c | 1 +
> drivers/hid/hid-ids.h | 3 +++
Acked-by: Jiri Kosina <jkosina@suse.cz>
> drivers/input/joystick/xpad.c | 1 +
> 3 files changed, 5 insertions(+)
>
> diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
> index 6ac0286..1540934 100644
> --- a/drivers/hid/hid-core.c
> +++ b/drivers/hid/hid-core.c
> @@ -1995,6 +1995,7 @@ static const struct hid_device_id hid_ignore_list[] = {
> { HID_USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_MCT) },
> { HID_USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_HYBRID) },
> { HID_USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_HEATCONTROL) },
> + { HID_USB_DEVICE(USB_VENDOR_ID_MADCATZ, USB_DEVICE_ID_MADCATZ_BEATPAD) },
> { HID_USB_DEVICE(USB_VENDOR_ID_MCC, USB_DEVICE_ID_MCC_PMD1024LS) },
> { HID_USB_DEVICE(USB_VENDOR_ID_MCC, USB_DEVICE_ID_MCC_PMD1208LS) },
> { HID_USB_DEVICE(USB_VENDOR_ID_MICROCHIP, USB_DEVICE_ID_PICKIT1) },
> diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
> index d1cdd2d..43c3d75 100644
> --- a/drivers/hid/hid-ids.h
> +++ b/drivers/hid/hid-ids.h
> @@ -518,6 +518,9 @@
> #define USB_DEVICE_ID_CRYSTALTOUCH 0x0006
> #define USB_DEVICE_ID_CRYSTALTOUCH_DUAL 0x0007
>
> +#define USB_VENDOR_ID_MADCATZ 0x0738
> +#define USB_DEVICE_ID_MADCATZ_BEATPAD 0x4540
> +
> #define USB_VENDOR_ID_MCC 0x09db
> #define USB_DEVICE_ID_MCC_PMD1024LS 0x0076
> #define USB_DEVICE_ID_MCC_PMD1208LS 0x007a
> diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c
> index ee16fb6..16974ef 100644
> --- a/drivers/input/joystick/xpad.c
> +++ b/drivers/input/joystick/xpad.c
> @@ -238,6 +238,7 @@ static struct usb_device_id xpad_table [] = {
> XPAD_XBOX360_VENDOR(0x045e), /* Microsoft X-Box 360 controllers */
> XPAD_XBOX360_VENDOR(0x046d), /* Logitech X-Box 360 style controllers */
> XPAD_XBOX360_VENDOR(0x0738), /* Mad Catz X-Box 360 controllers */
> + { USB_DEVICE(0x0738, 0x4540) }, /* Mad Catz Beat Pad */
> XPAD_XBOX360_VENDOR(0x0e6f), /* 0x0e6f X-Box 360 controllers */
> XPAD_XBOX360_VENDOR(0x12ab), /* X-Box 360 dance pads */
> XPAD_XBOX360_VENDOR(0x1430), /* RedOctane X-Box 360 controllers */
> --
> 1.7.9.5
>
--
Jiri Kosina
SUSE Labs
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH v3 1/1] Input: xpad - Handle all variations of Mad Catz Beat Pad
2012-07-10 17:33 ` [PATCH v3 " Yuri Khan
2012-07-10 20:05 ` Jiri Kosina
@ 2012-07-10 20:42 ` Dmitry Torokhov
1 sibling, 0 replies; 13+ messages in thread
From: Dmitry Torokhov @ 2012-07-10 20:42 UTC (permalink / raw)
To: Yuri Khan; +Cc: Jiri Kosina, linux-input, linux-kernel, linux-usb
Hi Yuri,
On Wed, Jul 11, 2012 at 12:33:22AM +0700, Yuri Khan wrote:
> * Add this device to usbhid ignore list
Please do not forget your "Signed-off-by: " so that I can apply the
patch.
Thanks.
> ---
> drivers/hid/hid-core.c | 1 +
> drivers/hid/hid-ids.h | 3 +++
> drivers/input/joystick/xpad.c | 1 +
> 3 files changed, 5 insertions(+)
>
> diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
> index 6ac0286..1540934 100644
> --- a/drivers/hid/hid-core.c
> +++ b/drivers/hid/hid-core.c
> @@ -1995,6 +1995,7 @@ static const struct hid_device_id hid_ignore_list[] = {
> { HID_USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_MCT) },
> { HID_USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_HYBRID) },
> { HID_USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_HEATCONTROL) },
> + { HID_USB_DEVICE(USB_VENDOR_ID_MADCATZ, USB_DEVICE_ID_MADCATZ_BEATPAD) },
> { HID_USB_DEVICE(USB_VENDOR_ID_MCC, USB_DEVICE_ID_MCC_PMD1024LS) },
> { HID_USB_DEVICE(USB_VENDOR_ID_MCC, USB_DEVICE_ID_MCC_PMD1208LS) },
> { HID_USB_DEVICE(USB_VENDOR_ID_MICROCHIP, USB_DEVICE_ID_PICKIT1) },
> diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
> index d1cdd2d..43c3d75 100644
> --- a/drivers/hid/hid-ids.h
> +++ b/drivers/hid/hid-ids.h
> @@ -518,6 +518,9 @@
> #define USB_DEVICE_ID_CRYSTALTOUCH 0x0006
> #define USB_DEVICE_ID_CRYSTALTOUCH_DUAL 0x0007
>
> +#define USB_VENDOR_ID_MADCATZ 0x0738
> +#define USB_DEVICE_ID_MADCATZ_BEATPAD 0x4540
> +
> #define USB_VENDOR_ID_MCC 0x09db
> #define USB_DEVICE_ID_MCC_PMD1024LS 0x0076
> #define USB_DEVICE_ID_MCC_PMD1208LS 0x007a
> diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c
> index ee16fb6..16974ef 100644
> --- a/drivers/input/joystick/xpad.c
> +++ b/drivers/input/joystick/xpad.c
> @@ -238,6 +238,7 @@ static struct usb_device_id xpad_table [] = {
> XPAD_XBOX360_VENDOR(0x045e), /* Microsoft X-Box 360 controllers */
> XPAD_XBOX360_VENDOR(0x046d), /* Logitech X-Box 360 style controllers */
> XPAD_XBOX360_VENDOR(0x0738), /* Mad Catz X-Box 360 controllers */
> + { USB_DEVICE(0x0738, 0x4540) }, /* Mad Catz Beat Pad */
> XPAD_XBOX360_VENDOR(0x0e6f), /* 0x0e6f X-Box 360 controllers */
> XPAD_XBOX360_VENDOR(0x12ab), /* X-Box 360 dance pads */
> XPAD_XBOX360_VENDOR(0x1430), /* RedOctane X-Box 360 controllers */
> --
> 1.7.9.5
>
--
Dmitry
^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH v4 1/1] Input: xpad - Handle all variations of Mad Catz Beat Pad
@ 2012-07-11 7:02 ` Yuri Khan
0 siblings, 0 replies; 13+ messages in thread
From: Yuri Khan @ 2012-07-11 7:02 UTC (permalink / raw)
To: Dmitry Torokhov
Cc: Jiri Kosina, linux-input, linux-kernel, linux-usb, Yuri Khan
* Add this device to usbhid ignore list
Signed-off-by: Yuri Khan <yurivkhan@gmail.com>
Acked-by: Jiri Kosina <jkosina@suse.cz>
---
drivers/hid/hid-core.c | 1 +
drivers/hid/hid-ids.h | 3 +++
drivers/input/joystick/xpad.c | 1 +
3 files changed, 5 insertions(+)
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
index 6ac0286..1540934 100644
--- a/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@ -1995,6 +1995,7 @@ static const struct hid_device_id hid_ignore_list[] = {
{ HID_USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_MCT) },
{ HID_USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_HYBRID) },
{ HID_USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_HEATCONTROL) },
+ { HID_USB_DEVICE(USB_VENDOR_ID_MADCATZ, USB_DEVICE_ID_MADCATZ_BEATPAD) },
{ HID_USB_DEVICE(USB_VENDOR_ID_MCC, USB_DEVICE_ID_MCC_PMD1024LS) },
{ HID_USB_DEVICE(USB_VENDOR_ID_MCC, USB_DEVICE_ID_MCC_PMD1208LS) },
{ HID_USB_DEVICE(USB_VENDOR_ID_MICROCHIP, USB_DEVICE_ID_PICKIT1) },
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
index d1cdd2d..43c3d75 100644
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@ -518,6 +518,9 @@
#define USB_DEVICE_ID_CRYSTALTOUCH 0x0006
#define USB_DEVICE_ID_CRYSTALTOUCH_DUAL 0x0007
+#define USB_VENDOR_ID_MADCATZ 0x0738
+#define USB_DEVICE_ID_MADCATZ_BEATPAD 0x4540
+
#define USB_VENDOR_ID_MCC 0x09db
#define USB_DEVICE_ID_MCC_PMD1024LS 0x0076
#define USB_DEVICE_ID_MCC_PMD1208LS 0x007a
diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c
index ee16fb6..16974ef 100644
--- a/drivers/input/joystick/xpad.c
+++ b/drivers/input/joystick/xpad.c
@@ -238,6 +238,7 @@ static struct usb_device_id xpad_table [] = {
XPAD_XBOX360_VENDOR(0x045e), /* Microsoft X-Box 360 controllers */
XPAD_XBOX360_VENDOR(0x046d), /* Logitech X-Box 360 style controllers */
XPAD_XBOX360_VENDOR(0x0738), /* Mad Catz X-Box 360 controllers */
+ { USB_DEVICE(0x0738, 0x4540) }, /* Mad Catz Beat Pad */
XPAD_XBOX360_VENDOR(0x0e6f), /* 0x0e6f X-Box 360 controllers */
XPAD_XBOX360_VENDOR(0x12ab), /* X-Box 360 dance pads */
XPAD_XBOX360_VENDOR(0x1430), /* RedOctane X-Box 360 controllers */
--
1.7.9.5
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH v4 1/1] Input: xpad - Handle all variations of Mad Catz Beat Pad
@ 2012-07-11 7:02 ` Yuri Khan
0 siblings, 0 replies; 13+ messages in thread
From: Yuri Khan @ 2012-07-11 7:02 UTC (permalink / raw)
To: Dmitry Torokhov
Cc: Jiri Kosina, linux-input-u79uwXL29TY76Z2rM5mHXA,
linux-kernel-u79uwXL29TY76Z2rM5mHXA,
linux-usb-u79uwXL29TY76Z2rM5mHXA, Yuri Khan
* Add this device to usbhid ignore list
Signed-off-by: Yuri Khan <yurivkhan-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
Acked-by: Jiri Kosina <jkosina-AlSwsSmVLrQ@public.gmane.org>
---
drivers/hid/hid-core.c | 1 +
drivers/hid/hid-ids.h | 3 +++
drivers/input/joystick/xpad.c | 1 +
3 files changed, 5 insertions(+)
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
index 6ac0286..1540934 100644
--- a/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@ -1995,6 +1995,7 @@ static const struct hid_device_id hid_ignore_list[] = {
{ HID_USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_MCT) },
{ HID_USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_HYBRID) },
{ HID_USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_HEATCONTROL) },
+ { HID_USB_DEVICE(USB_VENDOR_ID_MADCATZ, USB_DEVICE_ID_MADCATZ_BEATPAD) },
{ HID_USB_DEVICE(USB_VENDOR_ID_MCC, USB_DEVICE_ID_MCC_PMD1024LS) },
{ HID_USB_DEVICE(USB_VENDOR_ID_MCC, USB_DEVICE_ID_MCC_PMD1208LS) },
{ HID_USB_DEVICE(USB_VENDOR_ID_MICROCHIP, USB_DEVICE_ID_PICKIT1) },
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
index d1cdd2d..43c3d75 100644
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@ -518,6 +518,9 @@
#define USB_DEVICE_ID_CRYSTALTOUCH 0x0006
#define USB_DEVICE_ID_CRYSTALTOUCH_DUAL 0x0007
+#define USB_VENDOR_ID_MADCATZ 0x0738
+#define USB_DEVICE_ID_MADCATZ_BEATPAD 0x4540
+
#define USB_VENDOR_ID_MCC 0x09db
#define USB_DEVICE_ID_MCC_PMD1024LS 0x0076
#define USB_DEVICE_ID_MCC_PMD1208LS 0x007a
diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c
index ee16fb6..16974ef 100644
--- a/drivers/input/joystick/xpad.c
+++ b/drivers/input/joystick/xpad.c
@@ -238,6 +238,7 @@ static struct usb_device_id xpad_table [] = {
XPAD_XBOX360_VENDOR(0x045e), /* Microsoft X-Box 360 controllers */
XPAD_XBOX360_VENDOR(0x046d), /* Logitech X-Box 360 style controllers */
XPAD_XBOX360_VENDOR(0x0738), /* Mad Catz X-Box 360 controllers */
+ { USB_DEVICE(0x0738, 0x4540) }, /* Mad Catz Beat Pad */
XPAD_XBOX360_VENDOR(0x0e6f), /* 0x0e6f X-Box 360 controllers */
XPAD_XBOX360_VENDOR(0x12ab), /* X-Box 360 dance pads */
XPAD_XBOX360_VENDOR(0x1430), /* RedOctane X-Box 360 controllers */
--
1.7.9.5
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply related [flat|nested] 13+ messages in thread
* Re: [PATCH v4 1/1] Input: xpad - Handle all variations of Mad Catz Beat Pad
2012-07-11 7:02 ` Yuri Khan
(?)
@ 2012-07-11 7:57 ` Dmitry Torokhov
-1 siblings, 0 replies; 13+ messages in thread
From: Dmitry Torokhov @ 2012-07-11 7:57 UTC (permalink / raw)
To: Yuri Khan; +Cc: Jiri Kosina, linux-input, linux-kernel, linux-usb
On Wed, Jul 11, 2012 at 02:02:19PM +0700, Yuri Khan wrote:
> * Add this device to usbhid ignore list
>
> Signed-off-by: Yuri Khan <yurivkhan@gmail.com>
> Acked-by: Jiri Kosina <jkosina@suse.cz>
Applied, thank you Yuri.
--
Dmitry
^ permalink raw reply [flat|nested] 13+ messages in thread