Commit 6ca81d2b authored by Takashi Sakamoto's avatar Takashi Sakamoto Committed by Takashi Iwai

ALSA: firewire-motu: parse messages for output parameters in register DSP model

This commit parses message and cache current parameters of output
function, commonly available for all of register DSP model.
Signed-off-by: default avatarTakashi Sakamoto <o-takashi@sakamocchi.jp>
Link: https://lore.kernel.org/r/20211015080826.34847-7-o-takashi@sakamocchi.jpSigned-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent ce69bed5
...@@ -160,6 +160,10 @@ struct snd_firewire_motu_register_dsp_meter { ...@@ -160,6 +160,10 @@ struct snd_firewire_motu_register_dsp_meter {
* Audio Express. * Audio Express.
* @mixer.output.paired_volume: The volume of paired output from mixer. * @mixer.output.paired_volume: The volume of paired output from mixer.
* @mixer.output.paired_flag: The flag of paired output from mixer. * @mixer.output.paired_flag: The flag of paired output from mixer.
* @output.main_paired_volume: The volume of paired main output.
* @output.hp_paired_volume: The volume of paired hp output.
* @output.hp_paired_assignment: The source assigned to paired hp output.
* @output.reserved: Padding for 32 bit alignment for future extension.
* *
* The structure expresses the set of parameters for DSP controlled by register access. * The structure expresses the set of parameters for DSP controlled by register access.
*/ */
...@@ -177,6 +181,12 @@ struct snd_firewire_motu_register_dsp_parameter { ...@@ -177,6 +181,12 @@ struct snd_firewire_motu_register_dsp_parameter {
__u8 paired_flag[SNDRV_FIREWIRE_MOTU_REGISTER_DSP_MIXER_COUNT]; __u8 paired_flag[SNDRV_FIREWIRE_MOTU_REGISTER_DSP_MIXER_COUNT];
} output; } output;
} mixer; } mixer;
struct {
__u8 main_paired_volume;
__u8 hp_paired_volume;
__u8 hp_paired_assignment;
__u8 reserved[5];
} output;
}; };
// In below MOTU models, software is allowed to control their DSP by command in frame of // In below MOTU models, software is allowed to control their DSP by command in frame of
......
...@@ -54,7 +54,7 @@ enum register_dsp_msg_type { ...@@ -54,7 +54,7 @@ enum register_dsp_msg_type {
MIXER_OUTPUT_PAIRED_FLAG = 0x06, MIXER_OUTPUT_PAIRED_FLAG = 0x06,
MAIN_OUTPUT_PAIRED_VOLUME = 0x07, MAIN_OUTPUT_PAIRED_VOLUME = 0x07,
HP_OUTPUT_PAIRED_VOLUME = 0x08, HP_OUTPUT_PAIRED_VOLUME = 0x08,
HP_OUTPUT_ASSIGN = 0x09, HP_OUTPUT_PAIRED_ASSIGNMENT = 0x09,
// Transferred by all models but the purpose is still unknown. // Transferred by all models but the purpose is still unknown.
UNKNOWN_0 = 0x0a, UNKNOWN_0 = 0x0a,
// Specific to 828mk2, 896hd, Traveler. // Specific to 828mk2, 896hd, Traveler.
...@@ -210,6 +210,15 @@ void snd_motu_register_dsp_message_parser_parse(struct snd_motu *motu, const str ...@@ -210,6 +210,15 @@ void snd_motu_register_dsp_message_parser_parse(struct snd_motu *motu, const str
} }
break; break;
} }
case MAIN_OUTPUT_PAIRED_VOLUME:
parser->param.output.main_paired_volume = val;
break;
case HP_OUTPUT_PAIRED_VOLUME:
parser->param.output.hp_paired_volume = val;
break;
case HP_OUTPUT_PAIRED_ASSIGNMENT:
parser->param.output.hp_paired_assignment = val;
break;
case METER: case METER:
{ {
u8 pos; u8 pos;
......
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