# HG changeset patch
# User Space Falcon <falcon@ivan.Harhan.ORG>
# Date 1426482407 0
# Node ID 5d2a3318092321b9ff33373c75b0995f780e4b78
# Parent  ac09e56b4e3b89cefd04ff35b12021513fc8541c
aci: cmh_sat?.c done

diff -r ac09e56b4e3b -r 5d2a33180923 gsm-fw/g23m-aci/aci/Makefile
--- a/gsm-fw/g23m-aci/aci/Makefile	Mon Mar 16 04:28:11 2015 +0000
+++ b/gsm-fw/g23m-aci/aci/Makefile	Mon Mar 16 05:06:47 2015 +0000
@@ -14,7 +14,8 @@
 	cmh_ccf.o cmh_ccq.o cmh_ccr.o cmh_ccs.o cmh_cphs.o cmh_dmy.o cmh_dti.o \
 	cmh_emq.o cmh_emr.o cmh_f.o cmh_mmf.o cmh_mmiq.o cmh_mmir.o cmh_mmis.o \
 	cmh_mmit.o cmh_mmq.o cmh_mmr.o cmh_mms.o cmh_mmt.o cmh_phbf.o \
-	cmh_phbq.o cmh_phbr.o cmh_phbs.o cmh_phbt.o
+	cmh_phbq.o cmh_phbr.o cmh_phbs.o cmh_phbt.o cmh_satf.o cmh_satq.o \
+	cmh_satr.o cmh_sats.o
 
 all:	${OBJS}
 
diff -r ac09e56b4e3b -r 5d2a33180923 gsm-fw/g23m-aci/aci/cmh_satf.c
--- a/gsm-fw/g23m-aci/aci/cmh_satf.c	Mon Mar 16 04:28:11 2015 +0000
+++ b/gsm-fw/g23m-aci/aci/cmh_satf.c	Mon Mar 16 05:06:47 2015 +0000
@@ -19,6 +19,11 @@
 +----------------------------------------------------------------------------- 
 */ 
 
+#include "config.h"
+#include "fixedconf.h"
+#include "condat-features.h"
+#include "aci_conf.h"
+
 #ifdef SIM_TOOLKIT
 
 #ifndef CMH_SATF_C
@@ -3395,7 +3400,8 @@
    */
 //TISH, patch for call control CLIR
 //start
-#if 0
+// FreeCalypso: reverted
+#if 1
   ctb->CLIRsup = NOT_PRESENT_8BIT;
 #else
   switch( getCLIRState())
diff -r ac09e56b4e3b -r 5d2a33180923 gsm-fw/g23m-aci/aci/cmh_satq.c
--- a/gsm-fw/g23m-aci/aci/cmh_satq.c	Mon Mar 16 04:28:11 2015 +0000
+++ b/gsm-fw/g23m-aci/aci/cmh_satq.c	Mon Mar 16 05:06:47 2015 +0000
@@ -23,6 +23,11 @@
 #define CMH_SATQ_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"
diff -r ac09e56b4e3b -r 5d2a33180923 gsm-fw/g23m-aci/aci/cmh_satr.c
--- a/gsm-fw/g23m-aci/aci/cmh_satr.c	Mon Mar 16 04:28:11 2015 +0000
+++ b/gsm-fw/g23m-aci/aci/cmh_satr.c	Mon Mar 16 05:06:47 2015 +0000
@@ -20,6 +20,11 @@
 +----------------------------------------------------------------------------- 
 */ 
 
+#include "config.h"
+#include "fixedconf.h"
+#include "condat-features.h"
+#include "aci_conf.h"
+
 #ifdef SIM_TOOLKIT
 
 #ifndef CMH_SATR_C
@@ -800,8 +805,8 @@
 #if 0
         cmhCC_HoldCall(actId, psaCC_ctb(cId)->curSrc, AT_CMD_D);
 #else
-		CHLDaddInfo=CHLD_ADD_INFO_DIAL_CAL;
-		cmhPrm[actId].ccCmdPrm.CHLDmode = CHLD_MOD_HldActDial;
+	CHLDaddInfo=CHLD_ADD_INFO_DIAL_CAL;
+	cmhPrm[actId].ccCmdPrm.CHLDmode = CHLD_MOD_HldActDial;
         cmhCC_HoldCall(actId, psaCC_ctb(cId)->curSrc, AT_CMD_D);
 #endif
 //end
@@ -829,9 +834,9 @@
 
 //TISH, patch for OMAPS00129157
 //start
-		if (CHLDaddInfo!=CHLD_ADD_INFO_DIAL_CAL || cmhPrm[actId].ccCmdPrm.CHLDmode != CHLD_MOD_HldActDial)
+    if (CHLDaddInfo!=CHLD_ADD_INFO_DIAL_CAL || cmhPrm[actId].ccCmdPrm.CHLDmode != CHLD_MOD_HldActDial)
 //end
-    psaCC_NewCall (cId);
+      psaCC_NewCall (cId);
 
 
 #if defined SMI OR defined MFW
diff -r ac09e56b4e3b -r 5d2a33180923 gsm-fw/g23m-aci/aci/cmh_sats.c
--- a/gsm-fw/g23m-aci/aci/cmh_sats.c	Mon Mar 16 04:28:11 2015 +0000
+++ b/gsm-fw/g23m-aci/aci/cmh_sats.c	Mon Mar 16 05:06:47 2015 +0000
@@ -19,6 +19,11 @@
 +----------------------------------------------------------------------------- 
 */ 
 
+#include "config.h"
+#include "fixedconf.h"
+#include "condat-features.h"
+#include "aci_conf.h"
+
 #ifdef SIM_TOOLKIT
 
 #ifndef CMH_SATS_C