# HG changeset patch
# User Michael Spacefalcon <msokolov@ivan.Harhan.ORG>
# Date 1406949836 0
# Node ID c87f2e4dc391d2c506550f7c8d467995fc4cb952
# Parent  93feb6393fe8c8c2d121e6ba4f78786a893a680d
gsm-fw/L1/include: more preening of LoCosto-based headers

diff -r 93feb6393fe8 -r c87f2e4dc391 gsm-fw/L1/include/l1_msgty.h
--- a/gsm-fw/L1/include/l1_msgty.h	Sat Aug 02 01:22:43 2014 +0000
+++ b/gsm-fw/L1/include/l1_msgty.h	Sat Aug 02 03:23:56 2014 +0000
@@ -208,8 +208,8 @@
   T_ENCRYPTION_KEY      cipher_key;
   #if (AMR == 1)
     T_AMR_CONFIGURATION amr_configuration;
-#endif // (AMR == 1)
-#if ((REL99 == 1) && (FF_BHO == 1))
+  #endif // (AMR == 1)
+  #if ((REL99 == 1) && (FF_BHO == 1))
     BOOL               handover_type;
   #endif
 }
@@ -227,7 +227,7 @@
   #if (AMR == 1)
     T_AMR_CONFIGURATION amr_configuration;
   #endif
-#if ((REL99 == 1) && (FF_BHO == 1))
+  #if ((REL99 == 1) && (FF_BHO == 1))
     BOOL               handover_type;
   #endif
 }  
@@ -257,7 +257,7 @@
   #if (AMR == 1)
     T_AMR_CONFIGURATION amr_configuration;
   #endif
-#if ((REL99 == 1) && (FF_BHO == 1))
+  #if ((REL99 == 1) && (FF_BHO == 1))
     BOOL               handover_type;
   #endif
 }  
@@ -266,7 +266,7 @@
 typedef struct
 {
   UWORD8  cause;
-#if ((REL99 == 1) && (FF_BHO == 1))
+  #if ((REL99 == 1) && (FF_BHO == 1))
     UWORD32 fn_offset;
     UWORD32 time_alignment;
   #endif
@@ -300,7 +300,7 @@
     UWORD8       cv_bep_block_num;
     UWORD8       nbr_rcvd_blocks;
 #endif
-  #endif
+#endif
 
   // RESERVED: for trace/debug only
   UWORD8         facch_dl_count;
diff -r 93feb6393fe8 -r c87f2e4dc391 gsm-fw/L1/include/l1_proto.h
--- a/gsm-fw/L1/include/l1_proto.h	Sat Aug 02 01:22:43 2014 +0000
+++ b/gsm-fw/L1/include/l1_proto.h	Sat Aug 02 03:23:56 2014 +0000
@@ -99,13 +99,11 @@
 
 void  l1s_read_tx_result          (UWORD8 param1, UWORD8 param2);
 
-#if REL99
 #if FF_EMR
   void  l1s_read_dedic_scell_meas   (UWORD8 meas,   UWORD8 sub_flag, T_EMR_PARAMS *emr_params);
-#endif
-#else //REL99
+#else //FF_EMR
 void  l1s_read_dedic_scell_meas   (UWORD8 meas,   UWORD8 sub_flag);
-#endif //REL99
+#endif //FF_EMR
 void  l1s_dedic_reporting         (void);
 
 void  l1s_read_fb                 (UWORD8 task, UWORD32 fb_flag, UWORD32 toa, UWORD32 attempt,
diff -r 93feb6393fe8 -r c87f2e4dc391 gsm-fw/L1/include/l1_time.h
--- a/gsm-fw/L1/include/l1_time.h	Sat Aug 02 01:22:43 2014 +0000
+++ b/gsm-fw/L1/include/l1_time.h	Sat Aug 02 03:23:56 2014 +0000
@@ -100,7 +100,7 @@
     #define D_NSUBB_DEDIC_EDA  30L                                                     // Nb of 48 samples window for FB26 task.
   #endif
 #else
-  #if (DSP == 33) || (DSP == 34) || (DSP == 35) || (DSP == 32) || (DSP == 36) || (DSP == 37) || (DSP == 38) || (DSP == 39)
+  #if (DSP >= 32)
     #define D_NSUBB_DEDIC        30L                                                     // Nb of 48 samples window for FB26 task.
   #else
     #define D_NSUBB_DEDIC        31L                                                     // Nb of 48 samples window for FB26 task.
@@ -136,16 +136,16 @@
 
 #define TPU_SLEEP_LOAD       (  2L )                                                 // 2qbit TPU scen exec. for TPU sleep
 #if (CODE_VERSION==SIMULATION)
-  #define DL_ABB_DELAY         ( 32L )                                             // RX ABB filter delay
+  #define DL_ABB_DELAY         ( 32L )                // RX ABB filter delay
 #else
   #if (RF_FAM != 61)
-  #ifndef DL_ABB_DELAY //Flexi ABB Delays defines it in tpudrvXX.c
-      #define DL_ABB_DELAY         ( 32L + 4L)                                         // RX ABB filter delay
+    #ifndef DL_ABB_DELAY //Flexi ABB Delays defines it in tpudrvXX.c
+      #define DL_ABB_DELAY         ( 32L + 4L)        // RX ABB filter delay
     #endif
   #endif
   #if (RF_FAM == 61)
     #ifndef DL_ABB_DELAY //Flexi ABB Delays defines it in tpudrvXX.c
-      #define DL_ABB_DELAY         ( 41L + 4L)                                         // RX DRP filter delay
+      #define DL_ABB_DELAY         ( 41L + 4L)        // RX DRP filter delay
     #endif
   #endif
 #endif
diff -r 93feb6393fe8 -r c87f2e4dc391 gsm-fw/L1/include/l1_types.h
--- a/gsm-fw/L1/include/l1_types.h	Sat Aug 02 01:22:43 2014 +0000
+++ b/gsm-fw/L1/include/l1_types.h	Sat Aug 02 03:23:56 2014 +0000
@@ -19,7 +19,8 @@
   typedef unsigned char  BOOL;
 #endif /* #if !defined (BOOL_FLAG) */
 
-#if (OP_L1_STANDALONE == 1)
+// FreeCalypso change
+#if 1 //(OP_L1_STANDALONE == 1)
  
  
 #if !defined (NUCLEUS) && !defined CHAR_FLAG