--- a/gsm-fw/g23m-aci/aci/cmh_smss.c	Sat Apr 04 22:51:00 2015 +0000
+++ b/gsm-fw/g23m-aci/aci/cmh_smss.c	Sun Apr 05 00:38:21 2015 +0000
@@ -23,6 +23,11 @@
 #define CMH_SMSS_C
 #endif
 
+#include "config.h"
+#include "fixedconf.h"
+#include "condat-features.h"
+#include "aci_conf.h"
+
 #include "aci_all.h"
 /*==== INCLUDES ===================================================*/
 #include "aci_cmh.h"
@@ -48,7 +53,7 @@
 #include "cmh.h"
 #include "cmh_sms.h"
 #include "pcm.h"
-#include "Phb.h"
+#include "phb.h"
 #include "cmh_phb.h"
 
 #ifdef SIM_TOOLKIT
@@ -722,12 +727,7 @@
     return ( AT_FAIL );
   }
 }
-
-
-
-#endif
-
-
+#endif	/* SMS_PDU_SUPPORT */
 
 /*
 +-------------------------------------------------------------------+
@@ -791,11 +791,8 @@
    *-----------------------------------------------------------------
    */
   if ( mt EQ CNMI_MT_NotPresent )
-
     chkMt = smsShrdPrm.CNMImt;
-
   else
-
     chkMt = mt;
 
   /*
@@ -821,11 +818,8 @@
    *-----------------------------------------------------------------
    */
   if ( bm EQ CNMI_BM_NotPresent )
-
     chkBm = smsShrdPrm.CNMIbm;
-
   else
-
     chkBm = bm;
 
   /*
@@ -850,11 +844,8 @@
    *-----------------------------------------------------------------
    */
   if ( ds EQ CNMI_DS_NotPresent )
-
     chkDs = smsShrdPrm.CNMIds;
-
   else
-
     chkDs = ds;
 
   /*
@@ -1167,6 +1158,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 +1225,7 @@
               isReply, rAT_PlusCMGS, rAT_PlusCMS);
  }
 }
-
+#endif
 
 /*
 +-------------------------------------------------------------------+
@@ -1582,7 +1581,7 @@
 #if defined SMI OR defined MFW OR defined FF_MMI_RIV
   smsShrdPrm.rplyCB.cmgs  = rAT_PlusCMGS;
   smsShrdPrm.errorCB      = rAT_PlusCMS;
-  #endif /* defined SMI OR defined MFW OR defined FF_MMI_RIV */
+#endif /* defined SMI OR defined MFW OR defined FF_MMI_RIV */
 
   /*
    *-------------------------------------------------------------------
@@ -1728,7 +1727,7 @@
            ** process the command later.
            */
            smsShrdPrm.smsEntStat.curCmd = AT_CMD_NONE;
-	    smsShrdPrm.owner = (T_OWN)CMD_SRC_NONE;
+           smsShrdPrm.owner = (T_OWN)CMD_SRC_NONE;
            smsShrdPrm.smsEntStat.entOwn = CMD_SRC_NONE;
 
            return( AT_EXCT );