FreeCalypso > hg > fc-magnetite
diff src/aci2/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/aci2/aci/hl_audio_drv.c Fri Jan 03 07:13:51 2020 +0000 +++ b/src/aci2/aci/hl_audio_drv.c Sat Jan 04 19:07:02 2020 +0000 @@ -39,7 +39,7 @@ LOCAL T_HL_VOCODER_STATE currVocoderState; -#ifdef CONFIG_TARGET_FCMODEM +#ifdef CONFIG_MCSI_MODEM GLOBAL UBYTE aci_digital_voice_autoswitch; #endif @@ -95,7 +95,7 @@ */ GLOBAL T_HL_VOICE_DRV_RSLT hl_drv_enable_vocoder ( void ) { -#ifdef CONFIG_TARGET_FCMODEM +#ifdef CONFIG_MCSI_MODEM T_AUDIO_VOICE_PATH_SETTING vpath = AUDIO_BLUETOOTH_HEADSET; T_AUDIO_FULL_ACCESS_WRITE audio_param; T_RV_RETURN return_path = { NULL, 0 }; @@ -134,7 +134,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) { audio_param.variable_indentifier = AUDIO_PATH_USED; @@ -160,7 +160,7 @@ */ GLOBAL void hl_drv_disable_vocoder ( void ) { -#ifdef CONFIG_TARGET_FCMODEM +#ifdef CONFIG_MCSI_MODEM T_AUDIO_VOICE_PATH_SETTING vpath = AUDIO_GSM_VOICE_PATH; T_AUDIO_FULL_ACCESS_WRITE audio_param; T_RV_RETURN return_path = { NULL, 0 }; @@ -177,7 +177,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) { audio_param.variable_indentifier = AUDIO_PATH_USED;