ALSA: oxfw: Add support for Behringer/Mackie devices

Some devices produced by Behringer/Mackie are based on OXFW970/971. This
commit adds support for them. Additionally, this commit changes the way to
name card with some information in config rom.

Ids of some Mackie(Loud) models are not identified, therefore this commit
applies name detection for these models.

The devices support capture/playback of PCM-samples and some of them
supports capture/playback of MIDI messages. These functionalities are
implemented by followed commits.

Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Acked-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --git a/sound/firewire/Kconfig b/sound/firewire/Kconfig
index 093286087bb0e65eed8c91168a33a4942f8efe13..6364e5b90a0005715c55e27ce878a6877fdc112e 100644 (file)
--- a/sound/firewire/Kconfig
+++ b/sound/firewire/Kconfig
@@ -31,6 +31,12 @@ config SND_OXFW
          Oxford Semiconductor FW970/971 chipset.
           * Griffin Firewave
           * LaCie Firewire Speakers
+          * Behringer F-Control Audio 202
+          * Mackie(Loud) Onyx-i series (former models)
+          * Mackie(Loud) Onyx Satellite
+          * Mackie(Loud) Tapco Link.Firewire
+          * Mackie(Loud) d.2 pro/d.4 pro
+          * Mackie(Loud) U.420/U.420d
 
          To compile this driver as a module, choose M here: the module
          will be called snd-oxfw.

diff --git a/sound/firewire/oxfw/oxfw.c b/sound/firewire/oxfw/oxfw.c
index a70149ab511b257defb31a962df7a2ecea40147a..797af33c7bcbac0b0df9ba4465825a76ad635eaf 100644 (file)
--- a/sound/firewire/oxfw/oxfw.c
+++ b/sound/firewire/oxfw/oxfw.c
@@ -14,7 +14,9 @@
 #define OXFORD_HARDWARE_ID_OXFW970     0x39443841
 #define OXFORD_HARDWARE_ID_OXFW971     0x39373100
 
+#define VENDOR_LOUD            0x000ff2
 #define VENDOR_GRIFFIN         0x001292
+#define VENDOR_BEHRINGER       0x001564
 #define VENDOR_LACIE           0x00d04b
 
 #define SPECIFIER_1394TA       0x00a02d
@@ -25,22 +27,69 @@ MODULE_AUTHOR("Clemens Ladisch <clemens@ladisch.de>");
 MODULE_LICENSE("GPL v2");
 MODULE_ALIAS("snd-firewire-speakers");
 
+static bool detect_loud_models(struct fw_unit *unit)
+{
+       const char *const models[] = {
+               "Onyxi",
+               "Onyx-i",
+               "d.Pro",
+               "Mackie Onyx Satellite",
+               "Tapco LINK.firewire 4x6",
+               "U.420"};
+       char model[32];
+       unsigned int i;
+       int err;
+
+       err = fw_csr_string(unit->directory, CSR_MODEL,
+                           model, sizeof(model));
+       if (err < 0)
+               return err;
+
+       for (i = 0; i < ARRAY_SIZE(models); i++) {
+               if (strcmp(models[i], model) == 0)
+                       break;
+       }
+
+       return (i < ARRAY_SIZE(models));
+}
+
 static int name_card(struct snd_oxfw *oxfw)
 {
        struct fw_device *fw_dev = fw_parent_device(oxfw->unit);
+       char vendor[24];
+       char model[32];
        const char *d, *v, *m;
        u32 firmware;
        int err;
 
+       /* get vendor name from root directory */
+       err = fw_csr_string(fw_dev->config_rom + 5, CSR_VENDOR,
+                           vendor, sizeof(vendor));
+       if (err < 0)
+               goto end;
+
+       /* get model name from unit directory */
+       err = fw_csr_string(oxfw->unit->directory, CSR_MODEL,
+                           model, sizeof(model));
+       if (err < 0)
+               goto end;
+
        err = snd_fw_transaction(oxfw->unit, TCODE_READ_QUADLET_REQUEST,
                                 OXFORD_FIRMWARE_ID_ADDRESS, &firmware, 4, 0);
        if (err < 0)
                goto end;
        be32_to_cpus(&firmware);
 
-       d = oxfw->device_info->driver_name;
-       v = oxfw->device_info->vendor_name;
-       m = oxfw->device_info->model_name;
+       /* to apply card definitions */
+       if (oxfw->device_info) {
+               d = oxfw->device_info->driver_name;
+               v = oxfw->device_info->vendor_name;
+               m = oxfw->device_info->model_name;
+       } else {
+               d = "OXFW";
+               v = vendor;
+               m = model;
+       }
 
        strcpy(oxfw->card->driver, d);
        strcpy(oxfw->card->mixername, m);
@@ -73,6 +122,9 @@ static int oxfw_probe(struct fw_unit *unit,
        struct snd_oxfw *oxfw;
        int err;
 
+       if ((id->vendor_id == VENDOR_LOUD) && !detect_loud_models(unit))
+               return -ENODEV;
+
        err = snd_card_new(&unit->device, -1, NULL, THIS_MODULE,
                           sizeof(*oxfw), &card);
        if (err < 0)
@@ -97,9 +149,11 @@ static int oxfw_probe(struct fw_unit *unit,
        if (err < 0)
                goto error;
 
-       err = snd_oxfw_create_mixer(oxfw);
-       if (err < 0)
-               goto error;
+       if (oxfw->device_info) {
+               err = snd_oxfw_create_mixer(oxfw);
+               if (err < 0)
+                       goto error;
+       }
 
        snd_oxfw_proc_init(oxfw);
 
@@ -183,6 +237,31 @@ static const struct ieee1394_device_id oxfw_id_table[] = {
                .version      = VERSION_AVC,
                .driver_data  = (kernel_ulong_t)&lacie_speakers,
        },
+       /* Behringer,F-Control Audio 202 */
+       {
+               .match_flags    = IEEE1394_MATCH_VENDOR_ID |
+                                 IEEE1394_MATCH_MODEL_ID,
+               .vendor_id      = VENDOR_BEHRINGER,
+               .model_id       = 0x00fc22,
+       },
+       /*
+        * Any Mackie(Loud) models (name string/model id):
+        *  Onyx-i series (former models):      0x081216
+        *  Mackie Onyx Satellite:              0x00200f
+        *  Tapco LINK.firewire 4x6:            0x000460
+        *  d.2 pro:                            Unknown
+        *  d.4 pro:                            Unknown
+        *  U.420:                              Unknown
+        *  U.420d:                             Unknown
+        */
+       {
+               .match_flags    = IEEE1394_MATCH_VENDOR_ID |
+                                 IEEE1394_MATCH_SPECIFIER_ID |
+                                 IEEE1394_MATCH_VERSION,
+               .vendor_id      = VENDOR_LOUD,
+               .specifier_id   = SPECIFIER_1394TA,
+               .version        = VERSION_AVC,
+       },
        { }
 };
 MODULE_DEVICE_TABLE(ieee1394, oxfw_id_table);