ALSA: oxfw: Split control functionality to a new file

This is a help for works in followed patches.

Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

4 files changed, 287 insertions, 277 deletions

diff --git a/sound/firewire/oxfw/Makefile b/sound/firewire/oxfw/Makefile
index 7fb4d09a5f07..0cf48fd87688 100644
--- a/sound/firewire/oxfw/Makefile
+++ b/sound/firewire/oxfw/Makefile
@@ -1,2 +1,2 @@
-snd-oxfw-objs := oxfw-stream.o oxfw-pcm.o oxfw.o
+snd-oxfw-objs := oxfw-stream.o oxfw-control.o oxfw-pcm.o oxfw.o
 obj-m += snd-oxfw.o
diff --git a/sound/firewire/oxfw/oxfw-control.c b/sound/firewire/oxfw/oxfw-control.c
new file mode 100644
index 000000000000..02a1cb90f20d
--- /dev/null
+++ b/sound/firewire/oxfw/oxfw-control.c
@@ -0,0 +1,283 @@
+/*
+ * oxfw_stream.c - a part of driver for OXFW970/971 based devices
+ *
+ * Copyright (c) Clemens Ladisch <clemens@ladisch.de>
+ * Licensed under the terms of the GNU General Public License, version 2.
+ */
+
+#include "oxfw.h"
+
+enum control_action { CTL_READ, CTL_WRITE };
+enum control_attribute {
+        CTL_MIN         = 0x02,
+        CTL_MAX         = 0x03,
+        CTL_CURRENT     = 0x10,
+};
+
+static int oxfw_mute_command(struct snd_oxfw *oxfw, bool *value,
+                             enum control_action action)
+{
+        u8 *buf;
+        u8 response_ok;
+        int err;
+
+        buf = kmalloc(11, GFP_KERNEL);
+        if (!buf)
+                return -ENOMEM;
+
+        if (action == CTL_READ) {
+                buf[0] = 0x01;          /* AV/C, STATUS */
+                response_ok = 0x0c;     /*       STABLE */
+        } else {
+                buf[0] = 0x00;          /* AV/C, CONTROL */
+                response_ok = 0x09;     /*       ACCEPTED */
+        }
+        buf[1] = 0x08;                  /* audio unit 0 */
+        buf[2] = 0xb8;                  /* FUNCTION BLOCK */
+        buf[3] = 0x81;                  /* function block type: feature */
+        buf[4] = oxfw->device_info->mute_fb_id; /* function block ID */
+        buf[5] = 0x10;                  /* control attribute: current */
+        buf[6] = 0x02;                  /* selector length */
+        buf[7] = 0x00;                  /* audio channel number */
+        buf[8] = 0x01;                  /* control selector: mute */
+        buf[9] = 0x01;                  /* control data length */
+        if (action == CTL_READ)
+                buf[10] = 0xff;
+        else
+                buf[10] = *value ? 0x70 : 0x60;
+
+        err = fcp_avc_transaction(oxfw->unit, buf, 11, buf, 11, 0x3fe);
+        if (err < 0)
+                goto error;
+        if (err < 11) {
+                dev_err(&oxfw->unit->device, "short FCP response\n");
+                err = -EIO;
+                goto error;
+        }
+        if (buf[0] != response_ok) {
+                dev_err(&oxfw->unit->device, "mute command failed\n");
+                err = -EIO;
+                goto error;
+        }
+        if (action == CTL_READ)
+                *value = buf[10] == 0x70;
+
+        err = 0;
+
+error:
+        kfree(buf);
+
+        return err;
+}
+
+static int oxfw_volume_command(struct snd_oxfw *oxfw, s16 *value,
+                               unsigned int channel,
+                               enum control_attribute attribute,
+                               enum control_action action)
+{
+        u8 *buf;
+        u8 response_ok;
+        int err;
+
+        buf = kmalloc(12, GFP_KERNEL);
+        if (!buf)
+                return -ENOMEM;
+
+        if (action == CTL_READ) {
+                buf[0] = 0x01;          /* AV/C, STATUS */
+                response_ok = 0x0c;     /*       STABLE */
+        } else {
+                buf[0] = 0x00;          /* AV/C, CONTROL */
+                response_ok = 0x09;     /*       ACCEPTED */
+        }
+        buf[1] = 0x08;                  /* audio unit 0 */
+        buf[2] = 0xb8;                  /* FUNCTION BLOCK */
+        buf[3] = 0x81;                  /* function block type: feature */
+        buf[4] = oxfw->device_info->volume_fb_id; /* function block ID */
+        buf[5] = attribute;             /* control attribute */
+        buf[6] = 0x02;                  /* selector length */
+        buf[7] = channel;               /* audio channel number */
+        buf[8] = 0x02;                  /* control selector: volume */
+        buf[9] = 0x02;                  /* control data length */
+        if (action == CTL_READ) {
+                buf[10] = 0xff;
+                buf[11] = 0xff;
+        } else {
+                buf[10] = *value >> 8;
+                buf[11] = *value;
+        }
+
+        err = fcp_avc_transaction(oxfw->unit, buf, 12, buf, 12, 0x3fe);
+        if (err < 0)
+                goto error;
+        if (err < 12) {
+                dev_err(&oxfw->unit->device, "short FCP response\n");
+                err = -EIO;
+                goto error;
+        }
+        if (buf[0] != response_ok) {
+                dev_err(&oxfw->unit->device, "volume command failed\n");
+                err = -EIO;
+                goto error;
+        }
+        if (action == CTL_READ)
+                *value = (buf[10] << 8) | buf[11];
+
+        err = 0;
+
+error:
+        kfree(buf);
+
+        return err;
+}
+
+static int oxfw_mute_get(struct snd_kcontrol *control,
+                         struct snd_ctl_elem_value *value)
+{
+        struct snd_oxfw *oxfw = control->private_data;
+
+        value->value.integer.value[0] = !oxfw->mute;
+
+        return 0;
+}
+
+static int oxfw_mute_put(struct snd_kcontrol *control,
+                         struct snd_ctl_elem_value *value)
+{
+        struct snd_oxfw *oxfw = control->private_data;
+        bool mute;
+        int err;
+
+        mute = !value->value.integer.value[0];
+
+        if (mute == oxfw->mute)
+                return 0;
+
+        err = oxfw_mute_command(oxfw, &mute, CTL_WRITE);
+        if (err < 0)
+                return err;
+        oxfw->mute = mute;
+
+        return 1;
+}
+
+static int oxfw_volume_info(struct snd_kcontrol *control,
+                            struct snd_ctl_elem_info *info)
+{
+        struct snd_oxfw *oxfw = control->private_data;
+
+        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;
+
+        return 0;
+}
+
+static const u8 channel_map[6] = { 0, 1, 4, 5, 2, 3 };
+
+static int oxfw_volume_get(struct snd_kcontrol *control,
+                           struct snd_ctl_elem_value *value)
+{
+        struct snd_oxfw *oxfw = control->private_data;
+        unsigned int i;
+
+        for (i = 0; i < oxfw->device_info->mixer_channels; ++i)
+                value->value.integer.value[channel_map[i]] = oxfw->volume[i];
+
+        return 0;
+}
+
+static int oxfw_volume_put(struct snd_kcontrol *control,
+                           struct snd_ctl_elem_value *value)
+{
+        struct snd_oxfw *oxfw = control->private_data;
+        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)
+                        return -EINVAL;
+                if (value->value.integer.value[i] !=
+                    value->value.integer.value[0])
+                        equal_values = false;
+        }
+
+        changed_channels = 0;
+        for (i = 0; i < oxfw->device_info->mixer_channels; ++i)
+                if (value->value.integer.value[channel_map[i]] !=
+                                                        oxfw->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) {
+                volume = value->value.integer.value[channel_map[i ? i - 1 : 0]];
+                if (changed_channels & (1 << i)) {
+                        err = oxfw_volume_command(oxfw, &volume, i,
+                                                   CTL_CURRENT, CTL_WRITE);
+                        if (err < 0)
+                                return err;
+                }
+                if (i > 0)
+                        oxfw->volume[i - 1] = volume;
+        }
+
+        return changed_channels != 0;
+}
+
+int snd_oxfw_create_mixer(struct snd_oxfw *oxfw)
+{
+        static const struct snd_kcontrol_new controls[] = {
+                {
+                        .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+                        .name = "PCM Playback Switch",
+                        .info = snd_ctl_boolean_mono_info,
+                        .get = oxfw_mute_get,
+                        .put = oxfw_mute_put,
+                },
+                {
+                        .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+                        .name = "PCM Playback Volume",
+                        .info = oxfw_volume_info,
+                        .get = oxfw_volume_get,
+                        .put = oxfw_volume_put,
+                },
+        };
+        unsigned int i, first_ch;
+        int err;
+
+        err = oxfw_volume_command(oxfw, &oxfw->volume_min,
+                                   0, CTL_MIN, CTL_READ);
+        if (err < 0)
+                return err;
+        err = oxfw_volume_command(oxfw, &oxfw->volume_max,
+                                   0, CTL_MAX, CTL_READ);
+        if (err < 0)
+                return err;
+
+        err = oxfw_mute_command(oxfw, &oxfw->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 = oxfw_volume_command(oxfw, &oxfw->volume[i],
+                                           first_ch + i, CTL_CURRENT, CTL_READ);
+                if (err < 0)
+                        return err;
+        }
+
+        for (i = 0; i < ARRAY_SIZE(controls); ++i) {
+                err = snd_ctl_add(oxfw->card,
+                                  snd_ctl_new1(&controls[i], oxfw));
+                if (err < 0)
+                        return err;
+        }
+
+        return 0;
+}
diff --git a/sound/firewire/oxfw/oxfw.c b/sound/firewire/oxfw/oxfw.c
index 24bb6dff23cc..951d9a4e2102 100644
--- a/sound/firewire/oxfw/oxfw.c
+++ b/sound/firewire/oxfw/oxfw.c
@@ -25,281 +25,6 @@ MODULE_AUTHOR("Clemens Ladisch <clemens@ladisch.de>");
 MODULE_LICENSE("GPL v2");
 MODULE_ALIAS("snd-firewire-speakers");
 
