--- a/components/aci-tcs3	Tue Oct 11 03:43:18 2016 +0000
+++ b/components/aci-tcs3	Tue Oct 11 04:49:14 2016 +0000
@@ -63,6 +63,11 @@
 CPPFLAGS="$CPPFLAGS -DUART"
 CPPFLAGS="$CPPFLAGS -DFF_ATI"
 
+# FreeCalypso additions to make the TCS3.2 version
+# behave more like TCS211
+
+CPPFLAGS="$CPPFLAGS -DTI_PS_FF_CONC_SMS"
+
 # Includes
 
 CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/inc"

--- a/src/g23m-aci/aci/cmh_smss.c	Tue Oct 11 03:43:18 2016 +0000
+++ b/src/g23m-aci/aci/cmh_smss.c	Tue Oct 11 04:49:14 2016 +0000
@@ -1167,6 +1167,14 @@
     return sAT_PlusCMGS_Gl(srcId, da, toda, src_data, udh_data, sca, tosca,
                            isReply, rAT_PlusCMGS, rAT_PlusCMS);  
 }
+
+/*
+ * The following function has been conditioned out for the FreeCalypso build
+ * as it was failing compilation; it does not appear in the TCS211 version;
+ * to be investigated later.
+ */
+
+#if 0
 GLOBAL T_ACI_RETURN sAT_PlusCMGS_byPort( T_ACI_CMD_SRC srcId,
                   CHAR*     da,
                   T_ACI_TOA*   toda,
@@ -1226,7 +1234,7 @@
               isReply, rAT_PlusCMGS, rAT_PlusCMS);
  }
 }
-
+#endif
 
 /*
 +-------------------------------------------------------------------+

--- a/src/g23m-aci/aci/psa_gmmp.c	Tue Oct 11 03:43:18 2016 +0000
+++ b/src/g23m-aci/aci/psa_gmmp.c	Tue Oct 11 04:49:14 2016 +0000
@@ -163,7 +163,11 @@
   PURPOSE : processes the GMMREG_ATTACH_REJ primitive send by GMM.
             this confirms a failed attach. 
 */
+
+#ifdef FF_GPF_TCPIP
 EXTERN T_DCM_ENV_CTRL_BLK *dcm_env_ctrl_blk_p;
+#endif
+
 GLOBAL void psa_gmmreg_attach_rej ( T_GMMREG_ATTACH_REJ *gmmreg_attach_rej )
 {
 
@@ -313,7 +317,6 @@
   PURPOSE : processes the GMMREG_DETACH_IND primitive send by GMM.
             the network initiated detach. 
 */
-EXTERN T_DCM_ENV_CTRL_BLK *dcm_env_ctrl_blk_p;
 
 GLOBAL void psa_gmmreg_detach_ind ( T_GMMREG_DETACH_IND *gmmreg_detach_ind )
 {