FreeCalypso > hg > fc-magnetite
comparison src/g23m-aci/aci/hl_audio_drv.c @ 599:4626d7a955de
aci3 MCSI autoswitch: RV return path fix
author | Mychaela Falconia <falcon@freecalypso.org> |
---|---|
date | Thu, 28 Mar 2019 00:01:11 +0000 |
parents | 717ed17d82c6 |
children | 8f50b202e81f |
comparison
equal
deleted
inserted
replaced
598:717ed17d82c6 | 599:4626d7a955de |
---|---|
67 TRACE_FUNCTION("hl_audio_drv_init()"); | 67 TRACE_FUNCTION("hl_audio_drv_init()"); |
68 | 68 |
69 currVocoderState = HL_VOCODER_DISABLED; | 69 currVocoderState = HL_VOCODER_DISABLED; |
70 } | 70 } |
71 | 71 |
72 #ifdef CONFIG_TARGET_FCDEV3B | |
73 static void audio_mode_callback(void *event_from_audio) | |
74 { | |
75 /* do nothing at this time */ | |
76 } | |
77 #endif | |
78 | |
72 /* | 79 /* |
73 +-------------------------------------------------------------------+ | 80 +-------------------------------------------------------------------+ |
74 | PROJECT : GSM-PS (6147) MODULE : PSA_CCF | | 81 | PROJECT : GSM-PS (6147) MODULE : PSA_CCF | |
75 | ROUTINE : hl_drv_set_vocoder_state| | 82 | ROUTINE : hl_drv_set_vocoder_state| |
76 +-------------------------------------------------------------------+ | 83 +-------------------------------------------------------------------+ |
83 GLOBAL void hl_drv_set_vocoder_state(BOOL user_attach) | 90 GLOBAL void hl_drv_set_vocoder_state(BOOL user_attach) |
84 { | 91 { |
85 #ifdef CONFIG_TARGET_FCDEV3B | 92 #ifdef CONFIG_TARGET_FCDEV3B |
86 T_AUDIO_VOICE_PATH_SETTING vpath; | 93 T_AUDIO_VOICE_PATH_SETTING vpath; |
87 T_AUDIO_FULL_ACCESS_WRITE audio_param; | 94 T_AUDIO_FULL_ACCESS_WRITE audio_param; |
88 T_RV_RETURN return_path = { NULL, 0 }; | 95 T_RV_RETURN return_path; |
89 #endif | 96 #endif |
90 | 97 |
91 TRACE_FUNCTION("hl_drv_set_vocoder_state"); | 98 TRACE_FUNCTION("hl_drv_set_vocoder_state"); |
92 | 99 |
93 if ( (user_attach EQ TRUE AND currVocoderState EQ HL_VOCODER_ENABLED) OR | 100 if ( (user_attach EQ TRUE AND currVocoderState EQ HL_VOCODER_ENABLED) OR |
103 if (aci_digital_voice_autoswitch) | 110 if (aci_digital_voice_autoswitch) |
104 { | 111 { |
105 vpath = AUDIO_BLUETOOTH_HEADSET; | 112 vpath = AUDIO_BLUETOOTH_HEADSET; |
106 audio_param.variable_indentifier = AUDIO_PATH_USED; | 113 audio_param.variable_indentifier = AUDIO_PATH_USED; |
107 audio_param.data = &vpath; | 114 audio_param.data = &vpath; |
115 return_path.addr_id = NULL; | |
116 return_path.callback_func = audio_mode_callback; | |
108 audio_full_access_write(&audio_param, return_path); | 117 audio_full_access_write(&audio_param, return_path); |
109 } | 118 } |
110 #endif | 119 #endif |
111 currVocoderState = HL_VOCODER_ENABLED; | 120 currVocoderState = HL_VOCODER_ENABLED; |
112 } | 121 } |
119 if (aci_digital_voice_autoswitch) | 128 if (aci_digital_voice_autoswitch) |
120 { | 129 { |
121 vpath = AUDIO_GSM_VOICE_PATH; | 130 vpath = AUDIO_GSM_VOICE_PATH; |
122 audio_param.variable_indentifier = AUDIO_PATH_USED; | 131 audio_param.variable_indentifier = AUDIO_PATH_USED; |
123 audio_param.data = &vpath; | 132 audio_param.data = &vpath; |
133 return_path.addr_id = NULL; | |
134 return_path.callback_func = audio_mode_callback; | |
124 audio_full_access_write(&audio_param, return_path); | 135 audio_full_access_write(&audio_param, return_path); |
125 } | 136 } |
126 #endif | 137 #endif |
127 currVocoderState = HL_VOCODER_DISABLED; | 138 currVocoderState = HL_VOCODER_DISABLED; |
128 } | 139 } |