summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Gmeiner <christian.gmeiner@gmail.com>2009-01-20 22:55:10 +0000
committerChristian Gmeiner <christian.gmeiner@gmail.com>2009-01-20 22:55:10 +0000
commitad6b6d764bf736a243d3422b0b53d4b673c8e2fd (patch)
tree958c7b676b4c20f0cdda7c3964c6250064bad61c
parent9f08068ecf0accc307bbf5da082e5d2b72eaaa96 (diff)
downloadrockbox-ad6b6d764bf736a243d3422b0b53d4b673c8e2fd.tar.gz
rockbox-ad6b6d764bf736a243d3422b0b53d4b673c8e2fd.zip
cleanup audiohw_set_frequency by adding it to audiohw.h and removing it from all driver .h files
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19806 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--firmware/export/as3514.h1
-rw-r--r--firmware/export/audiohw.h2
-rw-r--r--firmware/export/tlv320.h11
-rw-r--r--firmware/export/uda1380.h14
-rw-r--r--firmware/export/wm8731.h1
-rw-r--r--firmware/export/wm8751.h1
-rw-r--r--firmware/export/wm8758.h1
-rw-r--r--firmware/export/wm8975.h1
-rw-r--r--firmware/export/wm8978.h1
9 files changed, 2 insertions, 31 deletions
diff --git a/firmware/export/as3514.h b/firmware/export/as3514.h
index 9489d1ae0d..aeabb16144 100644
--- a/firmware/export/as3514.h
+++ b/firmware/export/as3514.h
@@ -26,7 +26,6 @@ extern int tenthdb2master(int db);
26 26
27extern void audiohw_set_master_vol(int vol_l, int vol_r); 27extern void audiohw_set_master_vol(int vol_l, int vol_r);
28extern void audiohw_set_lineout_vol(int vol_l, int vol_r); 28extern void audiohw_set_lineout_vol(int vol_l, int vol_r);
29extern void audiohw_set_frequency(int fsel);
30 29
31/* Register Descriptions */ 30/* Register Descriptions */
32#define AS3514_LINE_OUT_R 0x00 31#define AS3514_LINE_OUT_R 0x00
diff --git a/firmware/export/audiohw.h b/firmware/export/audiohw.h
index 33361b460a..7dba54a8a2 100644
--- a/firmware/export/audiohw.h
+++ b/firmware/export/audiohw.h
@@ -248,6 +248,8 @@ void audiohw_set_bass_cutoff(int val);
248void audiohw_set_treble_cutoff(int val); 248void audiohw_set_treble_cutoff(int val);
249#endif 249#endif
250 250
251void audiohw_set_frequency(int fsel);
252
251#ifdef HAVE_RECORDING 253#ifdef HAVE_RECORDING
252 254
253/** 255/**
diff --git a/firmware/export/tlv320.h b/firmware/export/tlv320.h
index 171223f5bb..66f4d5ca92 100644
--- a/firmware/export/tlv320.h
+++ b/firmware/export/tlv320.h
@@ -28,17 +28,6 @@
28extern int tenthdb2master(int db); 28extern int tenthdb2master(int db);
29 29
30/*** definitions ***/ 30/*** definitions ***/
31
32/**
33 * Sets internal sample rate for DAC and ADC relative to MCLK
34 * Selection for frequency:
35 * Fs: tlv: with:
36 * 11025: 0 = MCLK/2 MCLK/2 SCLK, LRCK: Audio Clk / 16
37 * 22050: 0 = MCLK/2 MCLK SCLK, LRCK: Audio Clk / 8
38 * 44100: 1 = MCLK MCLK SCLK, LRCK: Audio Clk / 4 (default)
39 * 88200: 2 = MCLK*2 MCLK SCLK, LRCK: Audio Clk / 2
40 */
41extern void audiohw_set_frequency(int fsel);
42extern void audiohw_set_headphone_vol(int vol_l, int vol_r); 31extern void audiohw_set_headphone_vol(int vol_l, int vol_r);
43 32
44#define HEADPHONE_MUTE 0x30 /* 0110000 = -73db */ 33#define HEADPHONE_MUTE 0x30 /* 0110000 = -73db */
diff --git a/firmware/export/uda1380.h b/firmware/export/uda1380.h
index af2b579a60..6858f51e3c 100644
--- a/firmware/export/uda1380.h
+++ b/firmware/export/uda1380.h
@@ -34,20 +34,6 @@ extern int tenthdb2mixer(int db);
34extern void audiohw_set_master_vol(int vol_l, int vol_r); 34extern void audiohw_set_master_vol(int vol_l, int vol_r);
35extern void audiohw_set_mixer_vol(int channel1, int channel2); 35extern void audiohw_set_mixer_vol(int channel1, int channel2);
36 36
37/**
38 * Sets frequency settings for DAC and ADC relative to MCLK
39 * For Coldfire IIS dividers, 11.2896MHz, codec as slave with
40 * PLL enabled.
41 *
42 * Selection for frequency ranges:
43 * Fs: range: with:
44 * 11025: 0 = 6.25 to 12.5 SCLK, LRCK: Audio Clk / 16
45 * 22050: 1 = 12.5 to 25 SCLK, LRCK: Audio Clk / 8
46 * 44100: 2 = 25 to 50 SCLK, LRCK: Audio Clk / 4 (default)
47 * 88200: 3 = 50 to 100 SCLK, LRCK: Audio Clk / 2
48 */
49extern void audiohw_set_frequency(int fsel);
50
51#define UDA1380_ADDR 0x30 37#define UDA1380_ADDR 0x30
52 38
53/* REG_0: Misc settings */ 39/* REG_0: Misc settings */
diff --git a/firmware/export/wm8731.h b/firmware/export/wm8731.h
index 512ef9ff3f..28d4d3940d 100644
--- a/firmware/export/wm8731.h
+++ b/firmware/export/wm8731.h
@@ -31,7 +31,6 @@
31extern int tenthdb2master(int db); 31extern int tenthdb2master(int db);
32 32
33extern void audiohw_set_master_vol(int vol_l, int vol_r); 33extern void audiohw_set_master_vol(int vol_l, int vol_r);
34extern void audiohw_set_frequency(int fsel);
35 34
36/* Common register bits */ 35/* Common register bits */
37#ifdef HAVE_WM8731 36#ifdef HAVE_WM8731
diff --git a/firmware/export/wm8751.h b/firmware/export/wm8751.h
index 2fbfdb3124..15170b76bc 100644
--- a/firmware/export/wm8751.h
+++ b/firmware/export/wm8751.h
@@ -31,7 +31,6 @@ extern int tenthdb2master(int db);
31 31
32extern void audiohw_set_master_vol(int vol_l, int vol_r); 32extern void audiohw_set_master_vol(int vol_l, int vol_r);
33extern void audiohw_set_lineout_vol(int vol_l, int vol_r); 33extern void audiohw_set_lineout_vol(int vol_l, int vol_r);
34extern void audiohw_set_frequency(int fsel);
35 34
36/* Register addresses and bits */ 35/* Register addresses and bits */
37#define OUTPUT_MUTED 0x2f 36#define OUTPUT_MUTED 0x2f
diff --git a/firmware/export/wm8758.h b/firmware/export/wm8758.h
index 493d18b753..2c7c9e109d 100644
--- a/firmware/export/wm8758.h
+++ b/firmware/export/wm8758.h
@@ -34,7 +34,6 @@ extern int tenthdb2mixer(int db);
34extern void audiohw_set_master_vol(int vol_l, int vol_r); 34extern void audiohw_set_master_vol(int vol_l, int vol_r);
35extern void audiohw_set_lineout_vol(int vol_l, int vol_r); 35extern void audiohw_set_lineout_vol(int vol_l, int vol_r);
36extern void audiohw_set_mixer_vol(int channel1, int channel2); 36extern void audiohw_set_mixer_vol(int channel1, int channel2);
37extern void audiohw_set_frequency(int fsel);
38 37
39#define RESET 0x00 38#define RESET 0x00
40#define RESET_RESET 0x0 39#define RESET_RESET 0x0
diff --git a/firmware/export/wm8975.h b/firmware/export/wm8975.h
index aeec33e3d8..5524d2e037 100644
--- a/firmware/export/wm8975.h
+++ b/firmware/export/wm8975.h
@@ -32,7 +32,6 @@ extern int tenthdb2master(int db);
32 32
33extern void audiohw_set_master_vol(int vol_l, int vol_r); 33extern void audiohw_set_master_vol(int vol_l, int vol_r);
34extern void audiohw_set_lineout_vol(int vol_l, int vol_r); 34extern void audiohw_set_lineout_vol(int vol_l, int vol_r);
35extern void audiohw_set_frequency(int fsel);
36 35
37/* Register addresses and bits */ 36/* Register addresses and bits */
38 37
diff --git a/firmware/export/wm8978.h b/firmware/export/wm8978.h
index 5d9c0d01e7..5b77d1ae30 100644
--- a/firmware/export/wm8978.h
+++ b/firmware/export/wm8978.h
@@ -28,7 +28,6 @@
28 28
29int tenthdb2master(int db); 29int tenthdb2master(int db);
30void audiohw_set_headphone_vol(int vol_l, int vol_r); 30void audiohw_set_headphone_vol(int vol_l, int vol_r);
31void audiohw_set_frequency(int fsel);
32void audiohw_set_recsrc(int source, bool recording); 31void audiohw_set_recsrc(int source, bool recording);
33 32
34void wmc_set(unsigned int reg, unsigned int bits); 33void wmc_set(unsigned int reg, unsigned int bits);