# HG changeset patch
# User Mychaela Falconia <falcon@freecalypso.org>
# Date 1541401197 0
# Node ID 5c780d080afc3dedfef7b7ed4e4f21f88e0206ac
# Parent  6917ea63bffa3dca609df1f8c11e394517878963
armio.c GPIO directions for classic targets: more explicit
conditionals for FC additions on FC and Openmoko targets

diff -r 6917ea63bffa -r 5c780d080afc src/cs/drivers/drv_core/armio/armio.c
--- a/src/cs/drivers/drv_core/armio/armio.c	Fri Oct 26 00:29:16 2018 +0000
+++ b/src/cs/drivers/drv_core/armio/armio.c	Mon Nov 05 06:59:57 2018 +0000
@@ -236,24 +236,26 @@
 
     // ARMIO_CNTL_REG register configuration :
     // set IOs 1,2,5,7,9,14 and 15 as ouputs.
-    #ifndef CONFIG_TARGET_DSAMPLE
-      AI_ConfigBitAsOutput(0);	/* FreeCalypso addition */
+    // bits conditionalized on CONFIG_TARGET_GTAMODEM or CONFIG_TARGET_FCDEV3B
+    // are FreeCalypso additions
+    #if defined(CONFIG_TARGET_GTAMODEM) || defined(CONFIG_TARGET_FCDEV3B)
+      AI_ConfigBitAsOutput(0);
     #endif
     AI_ConfigBitAsOutput(1);	
     AI_ConfigBitAsOutput(2);
     #ifdef CONFIG_TARGET_GTAMODEM
       AI_ConfigBitAsOutput(3);
     #endif
-    #ifndef CONFIG_TARGET_DSAMPLE
-      AI_ConfigBitAsOutput(4);	/* FreeCalypso addition */
+    #if defined(CONFIG_TARGET_GTAMODEM) || defined(CONFIG_TARGET_FCDEV3B)
+      AI_ConfigBitAsOutput(4);
     #endif
     AI_ConfigBitAsOutput(5);
-    #ifndef CONFIG_TARGET_DSAMPLE
-      AI_ConfigBitAsOutput(6);	/* FreeCalypso addition */
+    #if defined(CONFIG_TARGET_GTAMODEM) || defined(CONFIG_TARGET_FCDEV3B)
+      AI_ConfigBitAsOutput(6);
     #endif
     AI_ConfigBitAsOutput(7);
-    #ifndef CONFIG_TARGET_DSAMPLE
-      AI_ConfigBitAsOutput(8);	/* FreeCalypso addition */
+    #if defined(CONFIG_TARGET_GTAMODEM) || defined(CONFIG_TARGET_FCDEV3B)
+      AI_ConfigBitAsOutput(8);
     #endif
     AI_ConfigBitAsOutput(9);
     #ifdef CONFIG_TARGET_GTAMODEM
@@ -261,8 +263,8 @@
       AI_ConfigBitAsOutput(11);
       AI_ConfigBitAsOutput(12);
     #endif
-    #ifndef CONFIG_TARGET_DSAMPLE
-      AI_ConfigBitAsOutput(13);	/* FreeCalypso addition */
+    #if defined(CONFIG_TARGET_GTAMODEM) || defined(CONFIG_TARGET_FCDEV3B)
+      AI_ConfigBitAsOutput(13);
     #endif
     AI_ConfigBitAsOutput(14);
     AI_ConfigBitAsOutput(15);