FreeCalypso > hg > fc-selenite
changeset 180:e69e6b9a28b5
src/g23m-aci: sync with Magnetite
| author | Mychaela Falconia <falcon@freecalypso.org> |
|---|---|
| date | Sat, 04 Jan 2020 21:44:15 +0000 |
| parents | 2a9935250c95 |
| children | e9674b5a00ed |
| files | src/g23m-aci/aci/ati_audio.c src/g23m-aci/aci/ati_cmd.c src/g23m-aci/aci/hl_audio_drv.c |
| diffstat | 3 files changed, 11 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/src/g23m-aci/aci/ati_audio.c Sat Jan 04 21:38:55 2020 +0000 +++ b/src/g23m-aci/aci/ati_audio.c Sat Jan 04 21:44:15 2020 +0000 @@ -69,7 +69,7 @@ #include "fc-target.h" #include "armio.h" -#if defined(CONFIG_TARGET_DSAMPLE) || defined(CONFIG_TARGET_FCFAM) +#if GPIO1_SPEAKER_CTRL /* AT@SPKR - turn loudspeaker amplifier on or off */ GLOBAL T_ATI_RSLT atAtSPKR ( char *cl, UBYTE srcId ) { @@ -167,7 +167,7 @@ return (ATI_CMPL); } -#ifdef CONFIG_TARGET_FCMODEM +#ifdef CONFIG_MCSI_MODEM extern UBYTE aci_digital_voice_autoswitch; /* AT@VPATH - configure digital voice path */
--- a/src/g23m-aci/aci/ati_cmd.c Sat Jan 04 21:38:55 2020 +0000 +++ b/src/g23m-aci/aci/ati_cmd.c Sat Jan 04 21:44:15 2020 +0000 @@ -743,11 +743,11 @@ EXTERN T_ATI_RSLT atAtBAND (CHAR *cl, UBYTE srcId); /* FreeCalypso additions */ -#if defined(CONFIG_TARGET_DSAMPLE) || defined(CONFIG_TARGET_FCFAM) +#if GPIO1_SPEAKER_CTRL EXTERN T_ATI_RSLT atAtSPKR (char *cl, UBYTE srcId); EXTERN T_ATI_RSLT queatAtSPKR (char *cl, UBYTE srcId); #endif -#ifdef CONFIG_TARGET_FCMODEM +#ifdef CONFIG_MCSI_MODEM EXTERN T_ATI_RSLT atAtVPATH (char *cl, UBYTE srcId); EXTERN T_ATI_RSLT queatAtVPATH (char *cl, UBYTE srcId); EXTERN T_ATI_RSLT atAtVSEL (char *cl, UBYTE srcId); @@ -1209,10 +1209,10 @@ {"@RST", AT_CMD_P_RST, atAtRST, 0, 0, 0}, {"@BAND", AT_CMD_P_BAND, atAtBAND, 0, 0, 0}, /* FreeCalypso additions */ -#if defined(CONFIG_TARGET_DSAMPLE) || defined(CONFIG_TARGET_FCFAM) +#if GPIO1_SPEAKER_CTRL {"@SPKR", AT_CMD_AT_SPKR, atAtSPKR, test_gen, queatAtSPKR, "%s: (0,1)"}, #endif -#ifdef CONFIG_TARGET_FCMODEM +#ifdef CONFIG_MCSI_MODEM {"@VPATH", AT_CMD_AT_VPATH, atAtVPATH,test_gen, queatAtVPATH,"%s: (0-2)"}, {"@VSEL", AT_CMD_AT_VSEL, atAtVSEL, test_gen, queatAtVSEL, "%s: (0,1)"}, #endif
--- a/src/g23m-aci/aci/hl_audio_drv.c Sat Jan 04 21:38:55 2020 +0000 +++ b/src/g23m-aci/aci/hl_audio_drv.c Sat Jan 04 21:44:15 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;