tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

Input: xpad - remove mouse buttons and axes for dance pads

Dance pads don't have any axes/sticks, only buttons for directions. For
example buttons like left+right will get triggered at once, an axis
can't handle this anyway. So this patch adds a module parameter named
"sticks_to_null" for unknown devices. A known dance pad makes use of
it by changing to a new mapping-option named DANCEPAD_MAP_CONFIG. Other
tested devices may follow by adding this mapping-option too.

Some buttons of xpad-devices are addressing mouse-buttons instead of
gamepad-buttons. This gets fixed too.

Signed-off-by: Christoph Fritz <chf.fritz@googlemail.com>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>

authored by

Christoph Fritz and committed by
Dmitry Torokhov 7beae702 bf77499f

+61 -42
+61 -42
drivers/input/joystick/xpad.c
··· 9 9 * 2005 Dominic Cerquetti <binary1230@yahoo.com> 10 10 * 2006 Adam Buchbinder <adam.buchbinder@gmail.com> 11 11 * 2007 Jan Kratochvil <honza@jikos.cz> 12 + * 2010 Christoph Fritz <chf.fritz@googlemail.com> 12 13 * 13 14 * This program is free software; you can redistribute it and/or 14 15 * modify it under the terms of the GNU General Public License as ··· 89 88 but we map them to axes when possible to simplify things */ 90 89 #define MAP_DPAD_TO_BUTTONS (1 << 0) 91 90 #define MAP_TRIGGERS_TO_BUTTONS (1 << 1) 91 + #define MAP_STICKS_TO_NULL (1 << 2) 92 + #define DANCEPAD_MAP_CONFIG (MAP_DPAD_TO_BUTTONS | \ 93 + MAP_TRIGGERS_TO_BUTTONS | MAP_STICKS_TO_NULL) 92 94 93 95 #define XTYPE_XBOX 0 94 96 #define XTYPE_XBOX360 1 ··· 106 102 module_param(triggers_to_buttons, bool, S_IRUGO); 107 103 MODULE_PARM_DESC(triggers_to_buttons, "Map triggers to buttons rather than axes for unknown pads"); 108 104 105 + static int sticks_to_null; 106 + module_param(sticks_to_null, bool, S_IRUGO); 107 + MODULE_PARM_DESC(sticks_to_null, "Do not map sticks at all for unknown pads"); 108 + 109 109 static const struct xpad_device { 110 110 u16 idVendor; 111 111 u16 idProduct; ··· 122 114 { 0x045e, 0x0285, "Microsoft X-Box pad (Japan)", 0, XTYPE_XBOX }, 123 115 { 0x045e, 0x0287, "Microsoft Xbox Controller S", 0, XTYPE_XBOX }, 124 116 { 0x045e, 0x0719, "Xbox 360 Wireless Receiver", MAP_DPAD_TO_BUTTONS, XTYPE_XBOX360W }, 125 - { 0x0c12, 0x8809, "RedOctane Xbox Dance Pad", MAP_DPAD_TO_BUTTONS, XTYPE_XBOX }, 117 + { 0x0c12, 0x8809, "RedOctane Xbox Dance Pad", DANCEPAD_MAP_CONFIG, XTYPE_XBOX }, 126 118 { 0x044f, 0x0f07, "Thrustmaster, Inc. Controller", 0, XTYPE_XBOX }, 127 119 { 0x046d, 0xc242, "Logitech Chillstream Controller", 0, XTYPE_XBOX360 }, 128 120 { 0x046d, 0xca84, "Logitech Xbox Cordless Controller", 0, XTYPE_XBOX }, ··· 166 158 /* buttons shared with xbox and xbox360 */ 167 159 static const signed short xpad_common_btn[] = { 168 160 BTN_A, BTN_B, BTN_X, BTN_Y, /* "analog" buttons */ 169 - BTN_START, BTN_BACK, BTN_THUMBL, BTN_THUMBR, /* start/back/sticks */ 161 + BTN_START, BTN_SELECT, BTN_THUMBL, BTN_THUMBR, /* start/back/sticks */ 170 162 -1 /* terminating entry */ 171 163 }; 172 164 ··· 176 168 -1 /* terminating entry */ 177 169 }; 178 170 179 - /* used when dpad is mapped to nuttons */ 171 + /* used when dpad is mapped to buttons */ 180 172 static const signed short xpad_btn_pad[] = { 181 - BTN_LEFT, BTN_RIGHT, /* d-pad left, right */ 182 - BTN_0, BTN_1, /* d-pad up, down (XXX names??) */ 173 + BTN_TRIGGER_HAPPY1, BTN_TRIGGER_HAPPY2, /* d-pad left, right */ 174 + BTN_TRIGGER_HAPPY3, BTN_TRIGGER_HAPPY4, /* d-pad up, down */ 183 175 -1 /* terminating entry */ 184 176 }; 185 177 ··· 287 279 { 288 280 struct input_dev *dev = xpad->dev; 289 281 290 - /* left stick */ 291 - input_report_abs(dev, ABS_X, 292 - (__s16) le16_to_cpup((__le16 *)(data + 12))); 293 - input_report_abs(dev, ABS_Y, 294 - ~(__s16) le16_to_cpup((__le16 *)(data + 14))); 282 + if (!(xpad->mapping & MAP_STICKS_TO_NULL)) { 283 + /* left stick */ 284 + input_report_abs(dev, ABS_X, 285 + (__s16) le16_to_cpup((__le16 *)(data + 12))); 286 + input_report_abs(dev, ABS_Y, 287 + ~(__s16) le16_to_cpup((__le16 *)(data + 14))); 295 288 296 - /* right stick */ 297 - input_report_abs(dev, ABS_RX, 298 - (__s16) le16_to_cpup((__le16 *)(data + 16))); 299 - input_report_abs(dev, ABS_RY, 300 - ~(__s16) le16_to_cpup((__le16 *)(data + 18))); 289 + /* right stick */ 290 + input_report_abs(dev, ABS_RX, 291 + (__s16) le16_to_cpup((__le16 *)(data + 16))); 292 + input_report_abs(dev, ABS_RY, 293 + ~(__s16) le16_to_cpup((__le16 *)(data + 18))); 294 + } 301 295 302 296 /* triggers left/right */ 303 297 if (xpad->mapping & MAP_TRIGGERS_TO_BUTTONS) { ··· 312 302 313 303 /* digital pad */ 314 304 if (xpad->mapping & MAP_DPAD_TO_BUTTONS) { 315 - input_report_key(dev, BTN_LEFT, data[2] & 0x04); 316 - input_report_key(dev, BTN_RIGHT, data[2] & 0x08); 317 - input_report_key(dev, BTN_0, data[2] & 0x01); /* up */ 318 - input_report_key(dev, BTN_1, data[2] & 0x02); /* down */ 305 + /* dpad as buttons (left, right, up, down) */ 306 + input_report_key(dev, BTN_TRIGGER_HAPPY1, data[2] & 0x04); 307 + input_report_key(dev, BTN_TRIGGER_HAPPY2, data[2] & 0x08); 308 + input_report_key(dev, BTN_TRIGGER_HAPPY3, data[2] & 0x01); 309 + input_report_key(dev, BTN_TRIGGER_HAPPY4, data[2] & 0x02); 319 310 } else { 320 311 input_report_abs(dev, ABS_HAT0X, 321 312 !!(data[2] & 0x08) - !!(data[2] & 0x04)); ··· 326 315 327 316 /* start/back buttons and stick press left/right */ 328 317 input_report_key(dev, BTN_START, data[2] & 0x10); 329 - input_report_key(dev, BTN_BACK, data[2] & 0x20); 318 + input_report_key(dev, BTN_SELECT, data[2] & 0x20); 330 319 input_report_key(dev, BTN_THUMBL, data[2] & 0x40); 331 320 input_report_key(dev, BTN_THUMBR, data[2] & 0x80); 332 321 ··· 360 349 361 350 /* digital pad */ 362 351 if (xpad->mapping & MAP_DPAD_TO_BUTTONS) { 363 - /* dpad as buttons (right, left, down, up) */ 364 - input_report_key(dev, BTN_LEFT, data[2] & 0x04); 365 - input_report_key(dev, BTN_RIGHT, data[2] & 0x08); 366 - input_report_key(dev, BTN_0, data[2] & 0x01); /* up */ 367 - input_report_key(dev, BTN_1, data[2] & 0x02); /* down */ 352 + /* dpad as buttons (left, right, up, down) */ 353 + input_report_key(dev, BTN_TRIGGER_HAPPY1, data[2] & 0x04); 354 + input_report_key(dev, BTN_TRIGGER_HAPPY2, data[2] & 0x08); 355 + input_report_key(dev, BTN_TRIGGER_HAPPY3, data[2] & 0x01); 356 + input_report_key(dev, BTN_TRIGGER_HAPPY4, data[2] & 0x02); 368 357 } else { 369 358 input_report_abs(dev, ABS_HAT0X, 370 359 !!(data[2] & 0x08) - !!(data[2] & 0x04)); ··· 374 363 375 364 /* start/back buttons */ 376 365 input_report_key(dev, BTN_START, data[2] & 0x10); 377 - input_report_key(dev, BTN_BACK, data[2] & 0x20); 366 + input_report_key(dev, BTN_SELECT, data[2] & 0x20); 378 367 379 368 /* stick press left/right */ 380 369 input_report_key(dev, BTN_THUMBL, data[2] & 0x40); ··· 389 378 input_report_key(dev, BTN_TR, data[3] & 0x02); 390 379 input_report_key(dev, BTN_MODE, data[3] & 0x04); 391 380 392 - /* left stick */ 393 - input_report_abs(dev, ABS_X, 394 - (__s16) le16_to_cpup((__le16 *)(data + 6))); 395 - input_report_abs(dev, ABS_Y, 396 - ~(__s16) le16_to_cpup((__le16 *)(data + 8))); 381 + if (!(xpad->mapping & MAP_STICKS_TO_NULL)) { 382 + /* left stick */ 383 + input_report_abs(dev, ABS_X, 384 + (__s16) le16_to_cpup((__le16 *)(data + 6))); 385 + input_report_abs(dev, ABS_Y, 386 + ~(__s16) le16_to_cpup((__le16 *)(data + 8))); 397 387 398 - /* right stick */ 399 - input_report_abs(dev, ABS_RX, 400 - (__s16) le16_to_cpup((__le16 *)(data + 10))); 401 - input_report_abs(dev, ABS_RY, 402 - ~(__s16) le16_to_cpup((__le16 *)(data + 12))); 388 + /* right stick */ 389 + input_report_abs(dev, ABS_RX, 390 + (__s16) le16_to_cpup((__le16 *)(data + 10))); 391 + input_report_abs(dev, ABS_RY, 392 + ~(__s16) le16_to_cpup((__le16 *)(data + 12))); 393 + } 403 394 404 395 /* triggers left/right */ 405 396 if (xpad->mapping & MAP_TRIGGERS_TO_BUTTONS) { ··· 827 814 xpad->mapping |= MAP_DPAD_TO_BUTTONS; 828 815 if (triggers_to_buttons) 829 816 xpad->mapping |= MAP_TRIGGERS_TO_BUTTONS; 817 + if (sticks_to_null) 818 + xpad->mapping |= MAP_STICKS_TO_NULL; 830 819 } 831 820 832 821 xpad->dev = input_dev; ··· 845 830 input_dev->open = xpad_open; 846 831 input_dev->close = xpad_close; 847 832 848 - input_dev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_ABS); 833 + input_dev->evbit[0] = BIT_MASK(EV_KEY); 849 834 850 - /* set up standard buttons and axes */ 835 + if (!(xpad->mapping & MAP_STICKS_TO_NULL)) { 836 + input_dev->evbit[0] |= BIT_MASK(EV_ABS); 837 + /* set up axes */ 838 + for (i = 0; xpad_abs[i] >= 0; i++) 839 + xpad_set_up_abs(input_dev, xpad_abs[i]); 840 + } 841 + 842 + /* set up standard buttons */ 851 843 for (i = 0; xpad_common_btn[i] >= 0; i++) 852 844 __set_bit(xpad_common_btn[i], input_dev->keybit); 853 845 854 - for (i = 0; xpad_abs[i] >= 0; i++) 855 - xpad_set_up_abs(input_dev, xpad_abs[i]); 856 - 857 - /* Now set up model-specific ones */ 846 + /* set up model-specific ones */ 858 847 if (xpad->xtype == XTYPE_XBOX360 || xpad->xtype == XTYPE_XBOX360W) { 859 848 for (i = 0; xpad360_btn[i] >= 0; i++) 860 849 __set_bit(xpad360_btn[i], input_dev->keybit);