--- a/gsm-fw/g23m-gsm/rr/Makefile	Sun Oct 05 19:24:06 2014 +0000
+++ b/gsm-fw/g23m-gsm/rr/Makefile	Sun Oct 05 19:58:17 2014 +0000
@@ -5,7 +5,8 @@
 CPPFLAGS=-I. -I../../include -I../../include/condat -I../../gpf/inc \
 	-I../../cdginc
 
-OBJS=	rr_attf.o rr_attp.o rr_atts.o rr_cs.o rr_csf.o rr_datf.o rr_datp.o
+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
 
 all:	${OBJS}
 

--- a/gsm-fw/g23m-gsm/rr/rr_dats.c	Sun Oct 05 19:24:06 2014 +0000
+++ b/gsm-fw/g23m-gsm/rr/rr_dats.c	Sun Oct 05 19:58:17 2014 +0000
@@ -22,6 +22,10 @@
 #ifndef RR_DATS_C
 #define RR_DATS_C
 
+#include "config.h"
+#include "fixedconf.h"
+#include "condat-features.h"
+
 #define ENTITY_RR
 
 /*==== INCLUDES ===================================================*/
@@ -644,7 +648,7 @@
 
     EM_CHANNEL_RELEASE;
   }
- PFREE (dl_data_ind);
+  PFREE (dl_data_ind);
 }
 
 /*
@@ -665,7 +669,6 @@
 #endif
 {
   TRACE_FUNCTION ("dat_for_class_enq()");
-  
 
   if (dat_check_error_flag (SEND_RR_STATUS))
   {
@@ -685,7 +688,6 @@
       dat_class_chng_data_req();
   }
 
-
   EM_CLASSMARK_ENQUIRY;
 
   PFREE (dl_data_ind);
@@ -965,7 +967,7 @@
       /*
        * store cipher parameter
        */
-        rr_data->sc_data.ciph_on = ciph_cmd->ciph_mode_set.sc;
+      rr_data->sc_data.ciph_on = ciph_cmd->ciph_mode_set.sc;
 
       rr_data->sc_data.algo    = ciph_cmd->ciph_mode_set.algo_ident;
       rr_data->sc_data.ciph_received = TRUE;
@@ -1220,7 +1222,6 @@
       break;
     }
 
-
     default:
       /*
        * the message check has passed.
@@ -1368,7 +1369,6 @@
           }
         }
 
-
         if(handov_cmd->v_mob_alloc_after)
         {
           if(dat_for_handover_mob_alloc(mob_alloc, hop_list_after, (T_VOID_STRUCT *) &handov_cmd->mob_alloc_after,dl_data_ind))
@@ -1436,20 +1436,21 @@
                  * calculate the observed time difference from the relative
                  * time difference of neighbourcell and serving cell
                  * (given by time_alignment and frame offset) and the observed
-                 * time difference of the serving cell (coming from timing advance
-                 * in layer 1 header of the downlink SACCH messages).
+                 * time difference of the serving cell (coming from timing
+		 * advance in layer 1 header of the downlink SACCH messages).
                  */
                  /*
                   * A.1.3 of   3GPP TS 05.10
                   * after successful handover, either synchronized,
-                  * non-synchronized or pseudo-synchronized, the MS shall provide
-                  * to BTS 1 the value of OTD + t0 in the "HANDOVER COMPLETE"
-                  * message.
+                  * non-synchronized or pseudo-synchronized, the MS shall
+		  * provide to BTS 1 the value of OTD + t0 in the
+		  * "HANDOVER COMPLETE" message.
                   *
                   * NOTE : measurement_report.otd is the TA sent by the
-                  * network in downlink SACCH.  TA is roundtrip propogation delay in bit periods.
-                  * t0 denotes the "one way" line of sight propagation delay between
-                  * the MS and BTS 0, in "half bits".
+                  * network in downlink SACCH.  TA is roundtrip propogation
+		  * delay in bit periods.
+                  * t0 denotes the "one way" line of sight propagation delay
+		  * between the MS and BTS 0, in "half bits".
                   * t0 = measurement_report.otd * 2 / 2.
                   */
                 rr_data->sc_data.observed_ta =
@@ -1460,7 +1461,6 @@
             }
           }
 
-
           dedicated_req->ho_param.ho_nci = rr_data->ms_data.ho_type.nci;
 
           /*
@@ -2410,7 +2410,7 @@
                               &data_req->sapi,
                               rr_data->sc_data.chan_desc.chan_type);
 
-		TRACE_EVENT_P1 ( "Value of tch_loop_subch %x", rr_data->tch_loop_subch);
+	TRACE_EVENT_P1 ( "Value of tch_loop_subch %x", rr_data->tch_loop_subch);
 
         /*
          * do not use CCD for the response
@@ -2840,9 +2840,9 @@
   {
     if (v_multirate_conf)
     {
-     /*
-      *  store a new multi-rate speech codec if available.
-      */
+      /*
+       *  store a new multi-rate speech codec if available.
+       */
       UBYTE i;
 
       rr_data->cr_data.amr_conf.mr_vers = multirate_conf->mr_vers;
@@ -2851,10 +2851,11 @@
       rr_data->cr_data.amr_conf.st_mode = multirate_conf->st_mode;
       rr_data->cr_data.amr_conf.set_amr = multirate_conf->set_amr;
 
-     /*
-      *  valid flag for the threshold and hystersis values. multirate_conf.c_cod_prop
-      *  defines the number of threshold and hystersis values.
-      */
+      /*
+       * valid flag for the threshold and hystersis values.
+       * multirate_conf.c_cod_prop
+       * defines the number of threshold and hystersis values.
+       */
       rr_data->cr_data.amr_conf.v_cod_prop = multirate_conf->v_cod_prop;
 
       if(rr_data->cr_data.amr_conf.v_cod_prop)
@@ -2892,9 +2893,9 @@
     MCAST (class_chng, U_CLASS_CHNG);/* T_U_CLASS_CHNG */
     PALLOC_MSG (dl_data_req, DL_DATA_REQ, U_CLASS_CHNG);
 
-   /*
-    * set channel type and sapi
-    */
+    /*
+     * set channel type and sapi
+     */
     dat_code_prr_channel (&dl_data_req->ch_type,
                           &dl_data_req->sapi, rr_data->sc_data.chan_desc.chan_type);