Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-24 21:21:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Input: xpad - spelling fixes for "Xbox"

Browse Source 
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>
This commit is contained in:
Ismael Ferreras Morezuelas 2023-05-22 17:21:07 -07:00 committed by Dmitry Torokhov
parent 50cd8714a1
commit 9284d3b9a3
4 changed files with 45 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Documentation/input/devices/xpad.rst
View File

@ -4,16 +4,16 @@ xpad - Linux USB driver for Xbox compatible controllers
This driver exposes all first-party and third-party Xbox compatible This driver exposes all first-party and third-party Xbox compatible
controllers. It has a long history and has enjoyed considerable usage controllers. It has a long history and has enjoyed considerable usage
as Window's xinput library caused most PC games to focus on Xbox as Windows' xinput library caused most PC games to focus on Xbox
controller compatibility. controller compatibility.
Due to backwards compatibility all buttons are reported as digital. Due to backwards compatibility all buttons are reported as digital.
This only effects Original Xbox controllers. All later controller models This only affects Original Xbox controllers. All later controller models
have only digital face buttons. have only digital face buttons.
Rumble is supported on some models of Xbox 360 controllers but not of Rumble is supported on some models of Xbox 360 controllers but not of
Original Xbox controllers nor on Xbox One controllers. As of writing Original Xbox controllers nor on Xbox One controllers. As of writing
the Xbox One's rumble protocol has not been reverse engineered but in the Xbox One's rumble protocol has not been reverse-engineered but in
the future could be supported. the future could be supported.
@ -82,7 +82,7 @@ I've tested this with Stepmania, and it works quite well.
Unknown Controllers Unknown Controllers
------------------- -------------------
If you have an unknown xbox controller, it should work just fine with If you have an unknown Xbox controller, it should work just fine with
the default settings. the default settings.
HOWEVER if you have an unknown dance pad not listed below, it will not HOWEVER if you have an unknown dance pad not listed below, it will not
@ -123,7 +123,7 @@ can be found on the net ([1]_, [2]_, [3]_).
Thanks to the trip splitter found on the cable you don't even need to cut the Thanks to the trip splitter found on the cable you don't even need to cut the
original one. You can buy an extension cable and cut that instead. That way, original one. You can buy an extension cable and cut that instead. That way,
you can still use the controller with your X-Box, if you have one ;) you can still use the controller with your Xbox, if you have one ;)

2
Documentation/input/gamepad.rst
View File

@ -184,7 +184,7 @@ Gamepads report the following events:
Many pads also have a third button which is branded or has a special symbol Many pads also have a third button which is branded or has a special symbol
and meaning. Such buttons are mapped as BTN_MODE. Examples are the Nintendo and meaning. Such buttons are mapped as BTN_MODE. Examples are the Nintendo
"HOME" button, the XBox "X"-button or Sony "PS" button. "HOME" button, the Xbox "X" button or the Sony PlayStation "PS" button.
- Rumble: - Rumble:

14
drivers/input/joystick/Kconfig
View File

@ -292,33 +292,33 @@ config JOYSTICK_JOYDUMP
module will be called joydump. module will be called joydump.
config JOYSTICK_XPAD config JOYSTICK_XPAD
tristate "X-Box gamepad support" tristate "Xbox gamepad support"
depends on USB_ARCH_HAS_HCD depends on USB_ARCH_HAS_HCD
select USB select USB
help help
Say Y here if you want to use the X-Box pad with your computer. Say Y here if you want to use Xbox pads with your computer.
Make sure to say Y to "Joystick support" (CONFIG_INPUT_JOYDEV) Make sure to say Y to "Joystick support" (CONFIG_INPUT_JOYDEV)
and/or "Event interface support" (CONFIG_INPUT_EVDEV) as well. and/or "Event interface support" (CONFIG_INPUT_EVDEV) as well.
For information about how to connect the X-Box pad to USB, see For information about how to connect the Xbox pad to USB, see
<file:Documentation/input/devices/xpad.rst>. <file:Documentation/input/devices/xpad.rst>.
To compile this driver as a module, choose M here: the To compile this driver as a module, choose M here: the
module will be called xpad. module will be called xpad.
config JOYSTICK_XPAD_FF config JOYSTICK_XPAD_FF
bool "X-Box gamepad rumble support" bool "Xbox gamepad rumble support"
depends on JOYSTICK_XPAD && INPUT depends on JOYSTICK_XPAD && INPUT
select INPUT_FF_MEMLESS select INPUT_FF_MEMLESS
help help
Say Y here if you want to take advantage of xbox 360 rumble features. Say Y here if you want to take advantage of Xbox 360 rumble features.
config JOYSTICK_XPAD_LEDS config JOYSTICK_XPAD_LEDS
bool "LED Support for Xbox360 controller 'BigX' LED" bool "LED Support for the Xbox 360 controller Guide button"
depends on JOYSTICK_XPAD && (LEDS_CLASS=y || LEDS_CLASS=JOYSTICK_XPAD) depends on JOYSTICK_XPAD && (LEDS_CLASS=y || LEDS_CLASS=JOYSTICK_XPAD)
help help
This option enables support for the LED which surrounds the Big X on This option enables support for the LED which surrounds the Big X on
XBox 360 controller. Xbox 360 controllers.
config JOYSTICK_WALKERA0701 config JOYSTICK_WALKERA0701
tristate "Walkera WK-0701 RC transmitter" tristate "Walkera WK-0701 RC transmitter"

