--- a/gsm-fw/g23m-gsm/rr/Makefile	Sun Oct 05 22:01:15 2014 +0000
+++ b/gsm-fw/g23m-gsm/rr/Makefile	Sun Oct 05 22:13:16 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_forf.o
+	rr_dats.o rr_em.o rr_forf.o rr_forp.o
 
 all:	${OBJS}
 

--- a/gsm-fw/g23m-gsm/rr/rr_forp.c	Sun Oct 05 22:01:15 2014 +0000
+++ b/gsm-fw/g23m-gsm/rr/rr_forp.c	Sun Oct 05 22:13:16 2014 +0000
@@ -21,6 +21,10 @@
 #ifndef RR_FORC_C
 #define RR_FORC_C
 
+#include "config.h"
+#include "fixedconf.h"
+#include "condat-features.h"
+
 #define ENTITY_RR
 
 /*==== INCLUDES ===================================================*/
@@ -274,13 +278,10 @@
       switch (_decodedMsg[0])
       {
         case D_ASSIGN_CMD:
-
           /*
            * Assignment command message to start an intracell
            * handover. Check the message content and configure layer 1.
            */
-
-
           for_check_assign_cmd (dl_data_ind, (T_D_ASSIGN_CMD *)_decodedMsg);
           break;
 
@@ -291,8 +292,6 @@
            */
           MCAST (chan_rel, D_CHAN_REL);
 
-
-
           if (chan_rel->v_ba_range)
           {
             /*
@@ -324,8 +323,6 @@
            */
           MCAST (chmod, D_CHAN_MOD); /* T_D_CHAN_MOD */
 
-
-
           switch( chmod->chan_desc.chan_type )
           {
             case TCH_H_S0:
@@ -369,7 +366,6 @@
             dat_for_chan_mod (dl_data_ind, chmod);
             break;
           }
-		  
 
           /*
            * if the message contains a channel mode information element which indicating AMR
@@ -420,8 +416,6 @@
 
           MCAST (ciph_cmd, D_CIPH_CMD); /* T_D_CIPH_CMD */
 
-
-
           /*
            * check the message content
            */
@@ -447,8 +441,6 @@
 
           MCAST (freq_redef, D_FREQ_REDEF); /* T_D_FREQ_REDEF */
 
-
-
           /*
            * check the channel description
            */
@@ -478,8 +470,6 @@
            * check the message content and process the handover message.
            */
 
-
-
           for_check_handov_cmd (dl_data_ind, (T_D_HANDOV_CMD *)_decodedMsg);
           break;
 
@@ -488,8 +478,6 @@
            * incoming status messages are ignored.
            */
 
-
-                         
           EM_RR_STATUS_RECEIVED;
 
           PFREE (dl_data_ind);
@@ -499,20 +487,15 @@
           /*
            * the network requests the mobile station classmark.
            */
-
-
-
 #ifdef REL99
           dat_for_class_enq (dl_data_ind, (T_D_CLASS_ENQ *)_decodedMsg);
 #else
           dat_for_class_enq (dl_data_ind);
 #endif
           break;
+
 #ifdef GPRS
         case D_PDCH_ASS_CMD:
-
-
-
           dl_data_ind->sdu.l_buf += 8;
           dl_data_ind->sdu.o_buf -= 8;
           rr_data->gprs_data.tbf_est = TBF_EST_NONE;
@@ -520,15 +503,13 @@
           break;
 
         case D_CHANGE_ORDER:
-
-
-
           dl_data_ind->sdu.l_buf += 8;
           dl_data_ind->sdu.o_buf -= 8;
           rr_data->gprs_data.tbf_est = TBF_EST_NONE;
           dat_rrgrr_change_order (dl_data_ind, (T_D_CHANGE_ORDER *)_decodedMsg);
           break;
 #endif
+
 #if defined FF_EOTD
         case B_APPLIC_INFO:
         {
@@ -552,7 +533,6 @@
       }
       break;
 
-
     default: /* switch (pd) */
       /*
        * all other protocol discriminators are for upper layer
@@ -694,8 +674,6 @@
        */
       MCAST (sys_info_1, D_SYS_INFO_1); /* T_D_SYS_INFO_1 */
 
-
-
       /*
        * successfully received system info
        * decrements the BCCH error counter
@@ -726,16 +704,12 @@
 
       MCAST (sys_info_2, D_SYS_INFO_2); /* T_D_SYS_INFO_2 */
 
-              
 /* Implements RR Clone findings #13 */
       for_unitdata_ind_sys_info_2_2bis(SI_TYPE_2, mph_unitdata_ind,
                                        &sys_info_2->neigh_cell_desc,&list,(T_VOID_STRUCT  *)sys_info_2);
 
-       
        break;
-
-       
-     }
+    }
 
     case D_SYS_INFO_2BIS:
     {
@@ -751,8 +725,6 @@
       for_unitdata_ind_sys_info_2_2bis(SI_TYPE_2BIS, mph_unitdata_ind,
                                        &sys_info_2bis->neigh_cell_desc,&list,(T_VOID_STRUCT *)sys_info_2bis);
        break;
-
-   
      }
 
      case D_SYS_INFO_2TER:
