diff options
-rw-r--r-- | firmware/drivers/audio/as3514.c | 2 | ||||
-rw-r--r-- | firmware/drivers/audio/tlv320.c | 8 | ||||
-rw-r--r-- | firmware/drivers/audio/uda1380.c | 4 | ||||
-rw-r--r-- | firmware/drivers/audio/wm8751.c | 3 | ||||
-rw-r--r-- | firmware/drivers/audio/wm8758.c | 2 | ||||
-rw-r--r-- | firmware/drivers/audio/wm8975.c | 3 | ||||
-rw-r--r-- | firmware/export/as3514.h | 1 | ||||
-rw-r--r-- | firmware/export/tlv320.h | 1 | ||||
-rw-r--r-- | firmware/export/uda1380.h | 1 | ||||
-rw-r--r-- | firmware/export/wm8721.h | 1 | ||||
-rw-r--r-- | firmware/export/wm8731.h | 1 | ||||
-rw-r--r-- | firmware/export/wm8751.h | 1 | ||||
-rw-r--r-- | firmware/export/wm8758.h | 1 | ||||
-rw-r--r-- | firmware/export/wm8975.h | 1 |
14 files changed, 2 insertions, 28 deletions
diff --git a/firmware/drivers/audio/as3514.c b/firmware/drivers/audio/as3514.c index f88cafe25c..2dc1513668 100644 --- a/firmware/drivers/audio/as3514.c +++ b/firmware/drivers/audio/as3514.c | |||
@@ -125,8 +125,6 @@ int sound_val2phys(int setting, int value) | |||
125 | return result; | 125 | return result; |
126 | } | 126 | } |
127 | 127 | ||
128 | void audiohw_reset(void); | ||
129 | |||
130 | /* | 128 | /* |
131 | * Initialise the PP I2C and I2S. | 129 | * Initialise the PP I2C and I2S. |
132 | */ | 130 | */ |
diff --git a/firmware/drivers/audio/tlv320.c b/firmware/drivers/audio/tlv320.c index d57bef9d96..3059b5a075 100644 --- a/firmware/drivers/audio/tlv320.c +++ b/firmware/drivers/audio/tlv320.c | |||
@@ -118,14 +118,6 @@ void audiohw_postinit(void) | |||
118 | } | 118 | } |
119 | 119 | ||
120 | /** | 120 | /** |
121 | * Resets tlv320 to default values | ||
122 | */ | ||
123 | void audiohw_reset(void) | ||
124 | { | ||
125 | tlv320_write_reg(REG_RR, RR_RESET); | ||
126 | } | ||
127 | |||
128 | /** | ||
129 | * Sets internal sample rate for DAC and ADC relative to MCLK | 121 | * Sets internal sample rate for DAC and ADC relative to MCLK |
130 | * Selection for frequency: | 122 | * Selection for frequency: |
131 | * Fs: tlv: with: | 123 | * Fs: tlv: with: |
diff --git a/firmware/drivers/audio/uda1380.c b/firmware/drivers/audio/uda1380.c index f5b637eaa4..e5481a5cd0 100644 --- a/firmware/drivers/audio/uda1380.c +++ b/firmware/drivers/audio/uda1380.c | |||
@@ -201,7 +201,7 @@ void audiohw_enable_output(bool enable) | |||
201 | } | 201 | } |
202 | } | 202 | } |
203 | 203 | ||
204 | void audiohw_reset(void) | 204 | static void reset(void) |
205 | { | 205 | { |
206 | #ifdef IRIVER_H300_SERIES | 206 | #ifdef IRIVER_H300_SERIES |
207 | int mask = set_irq_level(HIGHEST_IRQ_LEVEL); | 207 | int mask = set_irq_level(HIGHEST_IRQ_LEVEL); |
@@ -261,7 +261,7 @@ void audiohw_init(void) | |||
261 | recgain_mic = 0; | 261 | recgain_mic = 0; |
262 | recgain_line = 0; | 262 | recgain_line = 0; |
263 | 263 | ||
264 | audiohw_reset(); | 264 | reset(); |
265 | 265 | ||
266 | if (audiohw_set_regs() == -1) | 266 | if (audiohw_set_regs() == -1) |
267 | { | 267 | { |
diff --git a/firmware/drivers/audio/wm8751.c b/firmware/drivers/audio/wm8751.c index 6358484c06..138f3c3174 100644 --- a/firmware/drivers/audio/wm8751.c +++ b/firmware/drivers/audio/wm8751.c | |||
@@ -104,9 +104,6 @@ static int adaptivebass2hw(int value) | |||
104 | } | 104 | } |
105 | #endif | 105 | #endif |
106 | 106 | ||
107 | |||
108 | void audiohw_reset(void); | ||
109 | |||
110 | /* Reset and power up the WM8751 */ | 107 | /* Reset and power up the WM8751 */ |
111 | void audiohw_preinit(void) | 108 | void audiohw_preinit(void) |
112 | { | 109 | { |
diff --git a/firmware/drivers/audio/wm8758.c b/firmware/drivers/audio/wm8758.c index 30740d5fed..1cfac7c7cb 100644 --- a/firmware/drivers/audio/wm8758.c +++ b/firmware/drivers/audio/wm8758.c | |||
@@ -74,8 +74,6 @@ int tenthdb2mixer(int db) | |||
74 | return -db * 2 / 5; | 74 | return -db * 2 / 5; |
75 | } | 75 | } |
76 | 76 | ||
77 | void audiohw_reset(void); | ||
78 | |||
79 | #define IPOD_PCM_LEVEL 0x65 /* -6dB */ | 77 | #define IPOD_PCM_LEVEL 0x65 /* -6dB */ |
80 | 78 | ||
81 | //#define BASSCTRL 0x | 79 | //#define BASSCTRL 0x |
diff --git a/firmware/drivers/audio/wm8975.c b/firmware/drivers/audio/wm8975.c index a069d159e5..7732c39cc6 100644 --- a/firmware/drivers/audio/wm8975.c +++ b/firmware/drivers/audio/wm8975.c | |||
@@ -70,9 +70,6 @@ int tenthdb2mixer(int db) | |||
70 | return 0; | 70 | return 0; |
71 | } | 71 | } |
72 | 72 | ||
73 | |||
74 | void audiohw_reset(void); | ||
75 | |||
76 | #define IPOD_PCM_LEVEL 0x65 /* -6dB */ | 73 | #define IPOD_PCM_LEVEL 0x65 /* -6dB */ |
77 | 74 | ||
78 | 75 | ||
diff --git a/firmware/export/as3514.h b/firmware/export/as3514.h index 82be135f98..088d55141a 100644 --- a/firmware/export/as3514.h +++ b/firmware/export/as3514.h | |||
@@ -24,7 +24,6 @@ | |||
24 | 24 | ||
25 | extern int tenthdb2master(int db); | 25 | extern int tenthdb2master(int db); |
26 | 26 | ||
27 | extern void audiohw_reset(void); | ||
28 | extern void audiohw_enable_output(bool enable); | 27 | extern void audiohw_enable_output(bool enable); |
29 | extern int audiohw_set_master_vol(int vol_l, int vol_r); | 28 | extern int audiohw_set_master_vol(int vol_l, int vol_r); |
30 | extern int audiohw_set_lineout_vol(int vol_l, int vol_r); | 29 | extern int audiohw_set_lineout_vol(int vol_l, int vol_r); |
diff --git a/firmware/export/tlv320.h b/firmware/export/tlv320.h index 94c51aaf76..87b29dd422 100644 --- a/firmware/export/tlv320.h +++ b/firmware/export/tlv320.h | |||
@@ -27,7 +27,6 @@ extern int tenthdb2master(int db); | |||
27 | 27 | ||
28 | /*** definitions ***/ | 28 | /*** definitions ***/ |
29 | 29 | ||
30 | extern void audiohw_reset(void); | ||
31 | /** | 30 | /** |
32 | * Sets internal sample rate for DAC and ADC relative to MCLK | 31 | * Sets internal sample rate for DAC and ADC relative to MCLK |
33 | * Selection for frequency: | 32 | * Selection for frequency: |
diff --git a/firmware/export/uda1380.h b/firmware/export/uda1380.h index 2f35b29325..28da424660 100644 --- a/firmware/export/uda1380.h +++ b/firmware/export/uda1380.h | |||
@@ -27,7 +27,6 @@ | |||
27 | extern int tenthdb2master(int db); | 27 | extern int tenthdb2master(int db); |
28 | extern int tenthdb2mixer(int db); | 28 | extern int tenthdb2mixer(int db); |
29 | 29 | ||
30 | extern void audiohw_reset(void); | ||
31 | extern void audiohw_enable_output(bool enable); | 30 | extern void audiohw_enable_output(bool enable); |
32 | extern int audiohw_set_master_vol(int vol_l, int vol_r); | 31 | extern int audiohw_set_master_vol(int vol_l, int vol_r); |
33 | extern int audiohw_set_mixer_vol(int channel1, int channel2); | 32 | extern int audiohw_set_mixer_vol(int channel1, int channel2); |
diff --git a/firmware/export/wm8721.h b/firmware/export/wm8721.h index bb4c8b01d3..25338af737 100644 --- a/firmware/export/wm8721.h +++ b/firmware/export/wm8721.h | |||
@@ -27,7 +27,6 @@ | |||
27 | extern int tenthdb2master(int db); | 27 | extern int tenthdb2master(int db); |
28 | extern int tenthdb2mixer(int db); | 28 | extern int tenthdb2mixer(int db); |
29 | 29 | ||
30 | extern void audiohw_reset(void); | ||
31 | extern void audiohw_enable_output(bool enable); | 30 | extern void audiohw_enable_output(bool enable); |
32 | extern int audiohw_set_master_vol(int vol_l, int vol_r); | 31 | extern int audiohw_set_master_vol(int vol_l, int vol_r); |
33 | extern void audiohw_set_nsorder(int order); | 32 | extern void audiohw_set_nsorder(int order); |
diff --git a/firmware/export/wm8731.h b/firmware/export/wm8731.h index 3dc82b6d76..1ee616619a 100644 --- a/firmware/export/wm8731.h +++ b/firmware/export/wm8731.h | |||
@@ -27,7 +27,6 @@ | |||
27 | extern int tenthdb2master(int db); | 27 | extern int tenthdb2master(int db); |
28 | extern int tenthdb2mixer(int db); | 28 | extern int tenthdb2mixer(int db); |
29 | 29 | ||
30 | extern void audiohw_reset(void); | ||
31 | extern void audiohw_preinit(void); | 30 | extern void audiohw_preinit(void); |
32 | extern void audiohw_postinit(void); | 31 | extern void audiohw_postinit(void); |
33 | extern int audiohw_set_master_vol(int vol_l, int vol_r); | 32 | extern int audiohw_set_master_vol(int vol_l, int vol_r); |
diff --git a/firmware/export/wm8751.h b/firmware/export/wm8751.h index 23966fd568..5ad0a01a84 100644 --- a/firmware/export/wm8751.h +++ b/firmware/export/wm8751.h | |||
@@ -26,7 +26,6 @@ | |||
26 | extern int tenthdb2master(int db); | 26 | extern int tenthdb2master(int db); |
27 | extern int tenthdb2mixer(int db); | 27 | extern int tenthdb2mixer(int db); |
28 | 28 | ||
29 | extern void audiohw_reset(void); | ||
30 | extern void audiohw_preinit(void); | 29 | extern void audiohw_preinit(void); |
31 | extern void audiohw_enable_output(bool enable); | 30 | extern void audiohw_enable_output(bool enable); |
32 | extern int audiohw_set_master_vol(int vol_l, int vol_r); | 31 | extern int audiohw_set_master_vol(int vol_l, int vol_r); |
diff --git a/firmware/export/wm8758.h b/firmware/export/wm8758.h index 62fb04a7e0..6d3220a5fc 100644 --- a/firmware/export/wm8758.h +++ b/firmware/export/wm8758.h | |||
@@ -27,7 +27,6 @@ | |||
27 | extern int tenthdb2master(int db); | 27 | extern int tenthdb2master(int db); |
28 | extern int tenthdb2mixer(int db); | 28 | extern int tenthdb2mixer(int db); |
29 | 29 | ||
30 | extern void audiohw_reset(void); | ||
31 | extern void audiohw_enable_output(bool enable); | 30 | extern void audiohw_enable_output(bool enable); |
32 | extern int audiohw_set_master_vol(int vol_l, int vol_r); | 31 | extern int audiohw_set_master_vol(int vol_l, int vol_r); |
33 | extern int audiohw_set_lineout_vol(int vol_l, int vol_r); | 32 | extern int audiohw_set_lineout_vol(int vol_l, int vol_r); |
diff --git a/firmware/export/wm8975.h b/firmware/export/wm8975.h index ab162fcab6..d77d61e8a0 100644 --- a/firmware/export/wm8975.h +++ b/firmware/export/wm8975.h | |||
@@ -27,7 +27,6 @@ | |||
27 | extern int tenthdb2master(int db); | 27 | extern int tenthdb2master(int db); |
28 | extern int tenthdb2mixer(int db); | 28 | extern int tenthdb2mixer(int db); |
29 | 29 | ||
30 | extern void audiohw_reset(void); | ||
31 | extern void audiohw_enable_output(bool enable); | 30 | extern void audiohw_enable_output(bool enable); |
32 | extern int audiohw_set_master_vol(int vol_l, int vol_r); | 31 | extern int audiohw_set_master_vol(int vol_l, int vol_r); |
33 | extern int audiohw_set_lineout_vol(int vol_l, int vol_r); | 32 | extern int audiohw_set_lineout_vol(int vol_l, int vol_r); |