ALSA: oxfw: add explicit device entry for Loud Technologies Mackie Onyx Sattelite
authorTakashi Sakamoto <o-takashi@sakamocchi.jp>
Tue, 18 May 2021 08:45:52 +0000 (17:45 +0900)
committerTakashi Iwai <tiwai@suse.de>
Tue, 18 May 2021 10:23:00 +0000 (12:23 +0200)
Loud Technologies Mackie Onyx Satellite is identified as the model with
OXFW970 ASIC.

This commit adds explicit entry for the model.

Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Link: https://lore.kernel.org/r/20210518084557.102681-7-o-takashi@sakamocchi.jp
Signed-off-by: Takashi Iwai <tiwai@suse.de>
sound/firewire/oxfw/oxfw.c

index 998f0da6fd5b47c66eee1c0e06b89ba7e79070d8..e851149c52807faac8f4693fb083fbaa6d355c06 100644 (file)
@@ -46,7 +46,6 @@ static bool detect_loud_models(struct fw_unit *unit)
                "Onyx-i",
                "Onyx 1640i",
                "d.Pro",
-               "Mackie Onyx Satellite",
                "U.420"};
        char model[32];
        int err;
@@ -339,15 +338,14 @@ static const struct ieee1394_device_id oxfw_id_table[] = {
        OXFW_DEV_ENTRY(VENDOR_BEHRINGER, 0x00fc22, NULL),
        // Loud Technologies, Tapco Link.FireWire 4x6.
        OXFW_DEV_ENTRY(VENDOR_LOUD, 0x000460, NULL),
-       /*
-        * Any Mackie(Loud) models (name string/model id):
-        *  Onyx-i series (former models):      0x081216
-        *  Onyx 1640i:                         0x001640
-        *  Mackie Onyx Satellite:              0x00200f
-        *  d.2 pro/d.4 pro (built-in card):    Unknown
-        *  U.420:                              Unknown
-        *  U.420d:                             Unknown
-        */
+       // Loud Technologies, Mackie Onyx Satellite.
+       OXFW_DEV_ENTRY(VENDOR_LOUD, MODEL_SATELLITE, NULL),
+       // Any Mackie(Loud) models (name string/model id):
+       //  Onyx-i series (former models):      0x081216
+       //  Onyx 1640i:                         0x001640
+       //  d.2 pro/d.4 pro (built-in card):    Unknown
+       //  U.420:                              Unknown
+       //  U.420d:                             Unknown
        {
                .match_flags    = IEEE1394_MATCH_VENDOR_ID |
                                  IEEE1394_MATCH_SPECIFIER_ID |