# HG changeset patch
# User Mychaela Falconia <falcon@freecalypso.org>
# Date 1554081603 0
# Node ID a911ac7710944cbf30a7fb540175147ebe929727
# Parent  8c5d012b9c4d8ec1e09022532f779c1efbcf5a8f
board preprocessor conditionals: prep for more FC hw in the future

Please see the corresponding change in fc-magnetite for the explanation.

diff -r 8c5d012b9c4d -r a911ac771094 src/cs/drivers/drv_core/armio/armio.c
--- a/src/cs/drivers/drv_core/armio/armio.c	Thu Mar 28 00:36:10 2019 +0000
+++ b/src/cs/drivers/drv_core/armio/armio.c	Mon Apr 01 01:20:03 2019 +0000
@@ -189,7 +189,7 @@
    * FreeCalypso change: we don't have BT, our new criterion is
    * whether or not a given board is wired for MCSI.
    */
-  #if defined(CONFIG_TARGET_FCDEV3B) || defined(CONFIG_TARGET_PIRELLI)
+  #if defined(CONFIG_TARGET_FCMODEM) || defined(CONFIG_TARGET_PIRELLI)
     AI_DisableBit(5);
     AI_DisableBit(6);
     AI_DisableBit(7);
@@ -272,9 +272,9 @@
 
     // ARMIO_CNTL_REG register configuration :
     // set IOs 1,2,5,7,9,14 and 15 as ouputs.
-    // bits conditionalized on CONFIG_TARGET_GTAMODEM or CONFIG_TARGET_FCDEV3B
+    // bits conditionalized on CONFIG_TARGET_GTAMODEM or CONFIG_TARGET_FCFAM
     // are FreeCalypso additions
-    #if defined(CONFIG_TARGET_GTAMODEM) || defined(CONFIG_TARGET_FCDEV3B)
+    #if defined(CONFIG_TARGET_GTAMODEM) || defined(CONFIG_TARGET_FCFAM)
       AI_ConfigBitAsOutput(0);
     #endif
     AI_ConfigBitAsOutput(1);
@@ -282,15 +282,15 @@
     #ifdef CONFIG_TARGET_GTAMODEM
       AI_ConfigBitAsOutput(3);
     #endif
-    #if defined(CONFIG_TARGET_GTAMODEM) || defined(CONFIG_TARGET_FCDEV3B)
+    #if defined(CONFIG_TARGET_GTAMODEM) || defined(CONFIG_TARGET_FCFAM)
       AI_ConfigBitAsOutput(4);
     #endif
     AI_ConfigBitAsOutput(5);
-    #if defined(CONFIG_TARGET_GTAMODEM) || defined(CONFIG_TARGET_FCDEV3B)
+    #if defined(CONFIG_TARGET_GTAMODEM) || defined(CONFIG_TARGET_FCFAM)
       AI_ConfigBitAsOutput(6);
     #endif
     AI_ConfigBitAsOutput(7);
-    #if defined(CONFIG_TARGET_GTAMODEM) || defined(CONFIG_TARGET_FCDEV3B)
+    #if defined(CONFIG_TARGET_GTAMODEM) || defined(CONFIG_TARGET_FCFAM)
       AI_ConfigBitAsOutput(8);
     #endif
     AI_ConfigBitAsOutput(9);
@@ -299,7 +299,7 @@
       AI_ConfigBitAsOutput(11);
       AI_ConfigBitAsOutput(12);
     #endif
-    #if defined(CONFIG_TARGET_GTAMODEM) || defined(CONFIG_TARGET_FCDEV3B)
+    #if defined(CONFIG_TARGET_GTAMODEM) || defined(CONFIG_TARGET_FCFAM)
       AI_ConfigBitAsOutput(13);
     #endif
     AI_ConfigBitAsOutput(14);
diff -r 8c5d012b9c4d -r a911ac771094 src/cs/layer1/tpu_drivers/source0/tpudrv12.h
--- a/src/cs/layer1/tpu_drivers/source0/tpudrv12.h	Thu Mar 28 00:36:10 2019 +0000
+++ b/src/cs/layer1/tpu_drivers/source0/tpudrv12.h	Mon Apr 01 01:20:03 2019 +0000
@@ -274,7 +274,7 @@
   #define TU_1900    ( PA_HI_BAND | FEM_PINS ^ FEM_8 )
   #define TD_1900    ( PA_OFF     | FEM_PINS ^ 0     )
 
-#elif defined(CONFIG_TARGET_GTAMODEM) || defined(CONFIG_TARGET_FCDEV3B)
+#elif defined(CONFIG_TARGET_GTAMODEM)
 
   // Openmoko's triband configuration is a bastardized version
   // of TI's quadband one from Leonardo/E-Sample
