--- a/gsm-fw/g23m-gsm/cc/Makefile	Tue Sep 30 01:56:15 2014 +0000
+++ b/gsm-fw/g23m-gsm/cc/Makefile	Tue Sep 30 02:09:45 2014 +0000
@@ -5,7 +5,7 @@
 CPPFLAGS=-I. -I../../include -I../../include/condat -I../../gpf/inc \
 	-I../../cdginc
 
-OBJS=	cc_act.o cc_cfk.o cc_csf.o cc_em.o cc_est.o cc_ffk.o
+OBJS=	cc_act.o cc_cfk.o cc_csf.o cc_em.o cc_est.o cc_ffk.o cc_for.o
 
 all:	${OBJS}
 

--- a/gsm-fw/g23m-gsm/cc/cc_for.c	Tue Sep 30 01:56:15 2014 +0000
+++ b/gsm-fw/g23m-gsm/cc/cc_for.c	Tue Sep 30 02:09:45 2014 +0000
@@ -22,6 +22,10 @@
 #ifndef CC_FOR_C
 #define CC_FOR_C
 
+#include "config.h"
+#include "fixedconf.h"
+#include "condat-features.h"
+
 #define ENTITY_CC
 /*==== INCLUDES ===================================================*/
 
@@ -305,8 +309,8 @@
   }
   else
   {
-	  cc_data->error = 0;
-		for_decode ((T_PRIM*)(D2P(data)), FALSE);
+    cc_data->error = 0;
+    for_decode ((T_PRIM*)(D2P(data)), FALSE);
   }
 }
 
@@ -754,7 +758,7 @@
             for_send_u_release_comp (M_CC_CAUSE_USER_BUSY);
             return;
           }
-		}
+	}
 
         if (cc_data->ti_ext_pres EQ TRUE)
         {
@@ -770,18 +774,17 @@
           return;            
         }
 
-          cc_data->index_ti = result;
-
+        cc_data->index_ti = result;
         break;
-      
+
       case B_STATUS:
         break;
-      
+
       case D_RELEASE_COMP:
         CCD_END;
         for_rel_req ();
         return;
-      
+
       default:
         for_send_u_release_comp (M_CC_CAUSE_INVALID_TI);
         return;
@@ -810,7 +813,6 @@
 } /* for_decode() */
 
 
-
 /*
 +--------------------------------------------------------------------+
 | PROJECT : GSM-PS (6147)       MODULE  : CC_FOR                     |
@@ -1047,8 +1049,8 @@
 
 Issue No 7674 :
 Accept the message as according to Anite test case ETSI 11.10 clause 26.8.1.4.2 
-and do nothing,no need to send any Notification Indication to ACI.Also check the 
-State of the CC, if we get a Notify in CC State other than U10 and U26 then Send 
+and do nothing,no need to send any Notification Indication to ACI.Also check the
+State of the CC, if we get a Notify in CC State other than U10 and U26 then Send
 STATUS message with cause "Message Type Incompatible" to the Network.
 */
 
@@ -1058,8 +1060,8 @@
 
   TRACE_FUNCTION ("for_b_notify()");
 
-   /* Processing an incoming notify message.*/
-   switch (cc_data->state[cc_data->index_ti])
+  /* Processing an incoming notify message.*/
+  switch (cc_data->state[cc_data->index_ti])
   {
       /*
        * CS_0 is handled by the formatter
@@ -1521,7 +1523,6 @@
 }
 
 
-
 /*
 +--------------------------------------------------------------------+
 | PROJECT : GSM-PS (6147)       MODULE  : CC_FOR                     |
@@ -1617,7 +1618,6 @@
 }
 
 
-
 /*
 +--------------------------------------------------------------------+
 | PROJECT : GSM-PS (6147)       MODULE  : CC_FOR                     |
@@ -1724,7 +1724,6 @@
 
 */
 
-
 GLOBAL void for_mmcm_est_cnf (T_MMCM_ESTABLISH_CNF * est_cnf)
 {
   GET_INSTANCE_DATA;
@@ -1771,7 +1770,6 @@
 }
 
 
-
 /*
 +--------------------------------------------------------------------+
 | PROJECT : GSM-PS (6147)       MODULE  : CC_FOR                     |
@@ -1895,14 +1893,14 @@
   PALLOC (rel, MMCM_RELEASE_REQ);
 
   TRACE_FUNCTION ("for_rel_req()");
-    rel->org_entity = NAS_ORG_ENTITY_CC;
-    rel->ti = cc_data->ti;
-
-    PSENDX (MM, rel);
-
-    EM_CC_RELEASE_SENT;     
-
-    if (cc_data->ti NEQ cc_data->setup_reattempt_ti)
+  rel->org_entity = NAS_ORG_ENTITY_CC;
+  rel->ti = cc_data->ti;
+
+  PSENDX (MM, rel);
+
+  EM_CC_RELEASE_SENT;     
+
+  if (cc_data->ti NEQ cc_data->setup_reattempt_ti)
   {
     srv_free_ti ();
   }
@@ -1925,11 +1923,11 @@
 
   PALLOC (reest, MMCM_REESTABLISH_REQ);
 
-    TRACE_FUNCTION ("for_reest_req()");
-
-    reest->ti = cc_data->ti;
-
-    PSENDX (MM, reest);
+  TRACE_FUNCTION ("for_reest_req()");
+
+  reest->ti = cc_data->ti;
+
+  PSENDX (MM, reest);
 }
 
 /*
@@ -1948,7 +1946,6 @@
   
 /* Implements Measure#  38 */
   code_msg ((UBYTE *)start_cc, BSIZE_U_START_CC);
-  
 }
 
 
