diff src/cs/drivers/drv_core/armio/armio.c @ 163:a911ac771094

board preprocessor conditionals: prep for more FC hw in the future Please see the corresponding change in fc-magnetite for the explanation.
author Mychaela Falconia <falcon@freecalypso.org>
date Mon, 01 Apr 2019 01:20:03 +0000
parents b0a18d9f99f4
children 7409b22cac61
line wrap: on
line diff
--- 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);