FreeCalypso > hg > fc-magnetite
diff src/g23m-aci/aci/hl_audio_drv.c @ 631:597869e59805
config: introduced new CONFIG_MCSI_MODEM preprocessor symbol
All MCSI functionality was previously conditionalized on CONFIG_TARGET_FCMODEM
(even earlier it was CONFIG_TARGET_FCDEV3B), but having a dedicated
preprocessor symbol for this purpose (defined in targets/*.h as appropriate)
makes it much easier to support different modem targets with MCSI enabled.
| author | Mychaela Falconia <falcon@freecalypso.org> |
|---|---|
| date | Sat, 04 Jan 2020 19:07:02 +0000 |
| parents | 92dbfa906f66 |
| children |
line wrap: on
line diff
--- a/src/g23m-aci/aci/hl_audio_drv.c Fri Jan 03 07:13:51 2020 +0000 +++ b/src/g23m-aci/aci/hl_audio_drv.c Sat Jan 04 19:07:02 2020 +0000 @@ -38,7 +38,7 @@ LOCAL T_HL_VOCODER_STATE currVocoderState; -#ifdef CONFIG_TARGET_FCMODEM +#ifdef CONFIG_MCSI_MODEM GLOBAL UBYTE aci_digital_voice_autoswitch; #endif @@ -69,7 +69,7 @@ currVocoderState = HL_VOCODER_DISABLED; } -#ifdef CONFIG_TARGET_FCMODEM +#ifdef CONFIG_MCSI_MODEM static void audio_mode_callback(void *event_from_audio) { /* do nothing at this time */ @@ -89,7 +89,7 @@ */ GLOBAL void hl_drv_set_vocoder_state(BOOL user_attach) { -#ifdef CONFIG_TARGET_FCMODEM +#ifdef CONFIG_MCSI_MODEM T_AUDIO_VOICE_PATH_SETTING vpath; T_AUDIO_FULL_ACCESS_WRITE audio_param; T_RV_RETURN return_path; @@ -106,7 +106,7 @@ enable_tch_vocoder(TRUE); vocoder_mute_dl (FALSE); /* un-mute speaker */ vocoder_mute_ul (FALSE); /* un-mute microphone */ - #ifdef CONFIG_TARGET_FCMODEM + #ifdef CONFIG_MCSI_MODEM if (aci_digital_voice_autoswitch) { vpath = AUDIO_BLUETOOTH_HEADSET; @@ -124,7 +124,7 @@ vocoder_mute_dl (TRUE); /* mute speaker */ vocoder_mute_ul (TRUE); /* mute microphone */ enable_tch_vocoder (FALSE); /* disable vocoder */ - #ifdef CONFIG_TARGET_FCMODEM + #ifdef CONFIG_MCSI_MODEM if (aci_digital_voice_autoswitch) { vpath = AUDIO_GSM_VOICE_PATH;