---

yaml --- r: 248120 b: refs/heads/master c: 1c5d7b3 h: refs/heads/master v: v3
git-mirror · May 3, 2011 · 376e0b8 · 376e0b8
1 parent 2edb792
commit 376e0b8
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d43f3010b8fa7530c3780c087fad9b0a8a437ba1
+refs/heads/master: 1c5d7b312f9d0e18e2051eac058257db3586f54d
diff --git a/trunk/sound/pci/lola/lola.h b/trunk/sound/pci/lola/lola.h
@@ -499,6 +499,7 @@ int lola_set_clock_index(struct lola *chip, unsigned int idx);
 int lola_set_clock(struct lola *chip, int idx);
 int lola_set_sample_rate(struct lola *chip, int rate);
 bool lola_update_ext_clock_freq(struct lola *chip, unsigned int val);
+unsigned int lola_sample_rate_convert(unsigned int coded);
 
 /* mixer */
 int lola_init_pins(struct lola *chip, int dir, int *nidp);

diff --git a/trunk/sound/pci/lola/lola_clock.c b/trunk/sound/pci/lola/lola_clock.c
@@ -24,7 +24,7 @@
 #include <sound/pcm.h>
 #include "lola.h"
 
-static unsigned int sample_rate_convert(unsigned int coded)
+unsigned int lola_sample_rate_convert(unsigned int coded)
 {
 	unsigned int freq;
 
@@ -172,7 +172,7 @@ int __devinit lola_init_clock_widget(struct lola *chip, int nid)
 			int format = LOLA_CLOCK_FORMAT_NONE;
 			bool add_clock = true;
 			if (type == LOLA_CLOCK_TYPE_INTERNAL) {
-				freq = sample_rate_convert(freq);
+				freq = lola_sample_rate_convert(freq);
 				if (freq < chip->sample_rate_min)
 					add_clock = false;
 				else if (freq == 48000) {
@@ -181,7 +181,7 @@ int __devinit lola_init_clock_widget(struct lola *chip, int nid)
 					chip->clock.cur_valid = true;
 				}
 			} else if (type == LOLA_CLOCK_TYPE_VIDEO) {
-				freq = sample_rate_convert(freq);
+				freq = lola_sample_rate_convert(freq);
 				if (freq < chip->sample_rate_min)
 					add_clock = false;
 				/* video clock has a format (0:NTSC, 1:PAL)*/
@@ -263,7 +263,7 @@ bool lola_update_ext_clock_freq(struct lola *chip, unsigned int val)
 	/* only for current = external clocks */
 	if (chip->clock.sample_clock[chip->clock.cur_index].type !=
 	    LOLA_CLOCK_TYPE_INTERNAL) {
-		chip->clock.cur_freq = sample_rate_convert(val & 0x7f);
+		chip->clock.cur_freq = lola_sample_rate_convert(val & 0x7f);
 		chip->clock.cur_valid = (val & 0x100) != 0;
 	}
 	return true;