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

Input: xpad - spelling fixes for "Xbox"

The Linux kernel is notorious for misspelling X-Box, X-box, XBox or XBOX;
the official spelling is actually just Xbox. Plain and simple.

Tried to respect the existing notes but still following the style guide.
No functional changes intended. This only affects ancillary parts.

Signed-off-by: Ismael Ferreras Morezuelas <swyterzone@gmail.com>
Link: https://lore.kernel.org/r/401b1d94-1348-15fd-b48f-a80e8885c7a4@gmail.com
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>

authored by

Ismael Ferreras Morezuelas and committed by
Dmitry Torokhov
9284d3b9 50cd8714

+45 -45
+5 -5
Documentation/input/devices/xpad.rst
··· 4 4 5 5 This driver exposes all first-party and third-party Xbox compatible 6 6 controllers. It has a long history and has enjoyed considerable usage 7 - as Window's xinput library caused most PC games to focus on Xbox 7 + as Windows' xinput library caused most PC games to focus on Xbox 8 8 controller compatibility. 9 9 10 10 Due to backwards compatibility all buttons are reported as digital. 11 - This only effects Original Xbox controllers. All later controller models 11 + This only affects Original Xbox controllers. All later controller models 12 12 have only digital face buttons. 13 13 14 14 Rumble is supported on some models of Xbox 360 controllers but not of 15 15 Original Xbox controllers nor on Xbox One controllers. As of writing 16 - the Xbox One's rumble protocol has not been reverse engineered but in 16 + the Xbox One's rumble protocol has not been reverse-engineered but in 17 17 the future could be supported. 18 18 19 19 ··· 82 82 Unknown Controllers 83 83 ------------------- 84 84 85 - If you have an unknown xbox controller, it should work just fine with 85 + If you have an unknown Xbox controller, it should work just fine with 86 86 the default settings. 87 87 88 88 HOWEVER if you have an unknown dance pad not listed below, it will not ··· 123 123 124 124 Thanks to the trip splitter found on the cable you don't even need to cut the 125 125 original one. You can buy an extension cable and cut that instead. That way, 126 - you can still use the controller with your X-Box, if you have one ;) 126 + you can still use the controller with your Xbox, if you have one ;) 127 127 128 128 129 129
+1 -1
Documentation/input/gamepad.rst
··· 184 184 185 185 Many pads also have a third button which is branded or has a special symbol 186 186 and meaning. Such buttons are mapped as BTN_MODE. Examples are the Nintendo 187 - "HOME" button, the XBox "X"-button or Sony "PS" button. 187 + "HOME" button, the Xbox "X" button or the Sony PlayStation "PS" button. 188 188 189 189 - Rumble: 190 190
+7 -7
drivers/input/joystick/Kconfig
··· 292 292 module will be called joydump. 293 293 294 294 config JOYSTICK_XPAD 295 - tristate "X-Box gamepad support" 295 + tristate "Xbox gamepad support" 296 296 depends on USB_ARCH_HAS_HCD 297 297 select USB 298 298 help 299 - Say Y here if you want to use the X-Box pad with your computer. 299 + Say Y here if you want to use Xbox pads with your computer. 300 300 Make sure to say Y to "Joystick support" (CONFIG_INPUT_JOYDEV) 301 301 and/or "Event interface support" (CONFIG_INPUT_EVDEV) as well. 302 302 303 - For information about how to connect the X-Box pad to USB, see 303 + For information about how to connect the Xbox pad to USB, see 304 304 <file:Documentation/input/devices/xpad.rst>. 305 305 306 306 To compile this driver as a module, choose M here: the 307 307 module will be called xpad. 308 308 309 309 config JOYSTICK_XPAD_FF 310 - bool "X-Box gamepad rumble support" 310 + bool "Xbox gamepad rumble support" 311 311 depends on JOYSTICK_XPAD && INPUT 312 312 select INPUT_FF_MEMLESS 313 313 help 314 - Say Y here if you want to take advantage of xbox 360 rumble features. 314 + Say Y here if you want to take advantage of Xbox 360 rumble features. 315 315 316 316 config JOYSTICK_XPAD_LEDS 317 - bool "LED Support for Xbox360 controller 'BigX' LED" 317 + bool "LED Support for the Xbox 360 controller Guide button" 318 318 depends on JOYSTICK_XPAD && (LEDS_CLASS=y || LEDS_CLASS=JOYSTICK_XPAD) 319 319 help 320 320 This option enables support for the LED which surrounds the Big X on 321 - XBox 360 controller. 321 + Xbox 360 controllers. 322 322 323 323 config JOYSTICK_WALKERA0701 324 324 tristate "Walkera WK-0701 RC transmitter"
+32 -32
drivers/input/joystick/xpad.c
··· 1 1 // SPDX-License-Identifier: GPL-2.0-or-later 2 2 /* 3 - * X-Box gamepad driver 3 + * Xbox gamepad driver 4 4 * 5 5 * Copyright (c) 2002 Marko Friedemann <mfr@bmx-chemnitz.de> 6 6 * 2004 Oliver Schwartz <Oliver.Schwartz@gmx.de>, ··· 23 23 * - ITO Takayuki for providing essential xpad information on his website 24 24 * - Vojtech Pavlik - iforce driver / input subsystem 25 25 * - Greg Kroah-Hartman - usb-skeleton driver 26 - * - XBOX Linux project - extra USB id's 27 - * - Pekka Pöyry (quantus) - Xbox One controller reverse engineering 26 + * - Xbox Linux project - extra USB IDs 27 + * - Pekka Pöyry (quantus) - Xbox One controller reverse-engineering 28 28 * 29 29 * TODO: 30 30 * - fine tune axes (especially trigger axes) ··· 52 52 * 2002-07-17 - 0.0.5 : simplified d-pad handling 53 53 * 54 54 * 2004-10-02 - 0.0.6 : DDR pad support 55 - * - borrowed from the XBOX linux kernel 55 + * - borrowed from the Xbox Linux kernel 56 56 * - USB id's for commonly used dance pads are present 57 57 * - dance pads will map D-PAD to buttons, not axes 58 58 * - pass the module paramater 'dpad_to_buttons' to force ··· 455 455 { XPAD_XBOXONE_VENDOR_PROTOCOL((vend), 208) } 456 456 457 457 static const struct usb_device_id xpad_table[] = { 458 - { USB_INTERFACE_INFO('X', 'B', 0) }, /* X-Box USB-IF not approved class */ 459 - XPAD_XBOX360_VENDOR(0x0079), /* GPD Win 2 Controller */ 458 + { USB_INTERFACE_INFO('X', 'B', 0) }, /* Xbox USB-IF not-approved class */ 459 + XPAD_XBOX360_VENDOR(0x0079), /* GPD Win 2 controller */ 460 460 XPAD_XBOX360_VENDOR(0x03eb), /* Wooting Keyboards (Legacy) */ 461 - XPAD_XBOX360_VENDOR(0x044f), /* Thrustmaster X-Box 360 controllers */ 462 - XPAD_XBOX360_VENDOR(0x045e), /* Microsoft X-Box 360 controllers */ 463 - XPAD_XBOXONE_VENDOR(0x045e), /* Microsoft X-Box One controllers */ 464 - XPAD_XBOX360_VENDOR(0x046d), /* Logitech X-Box 360 style controllers */ 461 + XPAD_XBOX360_VENDOR(0x044f), /* Thrustmaster Xbox 360 controllers */ 462 + XPAD_XBOX360_VENDOR(0x045e), /* Microsoft Xbox 360 controllers */ 463 + XPAD_XBOXONE_VENDOR(0x045e), /* Microsoft Xbox One controllers */ 464 + XPAD_XBOX360_VENDOR(0x046d), /* Logitech Xbox 360-style controllers */ 465 465 XPAD_XBOX360_VENDOR(0x056e), /* Elecom JC-U3613M */ 466 466 XPAD_XBOX360_VENDOR(0x06a3), /* Saitek P3600 */ 467 - XPAD_XBOX360_VENDOR(0x0738), /* Mad Catz X-Box 360 controllers */ 467 + XPAD_XBOX360_VENDOR(0x0738), /* Mad Catz Xbox 360 controllers */ 468 468 { USB_DEVICE(0x0738, 0x4540) }, /* Mad Catz Beat Pad */ 469 469 XPAD_XBOXONE_VENDOR(0x0738), /* Mad Catz FightStick TE 2 */ 470 - XPAD_XBOX360_VENDOR(0x07ff), /* Mad Catz GamePad */ 470 + XPAD_XBOX360_VENDOR(0x07ff), /* Mad Catz Gamepad */ 471 471 XPAD_XBOX360_VENDOR(0x0c12), /* Zeroplus X-Box 360 controllers */ 472 - XPAD_XBOX360_VENDOR(0x0e6f), /* 0x0e6f X-Box 360 controllers */ 473 - XPAD_XBOXONE_VENDOR(0x0e6f), /* 0x0e6f X-Box One controllers */ 474 - XPAD_XBOX360_VENDOR(0x0f0d), /* Hori Controllers */ 475 - XPAD_XBOXONE_VENDOR(0x0f0d), /* Hori Controllers */ 476 - XPAD_XBOX360_VENDOR(0x1038), /* SteelSeries Controllers */ 472 + XPAD_XBOX360_VENDOR(0x0e6f), /* 0x0e6f Xbox 360 controllers */ 473 + XPAD_XBOXONE_VENDOR(0x0e6f), /* 0x0e6f Xbox One controllers */ 474 + XPAD_XBOX360_VENDOR(0x0f0d), /* Hori controllers */ 475 + XPAD_XBOXONE_VENDOR(0x0f0d), /* Hori controllers */ 476 + XPAD_XBOX360_VENDOR(0x1038), /* SteelSeries controllers */ 477 477 XPAD_XBOXONE_VENDOR(0x10f5), /* Turtle Beach Controllers */ 478 478 XPAD_XBOX360_VENDOR(0x11c9), /* Nacon GC100XF */ 479 479 XPAD_XBOX360_VENDOR(0x1209), /* Ardwiino Controllers */ 480 - XPAD_XBOX360_VENDOR(0x12ab), /* X-Box 360 dance pads */ 481 - XPAD_XBOX360_VENDOR(0x1430), /* RedOctane X-Box 360 controllers */ 482 - XPAD_XBOX360_VENDOR(0x146b), /* BigBen Interactive Controllers */ 480 + XPAD_XBOX360_VENDOR(0x12ab), /* Xbox 360 dance pads */ 481 + XPAD_XBOX360_VENDOR(0x1430), /* RedOctane Xbox 360 controllers */ 482 + XPAD_XBOX360_VENDOR(0x146b), /* Bigben Interactive controllers */ 483 483 XPAD_XBOX360_VENDOR(0x1532), /* Razer Sabertooth */ 484 484 XPAD_XBOXONE_VENDOR(0x1532), /* Razer Wildcat */ 485 - XPAD_XBOX360_VENDOR(0x15e4), /* Numark X-Box 360 controllers */ 486 - XPAD_XBOX360_VENDOR(0x162e), /* Joytech X-Box 360 controllers */ 485 + XPAD_XBOX360_VENDOR(0x15e4), /* Numark Xbox 360 controllers */ 486 + XPAD_XBOX360_VENDOR(0x162e), /* Joytech Xbox 360 controllers */ 487 487 XPAD_XBOX360_VENDOR(0x1689), /* Razer Onza */ 488 488 XPAD_XBOX360_VENDOR(0x1949), /* Amazon controllers */ 489 - XPAD_XBOX360_VENDOR(0x1bad), /* Harminix Rock Band Guitar and Drums */ 490 - XPAD_XBOX360_VENDOR(0x20d6), /* PowerA Controllers */ 491 - XPAD_XBOXONE_VENDOR(0x20d6), /* PowerA Controllers */ 492 - XPAD_XBOX360_VENDOR(0x24c6), /* PowerA Controllers */ 493 - XPAD_XBOXONE_VENDOR(0x24c6), /* PowerA Controllers */ 489 + XPAD_XBOX360_VENDOR(0x1bad), /* Harmonix Rock Band guitar and drums */ 490 + XPAD_XBOX360_VENDOR(0x20d6), /* PowerA controllers */ 491 + XPAD_XBOXONE_VENDOR(0x20d6), /* PowerA controllers */ 492 + XPAD_XBOX360_VENDOR(0x24c6), /* PowerA controllers */ 493 + XPAD_XBOXONE_VENDOR(0x24c6), /* PowerA controllers */ 494 494 XPAD_XBOX360_VENDOR(0x2563), /* OneXPlayer Gamepad */ 495 495 XPAD_XBOX360_VENDOR(0x260d), /* Dareu H101 */ 496 496 XPAD_XBOX360_VENDOR(0x2c22), /* Qanba Controllers */ 497 497 XPAD_XBOX360_VENDOR(0x2dc8), /* 8BitDo Pro 2 Wired Controller */ 498 498 XPAD_XBOXONE_VENDOR(0x2dc8), /* 8BitDo Pro 2 Wired Controller for Xbox */ 499 - XPAD_XBOXONE_VENDOR(0x2e24), /* Hyperkin Duke X-Box One pad */ 500 - XPAD_XBOX360_VENDOR(0x2f24), /* GameSir Controllers */ 499 + XPAD_XBOXONE_VENDOR(0x2e24), /* Hyperkin Duke Xbox One pad */ 500 + XPAD_XBOX360_VENDOR(0x2f24), /* GameSir controllers */ 501 501 XPAD_XBOX360_VENDOR(0x31e3), /* Wooting Keyboards */ 502 502 XPAD_XBOX360_VENDOR(0x3285), /* Nacon GC-100 */ 503 503 { } ··· 725 725 * Completes a request by converting the data into events for the 726 726 * input subsystem. 727 727 * 728 - * The used report descriptor was taken from ITO Takayukis website: 728 + * The used report descriptor was taken from ITO Takayuki's website: 729 729 * http://euc.jp/periphs/xbox-controller.ja.html 730 730 */ 731 731 static void xpad_process_packet(struct usb_xpad *xpad, u16 cmd, unsigned char *data) ··· 1569 1569 }; 1570 1570 1571 1571 /* 1572 - * set the LEDs on Xbox360 / Wireless Controllers 1572 + * set the LEDs on Xbox 360 / Wireless Controllers 1573 1573 * @param command 1574 1574 * 0: off 1575 1575 * 1: all blink, then previous setting ··· 2229 2229 module_usb_driver(xpad_driver); 2230 2230 2231 2231 MODULE_AUTHOR("Marko Friedemann <mfr@bmx-chemnitz.de>"); 2232 - MODULE_DESCRIPTION("X-Box pad driver"); 2232 + MODULE_DESCRIPTION("Xbox pad driver"); 2233 2233 MODULE_LICENSE("GPL");