Merge tag 'xtensa-20161005' of git://github.com/jcmvbkbc/linux-xtensa

[cascardo/linux.git] / sound / firewire / oxfw / oxfw-spkr.c

diff --git a/sound/firewire/oxfw/oxfw-spkr.c b/sound/firewire/oxfw/oxfw-spkr.c
index d733a15..cb905af 100644 (file)
--- a/sound/firewire/oxfw/oxfw-spkr.c
+++ b/sound/firewire/oxfw/oxfw-spkr.c
@@ -7,6 +7,17 @@
 
 #include "oxfw.h"
 
+struct fw_spkr {
+       bool mute;
+       s16 volume[6];
+       s16 volume_min;
+       s16 volume_max;
+
+       unsigned int mixer_channels;
+       u8 mute_fb_id;
+       u8 volume_fb_id;
+};
+
 enum control_action { CTL_READ, CTL_WRITE };
 enum control_attribute {
        CTL_MIN         = 0x02,
@@ -135,8 +146,9 @@ static int spkr_mute_get(struct snd_kcontrol *control,
                         struct snd_ctl_elem_value *value)
 {
        struct snd_oxfw *oxfw = control->private_data;
+       struct fw_spkr *spkr = oxfw->spec;
 
-       value->value.integer.value[0] = !oxfw->mute;
+       value->value.integer.value[0] = !spkr->mute;
 
        return 0;
 }
@@ -145,19 +157,20 @@ static int spkr_mute_put(struct snd_kcontrol *control,
                         struct snd_ctl_elem_value *value)
 {
        struct snd_oxfw *oxfw = control->private_data;
+       struct fw_spkr *spkr = oxfw->spec;
        bool mute;
        int err;
 
        mute = !value->value.integer.value[0];
 
-       if (mute == oxfw->mute)
+       if (mute == spkr->mute)
                return 0;
 
-       err = avc_audio_feature_mute(oxfw->unit, oxfw->device_info->mute_fb_id,
-                                    &mute, CTL_WRITE);
+       err = avc_audio_feature_mute(oxfw->unit, spkr->mute_fb_id, &mute,
+                                    CTL_WRITE);
        if (err < 0)
                return err;
-       oxfw->mute = mute;
+       spkr->mute = mute;
 
        return 1;
 }
@@ -166,11 +179,12 @@ static int spkr_volume_info(struct snd_kcontrol *control,
                            struct snd_ctl_elem_info *info)
 {
        struct snd_oxfw *oxfw = control->private_data;
+       struct fw_spkr *spkr = oxfw->spec;
 
        info->type = SNDRV_CTL_ELEM_TYPE_INTEGER;
-       info->count = oxfw->device_info->mixer_channels;
-       info->value.integer.min = oxfw->volume_min;
-       info->value.integer.max = oxfw->volume_max;
+       info->count = spkr->mixer_channels;
+       info->value.integer.min = spkr->volume_min;
+       info->value.integer.max = spkr->volume_max;
 
        return 0;
 }
@@ -181,10 +195,11 @@ static int spkr_volume_get(struct snd_kcontrol *control,
                           struct snd_ctl_elem_value *value)
 {
        struct snd_oxfw *oxfw = control->private_data;
+       struct fw_spkr *spkr = oxfw->spec;
        unsigned int i;
 
-       for (i = 0; i < oxfw->device_info->mixer_channels; ++i)
-               value->value.integer.value[channel_map[i]] = oxfw->volume[i];
+       for (i = 0; i < spkr->mixer_channels; ++i)
+               value->value.integer.value[channel_map[i]] = spkr->volume[i];
 
        return 0;
 }
@@ -193,14 +208,15 @@ static int spkr_volume_put(struct snd_kcontrol *control,
                           struct snd_ctl_elem_value *value)
 {
        struct snd_oxfw *oxfw = control->private_data;
+       struct fw_spkr *spkr = oxfw->spec;
        unsigned int i, changed_channels;
        bool equal_values = true;
        s16 volume;
        int err;
 
-       for (i = 0; i < oxfw->device_info->mixer_channels; ++i) {
-               if (value->value.integer.value[i] < oxfw->volume_min ||
-                   value->value.integer.value[i] > oxfw->volume_max)
+       for (i = 0; i < spkr->mixer_channels; ++i) {
+               if (value->value.integer.value[i] < spkr->volume_min ||
+                   value->value.integer.value[i] > spkr->volume_max)
                        return -EINVAL;
                if (value->value.integer.value[i] !=
                    value->value.integer.value[0])
@@ -208,32 +224,31 @@ static int spkr_volume_put(struct snd_kcontrol *control,
        }
 
        changed_channels = 0;
-       for (i = 0; i < oxfw->device_info->mixer_channels; ++i)
+       for (i = 0; i < spkr->mixer_channels; ++i)
                if (value->value.integer.value[channel_map[i]] !=
-                                                       oxfw->volume[i])
+                                                       spkr->volume[i])
                        changed_channels |= 1 << (i + 1);
 
        if (equal_values && changed_channels != 0)
                changed_channels = 1 << 0;
 
-       for (i = 0; i <= oxfw->device_info->mixer_channels; ++i) {
+       for (i = 0; i <= spkr->mixer_channels; ++i) {
                volume = value->value.integer.value[channel_map[i ? i - 1 : 0]];
                if (changed_channels & (1 << i)) {
                        err = avc_audio_feature_volume(oxfw->unit,
-                                                 oxfw->device_info->mute_fb_id,
-                                                 &volume,
+                                                 spkr->volume_fb_id, &volume,
                                                  i, CTL_CURRENT, CTL_WRITE);
                        if (err < 0)
                                return err;
                }
                if (i > 0)
-                       oxfw->volume[i - 1] = volume;
+                       spkr->volume[i - 1] = volume;
        }
 
        return changed_channels != 0;
 }
 
-int snd_oxfw_add_spkr(struct snd_oxfw *oxfw)
+int snd_oxfw_add_spkr(struct snd_oxfw *oxfw, bool is_lacie)
 {
        static const struct snd_kcontrol_new controls[] = {
                {
@@ -251,31 +266,44 @@ int snd_oxfw_add_spkr(struct snd_oxfw *oxfw)
                        .put = spkr_volume_put,
                },
        };
+       struct fw_spkr *spkr;
        unsigned int i, first_ch;
        int err;
 
-       err = avc_audio_feature_volume(oxfw->unit,
-                                      oxfw->device_info->volume_fb_id,
-                                      &oxfw->volume_min, 0, CTL_MIN, CTL_READ);
+       spkr = kzalloc(sizeof(struct fw_spkr), GFP_KERNEL);
+       if (spkr == NULL)
+               return -ENOMEM;
+       oxfw->spec = spkr;
+
+       if (is_lacie) {
+               spkr->mixer_channels = 1;
+               spkr->mute_fb_id = 0x01;
+               spkr->volume_fb_id = 0x01;
+       } else {
+               spkr->mixer_channels = 6;
+               spkr->mute_fb_id = 0x01;
+               spkr->volume_fb_id = 0x02;
+       }
+
+       err = avc_audio_feature_volume(oxfw->unit, spkr->volume_fb_id,
+                                      &spkr->volume_min, 0, CTL_MIN, CTL_READ);
        if (err < 0)
                return err;
-       err = avc_audio_feature_volume(oxfw->unit,
-                                      oxfw->device_info->volume_fb_id,
-                                      &oxfw->volume_max, 0, CTL_MAX, CTL_READ);
+       err = avc_audio_feature_volume(oxfw->unit, spkr->volume_fb_id,
+                                      &spkr->volume_max, 0, CTL_MAX, CTL_READ);
        if (err < 0)
                return err;
 
-       err = avc_audio_feature_mute(oxfw->unit, oxfw->device_info->mute_fb_id,
-                                    &oxfw->mute, CTL_READ);
+       err = avc_audio_feature_mute(oxfw->unit, spkr->mute_fb_id, &spkr->mute,
+                                    CTL_READ);
        if (err < 0)
                return err;
 
-       first_ch = oxfw->device_info->mixer_channels == 1 ? 0 : 1;
-       for (i = 0; i < oxfw->device_info->mixer_channels; ++i) {
-               err = avc_audio_feature_volume(oxfw->unit,
-                                         oxfw->device_info->volume_fb_id,
-                                         &oxfw->volume[i],
-                                         first_ch + i, CTL_CURRENT, CTL_READ);
+       first_ch = spkr->mixer_channels == 1 ? 0 : 1;
+       for (i = 0; i < spkr->mixer_channels; ++i) {
+               err = avc_audio_feature_volume(oxfw->unit, spkr->volume_fb_id,
+                                              &spkr->volume[i], first_ch + i,
+                                              CTL_CURRENT, CTL_READ);
                if (err < 0)
                        return err;
        }