ALSA: bebob: add 'version' member for BeBoB protocol version

BeBoB installed devices have BeBoB register area. This area stores
basic information about its firmware. A register has its protocol
version.

This commit adds 'version' member and store the device's protocol
version to handle v3 quirks in following commits.

Tested-by: Kim Tore Jensen <kim@incendio.no>
Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --git a/sound/firewire/bebob/bebob.c b/sound/firewire/bebob/bebob.c
index e71bd353f4e7e9f4ca12f8002377fb5d0dd1ae02..920571bc3c60ca64f16ae7373bf744d6620401ed 100644 (file)
--- a/sound/firewire/bebob/bebob.c
+++ b/sound/firewire/bebob/bebob.c
@@ -33,6 +33,7 @@ static DEFINE_MUTEX(devices_mutex);
 static DECLARE_BITMAP(devices_used, SNDRV_CARDS);
 
 /* Offsets from information register. */
+#define INFO_OFFSET_BEBOB_VERSION      0x08
 #define INFO_OFFSET_GUID               0x10
 #define INFO_OFFSET_HW_MODEL_ID                0x18
 #define INFO_OFFSET_HW_MODEL_REVISION  0x1c
@@ -73,6 +74,7 @@ name_device(struct snd_bebob *bebob, unsigned int vendor_id)
        u32 hw_id;
        u32 data[2] = {0};
        u32 revision;
+       u32 version;
        int err;
 
        /* get vendor name from root directory */
@@ -105,6 +107,12 @@ name_device(struct snd_bebob *bebob, unsigned int vendor_id)
        if (err < 0)
                goto end;
 
+       err = snd_bebob_read_quad(bebob->unit, INFO_OFFSET_BEBOB_VERSION,
+                                 &version);
+       if (err < 0)
+               goto end;
+       bebob->version = version;
+
        strcpy(bebob->card->driver, "BeBoB");
        strcpy(bebob->card->shortname, model);
        strcpy(bebob->card->mixername, model);

diff --git a/sound/firewire/bebob/bebob.h b/sound/firewire/bebob/bebob.h
index 11362b30ee5bfc58931faf52cdb4b9d5a4c1fffc..1520854b76d7866deb98a6e1de371d42038b45fb 100644 (file)
--- a/sound/firewire/bebob/bebob.h
+++ b/sound/firewire/bebob/bebob.h
@@ -115,6 +115,9 @@ struct snd_bebob {
        /* for M-Audio special devices */
        void *maudio_special_quirk;
        bool deferred_registration;
+
+       /* For BeBoB version quirk. */
+       unsigned int version;
 };
 
 static inline int