@@ -763,7 +735,6 @@
 
        MCAST (sys_info_2ter, D_SYS_INFO_2TER); /* T_D_SYS_INFO_2TER */
 
-
        /*
         * successfully received system info
         * decrements the BCCH error counter
@@ -840,15 +811,11 @@
 
        MCAST (sys_info_3, D_SYS_INFO_3); /* T_D_SYS_INFO_3 */
 
-
-
 /* Implements RR Clone findings #16 */
        for_unitdata_ind_si3_si4(SI_TYPE_3, mph_unitdata_ind,
                                 &sys_info_3->loc_area_ident,(T_VOID_STRUCT *)sys_info_3);
        
        break;
-       
-      
      }
 
      case D_SYS_INFO_4:
@@ -859,14 +826,10 @@
 
        MCAST (sys_info_4, D_SYS_INFO_4); /* T_D_SYS_INFO_4 */
 
-
-
 /* Implements RR Clone findings #16 */
        for_unitdata_ind_si3_si4(SI_TYPE_4, mph_unitdata_ind,
                                 &sys_info_4->loc_area_ident,(T_VOID_STRUCT *)sys_info_4);
        break;
-
-      
      }
 
      case D_SYS_INFO_5:
@@ -875,18 +838,13 @@
         * system information type 5 message on SACCH
         */
 /* Implements RR Clone findings #4 */
-       
 
        MCAST (sys_info_5, D_SYS_INFO_5); /* T_D_SYS_INFO_5 */
 
-       
 /* Implements RR Clone findings #4 */
        for_unitdata_ind_sys_info_5_5bis(SI_TYPE_5, mph_unitdata_ind,&rr_data->sc_data.ba_index,
                                         &sys_info_5->neigh_cell_desc, &list,(T_VOID_STRUCT *)sys_info_5);
        break;
-
-  
-       
      }
 
      case D_SYS_INFO_5BIS:
@@ -898,12 +856,10 @@
 
        MCAST (sys_info_5bis, D_SYS_INFO_5BIS); /* T_D_SYS_INFO_5BIS */
 
-       
 /* Implements RR Clone findings #4 */
        for_unitdata_ind_sys_info_5_5bis(SI_TYPE_5BIS, mph_unitdata_ind,&rr_data->sc_data.ba_index,
                                          &sys_info_5bis->neigh_cell_desc,&list,(T_VOID_STRUCT *)sys_info_5bis);
        break;
-      
      }
 
      case D_SYS_INFO_5TER:
@@ -914,7 +870,6 @@
 
        MCAST (sys_info_5ter, D_SYS_INFO_5TER); /* T_D_SYS_INFO_5TER */
 
-
        switch (std)
        {
          case STD_EGSM:
@@ -965,7 +920,6 @@
 
        MCAST (sys_info_6, D_SYS_INFO_6); /* T_D_SYS_INFO_6 */
 
-
        if (sys_info_6->loc_area_ident.c_mnc EQ 2)
        {
          /* Internally G23 uses always 3-digit-MNC */
@@ -987,7 +941,6 @@
         * decrements the BCCH error counter
         */
 
-
        if (rr_data->bcch_error)
          rr_data->bcch_error--;
 
@@ -999,10 +952,8 @@
 #ifdef GPRS
      case D_SYS_INFO_13: /* T_D_SYS_INFO_13 */
        {
-
          MCAST (sys_info_13, D_SYS_INFO_13);
 
-
          if (rr_data->bcch_error)
            rr_data->bcch_error--;
 
@@ -1019,7 +970,6 @@
 
        MCAST (imm_assign, D_IMM_ASSIGN); /* T_D_IMM_ASSIGN */
 
-
        /*
         * process the message
         */
@@ -1035,7 +985,6 @@
 
        MCAST (imm_assign_ext, D_IMM_ASSIGN_EXT); /* T_D_IMM_ASSIGN_EXT */
 
-
        /*
         * process the message.
         */
@@ -1045,10 +994,8 @@
 
      case D_IMM_ASSIGN_REJ:
      {
-
        MCAST (imm_assign_rej, D_IMM_ASSIGN_REJ); /* T_D_IMM_ASSIGN_REJ */
 
-
        /*
         * process the message
         */
@@ -1058,14 +1005,10 @@
 
      case D_EXT_MEAS_ORDER:
      {
-
        MCAST (ext_meas_order, D_EXT_MEAS_ORDER);
 
-
-
        dat_for_ext_meas_order (ext_meas_order);
        break;
-
      }
 
      default:
@@ -1073,7 +1016,7 @@
        break;
    }
 
-  PFREE (mph_unitdata_ind);
+   PFREE (mph_unitdata_ind);
 }
 
 /*