# HG changeset patch
# User Mychaela Falconia <falcon@freecalypso.org>
# Date 1577086259 0
# Node ID 38a65c3a96afb47cf868739190708caf76cbfa49
# Parent  4a8dacbe9187109ca7a7111702956d55a5c088c9
aci2 & aci3: AT@SPKR conditionalized on GPIO1_SPEAKER_CTRL
new preprocessor symbol

diff -r 4a8dacbe9187 -r 38a65c3a96af src/aci2/aci/ati_audio.c
--- a/src/aci2/aci/ati_audio.c	Mon Dec 23 07:12:10 2019 +0000
+++ b/src/aci2/aci/ati_audio.c	Mon Dec 23 07:30:59 2019 +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 )
 {
diff -r 4a8dacbe9187 -r 38a65c3a96af src/aci2/aci/ati_cmd.c
--- a/src/aci2/aci/ati_cmd.c	Mon Dec 23 07:12:10 2019 +0000
+++ b/src/aci2/aci/ati_cmd.c	Mon Dec 23 07:30:59 2019 +0000
@@ -675,7 +675,7 @@
 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
@@ -1090,7 +1090,7 @@
     {"@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
diff -r 4a8dacbe9187 -r 38a65c3a96af src/g23m-aci/aci/ati_audio.c
--- a/src/g23m-aci/aci/ati_audio.c	Mon Dec 23 07:12:10 2019 +0000
+++ b/src/g23m-aci/aci/ati_audio.c	Mon Dec 23 07:30:59 2019 +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 )
 {
diff -r 4a8dacbe9187 -r 38a65c3a96af src/g23m-aci/aci/ati_cmd.c
--- a/src/g23m-aci/aci/ati_cmd.c	Mon Dec 23 07:12:10 2019 +0000
+++ b/src/g23m-aci/aci/ati_cmd.c	Mon Dec 23 07:30:59 2019 +0000
@@ -743,7 +743,7 @@
 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
@@ -1209,7 +1209,7 @@
     {"@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