diff options
| author | Takashi Sakamoto <o-takashi@sakamocchi.jp> | 2015-10-04 09:17:03 +0900 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2015-10-04 17:21:34 +0200 |
| commit | 425a570e1bfaeadaf6558df1e14e1735d5a76c10 (patch) | |
| tree | 526aa7aa0c523c8658e855255e90c706f5004352 /sound/firewire/bebob | |
| parent | e5e0c3dd257bf34cf001e10422943f90437f0f1b (diff) | |
| download | linux-425a570e1bfaeadaf6558df1e14e1735d5a76c10.tar.bz2 | |
ALSA: bebob: support Firewire I/O card of Mackie Onyx 1220/1620/1640
Current ALSA BeBoB drivers has an entry for this model, while the value of
vendor ID seems to be wrong according to an user's report.
The vendor had released no updated firmware, thus we can judge that this
model had not changed the content of its config ROM. It's reasonable to fix
the ID according to the report.
$ ./linux-firewire-utils/src/crpp < /sys/bus/firewire/devices/fw1/config_rom
ROM header and bus information block
-----------------------------------------------------------------
400 0425720f bus_info_length 4, crc_length 37, crc 29199
404 31333934 bus_name "1394"
408 f0646122 irmc 1, cmc 1, isc 1, bmc 1, pmc 0, cyc_clk_acc 100,
max_rec 6 (128), max_rom 1, gen 2, spd 2 (S400)
40c 00000ff2 company_id 00000f |
410 00004697 device_id f200004697 | EUI-64 00000ff200004697
root directory
-----------------------------------------------------------------
414 000859be directory_length 8, crc 22974
418 04000082 hardware version
41c 0c0083c0 node capabilities per IEEE 1394
420 03000ff2 vendor
424 8100000a --> descriptor leaf at 44c
428 17010065 model
42c 8100000d --> descriptor leaf at 460
430 13000910 version
434 d1000001 --> unit directory at 438
unit directory at 438
-----------------------------------------------------------------
438 0004ccec directory_length 4, crc 52460
43c 1200a02d specifier id: 1394 TA
440 13010001 version: AV/C
444 17010065 model
448 8100000d --> descriptor leaf at 47c
descriptor leaf at 44c
-----------------------------------------------------------------
44c 0004152a leaf_length 4, crc 5418
450 00000000 textual descriptor
454 00000000 minimal ASCII
458 4d61636b "Mack"
45c 69650000 "ie"
descriptor leaf at 460
-----------------------------------------------------------------
460 000612b5 leaf_length 6, crc 4789
464 00000000 textual descriptor
468 00000000 minimal ASCII
46c 4f6e7978 "Onyx"
470 20466972 " Fir"
474 65776972 "ewir"
478 65000000 "e"
descriptor leaf at 47c
-----------------------------------------------------------------
47c 000612b5 leaf_length 6, crc 4789
480 00000000 textual descriptor
484 00000000 minimal ASCII
488 4f6e7978 "Onyx"
48c 20466972 " Fir"
490 65776972 "ewir"
494 65000000 "e"
$ cat /proc/asound/card3/firewire/firmware
Manufacturer: bridgeCo
Protocol Ver: 1
Build Ver: 0
GUID: 0x00000FF200004697
Model ID: 0x82
Model Rev: 1
Firmware Date: 20040430
Firmware Time: 131527
Firmware ID: 0x10065
Firmware Ver: 2320
Base Addr: 0x20080000
Max Size: 1572864
Loader Date: 20040430
Loader Time: 112036
Reported-by: Andrzej Gansiniec <andrzej@gansiniec.pl>
Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/firewire/bebob')
| -rw-r--r-- | sound/firewire/bebob/bebob.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sound/firewire/bebob/bebob.c b/sound/firewire/bebob/bebob.c index 27a04ac8ffee..0ed5e5ff9346 100644 --- a/sound/firewire/bebob/bebob.c +++ b/sound/firewire/bebob/bebob.c @@ -41,7 +41,8 @@ static DECLARE_BITMAP(devices_used, SNDRV_CARDS); #define VEN_EDIROL 0x000040ab #define VEN_PRESONUS 0x00000a92 #define VEN_BRIDGECO 0x000007f5 -#define VEN_MACKIE 0x0000000f +#define VEN_MACKIE1 0x0000000f +#define VEN_MACKIE2 0x00000ff2 #define VEN_STANTON 0x00001260 #define VEN_TASCAM 0x0000022e #define VEN_BEHRINGER 0x00001564 @@ -360,9 +361,9 @@ static const struct ieee1394_device_id bebob_id_table[] = { /* BridgeCo, Audio5 */ SND_BEBOB_DEV_ENTRY(VEN_BRIDGECO, 0x00010049, &spec_normal), /* Mackie, Onyx 1220/1620/1640 (Firewire I/O Card) */ - SND_BEBOB_DEV_ENTRY(VEN_MACKIE, 0x00010065, &spec_normal), + SND_BEBOB_DEV_ENTRY(VEN_MACKIE2, 0x00010065, &spec_normal), /* Mackie, d.2 (Firewire Option) */ - SND_BEBOB_DEV_ENTRY(VEN_MACKIE, 0x00010067, &spec_normal), + SND_BEBOB_DEV_ENTRY(VEN_MACKIE1, 0x00010067, &spec_normal), /* Stanton, ScratchAmp */ SND_BEBOB_DEV_ENTRY(VEN_STANTON, 0x00000001, &spec_normal), /* Tascam, IF-FW DM */ |