# HG changeset patch
# User Space Falcon <falcon@ivan.Harhan.ORG>
# Date 1428217646 0
# Node ID 1385f2c30ad85dbc2f831a5db2b7d661e3c7067c
# Parent  6ce960359feea9f69cc454756fee1cf56c3b6247
aci: psa_cc?.c done

diff -r 6ce960359fee -r 1385f2c30ad8 gsm-fw/g23m-aci/aci/Makefile
--- a/gsm-fw/g23m-aci/aci/Makefile	Sun Apr 05 05:50:28 2015 +0000
+++ b/gsm-fw/g23m-aci/aci/Makefile	Sun Apr 05 07:07:26 2015 +0000
@@ -19,7 +19,8 @@
 	cmh_smsf.o cmh_smsq.o cmh_smsr.o cmh_smss.o cmh_ssf.o cmh_ssq.o \
 	cmh_ssr.o cmh_sss.o cmh_tsts.o cmh_uartf.o cmh_uartr.o cmh_uarts.o \
 	conc_sms.o cphs.o cphs_aci.o dti_cntrl_mng.o hl_audio_drv.o \
-	line_edit.o line_split.o phb.o
+	line_edit.o line_split.o phb.o \
+	psa_ccf.o psa_ccp.o psa_ccs.o
 
 all:	${OBJS}
 
diff -r 6ce960359fee -r 1385f2c30ad8 gsm-fw/g23m-aci/aci/psa_ccf.c
--- a/gsm-fw/g23m-aci/aci/psa_ccf.c	Sun Apr 05 05:50:28 2015 +0000
+++ b/gsm-fw/g23m-aci/aci/psa_ccf.c	Sun Apr 05 07:07:26 2015 +0000
@@ -23,6 +23,11 @@
 #define PSA_CCF_C
 #endif
 
+#include "config.h"
+#include "fixedconf.h"
+#include "condat-features.h"
+#include "aci_conf.h"
+
 #include "aci_all.h"
 
 #undef TRACING
@@ -207,7 +212,6 @@
 }
 
 
-
 /*
 +-------------------------------------------------------------------+
 | PROJECT : GSM-PS (6147)         MODULE  : PSA_CCF                 |
@@ -325,7 +329,7 @@
     T_CC_CALL_TBL *ctbx = ccShrdPrm.ctb[ctbIdx];
 
     if (ctbx NEQ NULL && ctbx->calStat EQ CS_ACT)
-		activeCallNum++;
+	activeCallNum++;
   }
   return activeCallNum;
 }
@@ -370,9 +374,6 @@
 }
 
 
-
-
-
 /*
 +-------------------------------------------------------------------+
 | PROJECT : GSM-PS (6147)         MODULE  : PSA_CCF                 |
@@ -899,26 +900,24 @@
         {
 //TISH: open vocoder if there is active call
           if (ctbx->calStat EQ CS_ACT)
-		  {
-			  user_attach = TRUE;
-			  break;
-		  }
+	  {
+		user_attach = TRUE;
+		break;
+	  }
           if (ccShrdPrm.TCHasg NEQ TRUE)
-
           {
               /* CCBS: 4.08/5.4.4.2ff do not connect to the in-band tone/announcement
               */
           }
           else
           {
-          user_attach = TRUE;
-          break;
+            user_attach = TRUE;
+            break;
+          }
         }
       }
-
     }
   }
-  }
 
   hl_drv_set_vocoder_state(user_attach);
 
@@ -966,7 +965,6 @@
       return;
   }
 
-
   psaCC_phbSrchNumPlnTxt( numBuf, &maxLen, &psaCC_ctb(cId)->alphIdUni );
 
   return;
@@ -1653,11 +1651,6 @@
       ntry.second = rtc_time.second;
 #endif
 
-
-
-
-
-
     }
 
 #ifdef TI_PS_FFS_PHB
diff -r 6ce960359fee -r 1385f2c30ad8 gsm-fw/g23m-aci/aci/psa_ccp.c
--- a/gsm-fw/g23m-aci/aci/psa_ccp.c	Sun Apr 05 05:50:28 2015 +0000
+++ b/gsm-fw/g23m-aci/aci/psa_ccp.c	Sun Apr 05 07:07:26 2015 +0000
@@ -24,6 +24,11 @@
 #define PSA_CCP_C
 #endif
 
+#include "config.h"
+#include "fixedconf.h"
+#include "condat-features.h"
+#include "aci_conf.h"
+
 #include "aci_all.h"
 
 /*==== INCLUDES ===================================================*/
diff -r 6ce960359fee -r 1385f2c30ad8 gsm-fw/g23m-aci/aci/psa_ccs.c
--- a/gsm-fw/g23m-aci/aci/psa_ccs.c	Sun Apr 05 05:50:28 2015 +0000
+++ b/gsm-fw/g23m-aci/aci/psa_ccs.c	Sun Apr 05 07:07:26 2015 +0000
@@ -23,6 +23,11 @@
 #define PSA_CCS_C
 #endif
 
+#include "config.h"
+#include "fixedconf.h"
+#include "condat-features.h"
+#include "aci_conf.h"
+
 #include "aci_all.h"
 
 /*==== INCLUDES ===================================================*/
@@ -364,13 +369,13 @@
 
 //TISH, hot fix for GCF 27.22.7.3,  added in 2007-03-23
 //start 38.patch for GCF test case:	27.22.7.3
-	if (pCtbNtry -> nrmCs EQ 0x510)
-	{
+    if (pCtbNtry -> nrmCs EQ 0x510)
+    {
 	pCtbNtry->numRawCauseBytes=2;
 	ACI_MALLOC(pCtbNtry -> rawCauseBytes,2);
 	pCtbNtry -> rawCauseBytes[0]=0xe0;
 	pCtbNtry -> rawCauseBytes[1]=0x90;
-	}
+    }
 //end
 
 
@@ -379,11 +384,11 @@
 
 //TISH, hot fix for GCF 27.22.7.3,  added in 2007-03-23
 //start 38.patch for GCF test case:	27.22.7.3
-	if (pCtbNtry -> nrmCs EQ 0x510)
-	{
+    if (pCtbNtry -> nrmCs EQ 0x510)
+    {
 	pCtbNtry->numRawCauseBytes=0;
 	ACI_MFREE(pCtbNtry -> rawCauseBytes);
-	}	
+    }	
 //end
 
   }