3 more xbox controllers for inclusion

The below patch is against CVS xpad.c from today.

--- xpad.c.orig360      2006-01-02 13:30:43.000000000 -0500
+++ xpad.c.orig_abs_trig        2006-01-02 13:39:14.000000000 -0500
@@ -89,6 +89,7 @@
        { 0x0738, 0x4536, 0, "Mad Catz MicroCON", 0},
        { 0x0738, 0x4540, 1, "Mad Catz Beat Pad", 0},
        { 0x0738, 0x4556, 0, "Mad Catz Lynx Wireless Controller", 0},
+       { 0x0738, 0x4586, 0, "Mad Catz MicroCON Wireless Controller", 0},
        { 0x0738, 0x6040, 1, "Mad Catz Beat Pad Pro", 0},
        { 0x0c12, 0x8802, 0, "Zeroplus Xbox Controller", 0},
        { 0x0c12, 0x8809, 0, "Level Six Xbox DDR Dancepad", 0},
@@ -99,11 +100,13 @@
        { 0x0e6f, 0x0003, 0, "Logic3 Freebird wireless Controller", 0},
        { 0x0e6f, 0x0005, 0, "Eclipse wireless Controller", 0},
        { 0x0e6f, 0x0006, 0, "Edge wireless Controller", 0},
+       { 0x0e6f, 0x000c, 0, "Pelican Pro wireless Controller", 0},
        { 0x0e8f, 0x0201, 0, "SmartJoy Frag Xpad/PS2 adaptor", 0},
        { 0x0f30, 0x0202, 0, "Joytech Advanced Controller", 0},
        { 0x0f30, 0x8888, 0, "BigBen XBMiniPad Controller", 0},
        { 0x102c, 0xff0c, 0, "Joytech Wireless Advanced Controller", 0},
        { 0x12ab, 0x8809, 1, "Xbox DDR dancepad", 0},
+       { 0x13ba, 0x0202, 0, "Naki World Spiderman 2.4ghz Wireless Controller", 0},
        { 0xffff, 0xffff, 0, "Chinese-made Xbox Controller", 0}, /* WTF are
device IDs for? */
        { 0x0000, 0x0000, 0, "nothing detected - FAIL", 0}
 };
Exit 1



Note: The Nakiworld and Mad Catz controllers require a patch to hid-core.c
so linux won't detect them as normal HID joysticks:

--- hid-core.c.orig     2005-08-31 09:20:08.000000000 -0400
+++ hid-core.c.nakiworld        2005-12-11 03:02:48.000000000 -0500
@@ -1444,6 +1444,12 @@
 #define USB_DEVICE_ID_NETWORKANALYSER  0x2020
 #define USB_DEVICE_ID_POWERCONTROL     0x2030

+#define USB_VENDOR_ID_MADCATZ          0x0738
+#define USB_DEVICE_ID_MADCATZ_MCW      0x4586
+
+#define USB_VENDOR_ID_NAKIWORLD                0x13ba
+#define USB_DEVICE_ID_NAKIWORLD_SW     0x0202
+

 /*
  * Alphabetically sorted blacklist by quirk type.
@@ -1560,6 +1566,8 @@
        { USB_VENDOR_ID_NEC, USB_DEVICE_ID_NEC_USB_GAME_PAD, HID_QUIRK_BADPAD },
        { 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_MCW, HID_QUIRK_IGNORE },
+       { USB_VENDOR_ID_NAKIWORLD, USB_DEVICE_ID_NAKIWORLD_SW, HID_QUIRK_IGNORE },

        { 0, 0 }
 };
Exit 1


Thanks!


-- 
Jesse Guardiani
Programmer/Sys Admin
[email protected]




-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems?  Stop!  Download the new AJAX search engine that makes
searching your log files as easy as surfing the  web.  DOWNLOAD SPLUNK!
http://ads.osdn.com/?ad_id=7637&alloc_id=16865&op=click