--- a/gsm-fw/g23m-gsm/rr/rr_csf.c	Sun Oct 05 08:52:20 2014 +0000
+++ b/gsm-fw/g23m-gsm/rr/rr_csf.c	Sun Oct 05 17:08:49 2014 +0000
@@ -22,6 +22,10 @@
 #ifndef RR_CSF_C
 #define RR_CSF_C
 
+#include "config.h"
+#include "fixedconf.h"
+#include "condat-features.h"
+
 #define ENTITY_RR
 #define SAP_ACI
 
@@ -45,7 +49,7 @@
 #include "rr.h"
 #include "cl_imei.h"   /* IMEI common library */
 #if defined(_SIMULATION_FFS_)
-#include "ffs/ffs.h"
+#include "../../services/ffs/ffs.h"
 #include "ffs_coat.h"
 #endif /* _SIMULATION_FFS_ */
 
@@ -531,8 +535,6 @@
     TRACE_EVENT_P1 ("'cmsp' configured to a value of %d (overwrite of rfcap)", cmsp);
   }
 
-
-
 #if defined(RFCAP_TEST)
   if (ccd_ret NEQ ccdOK)
   {
@@ -886,9 +888,10 @@
       break;
     case STD_DUAL_EGSM:
       /* note: incase of 1800 band, the FC bit shall be set to 0 */ 
-      if((rr_data->ms_data.rr_service EQ FULL_SERVICE) AND 
-         (!INRANGE(LOW_CHANNEL_1800,rr_data->nc_data[SC_INDEX].arfcn,HIGH_CHANNEL_1800)))
-      cm2->egsm = SUPPORTED;
+      if ((rr_data->ms_data.rr_service EQ FULL_SERVICE) AND 
+          (!INRANGE(LOW_CHANNEL_1800, rr_data->nc_data[SC_INDEX].arfcn,
+		    HIGH_CHANNEL_1800)))
+        cm2->egsm = SUPPORTED;
       cm3->mb_value = MB_DUAL_EXT;
 #ifdef GPRS
       rac->acc_tech_typ = ACC_GSM_E;
@@ -987,7 +990,7 @@
       cm3->gsm850_cap = rfc->rf_power.pow_class4[IDX_PWRCLASS_850].pow_class;
       cm3->v_pcs1900_cap = SUPPORTED;
       cm3->pcs1900_cap = rfc->rf_power.pow_class4[IDX_PWRCLASS_1900].pow_class;
-      /* note: in case the sc isīnt set, it is out of range */
+      /* note: in case the sc isn't set, it is out of range */
       if (INRANGE(LOW_CHANNEL_1900,serving_cell,HIGH_CHANNEL_1900))
         cm2->rf_pow_cap = cm3->pcs1900_cap - 1;
       else
@@ -1141,7 +1144,6 @@
     rac->acc_cap.ms_struct.hscsd_ms_class = rfc->rf_ms.hscsd_ms_class;
   }
 
-
   if (rfc->rf_ms.gprs_ms_class)
   {
     rac->acc_cap.v_ms_struct = SUPPORTED;
@@ -1149,7 +1151,6 @@
     rac->acc_cap.ms_struct.gprs_struct.gprs_ms_class = rfc->rf_ms.gprs_ms_class;
     rac->acc_cap.ms_struct.gprs_struct.gprs_eda = rfc->gprs_eda;
   }
-
 #endif
   
   cm3->ext_meas = rfc->ext_meas;
@@ -1530,7 +1531,7 @@
       rac->ra_cap_r[0].ra_cap_values.v_acc_cap = YES;
       
       if (INRANGE(LOW_CHANNEL_1800,serving_cell,HIGH_CHANNEL_1800))
-	  {
+      {
           rac->ra_cap_values.acc_tech_typ = ACC_GSM_1800;
           rac->ra_cap_r[0].ra_cap_values.acc_tech_typ = ACC_GSM_P;
       }
@@ -1554,7 +1555,7 @@
 
 #ifdef GPRS
       rac->v_ra_cap_r = YES;
-	  rac->c_ra_cap_r++;
+      rac->c_ra_cap_r++;
       rac->ra_cap_r[0].ra_cap_values.v_acc_cap = YES;
 
       if (INRANGE(LOW_CHANNEL_1800,serving_cell,HIGH_CHANNEL_1800))
@@ -1670,7 +1671,7 @@
       cm3->v_pcs1900_cap = SUPPORTED;
       cm3->pcs1900_cap = rfc->rf_power.pow_class4[IDX_PWRCLASS_1900].pow_class;
       
-	  /* note: in case the sc isīnt set, it is out of range */
+      /* note: in case the sc isn't set, it is out of range */
       if (INRANGE(LOW_CHANNEL_1900,serving_cell,HIGH_CHANNEL_1900))
         cm2->rf_pow_cap = cm3->pcs1900_cap - 1;
       else
@@ -1693,7 +1694,7 @@
         rac->ra_cap_values.acc_cap.pow_class = cm3->gsm850_cap;
         rac->ra_cap_r[0].ra_cap_values.acc_cap.pow_class = cm3->pcs1900_cap;
       }
-	  rac->ra_cap_r[0].ra_cap_values.acc_cap.v_a5_bits      = NOT_SUPPORTED;
+      rac->ra_cap_r[0].ra_cap_values.acc_cap.v_a5_bits      = NOT_SUPPORTED;
       rac->ra_cap_r[0].ra_cap_values.acc_cap.v_ms_struct    = NOT_SUPPORTED;
       rac->ra_cap_r[0].ra_cap_values.acc_cap.v_pow_8psk_cap = NOT_SUPPORTED;
 #endif
@@ -1861,7 +1862,6 @@
   rr_csf_trace_power ();
 #endif  /* RFCAP_TEST*/
 
-
 /*Set 8psk capability in uplink for EGPRS*/
 #if defined(FF_EGPRS)
 
@@ -1953,7 +1953,7 @@
           }
           if (rfc->rf_power.egde_pow2)
           {
-           /*Set 8psk capability for 850/900*/
+            /*Set 8psk capability for 850/900*/
             cm3->v_egde_struct = TRUE;
             cm3->egde_struct.mod = SUPPORTED;
             cm3->egde_struct.v_egde_pow2 = TRUE;
@@ -2013,7 +2013,6 @@
     rac->ra_cap_values.acc_cap.ms_struct.gprs_struct.gprs_eda = rfc->gprs_eda;
   }
 
-
   if (rfc->meas)
   {
     rac->ra_cap_values.acc_cap.ms_struct.v_sms_sm_value = SUPPORTED;
@@ -2046,7 +2045,6 @@
     rac->v_ra_cap_r = TRUE;
     rac->ra_cap_r[0].ra_cap_values.acc_cap.rev99 = RELEASE99; 
 
-
     rac->ra_cap_r[0].ra_cap_values.acc_cap.compact = rfc->compact;
     rac->ra_cap_r[0].ra_cap_values.acc_cap.es_ind = rfc->es_ind;
     rac->ra_cap_r[0].ra_cap_values.acc_cap.ps = rfc->ps;
@@ -2197,7 +2195,6 @@
 #endif
       )
     {
-
       if ( GET_STATE (STATE_ATT) NEQ ATT_DEDICATED )
       {
         rx_act_value = new_value;