--- a/gsm-fw/g23m-gsm/rr/Makefile	Sun Oct 05 21:02:39 2014 +0000
+++ b/gsm-fw/g23m-gsm/rr/Makefile	Sun Oct 05 22:01:15 2014 +0000
@@ -6,7 +6,7 @@
 	-I../../cdginc
 
 OBJS=	rr_attf.o rr_attp.o rr_atts.o rr_cs.o rr_csf.o rr_datf.o rr_datp.o \
-	rr_dats.o rr_em.o
+	rr_dats.o rr_em.o rr_forf.o
 
 all:	${OBJS}
 

--- a/gsm-fw/g23m-gsm/rr/rr_forf.c	Sun Oct 05 21:02:39 2014 +0000
+++ b/gsm-fw/g23m-gsm/rr/rr_forf.c	Sun Oct 05 22:01:15 2014 +0000
@@ -18,10 +18,13 @@
 +-----------------------------------------------------------------------------
 */
 
-
 #ifndef RR_FORF_C
 #define RR_FORF_C
 
+#include "config.h"
+#include "fixedconf.h"
+#include "condat-features.h"
+
 #define ENTITY_RR
 
 /*==== INCLUDES ===================================================*/
@@ -119,7 +122,7 @@
      * check the upper range boarder
      */
     bands_used = for_check_frequency (ba_range->freq_range[i].freq_higher);
-     if (bands_used <= INVALID_BAND_USED)
+    if (bands_used <= INVALID_BAND_USED)
       return FALSE;
   }
   return TRUE;
@@ -189,11 +192,8 @@
     for_frequency_list(&assign_cmd->freq_list_after,
                        &a_para->freq_list_after,
                        &a_para->hop_list_after);
-         
   }
-  
-  
-  
+
   /*
    * check the channel mode, if available.
    */
@@ -387,8 +387,6 @@
                         &a_para->hop_list_before);
   }
 
-
-
   if (assign_cmd->v_freq_chan_seq)
   {
     /*
@@ -542,8 +540,8 @@
   TRACE_FUNCTION ("for_check_multirate_conf()");
 
   /*
-  *  Check number of codec modes inside the set of AMR codec mode mask
-  */
+   *  Check number of codec modes inside the set of AMR codec mode mask
+   */
   for(i=0; i<8; i++)
   {
     if( (0x01<<i) & acs )
@@ -1076,7 +1074,6 @@
 
 typedef struct
 {
-
   UBYTE        count_after;
   UBYTE        count_before;
   T_LIST       cell_chan_desc;
@@ -1150,8 +1147,6 @@
     }
   }
 
-
-
   if (handov_cmd->v_freq_list_after)
   {
     /*
@@ -1165,10 +1160,8 @@
     for_frequency_list (&handov_cmd->freq_list_after,
                         &h_para->freq_list_after,
                         &h_para->hop_list_after);
-    
   }
 
-
   if (handov_cmd->v_cell_chan_desc)
   {
     /*
@@ -1324,9 +1317,9 @@
 
     if (h_para->count_before NEQ 0)
     {
-    /*
-     * The message contains a starting time information element.
-     */
+      /*
+       * The message contains a starting time information element.
+       */
       if (handov_cmd->v_chan_desc_before EQ FALSE)
       {
         /*
@@ -1481,17 +1474,12 @@
 
   if (handov_cmd->v_freq_list_before)
   {
-
-/* Implements RR Clone findings #7 */
+    /* Implements RR Clone findings #7 */
     for_frequency_list (&handov_cmd->freq_list_before,
                         &h_para->freq_list_before,
                         &h_para->hop_list_before);
-    
-
   }
 
-
-
   if (handov_cmd->v_freq_chan_seq_before)
   {
     /*
@@ -2365,7 +2353,7 @@
                               T_LIST *hop_list_starting_time)
 {
   TRACE_FUNCTION("for_frequency_list()");
-  
+
   memset (freq_list_starting_time_para, 0, sizeof (T_f_range));
   memcpy (freq_list_starting_time_para->b_f,
           freq_list_starting_time_cmd->flist,
@@ -2387,7 +2375,7 @@
 /*
 +--------------------------------------------------------------------+
 | PROJECT : GSM-PS (6147)       MODULE  : RR_FOR                     |
-| STATE   : code                ROUTINE : for_decode_param_freq        |
+| STATE   : code                ROUTINE : for_decode_param_freq      |
 +--------------------------------------------------------------------+
 
   PURPOSE : This function decodes the frequency parameter from the channel
@@ -2478,7 +2466,6 @@
   UBYTE             i,j;
 #endif /* #if defined (TI_PS_FF_RTD) AND defined (REL99) */
 
-  
   TRACE_FUNCTION ("for_process_si2quater");
 
   /* Step 1: Check if we received right BA_IND */
@@ -2993,7 +2980,7 @@
 +------------------------------------------------------------------------------
 */
 GLOBAL BOOL for_process_common_emr_data (T_gprs_rep_prio *p_rep,
-                                             T_gprs_bsic *p_bsic,                                             
+                                             T_gprs_bsic *p_bsic,
                                              UBYTE  msg_index,
                                              BOOL ba_available)
 {
@@ -3245,5 +3232,4 @@
 } /* end for_store_rtd_data() */
 #endif /* #if defined (TI_PS_FF_RTD) AND defined (REL99) */
 
-
 #endif