aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorThibault LE MEUR <Thibault.LeMeur@supelec.fr>2006-03-21 05:06:40 -0500
committerJaroslav Kysela <perex@suse.cz>2006-03-22 04:40:10 -0500
commit19739fef0203d2f3eecc9c4b1ef25b57d85f2b30 (patch)
tree0c20e5f8ee03c0f4804175e5bc1299ad48c562f4 /Documentation
parent01a00e5e421b3c40240781d67bb9fd5fd9b1f0f1 (diff)
[ALSA] Fixes typos in Audiophile-USB.txt
Modules: Documentation Fixes typos in Audiophile-USB.txt. Signed-off-by: Thibault LE MEUR <Thibault.LeMeur@supelec.fr> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/sound/alsa/Audiophile-Usb.txt29
1 files changed, 16 insertions, 13 deletions
diff --git a/Documentation/sound/alsa/Audiophile-Usb.txt b/Documentation/sound/alsa/Audiophile-Usb.txt
index 3ba45adbf040..4692c8e77dc1 100644
--- a/Documentation/sound/alsa/Audiophile-Usb.txt
+++ b/Documentation/sound/alsa/Audiophile-Usb.txt
@@ -1,4 +1,4 @@
1 Guide to using M-Audio Audiophile USB with ALSA and Jack v1.1 1 Guide to using M-Audio Audiophile USB with ALSA and Jack v1.2
2 ======================================================== 2 ========================================================
3 3
4 Thibault Le Meur <Thibault.LeMeur@supelec.fr> 4 Thibault Le Meur <Thibault.LeMeur@supelec.fr>
@@ -13,6 +13,9 @@ of the device.
13 13
14The device has 4 audio interfaces, and 2 MIDI ports: 14The device has 4 audio interfaces, and 2 MIDI ports:
15 * Analog Stereo Input (Ai) 15 * Analog Stereo Input (Ai)
16 - This port supports 2 pairs of line-level audio inputs (1/4" TS and RCA)
17 - When the 1/4" TS (jack) connectors are connected, the RCA connectors
18 are disabled
16 * Analog Stereo Output (Ao) 19 * Analog Stereo Output (Ao)
17 * Digital Stereo Input (Di) 20 * Digital Stereo Input (Di)
18 * Digital Stereo Output (Do) 21 * Digital Stereo Output (Do)
@@ -42,7 +45,7 @@ Important facts about the Digital interface:
42though I haven't tested it under linux 45though I haven't tested it under linux
43 - Note that in this setup only the Do interface can be enabled 46 - Note that in this setup only the Do interface can be enabled
44 * Apart from recording an audio digital stream, enabling the Di port is a way 47 * Apart from recording an audio digital stream, enabling the Di port is a way
45to syncrhonize the device to an external sample clock 48to synchronize the device to an external sample clock
46 - As a consequence, the Di port must be enable only if an active Digital 49 - As a consequence, the Di port must be enable only if an active Digital
47source is connected 50source is connected
48 - Enabling Di when no digital source is connected can result in a 51 - Enabling Di when no digital source is connected can result in a
@@ -180,7 +183,7 @@ IMPORTANT NOTE WHEN SWITCHING CONFIGURATION:
180 or changing modprobe.conf) 183 or changing modprobe.conf)
181 - turn on the device 184 - turn on the device
182 185
1832.2.2.3 - Setting and switching configurations with the device_setup parameter 1862.2.2.3 - Audiophile USB's device_setup structure
184 187
185If you want to understand the device_setup magic numbers for the Audiophile 188If you want to understand the device_setup magic numbers for the Audiophile
186USB, you need some very basic understanding of binary computation. However, 189USB, you need some very basic understanding of binary computation. However,
@@ -226,7 +229,7 @@ Caution:
226 - choosing b2 will prepare all interfaces for 24bits/96kHz but you'll 229 - choosing b2 will prepare all interfaces for 24bits/96kHz but you'll
227 only be able to use one at the same time 230 only be able to use one at the same time
228 231
2292.2.3 - Technical Details for Audiophile Usb 2322.2.3 - USB implementation details for this device
230 233
231You may safely skip this section if you're not interrested in driver 234You may safely skip this section if you're not interrested in driver
232development. 235development.
@@ -234,20 +237,20 @@ development.
234This section describes some internals aspect of the device and summarize the 237This section describes some internals aspect of the device and summarize the
235data I got by usb-snooping the windows and linux drivers. 238data I got by usb-snooping the windows and linux drivers.
236 239
237The M-Audio Audiophile USB has 7 Usb Interfaces: 240The M-Audio Audiophile USB has 7 USB Interfaces:
238a "USB interface": 241a "USB interface":
239 * Usb Interface nb.0 242 * USB Interface nb.0
240 * Usb Interface nb.1 243 * USB Interface nb.1
241 - Audio Control function 244 - Audio Control function
242 * Usb Interface nb.2 245 * USB Interface nb.2
243 - Analog Output 246 - Analog Output
244 * Usb Interface nb.3 247 * USB Interface nb.3
245 - Digital Output 248 - Digital Output
246 * Usb Interface nb.4 249 * USB Interface nb.4
247 - Analog Input 250 - Analog Input
248 * Usb Interface nb.5 251 * USB Interface nb.5
249 - Digital Input 252 - Digital Input
250 * Usb Interface nb.6 253 * USB Interface nb.6
251 - MIDI interface compliant with the MIDIMAN quirk 254 - MIDI interface compliant with the MIDIMAN quirk
252 255
253Each interface has 5 altsettings (AltSet 1,2,3,4,5) except: 256Each interface has 5 altsettings (AltSet 1,2,3,4,5) except:
@@ -326,5 +329,5 @@ atid=425939
326 329
327After having applied the patch you can run jackd with the following command 330After having applied the patch you can run jackd with the following command
328line: 331line:
329# /usr/local/bin/jackd -R -dalsa -Phw:1,0 -r48000 -p128 -n2 -D -Chw:1,1 332 % jackd -R -dalsa -Phw:1,0 -r48000 -p128 -n2 -D -Chw:1,1
330 333