--- a/gsm-fw/g23m-gsm/rr/rr_em.c	Sun Oct 05 19:58:17 2014 +0000
+++ b/gsm-fw/g23m-gsm/rr/rr_em.c	Sun Oct 05 21:02:39 2014 +0000
@@ -23,6 +23,10 @@
 #ifndef RR_EM_C
 #define RR_EM_C
 
+#include "config.h"
+#include "fixedconf.h"
+#include "condat-features.h"
+
 #define ENTITY_RR
 
 /*==== INCLUDES ===================================================*/
@@ -363,7 +367,7 @@
     memcpy(em_loc_pag_info_cnf->mcc, rr_data->nc_data[SC_INDEX].lai.mcc, SIZE_MCC);
 
     /*check for MNC with 2 digits*/
-	/* Fixed for Issue 21468 */
+    /* Fixed for Issue 21468 */
     if (rr_data->nc_data[SC_INDEX].lai.mnc[2] NEQ 0xF) /*defines a 3 digit NMC*/
     {
       memcpy(em_loc_pag_info_cnf->mnc, rr_data->nc_data[SC_INDEX].lai.mnc, SIZE_MNC);
@@ -437,8 +441,8 @@
   em_cip_hop_dtx_info_cnf->hop_chn.ma[0]  = NOT_PRESENT_16BIT;
   em_cip_hop_dtx_info_cnf->hop_chn2.ma[0] = NOT_PRESENT_16BIT;
   
-  if((GET_STATE(STATE_ATT) EQ ATT_DEDICATED) AND 
-	                            (GET_STATE(STATE_DAT) EQ DAT_DEDICATED))
+  if ((GET_STATE(STATE_ATT) EQ ATT_DEDICATED) AND 
+      (GET_STATE(STATE_DAT) EQ DAT_DEDICATED))
   {
     /* cipher status */
     em_cip_hop_dtx_info_cnf->ciph_stat = rr_data->sc_data.ciph_on;
@@ -597,7 +601,6 @@
   PALLOC(em_sw_version_info_cnf, EM_SW_VERSION_INFO_CNF);
   PFREE(em_sw_version_info_req);
 
-
   TRACE_FUNCTION ("dat_em_mobdata_version_info_req()");
 
   memset (em_sw_version_info_cnf, 0, sizeof (T_EM_SW_VERSION_INFO_CNF));
@@ -638,8 +641,8 @@
   TRACE_FUNCTION ("dat_em_amr_info_req()");
 
   /* AMR information is valid only in dedicated state, when chan mode is AMR */
-  if((GET_STATE(STATE_ATT) EQ ATT_DEDICATED) AND 
-	                              (GET_STATE(STATE_DAT) EQ DAT_DEDICATED))
+  if ((GET_STATE(STATE_ATT) EQ ATT_DEDICATED) AND 
+      (GET_STATE(STATE_DAT) EQ DAT_DEDICATED))
   {
     if(rr_data->sc_data.ch_mode EQ CM_AMR)
     {
@@ -1158,13 +1161,13 @@
 */
 static void rr_semaphore_err (void)
 {
- static UCHAR out = 0;
+  static UCHAR out = 0;
+
   if (!out)
   {
     out = 1;
 /* Implements Measure#32: Row 224 */
     TRACE_EVENT ("semaphore error");
-
   }
 }
 
@@ -1245,7 +1248,7 @@
   if (sem_EM_RR NEQ VSI_ERROR)
     em_rr_sem_clear ();
   else
-    SYST_TRACE ("RR:canīt open semaphore \"EM_RR_SEM\"");
+    SYST_TRACE ("RR:can't open semaphore \"EM_RR_SEM\"");
 }
 
 /*
@@ -1478,7 +1481,7 @@
   /*check for SC data*/
   if(em_pco_trace_req->pco_bitmap & EM_PCO_SC_INFO)
   {
-       switch (GET_STATE (STATE_ATT))
+    switch (GET_STATE (STATE_ATT))
     {
       case ATT_IDLE:
 
@@ -1692,9 +1695,9 @@
     
     /*to store the trace output*/
     char hop_freq_list[MAX_SPRINTF_STRING_LEN]; /*lint !e813 , info about length*/
-    
-    if((GET_STATE(STATE_ATT) EQ ATT_DEDICATED) AND 
-	                            (GET_STATE(STATE_DAT) EQ DAT_DEDICATED))
+
+    if ((GET_STATE(STATE_ATT) EQ ATT_DEDICATED) AND 
+        (GET_STATE(STATE_DAT) EQ DAT_DEDICATED))
     {
 
       TRACE_EVENT_EM_P6("EM_CIP_HOP_DTX_INFO_REQ_DEDICATED: ciph:%d dtx:%d v_start:%d hop:%d hsn:%d arfcn:%d",
@@ -1836,8 +1839,8 @@
    /*check AMR configuration data*/
   if(em_pco_trace_req->pco_bitmap & EM_PCO_AMR_INFO)
   {
-    if((GET_STATE(STATE_ATT) EQ ATT_DEDICATED) AND 
-	                                (GET_STATE(STATE_DAT) EQ DAT_DEDICATED))
+    if ((GET_STATE(STATE_ATT) EQ ATT_DEDICATED) AND 
+        (GET_STATE(STATE_DAT) EQ DAT_DEDICATED))
     {
       if(rr_data->sc_data.ch_mode EQ CM_AMR)
       {
@@ -2097,11 +2100,8 @@
  
 }
 
-
 #endif /* GPRS */
 
 #endif /* FF_EM_MODE */
 
-
-
 #endif /* RR_EM_C */