--- a/gsm-fw/L1/cfile/l1_drive.c	Mon Aug 04 04:57:24 2014 +0000
+++ b/gsm-fw/L1/cfile/l1_drive.c	Mon Aug 04 05:43:16 2014 +0000
@@ -17,7 +17,7 @@
 #endif
 
 #if ((W_A_WAIT_DSP_RESTART_AFTER_VOCODER_ENABLE ==1)&&(W_A_DSP_PR20037 == 1))
-  #include "nucleus.h"
+  #include "../../nucleus/nucleus.h"
 #endif
 #include "l1_macro.h"
 #if (CODE_VERSION == SIMULATION)
@@ -134,51 +134,13 @@
 
 
 
-/*-------------------------------------------------------*/
-/* Prototypes of external functions used in this file.   */
-/*-------------------------------------------------------*/
-void   l1dmacro_reset_hw (UWORD32 servingCellOffset);
-void   l1dmacro_idle     (void);
-void   l1dmacro_rx_synth (UWORD16 arfcn);
-void   l1dmacro_tx_synth (UWORD16 arfcn);
-void   l1dmacro_agc      (UWORD16 arfcn,WORD8 gain, UWORD8 lna
-                                            #if (RF_FAM == 61)
-                                            , UWORD8 if_ctl
-                                            #endif
-                                            );
-void   l1dmacro_afc      (UWORD16 afc_value, UWORD8 win_id);
-#if (CODE_VERSION == SIMULATION)
-  void   l1dmacro_rx_ms    (UWORD16 arfcn, BOOL rxnb_select);
-#else
-#if (L1_MADC_ON == 1)
-#if (RF_FAM == 61)
-void l1dmacro_rx_ms           (SYS_UWORD16 arfcn,UWORD8 adc_active);
-#endif
-#else
-void   l1dmacro_rx_ms    (SYS_UWORD16 arfcn);
-#endif
-#endif
+/*
+ * Prototypes of external functions used in this file.
+ *
+ * FreeCalypso change: removed all those prototypes which appear
+ * in tpudrv.h, and kept only the additional ones.
+ */
 
-#if (L1_MADC_ON == 1)
-#if (RF_FAM == 61)
-void   l1dmacro_rx_fb    (UWORD16 arfcn , UWORD8 adc_active);
-void   l1dmacro_rx_fb26  (UWORD16 arfcn, UWORD8 adc_active);
-#endif
-#else
-void   l1dmacro_rx_fb    (UWORD16 arfcn);
-void   l1dmacro_rx_fb26  (UWORD16 arfcn);
-#endif
-void   l1dmacro_offset   (UWORD32 offset_value, WORD32 relative_time);
-void   l1dmacro_synchro  (UWORD32 when, UWORD32 value);
-#if (L1_MADC_ON == 1)
-#if (RF_FAM == 61)
-void   l1dmacro_rx_sb    (UWORD16 arfcn, UWORD8 adc_active);
-void   l1dmacro_rx_nb    (UWORD16 arfcn, UWORD8 adc_active, UWORD8 csf_filter_choice
-						#if (NEW_SNR_THRESHOLD == 1)
-						  ,UWORD8 saic_flag
-						#endif /* NEW_SNR_THRESHOLD*/
-						);
-#endif
 #if ((REL99 == 1) && (FF_BHO == 1))
 #if (L1_MADC_ON == 1)
   void  l1dmacro_rx_fbsb (SYS_UWORD16 radio_freq,UWORD8 adc_active);
@@ -186,13 +148,6 @@
   void  l1dmacro_rx_fbsb (SYS_UWORD16 radio_freq);
 #endif
 #endif//#if ((REL99 == 1) && (FF_BHO == 1))
-#else
-void   l1dmacro_rx_sb    (UWORD16 arfcn);
-void   l1dmacro_rx_nb    (UWORD16 arfcn, UWORD8 csf_filter_choice);
-#endif
-void   l1dmacro_tx_nb    (UWORD16 arfcn, UWORD8 txpwr, UWORD8 adc_active);
-void   l1dmacro_tx_ra    (UWORD16 arfcn, UWORD8 txpwr, UWORD8 adc_active);
-void   l1dmacro_adc_read_rx (void);
 
 void Cust_get_ramp_tab(API *a_ramp, UWORD8 txpwr_ramp_up, UWORD8 txpwr_ramp_down, UWORD16 radio_freq);
 #if ((ANALOG == 1) || (ANALOG == 2) || (ANALOG == 3) || (RF_FAM == 61))
@@ -1510,8 +1465,9 @@
 /*-------------------------------------------------------*/
 void l1dtpu_serv_rx_nb(UWORD16 radio_freq, WORD8 agc, UWORD8 lna_off,
                        UWORD32 synchro_serv,UWORD32 new_offset,BOOL change_offset,
-                       UWORD8 adc_active, UWORD8 csf_filter_choice
+                       UWORD8 adc_active
                       #if(RF_FAM == 61)
+                     , UWORD8 csf_filter_choice
                      , UWORD8 if_ctl
                       #endif
                       #if (NEW_SNR_THRESHOLD == 1)
@@ -1579,7 +1535,11 @@
           );
    #endif /* RF_FAM == 61*/
    #else  /* L1_MADC_ON == 1 */
+    #if (RF_FAM == 61)
       l1dmacro_rx_cont   (FALSE, radio_freq,csf_filter_choice);
+    #else
+      l1dmacro_rx_cont   (FALSE, radio_freq);
+    #endif
    #endif
 	//TBD Danny New MAcro for Cont Tx reqd, to use only External Trigger
     else
@@ -1593,7 +1553,11 @@
         );  // RX window for NB.
  #endif /* RF_FAM == 61*/
  #else /* L1_MADC_ON == 1*/
-  l1dmacro_rx_nb   (radio_freq, csf_filter_choice); // RX window for NB.
+   #if (RF_FAM == 61)
+     l1dmacro_rx_nb   (radio_freq, csf_filter_choice);	// RX window for NB.
+   #else
+     l1dmacro_rx_nb   (radio_freq);			// RX window for NB.
+   #endif
  #endif
 
   #if ((ANALOG == 1) || (ANALOG == 2) || (ANALOG == 3))
@@ -1712,8 +1676,10 @@
 					      )
 {
   UWORD32 offset_neigh;
+#if (RF_FAM == 61)
   // By default we choose the hardware filter for neighbour Normal Bursts
   UWORD8 csf_filter_choice = L1_SAIC_HARDWARE_FILTER;
+#endif
 
   #if TESTMODE
     if (!l1_config.agc_enable)
@@ -1749,7 +1715,11 @@
       )  ;     // RX window for NB.
 #endif  /* RF_FAM == 61*/
 #else /* L1_MADC_ON == 1*/
-  l1dmacro_rx_nb   (radio_freq, csf_filter_choice);  // RX window for NB.
+  #if (RF_FAM == 61)
+    l1dmacro_rx_nb   (radio_freq, csf_filter_choice);	// RX window for NB.
+  #else
+    l1dmacro_rx_nb   (radio_freq);			// RX window for NB.
+  #endif
 #endif
 
   // Restore offset with serving value.