Skip to content

Commit 2b8f050

Browse files
takaswietiwai
authored andcommitted
ALSA: firewire-motu: refactoring protocol v2 for clock source getter
This commit splits the method to get clock source for protocol version 2 so that model-dependent operations are explicitly defined. Signed-off-by: Takashi Sakamoto <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Takashi Iwai <[email protected]>
1 parent 739bdba commit 2b8f050

File tree

1 file changed

+40
-8
lines changed

1 file changed

+40
-8
lines changed

sound/firewire/motu/motu-protocol-v2.c

Lines changed: 40 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -78,14 +78,10 @@ int snd_motu_protocol_v2_set_clock_rate(struct snd_motu *motu,
7878
sizeof(reg));
7979
}
8080

81-
static int get_clock_source(struct snd_motu *motu, u32 data,
82-
enum snd_motu_clock_source *src)
81+
static int detect_clock_source_optical_model(struct snd_motu *motu, u32 data,
82+
enum snd_motu_clock_source *src)
8383
{
84-
unsigned int index = data & V2_CLOCK_SRC_MASK;
85-
if (index > 5)
86-
return -EIO;
87-
88-
switch (index) {
84+
switch (data) {
8985
case 0:
9086
*src = SND_MOTU_CLOCK_SOURCE_INTERNAL;
9187
break;
@@ -118,12 +114,48 @@ static int get_clock_source(struct snd_motu *motu, u32 data,
118114
*src = SND_MOTU_CLOCK_SOURCE_ADAT_ON_DSUB;
119115
break;
120116
default:
121-
return -EIO;
117+
*src = SND_MOTU_CLOCK_SOURCE_UNKNOWN;
118+
break;
119+
}
120+
121+
return 0;
122+
}
123+
124+
static int v2_detect_clock_source(struct snd_motu *motu, u32 data,
125+
enum snd_motu_clock_source *src)
126+
{
127+
switch (data) {
128+
case 0:
129+
*src = SND_MOTU_CLOCK_SOURCE_INTERNAL;
130+
break;
131+
case 2:
132+
*src = SND_MOTU_CLOCK_SOURCE_SPDIF_ON_COAX;
133+
break;
134+
case 3:
135+
*src = SND_MOTU_CLOCK_SOURCE_SPH;
136+
break;
137+
case 4:
138+
*src = SND_MOTU_CLOCK_SOURCE_WORD_ON_BNC;
139+
break;
140+
default:
141+
*src = SND_MOTU_CLOCK_SOURCE_UNKNOWN;
142+
break;
122143
}
123144

124145
return 0;
125146
}
126147

148+
static int get_clock_source(struct snd_motu *motu, u32 data,
149+
enum snd_motu_clock_source *src)
150+
{
151+
data &= V2_CLOCK_SRC_MASK;
152+
if (motu->spec == &snd_motu_spec_828mk2 ||
153+
motu->spec == &snd_motu_spec_traveler)
154+
return detect_clock_source_optical_model(motu, data, src);
155+
else
156+
return v2_detect_clock_source(motu, data, src);
157+
}
158+
127159
int snd_motu_protocol_v2_get_clock_source(struct snd_motu *motu,
128160
enum snd_motu_clock_source *src)
129161
{

0 commit comments

Comments
 (0)