Commit 0edabdfe authored by Takashi Sakamoto's avatar Takashi Sakamoto Committed by Takashi Iwai

ALSA: bebob/oxfw: fix Kconfig entry for Mackie d.2 Pro

Mackie d.2 has an extension card for IEEE 1394 communication, which uses
BridgeCo DM1000 ASIC. On the other hand, Mackie d.4 Pro has built-in
function for IEEE 1394 communication by Oxford Semiconductor OXFW971,
according to schematic diagram available in Mackie website. Although I
misunderstood that Mackie d.2 Pro would be also a model with OXFW971,
it's wrong. Mackie d.2 Pro is a model which includes the extension card
as factory settings.

This commit fixes entries in Kconfig and comment in ALSA OXFW driver.

Cc: <stable@vger.kernel.org>
Fixes: fd6f4b0d ("ALSA: bebob: Add skelton for BeBoB based devices")
Fixes: ec4dba50 ("ALSA: oxfw: Add support for Behringer/Mackie devices")
Signed-off-by: default avatarTakashi Sakamoto <o-takashi@sakamocchi.jp>
Link: https://lore.kernel.org/r/20210513125652.110249-3-o-takashi@sakamocchi.jpSigned-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 1b660489
...@@ -38,7 +38,7 @@ config SND_OXFW ...@@ -38,7 +38,7 @@ config SND_OXFW
* Mackie(Loud) Onyx 1640i (former model) * Mackie(Loud) Onyx 1640i (former model)
* Mackie(Loud) Onyx Satellite * Mackie(Loud) Onyx Satellite
* Mackie(Loud) Tapco Link.Firewire * Mackie(Loud) Tapco Link.Firewire
* Mackie(Loud) d.2 pro/d.4 pro * Mackie(Loud) d.4 pro
* Mackie(Loud) U.420/U.420d * Mackie(Loud) U.420/U.420d
* TASCAM FireOne * TASCAM FireOne
* Stanton Controllers & Systems 1 Deck/Mixer * Stanton Controllers & Systems 1 Deck/Mixer
...@@ -84,7 +84,7 @@ config SND_BEBOB ...@@ -84,7 +84,7 @@ config SND_BEBOB
* PreSonus FIREBOX/FIREPOD/FP10/Inspire1394 * PreSonus FIREBOX/FIREPOD/FP10/Inspire1394
* BridgeCo RDAudio1/Audio5 * BridgeCo RDAudio1/Audio5
* Mackie Onyx 1220/1620/1640 (FireWire I/O Card) * Mackie Onyx 1220/1620/1640 (FireWire I/O Card)
* Mackie d.2 (FireWire Option) * Mackie d.2 (FireWire Option) and d.2 Pro
* Stanton FinalScratch 2 (ScratchAmp) * Stanton FinalScratch 2 (ScratchAmp)
* Tascam IF-FW/DM * Tascam IF-FW/DM
* Behringer XENIX UFX 1204/1604 * Behringer XENIX UFX 1204/1604
......
...@@ -387,7 +387,7 @@ static const struct ieee1394_device_id bebob_id_table[] = { ...@@ -387,7 +387,7 @@ static const struct ieee1394_device_id bebob_id_table[] = {
SND_BEBOB_DEV_ENTRY(VEN_BRIDGECO, 0x00010049, &spec_normal), SND_BEBOB_DEV_ENTRY(VEN_BRIDGECO, 0x00010049, &spec_normal),
/* Mackie, Onyx 1220/1620/1640 (Firewire I/O Card) */ /* Mackie, Onyx 1220/1620/1640 (Firewire I/O Card) */
SND_BEBOB_DEV_ENTRY(VEN_MACKIE2, 0x00010065, &spec_normal), SND_BEBOB_DEV_ENTRY(VEN_MACKIE2, 0x00010065, &spec_normal),
/* Mackie, d.2 (Firewire Option) */ // Mackie, d.2 (Firewire option card) and d.2 Pro (the card is built-in).
SND_BEBOB_DEV_ENTRY(VEN_MACKIE1, 0x00010067, &spec_normal), SND_BEBOB_DEV_ENTRY(VEN_MACKIE1, 0x00010067, &spec_normal),
/* Stanton, ScratchAmp */ /* Stanton, ScratchAmp */
SND_BEBOB_DEV_ENTRY(VEN_STANTON, 0x00000001, &spec_normal), SND_BEBOB_DEV_ENTRY(VEN_STANTON, 0x00000001, &spec_normal),
......
...@@ -355,7 +355,6 @@ static const struct ieee1394_device_id oxfw_id_table[] = { ...@@ -355,7 +355,6 @@ static const struct ieee1394_device_id oxfw_id_table[] = {
* Onyx-i series (former models): 0x081216 * Onyx-i series (former models): 0x081216
* Mackie Onyx Satellite: 0x00200f * Mackie Onyx Satellite: 0x00200f
* Tapco LINK.firewire 4x6: 0x000460 * Tapco LINK.firewire 4x6: 0x000460
* d.2 pro: Unknown
* d.4 pro: Unknown * d.4 pro: Unknown
* U.420: Unknown * U.420: Unknown
* U.420d: Unknown * U.420d: Unknown
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment