diff options
Diffstat (limited to 'sound/firewire/bebob/bebob_proc.c')
-rw-r--r-- | sound/firewire/bebob/bebob_proc.c | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/sound/firewire/bebob/bebob_proc.c b/sound/firewire/bebob/bebob_proc.c index 335da64506e0..301cc6a93945 100644 --- a/sound/firewire/bebob/bebob_proc.c +++ b/sound/firewire/bebob/bebob_proc.c | |||
@@ -132,25 +132,27 @@ static void | |||
132 | proc_read_clock(struct snd_info_entry *entry, | 132 | proc_read_clock(struct snd_info_entry *entry, |
133 | struct snd_info_buffer *buffer) | 133 | struct snd_info_buffer *buffer) |
134 | { | 134 | { |
135 | static const char *const clk_labels[] = { | ||
136 | "Internal", | ||
137 | "External", | ||
138 | "SYT-Match", | ||
139 | }; | ||
135 | struct snd_bebob *bebob = entry->private_data; | 140 | struct snd_bebob *bebob = entry->private_data; |
136 | struct snd_bebob_rate_spec *rate_spec = bebob->spec->rate; | 141 | struct snd_bebob_rate_spec *rate_spec = bebob->spec->rate; |
137 | struct snd_bebob_clock_spec *clk_spec = bebob->spec->clock; | 142 | struct snd_bebob_clock_spec *clk_spec = bebob->spec->clock; |
138 | unsigned int rate, id; | 143 | enum snd_bebob_clock_type src; |
139 | bool internal; | 144 | unsigned int rate; |
140 | 145 | ||
141 | if (rate_spec->get(bebob, &rate) >= 0) | 146 | if (rate_spec->get(bebob, &rate) >= 0) |
142 | snd_iprintf(buffer, "Sampling rate: %d\n", rate); | 147 | snd_iprintf(buffer, "Sampling rate: %d\n", rate); |
143 | 148 | ||
144 | if (clk_spec) { | 149 | if (snd_bebob_stream_get_clock_src(bebob, &src) >= 0) { |
145 | if (clk_spec->get(bebob, &id) >= 0) | 150 | if (clk_spec) |
146 | snd_iprintf(buffer, "Clock Source: %s\n", | 151 | snd_iprintf(buffer, "Clock Source: %s\n", |
147 | clk_spec->labels[id]); | 152 | clk_labels[src]); |
148 | } else { | 153 | else |
149 | if (snd_bebob_stream_check_internal_clock(bebob, | ||
150 | &internal) >= 0) | ||
151 | snd_iprintf(buffer, "Clock Source: %s (MSU-dest: %d)\n", | 154 | snd_iprintf(buffer, "Clock Source: %s (MSU-dest: %d)\n", |
152 | (internal) ? "Internal" : "External", | 155 | clk_labels[src], bebob->sync_input_plug); |
153 | bebob->sync_input_plug); | ||
154 | } | 156 | } |
155 | } | 157 | } |
156 | 158 | ||