-enum control_action { CTL_READ, CTL_WRITE };
-enum control_attribute {
-        CTL_MIN         = 0x02,
-        CTL_MAX         = 0x03,
-        CTL_CURRENT     = 0x10,
-};
-
-static int oxfw_mute_command(struct snd_oxfw *oxfw, bool *value,
-                              enum control_action action)
-{
-        u8 *buf;
-        u8 response_ok;
-        int err;
-
-        buf = kmalloc(11, GFP_KERNEL);
-        if (!buf)
-                return -ENOMEM;
-
-        if (action == CTL_READ) {
-                buf[0] = 0x01;          /* AV/C, STATUS */
-                response_ok = 0x0c;     /*       STABLE */
-        } else {
-                buf[0] = 0x00;          /* AV/C, CONTROL */
-                response_ok = 0x09;     /*       ACCEPTED */
-        }
-        buf[1] = 0x08;                  /* audio unit 0 */
-        buf[2] = 0xb8;                  /* FUNCTION BLOCK */
-        buf[3] = 0x81;                  /* function block type: feature */
-        buf[4] = oxfw->device_info->mute_fb_id; /* function block ID */
-        buf[5] = 0x10;                  /* control attribute: current */
-        buf[6] = 0x02;                  /* selector length */
-        buf[7] = 0x00;                  /* audio channel number */
-        buf[8] = 0x01;                  /* control selector: mute */
-        buf[9] = 0x01;                  /* control data length */
-        if (action == CTL_READ)
-                buf[10] = 0xff;
-        else
-                buf[10] = *value ? 0x70 : 0x60;
-
-        err = fcp_avc_transaction(oxfw->unit, buf, 11, buf, 11, 0x3fe);
-        if (err < 0)
-                goto error;
-        if (err < 11) {
-                dev_err(&oxfw->unit->device, "short FCP response\n");
-                err = -EIO;
-                goto error;
-        }
-        if (buf[0] != response_ok) {
-                dev_err(&oxfw->unit->device, "mute command failed\n");
-                err = -EIO;
-                goto error;
-        }
-        if (action == CTL_READ)
-                *value = buf[10] == 0x70;
-
-        err = 0;
-
-error:
-        kfree(buf);
-
-        return err;
-}
-
-static int oxfw_volume_command(struct snd_oxfw *oxfw, s16 *value,
-                                unsigned int channel,
-                                enum control_attribute attribute,
-                                enum control_action action)
-{
-        u8 *buf;
-        u8 response_ok;
-        int err;
-
-        buf = kmalloc(12, GFP_KERNEL);
-        if (!buf)
-                return -ENOMEM;
-
-        if (action == CTL_READ) {
-                buf[0] = 0x01;          /* AV/C, STATUS */
-                response_ok = 0x0c;     /*       STABLE */
-        } else {
-                buf[0] = 0x00;          /* AV/C, CONTROL */
-                response_ok = 0x09;     /*       ACCEPTED */
-        }
-        buf[1] = 0x08;                  /* audio unit 0 */
-        buf[2] = 0xb8;                  /* FUNCTION BLOCK */
-        buf[3] = 0x81;                  /* function block type: feature */
-        buf[4] = oxfw->device_info->volume_fb_id; /* function block ID */
-        buf[5] = attribute;             /* control attribute */
-        buf[6] = 0x02;                  /* selector length */
-        buf[7] = channel;               /* audio channel number */
-        buf[8] = 0x02;                  /* control selector: volume */
-        buf[9] = 0x02;                  /* control data length */
-        if (action == CTL_READ) {
-                buf[10] = 0xff;
-                buf[11] = 0xff;
-        } else {
-                buf[10] = *value >> 8;
-                buf[11] = *value;
-        }
-
-        err = fcp_avc_transaction(oxfw->unit, buf, 12, buf, 12, 0x3fe);
-        if (err < 0)
-                goto error;
-        if (err < 12) {
-                dev_err(&oxfw->unit->device, "short FCP response\n");
-                err = -EIO;
-                goto error;
-        }
-        if (buf[0] != response_ok) {
-                dev_err(&oxfw->unit->device, "volume command failed\n");
-                err = -EIO;
-                goto error;
-        }
-        if (action == CTL_READ)
-                *value = (buf[10] << 8) | buf[11];
-
-        err = 0;
-
-error:
-        kfree(buf);
-
-        return err;
-}
-
-static int oxfw_mute_get(struct snd_kcontrol *control,
-                          struct snd_ctl_elem_value *value)
-{
-        struct snd_oxfw *oxfw = control->private_data;
-
-        value->value.integer.value[0] = !oxfw->mute;
-
-        return 0;
-}
-
-static int oxfw_mute_put(struct snd_kcontrol *control,
-                          struct snd_ctl_elem_value *value)
-{
-        struct snd_oxfw *oxfw = control->private_data;
-        bool mute;
-        int err;
-
-        mute = !value->value.integer.value[0];
-
-        if (mute == oxfw->mute)
-                return 0;
-
-        err = oxfw_mute_command(oxfw, &mute, CTL_WRITE);
-        if (err < 0)
-                return err;
-        oxfw->mute = mute;
-
-        return 1;
-}
-
-static int oxfw_volume_info(struct snd_kcontrol *control,
-                             struct snd_ctl_elem_info *info)
-{
-        struct snd_oxfw *oxfw = control->private_data;
-
-        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;
-
-        return 0;
-}
-
-static const u8 channel_map[6] = { 0, 1, 4, 5, 2, 3 };
-
-static int oxfw_volume_get(struct snd_kcontrol *control,
-                            struct snd_ctl_elem_value *value)
-{
-        struct snd_oxfw *oxfw = control->private_data;
-        unsigned int i;
-
-        for (i = 0; i < oxfw->device_info->mixer_channels; ++i)
-                value->value.integer.value[channel_map[i]] = oxfw->volume[i];
-
-        return 0;
-}
-
-static int oxfw_volume_put(struct snd_kcontrol *control,
-                          struct snd_ctl_elem_value *value)
-{
-        struct snd_oxfw *oxfw = control->private_data;
-        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)
-                        return -EINVAL;
-                if (value->value.integer.value[i] !=
-                    value->value.integer.value[0])
-                        equal_values = false;
-        }
-
-        changed_channels = 0;
-        for (i = 0; i < oxfw->device_info->mixer_channels; ++i)
-                if (value->value.integer.value[channel_map[i]] !=
-                                                        oxfw->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) {
-                volume = value->value.integer.value[channel_map[i ? i - 1 : 0]];
-                if (changed_channels & (1 << i)) {
-                        err = oxfw_volume_command(oxfw, &volume, i,
-                                                   CTL_CURRENT, CTL_WRITE);
-                        if (err < 0)
-                                return err;
-                }
-                if (i > 0)
-                        oxfw->volume[i - 1] = volume;
-        }
-
-        return changed_channels != 0;
-}
-
-static int oxfw_create_mixer(struct snd_oxfw *oxfw)
-{
-        static const struct snd_kcontrol_new controls[] = {
-                {
-                        .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
-                        .name = "PCM Playback Switch",
-                        .info = snd_ctl_boolean_mono_info,
-                        .get = oxfw_mute_get,
-                        .put = oxfw_mute_put,
-                },
-                {
-                        .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
-                        .name = "PCM Playback Volume",
-                        .info = oxfw_volume_info,
-                        .get = oxfw_volume_get,
-                        .put = oxfw_volume_put,
-                },
-        };
-        unsigned int i, first_ch;
-        int err;
-
-        err = oxfw_volume_command(oxfw, &oxfw->volume_min,
-                                   0, CTL_MIN, CTL_READ);
-        if (err < 0)
-                return err;
-        err = oxfw_volume_command(oxfw, &oxfw->volume_max,
-                                   0, CTL_MAX, CTL_READ);
-        if (err < 0)
-                return err;
-
-        err = oxfw_mute_command(oxfw, &oxfw->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 = oxfw_volume_command(oxfw, &oxfw->volume[i],
-                                           first_ch + i, CTL_CURRENT, CTL_READ);
-                if (err < 0)
-                        return err;
-        }
-
-        for (i = 0; i < ARRAY_SIZE(controls); ++i) {
-                err = snd_ctl_add(oxfw->card,
-                                  snd_ctl_new1(&controls[i], oxfw));
-                if (err < 0)
-                        return err;
-        }
-
-        return 0;
-}
-
 static u32 oxfw_read_firmware_version(struct fw_unit *unit)
 {
         __be32 data;
@@ -353,7 +78,7 @@ static int oxfw_probe(struct fw_unit *unit,
         if (err < 0)
                 goto error;
 
-        err = oxfw_create_mixer(oxfw);
+        err = snd_oxfw_create_mixer(oxfw);
         if (err < 0)
                 goto error;
 
diff --git a/sound/firewire/oxfw/oxfw.h b/sound/firewire/oxfw/oxfw.h
index 1196db8a6300..6164bf3e1f5a 100644
--- a/sound/firewire/oxfw/oxfw.h
+++ b/sound/firewire/oxfw/oxfw.h
@@ -58,3 +58,5 @@ void snd_oxfw_stream_update_simplex(struct snd_oxfw *oxfw);
 int firewave_constraints(struct snd_pcm_runtime *runtime);
 int lacie_speakers_constraints(struct snd_pcm_runtime *runtime);
 int snd_oxfw_create_pcm(struct snd_oxfw *oxfw);
+
+int snd_oxfw_create_mixer(struct snd_oxfw *oxfw);