diff options
| author |   Takashi Sakamoto <o-takashi@sakamocchi.jp> | 2021-06-11 18:37:30 +0900 |
|---|---|---|
| committer |   Takashi Iwai <tiwai@suse.de> | 2021-06-12 09:33:35 +0200 |
| commit | 1586d461f641b60040438275e14c7dbcec5907d6 (patch) | |
| tree | aa7e8deb62be126bd3df66b0a399b7e2145db6e9 /sound/firewire | |
| parent | ALSA: bebob: code refactoring for M-Audio models (diff) | |
| download | linux-dev-1586d461f641b60040438275e14c7dbcec5907d6.tar.xz linux-dev-1586d461f641b60040438275e14c7dbcec5907d6.zip | |
ALSA: bebob: correct device entries for Phonic Helix Board and FireFly series
Phonic shipped Helix board and FireFly series with IEEE 1394
functionality. Regarding to the parameters in unit directory, these
series have two cases below:
1. the same parameters in unit directory
* Firefly 202
* Firefly 302
* Firefly 808 Universal
* HelixBoard 12 FireWire, 12 Universal
* HelixBoard 18 FireWire, 18 Universal
* HelixBoard 24 FireWire, 24 Universal
2. Unique parameters in unit directory
* FireFly 808
* HelixBoard 12 FireWire MkII
* HelixBoard 18 FireWire MkII
* HelixBoard 24 FireWire MkII
Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Link: https://lore.kernel.org/r/20210611093730.78254-7-o-takashi@sakamocchi.jp
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/firewire')
| -rw-r--r-- | sound/firewire/bebob/bebob.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/sound/firewire/bebob/bebob.c b/sound/firewire/bebob/bebob.c index 2fa312037f3c..7ca452efb133 100644 --- a/sound/firewire/bebob/bebob.c +++ b/sound/firewire/bebob/bebob.c @@ -406,13 +406,16 @@ static const struct ieee1394_device_id bebob_id_table[] = { SND_BEBOB_DEV_ENTRY(VEN_TERRATEC, 0x00000002, &spec_normal), /* CME, MatrixKFW */ SND_BEBOB_DEV_ENTRY(VEN_CME, 0x00030000, &spec_normal), - /* Phonic, Helix Board 12 MkII */ + // Phonic Helix Board 12 FireWire MkII. SND_BEBOB_DEV_ENTRY(VEN_PHONIC, 0x00050000, &spec_normal), - /* Phonic, Helix Board 18 MkII */ + // Phonic Helix Board 18 FireWire MkII. SND_BEBOB_DEV_ENTRY(VEN_PHONIC, 0x00060000, &spec_normal), - /* Phonic, Helix Board 24 MkII */ + // Phonic Helix Board 24 FireWire MkII. SND_BEBOB_DEV_ENTRY(VEN_PHONIC, 0x00070000, &spec_normal), - /* Phonic, Helix Board 12 Universal/18 Universal/24 Universal */ + // Phonic FireFly 808 FireWire. + SND_BEBOB_DEV_ENTRY(VEN_PHONIC, 0x00080000, &spec_normal), + // Phonic FireFly 202, 302, 808 Universal. + // Phinic Helix Board 12/18/24 FireWire, 12/18/24 Universal SND_BEBOB_DEV_ENTRY(VEN_PHONIC, 0x00000000, &spec_normal), /* Lynx, Aurora 8/16 (LT-FW) */ SND_BEBOB_DEV_ENTRY(VEN_LYNX, 0x00000001, &spec_normal), @@ -476,11 +479,6 @@ static const struct ieee1394_device_id bebob_id_table[] = { /* Infrasonic, Windy6 */ /* Mackie, Digital X Bus x.200 */ /* Mackie, Digital X Bus x.400 */ - /* Phonic, HB 12 */ - /* Phonic, HB 24 */ - /* Phonic, HB 18 */ - /* Phonic, FireFly 202 */ - /* Phonic, FireFly 302 */ /* Rolf Spuler, Firewire Guitar */ {} }; |