# HG changeset patch
# User Mychaela Falconia <falcon@freecalypso.org>
# Date 1592627565 0
# Node ID 91d9f85064208a051886462df9f1a1d76563b35e
# Parent  34f27d5f5393761e710db4893e1a5548c464ec0e
GPIO046 dummy outputs on FCDEV3B, GTA0x and Tango

diff -r 34f27d5f5393 -r 91d9f8506420 src/cs/drivers/drv_core/armio/armio.c
--- a/src/cs/drivers/drv_core/armio/armio.c	Sat Jun 20 04:05:05 2020 +0000
+++ b/src/cs/drivers/drv_core/armio/armio.c	Sat Jun 20 04:32:45 2020 +0000
@@ -276,10 +276,8 @@
 
     // 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_FCFAM
-    // are FreeCalypso additions
-    #if defined(CONFIG_TARGET_GTAMODEM) || defined(CONFIG_TARGET_FCFAM) || \
-        defined(CONFIG_TARGET_GTM900)
+    // all others are FreeCalypso additions
+    #if defined(CONFIG_GPIO046_OUTPUTS) || defined(CONFIG_TARGET_GTM900)
       AI_ConfigBitAsOutput(0);
     #endif
     AI_ConfigBitAsOutput(1);
@@ -289,11 +287,11 @@
     #ifdef CONFIG_GPIO3_OUTPUT
       AI_ConfigBitAsOutput(3);
     #endif
-    #if defined(CONFIG_TARGET_GTAMODEM) || defined(CONFIG_TARGET_FCFAM)
+    #ifdef CONFIG_GPIO046_OUTPUTS
       AI_ConfigBitAsOutput(4);
     #endif
     AI_ConfigBitAsOutput(5);
-    #if defined(CONFIG_TARGET_GTAMODEM) || defined(CONFIG_TARGET_FCFAM)
+    #ifdef CONFIG_GPIO046_OUTPUTS
       AI_ConfigBitAsOutput(6);
     #endif
     AI_ConfigBitAsOutput(7);
diff -r 34f27d5f5393 -r 91d9f8506420 targets/fcdev3b.h
--- a/targets/fcdev3b.h	Sat Jun 20 04:05:05 2020 +0000
+++ b/targets/fcdev3b.h	Sat Jun 20 04:32:45 2020 +0000
@@ -1,5 +1,6 @@
 #define	CONFIG_TARGET_FCFAM	1
 #define	CONFIG_TARGET_FCMODEM	1
+#define	CONFIG_GPIO046_OUTPUTS	1
 #define	CONFIG_MCSI_MODEM	1
 #define	GPIO1_SPEAKER_CTRL	1
 #define	UARTFAX_CLASSIC_DTR_DCD	1
diff -r 34f27d5f5393 -r 91d9f8506420 targets/gtamodem.h
--- a/targets/gtamodem.h	Sat Jun 20 04:05:05 2020 +0000
+++ b/targets/gtamodem.h	Sat Jun 20 04:32:45 2020 +0000
@@ -2,5 +2,6 @@
 #define	CONFIG_MOKOFFS		1
 #define	CONFIG_MCSI_UNUSED	1
 #define	CONFIG_GPIO3_OUTPUT	1
+#define	CONFIG_GPIO046_OUTPUTS	1
 #define	GPIO1_SPEAKER_CTRL	0
 #define	UARTFAX_CLASSIC_DTR_DCD	0
diff -r 34f27d5f5393 -r 91d9f8506420 targets/luna.h
--- a/targets/luna.h	Sat Jun 20 04:05:05 2020 +0000
+++ b/targets/luna.h	Sat Jun 20 04:32:45 2020 +0000
@@ -1,5 +1,6 @@
 #define	CONFIG_TARGET_LUNA	1
 #define	CONFIG_TARGET_TANGO	1
+#define	CONFIG_GPIO046_OUTPUTS	1
 #define	CONFIG_MCSI_UNUSED	1
 #define	CONFIG_GPIO1_HIGH	1
 #define	GPIO1_SPEAKER_CTRL	0
diff -r 34f27d5f5393 -r 91d9f8506420 targets/tangomdm.h
--- a/targets/tangomdm.h	Sat Jun 20 04:05:05 2020 +0000
+++ b/targets/tangomdm.h	Sat Jun 20 04:32:45 2020 +0000
@@ -1,4 +1,5 @@
 #define	CONFIG_TARGET_TANGO	1
+#define	CONFIG_GPIO046_OUTPUTS	1
 #define	CONFIG_MCSI_MODEM	1
 #define	CONFIG_GPIO1_HIGH	1
 #define	GPIO1_SPEAKER_CTRL	0