64
drivers/input/joystick/xpad.c
View File

@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-2.0-or-later // SPDX-License-Identifier: GPL-2.0-or-later
/* /*
* X-Box gamepad driver * Xbox gamepad driver
* *
* Copyright (c) 2002 Marko Friedemann <mfr@bmx-chemnitz.de> * Copyright (c) 2002 Marko Friedemann <mfr@bmx-chemnitz.de>
* 2004 Oliver Schwartz <Oliver.Schwartz@gmx.de>, * 2004 Oliver Schwartz <Oliver.Schwartz@gmx.de>,
@ -23,8 +23,8 @@
* - ITO Takayuki for providing essential xpad information on his website * - ITO Takayuki for providing essential xpad information on his website
* - Vojtech Pavlik - iforce driver / input subsystem * - Vojtech Pavlik - iforce driver / input subsystem
* - Greg Kroah-Hartman - usb-skeleton driver * - Greg Kroah-Hartman - usb-skeleton driver
* - XBOX Linux project - extra USB id's * - Xbox Linux project - extra USB IDs
* - Pekka Pöyry (quantus) - Xbox One controller reverse engineering * - Pekka Pöyry (quantus) - Xbox One controller reverse-engineering
* *
* TODO: * TODO:
* - fine tune axes (especially trigger axes) * - fine tune axes (especially trigger axes)
@ -52,7 +52,7 @@
* 2002-07-17 - 0.0.5 : simplified d-pad handling * 2002-07-17 - 0.0.5 : simplified d-pad handling
* *
* 2004-10-02 - 0.0.6 : DDR pad support * 2004-10-02 - 0.0.6 : DDR pad support
* - borrowed from the XBOX linux kernel * - borrowed from the Xbox Linux kernel
* - USB id's for commonly used dance pads are present * - USB id's for commonly used dance pads are present
* - dance pads will map D-PAD to buttons, not axes * - dance pads will map D-PAD to buttons, not axes
* - pass the module paramater 'dpad_to_buttons' to force * - pass the module paramater 'dpad_to_buttons' to force
@ -455,49 +455,49 @@ static const signed short xpad_btn_paddles[] = {
{ XPAD_XBOXONE_VENDOR_PROTOCOL((vend), 208) } { XPAD_XBOXONE_VENDOR_PROTOCOL((vend), 208) }
static const struct usb_device_id xpad_table[] = { static const struct usb_device_id xpad_table[] = {
{ USB_INTERFACE_INFO('X', 'B', 0) }, /* X-Box USB-IF not approved class */ { USB_INTERFACE_INFO('X', 'B', 0) }, /* Xbox USB-IF not-approved class */
XPAD_XBOX360_VENDOR(0x0079), /* GPD Win 2 Controller */ XPAD_XBOX360_VENDOR(0x0079), /* GPD Win 2 controller */
XPAD_XBOX360_VENDOR(0x03eb), /* Wooting Keyboards (Legacy) */ XPAD_XBOX360_VENDOR(0x03eb), /* Wooting Keyboards (Legacy) */
XPAD_XBOX360_VENDOR(0x044f), /* Thrustmaster X-Box 360 controllers */ XPAD_XBOX360_VENDOR(0x044f), /* Thrustmaster Xbox 360 controllers */
XPAD_XBOX360_VENDOR(0x045e), /* Microsoft X-Box 360 controllers */ XPAD_XBOX360_VENDOR(0x045e), /* Microsoft Xbox 360 controllers */
XPAD_XBOXONE_VENDOR(0x045e), /* Microsoft X-Box One controllers */ XPAD_XBOXONE_VENDOR(0x045e), /* Microsoft Xbox One controllers */
XPAD_XBOX360_VENDOR(0x046d), /* Logitech X-Box 360 style controllers */ XPAD_XBOX360_VENDOR(0x046d), /* Logitech Xbox 360-style controllers */
XPAD_XBOX360_VENDOR(0x056e), /* Elecom JC-U3613M */ XPAD_XBOX360_VENDOR(0x056e), /* Elecom JC-U3613M */
XPAD_XBOX360_VENDOR(0x06a3), /* Saitek P3600 */ XPAD_XBOX360_VENDOR(0x06a3), /* Saitek P3600 */
XPAD_XBOX360_VENDOR(0x0738), /* Mad Catz X-Box 360 controllers */ XPAD_XBOX360_VENDOR(0x0738), /* Mad Catz Xbox 360 controllers */
{ USB_DEVICE(0x0738, 0x4540) }, /* Mad Catz Beat Pad */ { USB_DEVICE(0x0738, 0x4540) }, /* Mad Catz Beat Pad */
XPAD_XBOXONE_VENDOR(0x0738), /* Mad Catz FightStick TE 2 */ XPAD_XBOXONE_VENDOR(0x0738), /* Mad Catz FightStick TE 2 */
XPAD_XBOX360_VENDOR(0x07ff), /* Mad Catz GamePad */ XPAD_XBOX360_VENDOR(0x07ff), /* Mad Catz Gamepad */
XPAD_XBOX360_VENDOR(0x0c12), /* Zeroplus X-Box 360 controllers */ XPAD_XBOX360_VENDOR(0x0c12), /* Zeroplus X-Box 360 controllers */
XPAD_XBOX360_VENDOR(0x0e6f), /* 0x0e6f X-Box 360 controllers */ XPAD_XBOX360_VENDOR(0x0e6f), /* 0x0e6f Xbox 360 controllers */
XPAD_XBOXONE_VENDOR(0x0e6f), /* 0x0e6f X-Box One controllers */ XPAD_XBOXONE_VENDOR(0x0e6f), /* 0x0e6f Xbox One controllers */
XPAD_XBOX360_VENDOR(0x0f0d), /* Hori Controllers */ XPAD_XBOX360_VENDOR(0x0f0d), /* Hori controllers */
XPAD_XBOXONE_VENDOR(0x0f0d), /* Hori Controllers */ XPAD_XBOXONE_VENDOR(0x0f0d), /* Hori controllers */
XPAD_XBOX360_VENDOR(0x1038), /* SteelSeries Controllers */ XPAD_XBOX360_VENDOR(0x1038), /* SteelSeries controllers */
XPAD_XBOXONE_VENDOR(0x10f5), /* Turtle Beach Controllers */ XPAD_XBOXONE_VENDOR(0x10f5), /* Turtle Beach Controllers */
XPAD_XBOX360_VENDOR(0x11c9), /* Nacon GC100XF */ XPAD_XBOX360_VENDOR(0x11c9), /* Nacon GC100XF */
XPAD_XBOX360_VENDOR(0x1209), /* Ardwiino Controllers */ XPAD_XBOX360_VENDOR(0x1209), /* Ardwiino Controllers */
XPAD_XBOX360_VENDOR(0x12ab), /* X-Box 360 dance pads */ XPAD_XBOX360_VENDOR(0x12ab), /* Xbox 360 dance pads */
XPAD_XBOX360_VENDOR(0x1430), /* RedOctane X-Box 360 controllers */ XPAD_XBOX360_VENDOR(0x1430), /* RedOctane Xbox 360 controllers */
XPAD_XBOX360_VENDOR(0x146b), /* BigBen Interactive Controllers */ XPAD_XBOX360_VENDOR(0x146b), /* Bigben Interactive controllers */
XPAD_XBOX360_VENDOR(0x1532), /* Razer Sabertooth */ XPAD_XBOX360_VENDOR(0x1532), /* Razer Sabertooth */
XPAD_XBOXONE_VENDOR(0x1532), /* Razer Wildcat */ XPAD_XBOXONE_VENDOR(0x1532), /* Razer Wildcat */
XPAD_XBOX360_VENDOR(0x15e4), /* Numark X-Box 360 controllers */ XPAD_XBOX360_VENDOR(0x15e4), /* Numark Xbox 360 controllers */
XPAD_XBOX360_VENDOR(0x162e), /* Joytech X-Box 360 controllers */ XPAD_XBOX360_VENDOR(0x162e), /* Joytech Xbox 360 controllers */
XPAD_XBOX360_VENDOR(0x1689), /* Razer Onza */ XPAD_XBOX360_VENDOR(0x1689), /* Razer Onza */
XPAD_XBOX360_VENDOR(0x1949), /* Amazon controllers */ XPAD_XBOX360_VENDOR(0x1949), /* Amazon controllers */
XPAD_XBOX360_VENDOR(0x1bad), /* Harminix Rock Band Guitar and Drums */ XPAD_XBOX360_VENDOR(0x1bad), /* Harmonix Rock Band guitar and drums */
XPAD_XBOX360_VENDOR(0x20d6), /* PowerA Controllers */ XPAD_XBOX360_VENDOR(0x20d6), /* PowerA controllers */
XPAD_XBOXONE_VENDOR(0x20d6), /* PowerA Controllers */ XPAD_XBOXONE_VENDOR(0x20d6), /* PowerA controllers */
XPAD_XBOX360_VENDOR(0x24c6), /* PowerA Controllers */ XPAD_XBOX360_VENDOR(0x24c6), /* PowerA controllers */
XPAD_XBOXONE_VENDOR(0x24c6), /* PowerA Controllers */ XPAD_XBOXONE_VENDOR(0x24c6), /* PowerA controllers */
XPAD_XBOX360_VENDOR(0x2563), /* OneXPlayer Gamepad */ XPAD_XBOX360_VENDOR(0x2563), /* OneXPlayer Gamepad */
XPAD_XBOX360_VENDOR(0x260d), /* Dareu H101 */ XPAD_XBOX360_VENDOR(0x260d), /* Dareu H101 */
XPAD_XBOX360_VENDOR(0x2c22), /* Qanba Controllers */ XPAD_XBOX360_VENDOR(0x2c22), /* Qanba Controllers */
XPAD_XBOX360_VENDOR(0x2dc8), /* 8BitDo Pro 2 Wired Controller */ XPAD_XBOX360_VENDOR(0x2dc8), /* 8BitDo Pro 2 Wired Controller */
XPAD_XBOXONE_VENDOR(0x2dc8), /* 8BitDo Pro 2 Wired Controller for Xbox */ XPAD_XBOXONE_VENDOR(0x2dc8), /* 8BitDo Pro 2 Wired Controller for Xbox */
XPAD_XBOXONE_VENDOR(0x2e24), /* Hyperkin Duke X-Box One pad */ XPAD_XBOXONE_VENDOR(0x2e24), /* Hyperkin Duke Xbox One pad */
XPAD_XBOX360_VENDOR(0x2f24), /* GameSir Controllers */ XPAD_XBOX360_VENDOR(0x2f24), /* GameSir controllers */
XPAD_XBOX360_VENDOR(0x31e3), /* Wooting Keyboards */ XPAD_XBOX360_VENDOR(0x31e3), /* Wooting Keyboards */
XPAD_XBOX360_VENDOR(0x3285), /* Nacon GC-100 */ XPAD_XBOX360_VENDOR(0x3285), /* Nacon GC-100 */
{ } { }
@ -725,7 +725,7 @@ static void xpad360w_poweroff_controller(struct usb_xpad *xpad);
* Completes a request by converting the data into events for the * Completes a request by converting the data into events for the
* input subsystem. * input subsystem.
* *
* The used report descriptor was taken from ITO Takayukis website: * The used report descriptor was taken from ITO Takayuki's website:
* http://euc.jp/periphs/xbox-controller.ja.html * http://euc.jp/periphs/xbox-controller.ja.html
*/ */
static void xpad_process_packet(struct usb_xpad *xpad, u16 cmd, unsigned char *data) static void xpad_process_packet(struct usb_xpad *xpad, u16 cmd, unsigned char *data)
@ -1569,7 +1569,7 @@ struct xpad_led {
}; };
/* /*
* set the LEDs on Xbox360 / Wireless Controllers * set the LEDs on Xbox 360 / Wireless Controllers
* @param command * @param command
* 0: off * 0: off
* 1: all blink, then previous setting * 1: all blink, then previous setting
@ -2229,5 +2229,5 @@ static struct usb_driver xpad_driver = {
module_usb_driver(xpad_driver); module_usb_driver(xpad_driver);
MODULE_AUTHOR("Marko Friedemann <mfr@bmx-chemnitz.de>"); MODULE_AUTHOR("Marko Friedemann <mfr@bmx-chemnitz.de>");
MODULE_DESCRIPTION("X-Box pad driver"); MODULE_DESCRIPTION("Xbox pad driver");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");