@@ -1968,7 +1965,6 @@
 
 /* Implements Measure#  38 */
   code_msg ((UBYTE *)est_cnf, BSIZE_U_CC_EST_CONF);
-
 }
 
 
@@ -2093,7 +2089,6 @@
 
   TRACE_FUNCTION ("for_release_complete()");
 
-
   if (cc_data->ti_ext_pres EQ TRUE)
   {
     data->sdu.o_buf = (USHORT)(CC_ENCODE_OFFSET+8);  /* additional byte for extended TI */
@@ -2112,7 +2107,6 @@
   EM_CC_RELEASE_COMPLETE_SENT;
   
   for_pd (data);
-
 }
 
 /*
@@ -2190,7 +2184,6 @@
 
 GLOBAL void for_start_dtmf ( T_U_START_DTMF * start_dtmf)
 {
-
   TRACE_FUNCTION ("for_start_dtmf()");
 /* Implements Measure#  22 */
   code_msg ((UBYTE *)start_dtmf, BSIZE_U_START_DTMF);
@@ -2212,7 +2205,6 @@
 {
   GET_INSTANCE_DATA;
 
-
   TRACE_FUNCTION ("for_stop_dtmf()");
 /* Implements Measure 42  */
   for_fill_sdu_and_send (U_STOP_DTMF, BSIZE_U_STOP_DTMF);
@@ -2295,12 +2287,10 @@
 {
   GET_INSTANCE_DATA;
 
-
   TRACE_FUNCTION ("for_connect_ack()");
 /* Implements Measure 34  */
   for_fill_sdu_and_send (B_CONNECT_ACK, BSIZE_B_CONNECT_ACK);
   EM_CC_CONNECT_ACKNOWLEDGE;
-
 }
 
 /*
@@ -2316,8 +2306,7 @@
 
 GLOBAL void for_retrieve (void)
 {
-
-    TRACE_FUNCTION ("for_retrieve()");
+  TRACE_FUNCTION ("for_retrieve()");
 
 /* Implements Measure 42  */
   for_fill_sdu_and_send (U_RETRIEVE, BSIZE_U_RETRIEVE);
@@ -2336,8 +2325,7 @@
 
 GLOBAL void for_hold (void)
 {
-
-    TRACE_FUNCTION ("for_hold()");
+  TRACE_FUNCTION ("for_hold()");
 
 /* Implements Measure 42  */
   for_fill_sdu_and_send (U_HOLD, BSIZE_U_HOLD);
@@ -2392,9 +2380,7 @@
 
 GLOBAL void for_congestion_control (T_B_CONGEST_CTRL * cong)
 {
-  
-
-    TRACE_FUNCTION ("for_congestion_control()");
+  TRACE_FUNCTION ("for_congestion_control()");
 /* Implements Measure#  27 */
   code_msg ((UBYTE *)cong, BSIZE_B_CONGEST_CTRL);
 }
@@ -2412,8 +2398,7 @@
 
 GLOBAL void for_modify (T_B_MODIFY * modify)
 {
-
-    TRACE_FUNCTION ("for_modify()");
+  TRACE_FUNCTION ("for_modify()");
 
 /* Implements Measure#  28 */
   code_msg ((UBYTE *)modify, BSIZE_B_MODIFY);
@@ -2766,7 +2751,6 @@
 
 */
 LOCAL void for_send_u_release_comp (USHORT cause)
-
 {
   TRACE_FUNCTION ("for_send_u_release_comp()");