@@ -322,7 +322,7 @@
    * In our FreeCalypso hw family, we would like to be able to use
    * both triband and quadband RFFEs.  Our current FCDEV3B is triband,
    * copied from Openmoko, and the same is expected to be the case for
-   * future low-cost designs, but if someone pays for a new RF layout,
+   * future low-budget designs, but if someone pays for a new RF layout,
    * we can use a quadband RFFE instead.  If we ever have two different
    * hw platforms or variants that differ in the RFFE but are otherwise
    * firmware-compatible, we would like to have the same fw build
diff -r 8c5d012b9c4d -r a911ac771094 src/g23m-aci/aci/ati_audio.c
--- a/src/g23m-aci/aci/ati_audio.c	Thu Mar 28 00:36:10 2019 +0000
+++ b/src/g23m-aci/aci/ati_audio.c	Mon Apr 01 01:20:03 2019 +0000
@@ -69,7 +69,7 @@
 #include "fc-target.cfg"
 #include "armio.h"
 
-#if defined(CONFIG_TARGET_DSAMPLE) || defined(CONFIG_TARGET_FCDEV3B)
+#if defined(CONFIG_TARGET_DSAMPLE) || defined(CONFIG_TARGET_FCFAM)
 /* 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_FCDEV3B
+#ifdef CONFIG_TARGET_FCMODEM
 extern UBYTE aci_digital_voice_autoswitch;
 
 /* AT@VPATH - configure digital voice path */
diff -r 8c5d012b9c4d -r a911ac771094 src/g23m-aci/aci/ati_cmd.c
--- a/src/g23m-aci/aci/ati_cmd.c	Thu Mar 28 00:36:10 2019 +0000
+++ b/src/g23m-aci/aci/ati_cmd.c	Mon Apr 01 01:20:03 2019 +0000
@@ -743,11 +743,11 @@
 EXTERN T_ATI_RSLT atAtBAND (CHAR *cl, UBYTE srcId);
 
 /* FreeCalypso additions */
-#if defined(CONFIG_TARGET_DSAMPLE) || defined(CONFIG_TARGET_FCDEV3B)
+#if defined(CONFIG_TARGET_DSAMPLE) || defined(CONFIG_TARGET_FCFAM)
 EXTERN T_ATI_RSLT atAtSPKR (char *cl, UBYTE srcId);
 EXTERN T_ATI_RSLT queatAtSPKR (char *cl, UBYTE srcId);
 #endif
-#ifdef CONFIG_TARGET_FCDEV3B
+#ifdef CONFIG_TARGET_FCMODEM
 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_FCDEV3B)
+#if defined(CONFIG_TARGET_DSAMPLE) || defined(CONFIG_TARGET_FCFAM)
     {"@SPKR",	AT_CMD_AT_SPKR,  atAtSPKR, test_gen, queatAtSPKR, "%s: (0,1)"},
 #endif
-#ifdef CONFIG_TARGET_FCDEV3B
+#ifdef CONFIG_TARGET_FCMODEM
     {"@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
diff -r 8c5d012b9c4d -r a911ac771094 src/g23m-aci/aci/hl_audio_drv.c
--- a/src/g23m-aci/aci/hl_audio_drv.c	Thu Mar 28 00:36:10 2019 +0000
+++ b/src/g23m-aci/aci/hl_audio_drv.c	Mon Apr 01 01:20:03 2019 +0000
@@ -38,7 +38,7 @@
 
 LOCAL  T_HL_VOCODER_STATE currVocoderState;
 
-#ifdef CONFIG_TARGET_FCDEV3B
+#ifdef CONFIG_TARGET_FCMODEM
 GLOBAL UBYTE aci_digital_voice_autoswitch;
 #endif
 
@@ -69,7 +69,7 @@
   currVocoderState = HL_VOCODER_DISABLED;
 }
 
-#ifdef CONFIG_TARGET_FCDEV3B
+#ifdef CONFIG_TARGET_FCMODEM
 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_FCDEV3B
+#ifdef CONFIG_TARGET_FCMODEM
   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_FCDEV3B
+  #ifdef CONFIG_TARGET_FCMODEM
     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_FCDEV3B
+  #ifdef CONFIG_TARGET_FCMODEM
     if (aci_digital_voice_autoswitch)
     {
       vpath = AUDIO_GSM_VOICE_PATH;
diff -r 8c5d012b9c4d -r a911ac771094 targets/fcdev3b.h
--- a/targets/fcdev3b.h	Thu Mar 28 00:36:10 2019 +0000
+++ b/targets/fcdev3b.h	Mon Apr 01 01:20:03 2019 +0000
@@ -1,3 +1,3 @@
-#define	CONFIG_TARGET_FCDEV3B	1
 #define	CONFIG_TARGET_FCFAM	1
+#define	CONFIG_TARGET_FCMODEM	1
 #define	UARTFAX_CLASSIC_DTR_DCD	1