diff options
author | Rafaël Carré <rafael.carre@gmail.com> | 2010-04-27 00:05:02 +0000 |
---|---|---|
committer | Rafaël Carré <rafael.carre@gmail.com> | 2010-04-27 00:05:02 +0000 |
commit | f2f34881ec84fb18020ae9a492f347e87c36359c (patch) | |
tree | 125941daf63f365e523d3e0d3dddb35284728e96 | |
parent | 5e88c4b4de14eeb16ddfa6632523ed6d5068f368 (diff) | |
download | rockbox-f2f34881ec84fb18020ae9a492f347e87c36359c.tar.gz rockbox-f2f34881ec84fb18020ae9a492f347e87c36359c.zip |
Remove pcm_mute() which has been unused since r19308
Remove audiohw_mute from header as well, and make this function static
to each driver (commented out when it was unused)
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25733 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | firmware/drivers/audio/ak4537.c | 4 | ||||
-rw-r--r-- | firmware/drivers/audio/as3514.c | 20 | ||||
-rw-r--r-- | firmware/drivers/audio/tlv320.c | 48 | ||||
-rw-r--r-- | firmware/drivers/audio/tsc2100.c | 22 | ||||
-rw-r--r-- | firmware/drivers/audio/uda1341.c | 4 | ||||
-rw-r--r-- | firmware/drivers/audio/uda1380.c | 2 | ||||
-rw-r--r-- | firmware/drivers/audio/wm8731.c | 2 | ||||
-rw-r--r-- | firmware/drivers/audio/wm8751.c | 14 | ||||
-rw-r--r-- | firmware/drivers/audio/wm8758.c | 2 | ||||
-rw-r--r-- | firmware/drivers/audio/wm8975.c | 2 | ||||
-rw-r--r-- | firmware/drivers/audio/wm8978.c | 38 | ||||
-rw-r--r-- | firmware/drivers/audio/wm8985.c | 24 | ||||
-rw-r--r-- | firmware/export/audiohw.h | 6 | ||||
-rw-r--r-- | firmware/export/pcm.h | 1 | ||||
-rw-r--r-- | firmware/pcm.c | 10 | ||||
-rw-r--r-- | firmware/target/arm/tms320dm320/mrobe-500/dm320codec-mr500.c | 5 | ||||
-rw-r--r-- | firmware/target/mips/ingenic_jz47xx/codec-jz4740.c | 2 |
17 files changed, 92 insertions, 114 deletions
diff --git a/firmware/drivers/audio/ak4537.c b/firmware/drivers/audio/ak4537.c index 034fd4f313..c3ce02a3af 100644 --- a/firmware/drivers/audio/ak4537.c +++ b/firmware/drivers/audio/ak4537.c @@ -113,7 +113,7 @@ int sound_val2phys(int setting, int value) return result; } -void audiohw_mute(bool mute) +/*static void audiohw_mute(bool mute) { if (mute) { @@ -125,7 +125,7 @@ void audiohw_mute(bool mute) udelay(200000); akc_clear(AK4537_DAC, SMUTE); } -} +}*/ void audiohw_preinit(void) { diff --git a/firmware/drivers/audio/as3514.c b/firmware/drivers/audio/as3514.c index 5817ff8f8c..a3be9e9246 100644 --- a/firmware/drivers/audio/as3514.c +++ b/firmware/drivers/audio/as3514.c @@ -229,6 +229,16 @@ void audiohw_preinit(void) #endif } +static void audiohw_mute(bool mute) +{ + if (mute) { + as3514_set(AS3514_HPH_OUT_L, HPH_OUT_L_HP_MUTE); + + } else { + as3514_clear(AS3514_HPH_OUT_L, HPH_OUT_L_HP_MUTE); + } +} + void audiohw_postinit(void) { /* wait until outputs have stabilized */ @@ -280,16 +290,6 @@ void audiohw_set_lineout_vol(int vol_l, int vol_r) as3514_write_masked(AS3514_LINE_OUT_L, vol_l, AS3514_VOL_MASK); } -void audiohw_mute(bool mute) -{ - if (mute) { - as3514_set(AS3514_HPH_OUT_L, HPH_OUT_L_HP_MUTE); - - } else { - as3514_clear(AS3514_HPH_OUT_L, HPH_OUT_L_HP_MUTE); - } -} - /* Nice shutdown of AS3514 audio codec */ void audiohw_close(void) { diff --git a/firmware/drivers/audio/tlv320.c b/firmware/drivers/audio/tlv320.c index 753a2453c3..b537fd5773 100644 --- a/firmware/drivers/audio/tlv320.c +++ b/firmware/drivers/audio/tlv320.c @@ -101,6 +101,30 @@ static void tlv320_write_reg(unsigned reg, unsigned value) tlv320_regs[reg] = value; } +static void audiohw_mute(bool mute) +{ + unsigned value_dap = tlv320_regs[REG_DAP]; + unsigned value_l, value_r; + + if (mute) + { + value_l = LHV_LHV(HEADPHONE_MUTE); + value_r = RHV_RHV(HEADPHONE_MUTE); + value_dap |= DAP_DACM; + } + else + { + value_l = LHV_LHV(tlv320.vol_l); + value_r = RHV_RHV(tlv320.vol_r); + if (value_l > HEADPHONE_MUTE || value_r > HEADPHONE_MUTE) + value_dap &= ~DAP_DACM; + } + + tlv320_write_reg(REG_LHV, LHV_LZC | value_l); + tlv320_write_reg(REG_RHV, RHV_RZC | value_r); + tlv320_write_reg(REG_DAP, value_dap); +} + /* public functions */ /** @@ -238,30 +262,6 @@ void audiohw_set_recvol(int left, int right, int type) } #endif -void audiohw_mute(bool mute) -{ - unsigned value_dap = tlv320_regs[REG_DAP]; - unsigned value_l, value_r; - - if (mute) - { - value_l = LHV_LHV(HEADPHONE_MUTE); - value_r = RHV_RHV(HEADPHONE_MUTE); - value_dap |= DAP_DACM; - } - else - { - value_l = LHV_LHV(tlv320.vol_l); - value_r = RHV_RHV(tlv320.vol_r); - if (value_l > HEADPHONE_MUTE || value_r > HEADPHONE_MUTE) - value_dap &= ~DAP_DACM; - } - - tlv320_write_reg(REG_LHV, LHV_LZC | value_l); - tlv320_write_reg(REG_RHV, RHV_RZC | value_r); - tlv320_write_reg(REG_DAP, value_dap); -} - /* Nice shutdown of TLV320 codec */ void audiohw_close(void) { diff --git a/firmware/drivers/audio/tsc2100.c b/firmware/drivers/audio/tsc2100.c index af41f0be52..cc6a7eed7d 100644 --- a/firmware/drivers/audio/tsc2100.c +++ b/firmware/drivers/audio/tsc2100.c @@ -81,17 +81,7 @@ void audiohw_init(void) tsc2100_writereg(TSAC4_PAGE, TSAC4_ADDRESS, val); } -void audiohw_postinit(void) -{ - audiohw_mute(false); -} - -void audiohw_set_master_vol(int vol_l, int vol_r) -{ - tsc2100_writereg(TSDACGAIN_PAGE, TSDACGAIN_ADDRESS, (short)((vol_l<<8) | vol_r) ); -} - -void audiohw_mute(bool mute) +static void audiohw_mute(bool mute) { short vol = tsc2100_readreg(TSDACGAIN_PAGE, TSDACGAIN_ADDRESS); /* left mute bit == 1<<15 @@ -108,6 +98,16 @@ void audiohw_mute(bool mute) tsc2100_writereg(TSDACGAIN_PAGE, TSDACGAIN_ADDRESS, vol); } +void audiohw_postinit(void) +{ + audiohw_mute(false); +} + +void audiohw_set_master_vol(int vol_l, int vol_r) +{ + tsc2100_writereg(TSDACGAIN_PAGE, TSDACGAIN_ADDRESS, (short)((vol_l<<8) | vol_r) ); +} + void audiohw_close(void) { /* mute headphones */ diff --git a/firmware/drivers/audio/uda1341.c b/firmware/drivers/audio/uda1341.c index 17d0475f2b..e26525b77a 100644 --- a/firmware/drivers/audio/uda1341.c +++ b/firmware/drivers/audio/uda1341.c @@ -210,14 +210,14 @@ void audiohw_set_treble(int value) udacodec_write (UDA_REG_DATA0, UDA_DATA_CTRL1 | uda_regs [UDA_REG_ID_CTRL1] ); }
-void audiohw_mute(bool mute)
+/*static void audiohw_mute(bool mute)
{
if (mute) uda_regs [UDA_REG_ID_CTRL2] |= UDA_MUTE_ON; else uda_regs [UDA_REG_ID_CTRL2] &= ~UDA_MUTE_ON; - udacodec_write (UDA_REG_DATA0, UDA_DATA_CTRL2 | uda_regs [UDA_REG_ID_CTRL2] ); + udacodec_write (UDA_REG_DATA0, UDA_DATA_CTRL2 | uda_regs [UDA_REG_ID_CTRL2] );*/ }
void audiohw_set_prescaler(int val)
diff --git a/firmware/drivers/audio/uda1380.c b/firmware/drivers/audio/uda1380.c index 0add100393..c9fef1d9ab 100644 --- a/firmware/drivers/audio/uda1380.c +++ b/firmware/drivers/audio/uda1380.c @@ -171,7 +171,7 @@ void audiohw_set_treble(int value) | TREBLEL(value) | TREBLER(value)); } -void audiohw_mute(bool mute) +static void audiohw_mute(bool mute) { unsigned int value = uda1380_regs[REG_MUTE]; diff --git a/firmware/drivers/audio/wm8731.c b/firmware/drivers/audio/wm8731.c index 0499c4e7d2..e50079a18d 100644 --- a/firmware/drivers/audio/wm8731.c +++ b/firmware/drivers/audio/wm8731.c @@ -149,7 +149,7 @@ int sound_val2phys(int setting, int value) return result; } -void audiohw_mute(bool mute) +static void audiohw_mute(bool mute) { if (mute) { /* Set DACMU = 1 to soft-mute the audio DACs. */ diff --git a/firmware/drivers/audio/wm8751.c b/firmware/drivers/audio/wm8751.c index cdc64fd69b..ffe7f20bba 100644 --- a/firmware/drivers/audio/wm8751.c +++ b/firmware/drivers/audio/wm8751.c @@ -99,6 +99,13 @@ static int adaptivebass2hw(int value) } #endif +static void audiohw_mute(bool mute) +{ + /* Mute: Set DACMU = 1 to soft-mute the audio DACs. */ + /* Unmute: Set DACMU = 0 to soft-un-mute the audio DACs. */ + wmcodec_write(DACCTRL, mute ? DACCTRL_DACMU : 0); +} + /* Reset and power up the WM8751 */ void audiohw_preinit(void) { @@ -230,13 +237,6 @@ void audiohw_set_treble(int value) TREBCTRL_TREB(tone_tenthdb2hw(value))); } -void audiohw_mute(bool mute) -{ - /* Mute: Set DACMU = 1 to soft-mute the audio DACs. */ - /* Unmute: Set DACMU = 0 to soft-un-mute the audio DACs. */ - wmcodec_write(DACCTRL, mute ? DACCTRL_DACMU : 0); -} - /* Nice shutdown of WM8751 codec */ void audiohw_close(void) { diff --git a/firmware/drivers/audio/wm8758.c b/firmware/drivers/audio/wm8758.c index 12ca987bd7..5abc8c9fcd 100644 --- a/firmware/drivers/audio/wm8758.c +++ b/firmware/drivers/audio/wm8758.c @@ -116,7 +116,7 @@ int sound_val2phys(int setting, int value) return result; } -void audiohw_mute(bool mute) +static void audiohw_mute(bool mute) { if (mute) { wmcodec_write(DACCTRL, DACCTRL_SOFTMUTE); diff --git a/firmware/drivers/audio/wm8975.c b/firmware/drivers/audio/wm8975.c index 97e4bf9255..dbe39d8b62 100644 --- a/firmware/drivers/audio/wm8975.c +++ b/firmware/drivers/audio/wm8975.c @@ -113,7 +113,7 @@ int sound_val2phys(int setting, int value) return result; } -void audiohw_mute(bool mute) +static void audiohw_mute(bool mute) { if (mute) { /* Set DACMU = 1 to soft-mute the audio DACs. */ diff --git a/firmware/drivers/audio/wm8978.c b/firmware/drivers/audio/wm8978.c index eb2e28aa69..e93c33b5ec 100644 --- a/firmware/drivers/audio/wm8978.c +++ b/firmware/drivers/audio/wm8978.c @@ -346,25 +346,7 @@ void audiohw_set_headphone_vol(int vol_l, int vol_r) } } -void audiohw_close(void) -{ - /* 1. Mute all analogue outputs */ - audiohw_mute(true); - audiohw_enable_headphone_jack(false); - - /* 2. Disable power management register 1. R1 = 00 */ - wmc_write(WMC_POWER_MANAGEMENT1, 0x000); - - /* 3. Disable power management register 2. R2 = 00 */ - wmc_write(WMC_POWER_MANAGEMENT2, 0x000); - - /* 4. Disable power management register 3. R3 = 00 */ - wmc_write(WMC_POWER_MANAGEMENT3, 0x000); - - /* 5. Remove external power supplies. */ -} - -void audiohw_mute(bool mute) +static void audiohw_mute(bool mute) { wmc_vol.ahw_mute = mute; @@ -385,6 +367,24 @@ void audiohw_mute(bool mute) } } +void audiohw_close(void) +{ + /* 1. Mute all analogue outputs */ + audiohw_mute(true); + audiohw_enable_headphone_jack(false); + + /* 2. Disable power management register 1. R1 = 00 */ + wmc_write(WMC_POWER_MANAGEMENT1, 0x000); + + /* 3. Disable power management register 2. R2 = 00 */ + wmc_write(WMC_POWER_MANAGEMENT2, 0x000); + + /* 4. Disable power management register 3. R3 = 00 */ + wmc_write(WMC_POWER_MANAGEMENT3, 0x000); + + /* 5. Remove external power supplies. */ +} + void audiohw_set_frequency(int fsel) { /* For 16.9344MHz MCLK, codec as master. */ diff --git a/firmware/drivers/audio/wm8985.c b/firmware/drivers/audio/wm8985.c index d59d2d3230..18fd7c590b 100644 --- a/firmware/drivers/audio/wm8985.c +++ b/firmware/drivers/audio/wm8985.c @@ -165,6 +165,18 @@ void audiohw_preinit(void) wmcodec_write(OUT4ADC, 0x0); /* POBCTRL = 0 */ } +static void audiohw_mute(bool mute) +{ + if (mute) + { + /* Set DACMU = 1 to soft-mute the audio DACs. */ + wmcodec_write(DACCTRL, 0x4c); + } else { + /* Set DACMU = 0 to soft-un-mute the audio DACs. */ + wmcodec_write(DACCTRL, 0xc); + } +} + void audiohw_postinit(void) { sleep(HZ/2); @@ -217,18 +229,6 @@ void audiohw_set_treble_cutoff(int value) wmcodec_write(EQ5, eq5_reg); } -void audiohw_mute(bool mute) -{ - if (mute) - { - /* Set DACMU = 1 to soft-mute the audio DACs. */ - wmcodec_write(DACCTRL, 0x4c); - } else { - /* Set DACMU = 0 to soft-un-mute the audio DACs. */ - wmcodec_write(DACCTRL, 0xc); - } -} - /* Nice shutdown of WM8985 codec */ void audiohw_close(void) { diff --git a/firmware/export/audiohw.h b/firmware/export/audiohw.h index c00b673a4a..22f6e68562 100644 --- a/firmware/export/audiohw.h +++ b/firmware/export/audiohw.h @@ -222,12 +222,6 @@ void audiohw_set_prescaler(int val); void audiohw_set_balance(int val); #endif -/** - * Mute or enable sound. - * @param mute true or false. - */ -void audiohw_mute(bool mute); - #ifdef AUDIOHW_HAVE_TREBLE /** * Set new treble value. diff --git a/firmware/export/pcm.h b/firmware/export/pcm.h index b9ad913100..e67d459693 100644 --- a/firmware/export/pcm.h +++ b/firmware/export/pcm.h @@ -79,7 +79,6 @@ const void* pcm_get_peak_buffer(int* count); size_t pcm_get_bytes_waiting(void); void pcm_play_stop(void); -void pcm_mute(bool mute); void pcm_play_pause(bool play); bool pcm_is_paused(void); bool pcm_is_playing(void); diff --git a/firmware/pcm.c b/firmware/pcm.c index 0e89cb90c9..edd4113677 100644 --- a/firmware/pcm.c +++ b/firmware/pcm.c @@ -355,16 +355,6 @@ bool pcm_is_paused(void) return pcm_paused; } -void pcm_mute(bool mute) -{ -#ifndef SIMULATOR - audiohw_mute(mute); -#endif - - if (mute) - sleep(HZ/16); -} - #ifdef HAVE_RECORDING /** Low level pcm recording apis **/ diff --git a/firmware/target/arm/tms320dm320/mrobe-500/dm320codec-mr500.c b/firmware/target/arm/tms320dm320/mrobe-500/dm320codec-mr500.c index 41f6369bac..16d388f0b9 100644 --- a/firmware/target/arm/tms320dm320/mrobe-500/dm320codec-mr500.c +++ b/firmware/target/arm/tms320dm320/mrobe-500/dm320codec-mr500.c @@ -39,8 +39,3 @@ void audiohw_init(void) void audiohw_close(void) { } - -void audiohw_mute(bool mute) -{ - (void) mute; -} diff --git a/firmware/target/mips/ingenic_jz47xx/codec-jz4740.c b/firmware/target/mips/ingenic_jz47xx/codec-jz4740.c index ac78be522b..ce6d889885 100644 --- a/firmware/target/mips/ingenic_jz47xx/codec-jz4740.c +++ b/firmware/target/mips/ingenic_jz47xx/codec-jz4740.c @@ -266,7 +266,7 @@ static void HP_turn_off(void) } #endif -void audiohw_mute(bool mute) +static void audiohw_mute(bool mute) { if(mute) REG_ICDC_CDCCR1 |= ICDC_CDCCR1_HPMUTE; |