--- a/gsm-fw/L1/cfile/Makefile	Sun Aug 03 18:32:58 2014 +0000
+++ b/gsm-fw/L1/cfile/Makefile	Sun Aug 03 18:59:50 2014 +0000
@@ -5,7 +5,7 @@
 LD=	arm-elf-ld
 INTSED=	../intram.sed
 
-IOBJS=	l1_api_hisr.o l1_cmplx_intram.o
+IOBJS=	l1_api_hisr.o l1_cmplx_intram.o l1_ctl.o
 XOBJS=	l1_afunc.o l1_async.o l1_cmplx.o
 
 all:	${IOBJS} ${XOBJS}

--- a/gsm-fw/L1/cfile/l1_ctl.c	Sun Aug 03 18:32:58 2014 +0000
+++ b/gsm-fw/L1/cfile/l1_ctl.c	Sun Aug 03 18:59:50 2014 +0000
@@ -9,8 +9,9 @@
 
 #define  L1_CTL_C
 
+#include "config.h"
+#include "l1_confg.h"
 #include "l1_macro.h"
-#include "l1_confg.h"
 
 #if (CODE_VERSION == SIMULATION)
   #include <string.h>
@@ -103,7 +104,7 @@
     #include "l1aac_defty.h"
   #endif
   #include "l1_defty.h"
-  #include "cust_os.h"
+  #include "../../gpf/inc/cust_os.h"
   #include "l1_msgty.h"
   #include "l1_varex.h"
   #include "l1_proto.h"
@@ -117,17 +118,15 @@
     #include "l1tm_msgty.h"
     #include "l1tm_varex.h"
   #endif
-#if (OP_L1_STANDALONE == 1)
   #ifdef _INLINE
     #define INLINE static inline // Inline functions when -v option is set
   #else                          // when the compiler is ivoked.
     #define INLINE
   #endif
-  #endif //omaps00090550
 #endif
 
 #if(RF_FAM == 61)
-	#include "l1_rf61.h"
+  #include "l1_rf61.h"
 #endif
 
 #if (TRACE_TYPE == 1) || (TRACE_TYPE == 4)
@@ -135,8 +134,9 @@
 #endif
 
 extern SYS_UWORD16 Convert_l1_radio_freq(SYS_UWORD16 radio_freq);
+#if(RF_FAM == 61)
 extern WORD16 drp_gain_correction(UWORD16 arfcn, UWORD8 lna_off, UWORD16 agc);
-
+#endif
 
 #define LNA_OFF  1
 #define LNA_ON   0
@@ -1935,9 +1935,9 @@
    UWORD16  arfcn;
    UWORD16 dco_algo_ctl_pw_temp = 0;
    UWORD8 if_ctl = 0;
-   #if (CODE_VERSION != SIMULATION)
+   #if (RF_RAM == 61) && (CODE_VERSION != SIMULATION)
    UWORD8 if_threshold = C_IF_ZERO_LOW_THRESHOLD_GSM;
-#endif
+   #endif
 
 #if (L1_FF_MULTIBAND == 0)
 
@@ -2119,9 +2119,9 @@
    UWORD16 arfcn;
    UWORD16 dco_algo_ctl_pw_temp = 0;
    UWORD8 if_ctl = 0;
-   #if (CODE_VERSION != SIMULATION)
+   #if (RF_RAM == 61) && (CODE_VERSION != SIMULATION)
    UWORD8 if_threshold = C_IF_ZERO_LOW_THRESHOLD_GSM;
-#endif
+   #endif
 
 #if (L1_FF_MULTIBAND == 0)
 
@@ -2220,9 +2220,9 @@
    UWORD16  arfcn;
    UWORD16 dco_algo_ctl_pw_temp = 0;
    UWORD8 if_ctl = 0;
-   #if (CODE_VERSION != SIMULATION)
+   #if (RF_RAM == 61) && (CODE_VERSION != SIMULATION)
    UWORD8 if_threshold = C_IF_ZERO_LOW_THRESHOLD_GSM;
-#endif
+   #endif
 
 #if (L1_FF_MULTIBAND == 0)
 
@@ -2399,9 +2399,9 @@
    UWORD8  lna_off;
    UWORD16 dco_algo_ctl_pw_temp = 0;
    UWORD8 if_ctl = 0;
-   #if (CODE_VERSION != SIMULATION)
+   #if (RF_RAM == 61) && (CODE_VERSION != SIMULATION)
    UWORD8 if_threshold = C_IF_ZERO_LOW_THRESHOLD_GSM;
-#endif
+   #endif
 
    delta1_freq = l1ctl_encode_delta1(radio_freq);
    delta2_freq = l1ctl_encode_delta2(radio_freq);
@@ -2509,9 +2509,9 @@
   UWORD8       lna_off;
   UWORD16 dco_algo_ctl_pw_temp = 0;
   UWORD8 if_ctl = 0;
-  #if (CODE_VERSION != SIMULATION)
+  #if (RF_RAM == 61) && (CODE_VERSION != SIMULATION)
   UWORD8 if_threshold = C_IF_ZERO_LOW_THRESHOLD_GSM;
-#endif
+  #endif
 
   delta1_freq = l1ctl_encode_delta1(radio_freq);
   delta2_freq = l1ctl_encode_delta2(radio_freq);
@@ -2691,18 +2691,18 @@
     UWORD8       max_G_all, max_G_DTX, max_il;
     WORD32       last_known_agc, new_IL, current_calibrated_IL;
     WORD8        delta1_freq, delta2_freq;
-	WORD16       delta_drp_gain=0;
+    WORD16       delta_drp_gain=0;
     UWORD8       i;
     UWORD8       *tab_ptr, *tab_amr_ptr;
     T_DEDIC_SET *aset;
     WORD32       lna_value;
     UWORD16      arfcn;
-	UWORD8       lna_off;
+    UWORD8       lna_off;
     UWORD16 dco_algo_ctl_pw_temp = 0;
     UWORD8 if_ctl = 0;
-	#if (CODE_VERSION != SIMULATION)
+    #if (RF_RAM == 61) && (CODE_VERSION != SIMULATION)
 	UWORD8 if_threshold = C_IF_ZERO_LOW_THRESHOLD_GSM;
-#endif
+    #endif
 
     delta1_freq = l1ctl_encode_delta1(radio_freq);
     delta2_freq = l1ctl_encode_delta2(radio_freq);
@@ -3173,6 +3173,3 @@
   }
 }
 #endif /* #if (FF_L1_FAST_DECODING == 1)  */
-
-
-