Commit eab8e4e4 authored by Takashi Sakamoto's avatar Takashi Sakamoto Committed by Takashi Iwai

ALSA: oxfw: change function prototype for AV/C Audio Subunit command

ALSA OXFW driver uses AV/C Audio Subunit commands to control some models.
The commands get/set the state of Feature function block of the subunit.
The commands are not specific to OXFW, thus there's a possibility to use
them in the other drivers.

Currently, helper functions for the commands require 'struct snd_oxfw',
although, it's not necessarily required. It's better to change prototype
of the functions without the structure for future use.

This commit changes the prototype.
Signed-off-by: default avatarTakashi Sakamoto <o-takashi@sakamocchi.jp>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 29aa09ac
...@@ -14,7 +14,7 @@ enum control_attribute { ...@@ -14,7 +14,7 @@ enum control_attribute {
CTL_CURRENT = 0x10, CTL_CURRENT = 0x10,
}; };
static int spkr_mute_command(struct snd_oxfw *oxfw, bool *value, static int avc_audio_feature_mute(struct fw_unit *unit, u8 fb_id, bool *value,
enum control_action action) enum control_action action)
{ {
u8 *buf; u8 *buf;
...@@ -35,7 +35,7 @@ static int spkr_mute_command(struct snd_oxfw *oxfw, bool *value, ...@@ -35,7 +35,7 @@ static int spkr_mute_command(struct snd_oxfw *oxfw, bool *value,
buf[1] = 0x08; /* audio unit 0 */ buf[1] = 0x08; /* audio unit 0 */
buf[2] = 0xb8; /* FUNCTION BLOCK */ buf[2] = 0xb8; /* FUNCTION BLOCK */
buf[3] = 0x81; /* function block type: feature */ buf[3] = 0x81; /* function block type: feature */
buf[4] = oxfw->device_info->mute_fb_id; /* function block ID */ buf[4] = fb_id; /* function block ID */
buf[5] = 0x10; /* control attribute: current */ buf[5] = 0x10; /* control attribute: current */
buf[6] = 0x02; /* selector length */ buf[6] = 0x02; /* selector length */
buf[7] = 0x00; /* audio channel number */ buf[7] = 0x00; /* audio channel number */
...@@ -46,16 +46,16 @@ static int spkr_mute_command(struct snd_oxfw *oxfw, bool *value, ...@@ -46,16 +46,16 @@ static int spkr_mute_command(struct snd_oxfw *oxfw, bool *value,
else else
buf[10] = *value ? 0x70 : 0x60; buf[10] = *value ? 0x70 : 0x60;
err = fcp_avc_transaction(oxfw->unit, buf, 11, buf, 11, 0x3fe); err = fcp_avc_transaction(unit, buf, 11, buf, 11, 0x3fe);
if (err < 0) if (err < 0)
goto error; goto error;
if (err < 11) { if (err < 11) {
dev_err(&oxfw->unit->device, "short FCP response\n"); dev_err(&unit->device, "short FCP response\n");
err = -EIO; err = -EIO;
goto error; goto error;
} }
if (buf[0] != response_ok) { if (buf[0] != response_ok) {
dev_err(&oxfw->unit->device, "mute command failed\n"); dev_err(&unit->device, "mute command failed\n");
err = -EIO; err = -EIO;
goto error; goto error;
} }
...@@ -70,7 +70,7 @@ static int spkr_mute_command(struct snd_oxfw *oxfw, bool *value, ...@@ -70,7 +70,7 @@ static int spkr_mute_command(struct snd_oxfw *oxfw, bool *value,
return err; return err;
} }
static int spkr_volume_command(struct snd_oxfw *oxfw, s16 *value, static int avc_audio_feature_volume(struct fw_unit *unit, u8 fb_id, s16 *value,
unsigned int channel, unsigned int channel,
enum control_attribute attribute, enum control_attribute attribute,
enum control_action action) enum control_action action)
...@@ -93,7 +93,7 @@ static int spkr_volume_command(struct snd_oxfw *oxfw, s16 *value, ...@@ -93,7 +93,7 @@ static int spkr_volume_command(struct snd_oxfw *oxfw, s16 *value,
buf[1] = 0x08; /* audio unit 0 */ buf[1] = 0x08; /* audio unit 0 */
buf[2] = 0xb8; /* FUNCTION BLOCK */ buf[2] = 0xb8; /* FUNCTION BLOCK */
buf[3] = 0x81; /* function block type: feature */ buf[3] = 0x81; /* function block type: feature */
buf[4] = oxfw->device_info->volume_fb_id; /* function block ID */ buf[4] = fb_id; /* function block ID */
buf[5] = attribute; /* control attribute */ buf[5] = attribute; /* control attribute */
buf[6] = 0x02; /* selector length */ buf[6] = 0x02; /* selector length */
buf[7] = channel; /* audio channel number */ buf[7] = channel; /* audio channel number */
...@@ -107,16 +107,16 @@ static int spkr_volume_command(struct snd_oxfw *oxfw, s16 *value, ...@@ -107,16 +107,16 @@ static int spkr_volume_command(struct snd_oxfw *oxfw, s16 *value,
buf[11] = *value; buf[11] = *value;
} }
err = fcp_avc_transaction(oxfw->unit, buf, 12, buf, 12, 0x3fe); err = fcp_avc_transaction(unit, buf, 12, buf, 12, 0x3fe);
if (err < 0) if (err < 0)
goto error; goto error;
if (err < 12) { if (err < 12) {
dev_err(&oxfw->unit->device, "short FCP response\n"); dev_err(&unit->device, "short FCP response\n");
err = -EIO; err = -EIO;
goto error; goto error;
} }
if (buf[0] != response_ok) { if (buf[0] != response_ok) {
dev_err(&oxfw->unit->device, "volume command failed\n"); dev_err(&unit->device, "volume command failed\n");
err = -EIO; err = -EIO;
goto error; goto error;
} }
...@@ -153,7 +153,8 @@ static int spkr_mute_put(struct snd_kcontrol *control, ...@@ -153,7 +153,8 @@ static int spkr_mute_put(struct snd_kcontrol *control,
if (mute == oxfw->mute) if (mute == oxfw->mute)
return 0; return 0;
err = spkr_mute_command(oxfw, &mute, CTL_WRITE); err = avc_audio_feature_mute(oxfw->unit, oxfw->device_info->mute_fb_id,
&mute, CTL_WRITE);
if (err < 0) if (err < 0)
return err; return err;
oxfw->mute = mute; oxfw->mute = mute;
...@@ -218,8 +219,10 @@ static int spkr_volume_put(struct snd_kcontrol *control, ...@@ -218,8 +219,10 @@ static int spkr_volume_put(struct snd_kcontrol *control,
for (i = 0; i <= oxfw->device_info->mixer_channels; ++i) { for (i = 0; i <= oxfw->device_info->mixer_channels; ++i) {
volume = value->value.integer.value[channel_map[i ? i - 1 : 0]]; volume = value->value.integer.value[channel_map[i ? i - 1 : 0]];
if (changed_channels & (1 << i)) { if (changed_channels & (1 << i)) {
err = spkr_volume_command(oxfw, &volume, i, err = avc_audio_feature_volume(oxfw->unit,
CTL_CURRENT, CTL_WRITE); oxfw->device_info->mute_fb_id,
&volume,
i, CTL_CURRENT, CTL_WRITE);
if (err < 0) if (err < 0)
return err; return err;
} }
...@@ -251,22 +254,27 @@ int snd_oxfw_add_spkr(struct snd_oxfw *oxfw) ...@@ -251,22 +254,27 @@ int snd_oxfw_add_spkr(struct snd_oxfw *oxfw)
unsigned int i, first_ch; unsigned int i, first_ch;
int err; int err;
err = spkr_volume_command(oxfw, &oxfw->volume_min, err = avc_audio_feature_volume(oxfw->unit,
0, CTL_MIN, CTL_READ); oxfw->device_info->volume_fb_id,
&oxfw->volume_min, 0, CTL_MIN, CTL_READ);
if (err < 0) if (err < 0)
return err; return err;
err = spkr_volume_command(oxfw, &oxfw->volume_max, err = avc_audio_feature_volume(oxfw->unit,
0, CTL_MAX, CTL_READ); oxfw->device_info->volume_fb_id,
&oxfw->volume_max, 0, CTL_MAX, CTL_READ);
if (err < 0) if (err < 0)
return err; return err;
err = spkr_mute_command(oxfw, &oxfw->mute, CTL_READ); err = avc_audio_feature_mute(oxfw->unit, oxfw->device_info->mute_fb_id,
&oxfw->mute, CTL_READ);
if (err < 0) if (err < 0)
return err; return err;
first_ch = oxfw->device_info->mixer_channels == 1 ? 0 : 1; first_ch = oxfw->device_info->mixer_channels == 1 ? 0 : 1;
for (i = 0; i < oxfw->device_info->mixer_channels; ++i) { for (i = 0; i < oxfw->device_info->mixer_channels; ++i) {
err = spkr_volume_command(oxfw, &oxfw->volume[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 + i, CTL_CURRENT, CTL_READ);
if (err < 0) if (err < 0)
return err; return err;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment