# HG changeset patch # User Mychaela Falconia # Date 1636424219 0 # Node ID ee16d57b32b24f8cda8fe1f69a532b09372bdff3 # Parent 59dff9a18e2a68978313d114d5366d935d23baeb Condat audio_Init(): rm setting of sidetone level The default sidetone level in the absence of audio mode loading is just that, a basic default without any promises of good tuning. In the original TCS211 code this default sidetone level was set in two places: first in L1 init of ABB-via-DSP registers (set to -17 dB), and then initialized again in Condat audio_Init(), this time set to -5 dB. The present change removes the redundant second initialization. The default sidetone level is now -17 dB instead of -5 dB with this change, but again it is just the default; all serious users are now expected to use audio mode config files. diff -r 59dff9a18e2a -r ee16d57b32b2 src/condat/com/src/driver/audio.c --- a/src/condat/com/src/driver/audio.c Mon Nov 08 23:53:22 2021 +0000 +++ b/src/condat/com/src/driver/audio.c Tue Nov 09 02:16:59 2021 +0000 @@ -244,10 +244,6 @@ #define BUZZER 0 #define AUDIO 1 -// Apr 26, 2005 REF : CRR 30627 xpradipg -#ifdef FF_MMI_SERVICES_MIGRATION -#define AUDIO_SIDE_TONE 175 -#endif #if defined (RIV_AUDIO) @@ -752,14 +748,6 @@ GLOBAL UBYTE audio_Init (drv_SignalCB_Type in_SignalCBPtr) #endif { -// Apr 26, 2005 REF : CRR 30627 xpradipg -// local variable declarations -#ifdef FF_MMI_SERVICES_MIGRATION - T_AUDIO_FULL_ACCESS_WRITE side_tone_cfg; - T_RV_RETURN_PATH return_path = {0, NULL}; - T_AUDIO_RET result; - INT8 side_tone = AUDIO_SIDE_TONE; -#endif // xpradipg - GSM-ENH-32494 : 23 June 2005 #ifdef FF_MMI_AUDIO_PROFILE T_AUDIO_RET status; @@ -815,27 +803,6 @@ audio_SetAmplf ( AUDIO_BUZZER, 175 ); #endif -/* Setting the Side Tone has been moved from audio_SetAmplf CQ21055*/ -#ifdef ALR - #ifdef FF_TTY - if (!tty_state) - #endif - { -// Apr 26, 2005 REF : CRR 30627 xpradipg -// set the sidetone value to 175 this is the optimum value -#ifdef FF_MMI_SERVICES_MIGRATION - side_tone_cfg.variable_indentifier = AUDIO_MICROPHONE_SPEAKER_LOOP_SIDETONE; - side_tone_cfg.data = (void*)&side_tone; - result = audio_full_access_write(&side_tone_cfg, return_path); -#else - ABB_SideTone (175); -#endif - } -#else - VG_SideTone (175); -#endif - - return DRV_OK; } @@ -1146,15 +1113,8 @@ #else ABB_DlVolume (in_Amplf); /* output volume */ #endif -#ifdef FF_TTY - if (!tty_state) -#endif - { - /* ABB_SideTone (175); */ /* To avoid the side tone reseting */ - } #else VG_DlVolume (in_Amplf); /* output volume */ - /* VG_SideTone (175); */ /* To avoid the side tone reseting */ #endif act_speakerVolume = in_Amplf; }