Skip to content

Commit 0edabdf

Browse files
takaswietiwai
authored andcommitted
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: <[email protected]> Fixes: fd6f4b0 ("ALSA: bebob: Add skelton for BeBoB based devices") Fixes: ec4dba5 ("ALSA: oxfw: Add support for Behringer/Mackie devices") Signed-off-by: Takashi Sakamoto <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Takashi Iwai <[email protected]>
1 parent 1b66048 commit 0edabdf

File tree

3 files changed

+3
-4
lines changed

3 files changed

+3
-4
lines changed

sound/firewire/Kconfig

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ config SND_OXFW
3838
* Mackie(Loud) Onyx 1640i (former model)
3939
* Mackie(Loud) Onyx Satellite
4040
* Mackie(Loud) Tapco Link.Firewire
41-
* Mackie(Loud) d.2 pro/d.4 pro
41+
* Mackie(Loud) d.4 pro
4242
* Mackie(Loud) U.420/U.420d
4343
* TASCAM FireOne
4444
* Stanton Controllers & Systems 1 Deck/Mixer
@@ -84,7 +84,7 @@ config SND_BEBOB
8484
* PreSonus FIREBOX/FIREPOD/FP10/Inspire1394
8585
* BridgeCo RDAudio1/Audio5
8686
* Mackie Onyx 1220/1620/1640 (FireWire I/O Card)
87-
* Mackie d.2 (FireWire Option)
87+
* Mackie d.2 (FireWire Option) and d.2 Pro
8888
* Stanton FinalScratch 2 (ScratchAmp)
8989
* Tascam IF-FW/DM
9090
* Behringer XENIX UFX 1204/1604

sound/firewire/bebob/bebob.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -387,7 +387,7 @@ static const struct ieee1394_device_id bebob_id_table[] = {
387387
SND_BEBOB_DEV_ENTRY(VEN_BRIDGECO, 0x00010049, &spec_normal),
388388
/* Mackie, Onyx 1220/1620/1640 (Firewire I/O Card) */
389389
SND_BEBOB_DEV_ENTRY(VEN_MACKIE2, 0x00010065, &spec_normal),
390-
/* Mackie, d.2 (Firewire Option) */
390+
// Mackie, d.2 (Firewire option card) and d.2 Pro (the card is built-in).
391391
SND_BEBOB_DEV_ENTRY(VEN_MACKIE1, 0x00010067, &spec_normal),
392392
/* Stanton, ScratchAmp */
393393
SND_BEBOB_DEV_ENTRY(VEN_STANTON, 0x00000001, &spec_normal),

sound/firewire/oxfw/oxfw.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -355,7 +355,6 @@ static const struct ieee1394_device_id oxfw_id_table[] = {
355355
* Onyx-i series (former models): 0x081216
356356
* Mackie Onyx Satellite: 0x00200f
357357
* Tapco LINK.firewire 4x6: 0x000460
358-
* d.2 pro: Unknown
359358
* d.4 pro: Unknown
360359
* U.420: Unknown
361360
* U.420d: Unknown

0 commit comments

Comments
 (0)