From f59c3c6d87d6f7e1593ca874b755265cf08f8714 Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Wed, 9 Nov 2016 17:04:22 +0100 Subject: [PATCH] ALSA: doc: ReSTize Joystick document A conversion from a simple text file. A new subdirectory, cards, was created to contain the card-specific information like this one. Signed-off-by: Takashi Iwai --- Documentation/sound/cards/index.rst | 7 ++ .../{alsa/Joystick.txt => cards/joystick.rst} | 71 ++++++++++--------- Documentation/sound/index.rst | 1 + 3 files changed, 46 insertions(+), 33 deletions(-) create mode 100644 Documentation/sound/cards/index.rst rename Documentation/sound/{alsa/Joystick.txt => cards/joystick.rst} (56%) diff --git a/Documentation/sound/cards/index.rst b/Documentation/sound/cards/index.rst new file mode 100644 index 000000000000..e1f4b78c75d6 --- /dev/null +++ b/Documentation/sound/cards/index.rst @@ -0,0 +1,7 @@ +Card-Specific Information +========================= + +.. toctree:: + :maxdepth: 2 + + joystick diff --git a/Documentation/sound/alsa/Joystick.txt b/Documentation/sound/cards/joystick.rst similarity index 56% rename from Documentation/sound/alsa/Joystick.txt rename to Documentation/sound/cards/joystick.rst index ccda41b10f8a..a6e468c81d02 100644 --- a/Documentation/sound/alsa/Joystick.txt +++ b/Documentation/sound/cards/joystick.rst @@ -1,7 +1,10 @@ +======================================= Analog Joystick Support on ALSA Drivers ======================================= - Oct. 14, 2003 - Takashi Iwai + +Oct. 14, 2003 + +Takashi Iwai General ------- @@ -34,44 +37,46 @@ stability and the resource management. The following PCI drivers support the joystick natively. - Driver Module Option Available Values - --------------------------------------------------------------------------- - als4000 joystick_port 0 = disable (default), 1 = auto-detect, - manual: any address (e.g. 0x200) - au88x0 N/A N/A - azf3328 joystick 0 = disable, 1 = enable, -1 = auto (default) - ens1370 joystick 0 = disable (default), 1 = enable - ens1371 joystick_port 0 = disable (default), 1 = auto-detect, - manual: 0x200, 0x208, 0x210, 0x218 - cmipci joystick_port 0 = disable (default), 1 = auto-detect, - manual: any address (e.g. 0x200) - cs4281 N/A N/A - cs46xx N/A N/A - es1938 N/A N/A - es1968 joystick 0 = disable (default), 1 = enable - sonicvibes N/A N/A - trident N/A N/A - via82xx(*1) joystick 0 = disable (default), 1 = enable - ymfpci joystick_port 0 = disable (default), 1 = auto-detect, - manual: 0x201, 0x202, 0x204, 0x205(*2) - --------------------------------------------------------------------------- - - *1) VIA686A/B only - *2) With YMF744/754 chips, the port address can be chosen arbitrarily +============== ============= ============================================ +Driver Module Option Available Values +============== ============= ============================================ +als4000 joystick_port 0 = disable (default), 1 = auto-detect, + manual: any address (e.g. 0x200) +au88x0 N/A N/A +azf3328 joystick 0 = disable, 1 = enable, -1 = auto (default) +ens1370 joystick 0 = disable (default), 1 = enable +ens1371 joystick_port 0 = disable (default), 1 = auto-detect, + manual: 0x200, 0x208, 0x210, 0x218 +cmipci joystick_port 0 = disable (default), 1 = auto-detect, + manual: any address (e.g. 0x200) +cs4281 N/A N/A +cs46xx N/A N/A +es1938 N/A N/A +es1968 joystick 0 = disable (default), 1 = enable +sonicvibes N/A N/A +trident N/A N/A +via82xx [#f1]_ joystick 0 = disable (default), 1 = enable +ymfpci joystick_port 0 = disable (default), 1 = auto-detect, + manual: 0x201, 0x202, 0x204, 0x205 [#f2]_ +============== ============= ============================================ + +.. [#f1] VIA686A/B only +.. [#f2] With YMF744/754 chips, the port address can be chosen arbitrarily The following drivers don't support gameport natively, but there are additional modules. Load the corresponding module to add the gameport support. - Driver Additional Module - ----------------------------- - emu10k1 emu10k1-gp - fm801 fm801-gp - ----------------------------- +======= ================= +Driver Additional Module +======= ================= +emu10k1 emu10k1-gp +fm801 fm801-gp +======= ================= Note: the "pcigame" and "cs461x" modules are for the OSS drivers only. - These ALSA drivers (cs46xx, trident and au88x0) have the - built-in gameport support. +These ALSA drivers (cs46xx, trident and au88x0) have the +built-in gameport support. As mentioned above, ALSA PCI drivers have the built-in gameport support, so you don't have to load ns558 module. Just load "joydev" diff --git a/Documentation/sound/index.rst b/Documentation/sound/index.rst index e9fbbfff9d0d..1f5d166f81c4 100644 --- a/Documentation/sound/index.rst +++ b/Documentation/sound/index.rst @@ -9,6 +9,7 @@ Linux Sound Subsystem Documentation designs/index alsa-configuration hd-audio/index + cards/index .. only:: subproject -- 2.20.1