changeset 151:d0de2d0a426d

more L1 header files brought in
author Michael Spacefalcon <msokolov@ivan.Harhan.ORG>
date Sun, 17 Nov 2013 04:50:45 +0000
parents 3c850b416c9a
children 26472940e5b0
files gsm-fw/L1/cust0/l1_rf10.h gsm-fw/L1/cust0/l1_rf12.h gsm-fw/L1/cust0/l1_rf2.h gsm-fw/L1/cust0/l1_rf35.h gsm-fw/L1/cust0/l1_rf8.h gsm-fw/L1/include/l1_confg.h gsm-fw/L1/include/l1_ctl.h gsm-fw/L1/include/l1_macro.h gsm-fw/bsp/abb+spi/abb.c
diffstat 9 files changed, 2860 insertions(+), 17 deletions(-) [+]
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/gsm-fw/L1/cust0/l1_rf10.h	Sun Nov 17 04:50:45 2013 +0000
@@ -0,0 +1,631 @@
+/************* Revision Controle System Header *************
+ *                  GSM Layer 1 software
+ *
+ *        Filename l1_rf10.h
+ *  Copyright 2003 (C) Texas Instruments  
+ * 
+ ************* Revision Controle System Header *************/
+
+#ifndef __L1_RF_H__
+#define __L1_RF_H__
+
+ // is this defined somewhere else?
+ //#define RF_HW_BAND_EGSM
+ //#define RF_HW_BAND_DCS
+
+#define RF_HW_BAND_PCS       0x4
+#define RF_HW_BAND_DUAL_US   0x80
+#define RF_HW_BAND_DUAL_EXT  0x20
+
+ #define RF_HW_BAND_SUPPORT (RF_HW_BAND_DUAL_EXT | RF_HW_BAND_PCS)  // radio_band_support E-GSM/DCS + PCS
+
+// L1 RF SW Multiband configuration
+//--------------------------
+
+// RF_SW_MULTIBAND_SUPPORT values
+#define SINGLE_BAND_900           1
+#define SINGLE_BAND_1800          2
+#define SINGLE_BAND_850           3
+#define SINGLE_BAND_1900          4
+#define DUAL_BAND_900_1800        5
+#define DUAL_BAND_850_1900        6
+#define TRI_BAND_900_1800_1900    7
+#define TRI_BAND_850_1900_1800    8
+#define QUAD_BAND                 9
+
+//IMPORTANT  !: To change RF_SW_MULTIBAND_SUPPORT value, it must be synchronized with other multiband settings in the software
+// To match the protocol stack settings( e.g EF_RFCAP ) in order to make sure that the value of STD sent in MPHC_INIT_L1_REQ is supported by L1
+// And also match the RF HW support: RF_HW_BAND_SUPPORT
+#define   RF_SW_MULTIBAND_SUPPORT   QUAD_BAND  
+
+ // Generate band dependancy options
+#define RF_SW_BAND900   ((RF_SW_MULTIBAND_SUPPORT == SINGLE_BAND_900)||(RF_SW_MULTIBAND_SUPPORT == DUAL_BAND_900_1800) \
+    					||(RF_SW_MULTIBAND_SUPPORT == TRI_BAND_900_1800_1900) ||(RF_SW_MULTIBAND_SUPPORT == QUAD_BAND) )
+
+ #define RF_SW_BAND1800  ((RF_SW_MULTIBAND_SUPPORT == SINGLE_BAND_1800) ||(RF_SW_MULTIBAND_SUPPORT == DUAL_BAND_900_1800) \
+    					 ||(RF_SW_MULTIBAND_SUPPORT == TRI_BAND_900_1800_1900) ||(RF_SW_MULTIBAND_SUPPORT == TRI_BAND_850_1900_1800) \
+    					 ||(RF_SW_MULTIBAND_SUPPORT == QUAD_BAND))
+
+ #define RF_SW_BAND850    ((RF_SW_MULTIBAND_SUPPORT == SINGLE_BAND_850)||(RF_SW_MULTIBAND_SUPPORT == DUAL_BAND_850_1900) \
+    					 ||(RF_SW_MULTIBAND_SUPPORT == TRI_BAND_850_1900_1800) ||(RF_SW_MULTIBAND_SUPPORT == QUAD_BAND)) 
+
+ #define RF_SW_BAND1900  ((RF_SW_MULTIBAND_SUPPORT == SINGLE_BAND_1900)||(RF_SW_MULTIBAND_SUPPORT == DUAL_BAND_850_1900) \
+ 					 ||(RF_SW_MULTIBAND_SUPPORT == TRI_BAND_900_1800_1900)||(RF_SW_MULTIBAND_SUPPORT == TRI_BAND_850_1900_1800) \
+ 					 ||(RF_SW_MULTIBAND_SUPPORT == QUAD_BAND))
+/************************************/
+/* SYNTHESIZER setup time...        */
+/************************************/
+
+#define RX_SYNTH_SETUP_TIME (PROVISION_TIME - TRF_R1)               // RX Synthesizer setup time in qbit.
+#define TX_SYNTH_SETUP_TIME (- TRF_T1)                              // TX Synthesizer setup time in qbit.
+
+/************************************/
+/* time for TPU scenario ending...  */
+/************************************/
+
+#define RX_TPU_SCENARIO_ENDING  0                                   // execution time of BDLENA down
+                                                                    // contained in serialization time
+#define TX_TPU_SCENARIO_ENDING  DLT_1B - SL_SU_DELAY2 + 1           // execution time of BULON down
+                                                                    // minus serialization time + 1 TPU_MOVE
+
+/******************************************************/
+/* TXPWR configuration...                             */
+/* Fixed TXPWR value when GSM management is disabled. */
+/******************************************************/
+
+#if ((ANLG_FAM == 1) || (ANLG_FAM == 2) || (ANLG_FAM == 3))
+//  #define FIXED_TXPWR       ((0xFC<<6) | AUXAPC | FALSE)            // TXPWR=10, value=252
+//  #define FIXED_TXPWR       ((0x65<<6) | AUXAPC | FALSE)  
+  #define FIXED_TXPWR       ((0x74<<6) | AUXAPC | FALSE)            // TXPWR=15
+#endif
+
+/************************************/
+/*(ANALOG)delay (in qbits)          */
+/************************************/
+#define  DL_DELAY_RF      1                                         // time spent in the Downlink global RF chain by the modulated signal 
+#define  UL_DELAY_1RF     5                                         // time spent in the first  uplink RF block
+#define  UL_DELAY_2RF     0                                         // time spent in the second uplink RF block
+
+#if (ANLG_FAM == 1)
+  #define  UL_ABB_DELAY   6                                         // modulator input to output delay
+#endif
+
+#if ((ANLG_FAM == 2) || (ANLG_FAM == 3))
+  #define  UL_ABB_DELAY   3                                         // modulator input to output delay
+#endif
+
+/************************************/
+/* TX Propagation delay...          */
+/************************************/
+#if (ANLG_FAM == 1)
+  #define  PRG_TX       (DL_DELAY_RF + UL_DELAY_2RF + (GUARD_BITS*4) + UL_DELAY_1RF + UL_ABB_DELAY)       // = 40
+#endif
+
+#if (ANLG_FAM == 2) || (ANLG_FAM == 3)
+  #define  PRG_TX       (DL_DELAY_RF + UL_DELAY_2RF + (GUARD_BITS*4) + UL_DELAY_1RF + UL_ABB_DELAY + 2)   // = 42
+#endif
+
+/************************************/
+/* Initial value for APC DELAY      */
+/************************************/
+
+#if (ANLG_FAM == 1)
+//#define APCDEL_DOWN     (32 - GUARD_BITS*4)                       // minimum value: 2
+  #define APCDEL_DOWN      2                                        // minimum value: 2
+  #define APCDEL_UP       (6+5)                                     // minimum value: 6
+#endif
+
+#if (ANLG_FAM == 2) || (ANLG_FAM == 3)
+//#define APCDEL_DOWN     (32 - GUARD_BITS*4)                       // minimum value: 2
+  #define APCDEL_DOWN     (2+0)                                     // minimum value: 2
+  #define APCDEL_UP       (6+8)                                     // minimum value: 6
+#endif
+
+#define GUARD_BITS         8
+
+/************************************/
+/* Initial value for AFC...         */
+/************************************/
+
+#define  EEPROM_AFC    ((150)*8)                                    // F13.3 required!!!!! (default : -952*8, initial deviation of -2400 forced)
+
+#define  SETUP_AFC_AND_RF     6                                     // AFC converges in 2 frames
+                                                                    // Clara (RF=10) LDO wakeup requires 3 frames
+
+/************************************/
+/* Baseband registers               */
+/************************************/
+
+#if (ANLG_FAM == 1)
+
+  // Omega registers values will be programmed at 1st DSP communication interrupt
+
+  #define  C_DEBUG1          (0x0000                  | FALSE)      // Enable f_tx delay of 400000 cyc DEBUG 
+  #define  C_AFCCTLADD      ((0x000 << 6) | AFCCTLADD | TRUE )      // Value at reset
+  #define  C_VBUCTRL        ((0x0C9 << 6) | VBUCTRL   | TRUE )      // Side tone -17 dB, PGA_UL 3 dB
+  #define  C_VBDCTRL        ((0x006 << 6) | VBDCTRL   | TRUE )      // PGA_DL 0dB, Volume -12 dB
+  #define  C_APCOFF         ((0x07c << 6) | APCOFF    | TRUE )      // value at reset-Changed from 0x0016- CR 27.12
+  #define  C_BULIOFF        ((0x0FF << 6) | BULIOFF   | TRUE )      // value at reset
+  #define  C_BULQOFF        ((0x0FF << 6) | BULQOFF   | TRUE )      // value at reset
+  #define  C_DAI_ON_OFF      (0x000)                                // value at reset
+  #define  C_AUXDAC         ((0x000 << 6) | AUXDAC    | TRUE )      // value at reset
+  #define  C_VBCTRL         ((0x00B << 6) | VBCTRL    | TRUE )      // VULSWITCH=1, VDLAUX=1, VDLEAR=1 
+
+  // BULRUDEL will be initialized on rach only ....
+  #define  C_APCDEL1        (((APCDEL_DOWN-2) << 11)  | ((APCDEL_UP-6) << 6) | APCDEL1) 
+  #define  C_BBCTRL         ((0x181 << 6) | BBCTRL    | TRUE)       // OUTLEV1=OUTLEV1=SELVMID1=SELVMID0=1 for B-sample 'modified'
+#endif
+
+#if (ANLG_FAM == 2)
+
+  // IOTA registers values will be programmed at 1st DSP communication interrupt
+
+  #define  C_DEBUG1          (0x0000                  | TRUE )      // Enable f_tx delay of 400000 cyc DEBUG 
+  #define  C_AFCCTLADD      ((0x000 << 6) | AFCCTLADD | TRUE )      // Value at reset
+  #define  C_VBUCTRL        ((0x0C9 << 6) | VBUCTRL   | TRUE )      // Side tone -17 dB, PGA_UL 3 dB
+  #define  C_VBDCTRL        ((0x006 << 6) | VBDCTRL   | TRUE )      // PGA_DL 0dB, Volume -12 dB
+  #define  C_APCOFF         ((0x068 << 6) | APCOFF    | TRUE )      // value at reset-Changed from 3c to 28 CR 17.11.02// x2 slope 128
+  #define  C_BULIOFF        ((0x0FF << 6) | BULIOFF   | TRUE )      // value at reset
+  #define  C_BULQOFF        ((0x0FF << 6) | BULQOFF   | TRUE )      // value at reset
+  #define  C_DAI_ON_OFF     ((0x000 << 6) | APCOFF    | TRUE )      // value at reset
+  #define  C_AUXDAC         ((0x000 << 6) | AUXDAC    | TRUE )      // value at reset
+  #define  C_VBCTRL1        ((0x00B << 6) | VBCTRL1   | TRUE )      // VULSWITCH=1, VDLAUX=1, VDLEAR=1 
+  #define  C_VBCTRL2        ((0x000 << 6) | VBCTRL2   | TRUE )      // MICBIASEL=0, VDLHSO=0, MICAUX=0
+
+  // BULRUDEL will be initialized on rach only ....
+  #define  C_APCDEL1        (((APCDEL_DOWN-2) << 11)  | ((APCDEL_UP-6) << 6) | APCDEL1)  
+  #define  C_APCDEL2        ((0x000 << 6) | APCDEL2   | TRUE )                          //
+  
+  #define  C_BBCTRL         ((0x2C1 << 6) | BBCTRL    | TRUE )      // External RX I/Q DC offset calibration, Output common mode=1.35V
+                                                                    // Monoslot, Vpp=8/15*Vref
+  #define  C_BULGCAL        ((0x000 << 6) | BULGCAL   | TRUE )      // IAG=0 dB, QAG=0 dB
+#endif
+
+#if (ANLG_FAM == 3)
+
+  // SYREN registers values will be programmed at 1st DSP communication interrupt
+
+  #define  C_DEBUG1          (0x0000                  | FALSE)      // Enable f_tx delay of 400000 cyc DEBUG 
+  #define  C_AFCCTLADD      ((0x000 << 6) | AFCCTLADD | TRUE )      // Value at reset
+  #define  C_VBUCTRL        ((0x0C9 << 6) | VBUCTRL   | TRUE )      // Side tone - 17 dB, PGA_UL 3 dB
+  #define  C_VBDCTRL        ((0x006 << 6) | VBDCTRL   | TRUE )      // PGA_DL 0dB, Volume -12 dB
+  #define  C_APCOFF         ((0x07c << 6) | APCOFF    | TRUE )      // value at reset-Changed from 0x0016- CR 27.12
+  #define  C_BULIOFF        ((0x0FF << 6) | BULIOFF   | TRUE )      // value at reset
+  #define  C_BULQOFF        ((0x0FF << 6) | BULQOFF   | TRUE )      // value at reset
+  #define  C_DAI_ON_OFF     ((0x000 << 6) | APCOFF    | TRUE )      // value at reset
+  #define  C_AUXDAC         ((0x000 << 6) | AUXDAC    | TRUE )      // value at reset
+  #define  C_VBCTRL1        ((0x108 << 6) | VBCTRL1   | TRUE )      // VULSWITCH=1 AUXI 28,2 dB
+  #define  C_VBCTRL2        ((0x001 << 6) | VBCTRL2   | TRUE )      // HSMIC on, SPKG gain @ 2,5dB
+
+  // BULRUDEL will be initialized on rach only ....
+  #define  C_APCDEL1        (((APCDEL_DOWN-2) << 11)  | ((APCDEL_UP-6)<<6) | APCDEL1)  
+  #define  C_APCDEL2        ((0x000 << 6) | APCDEL2   | TRUE )
+  
+  #define  C_BBCTRL         ((0x2C1 << 6) | BBCTRL    | TRUE )      // External autocalibration, Output common mode=1.35V
+                                                                    // Monoslot, Vpp=8/15*Vref
+  #define  C_BULGCAL        ((0x000 << 6) | BULGCAL   | TRUE )      // IAG=0 dB, QAG=0 dB
+
+  #define  C_VBPOP          ((0x004 << 6) | VBPOP     | TRUE )      // HSOAUTO enabled only
+  #define  C_VAUDINITD      2                                       // vaud_init_delay init 2 frames
+  #define  C_VAUDCTRL       ((0x000 << 6) | VAUDCTRL  | TRUE )      // Init to zero
+  #define  C_VAUOCTRL       ((0x155 << 6) | VAUOCTRL  | TRUE )      // Speech on all outputs
+  #define  C_VAUSCTRL       ((0x000 << 6) | VAUSCTRL  | TRUE )      // Init to zero
+  #define  C_VAUDPLL        ((0x000 << 6) | VAUDPLL   | TRUE )      // Init to zero
+
+  // SYREN registers values programmed by L1 directly through SPI (ABB_on)
+
+  #define  C_BBCFG           0x44      // Syren Like BDLF Filter - DC OFFSET removal OFF
+
+#endif
+
+/************************************/
+/* Automatic frequency compensation */
+/************************************/
+/********************* C_Psi_sta definition *****************************/
+/* C_Psi_sta = (2*pi*Fr)        / (N * Fb)                              */
+/*      (1)  = (2*pi*V*ppm*0.9) / (N*V*Fb)                              */
+/*           regarding Vega V/N   = 2.4/4096                            */
+/*           regarding VCO  ppm/V = 16 / 1   (average slope of the VCO) */
+/*      (1)  = (2*pi*2.4*16*0.9) / (4096*1*270.83)                      */
+/*           = 0.000195748                                              */
+/* C_Psi_sta_inv = 1/C_Psi_sta = 5108                                   */
+/************************************************************************/
+
+#define  C_Psi_sta_inv    4174L                                     // (1/C_Psi_sta)        
+#define  C_Psi_st         13L                                       // C_Psi_sta * 0.8 F0.16
+#define  C_Psi_st_32      823216L                                   // F0.32                
+#define  C_Psi_st_inv     5217L                                     // (1/C_Psi_st)         
+
+#if (VCXO_ALGO == 1)
+  // Linearity parameters
+  #define  C_AFC_DAC_CENTER     ((111)*8)
+  #define  C_AFC_DAC_MIN        ((-1196)*8)
+  #define  C_AFC_DAC_MAX        ((1419)*8)
+
+  #define  C_AFC_SNR_THR        2560                                // 1/0.4    * 2**10
+#endif
+
+typedef struct
+{
+  WORD16  eeprom_afc;
+  UWORD32 psi_sta_inv;
+  UWORD32 psi_st;
+  UWORD32 psi_st_32;
+  UWORD32 psi_st_inv;
+
+  #if (VCXO_ALGO == 1)
+    // VCXO adjustment parameters
+    // Parameters used when assuming linearity
+    WORD16  dac_center;
+    WORD16  dac_min;
+    WORD16  dac_max;
+    WORD16  snr_thr;
+  #endif
+}
+T_AFC_PARAMS;
+
+/************************************/
+/* Swap IQ definitions...           */
+/************************************/
+/* 0=No Swap, 1=Swap RX only, 2=Swap TX only, 3=Swap RX and TX */
+
+#define  SWAP_IQ_GSM    0
+#define  SWAP_IQ_DCS    2                                           // was 2 for sara version 1
+#define  SWAP_IQ_PCS    2
+#define  SWAP_IQ_GSM850 0                                           // TBD
+
+/************************************/
+/************************************/
+// typedef
+/************************************/
+/************************************/
+
+/*************************************************************/
+/* Define structure for apc of TX Power                 ******/
+/*************************************************************/
+
+typedef struct 
+{ // pcm-file "rf/tx/level.gsm|dcs"
+  UWORD16 apc;                                                      // 0..31
+  UWORD8  ramp_index;                                               // 0..RF_TX_RAMP_SIZE
+  UWORD8  chan_cal_index;                                           // 0..RF_TX_CHAN_CAL_TABLE_SIZE
+} 
+T_TX_LEVEL;
+
+/************************************/
+/* Automatic Gain Control           */
+/************************************/
+/* Define structure for sub-band definition of TX Power ******/ 
+typedef struct 
+   {
+   UWORD16  upper_bound;                                            // highest physical arfcn of the sub-band 
+   WORD16    agc_calib;                                             // AGC  for each TXPWR
+   }T_RF_AGC_BAND;
+
+/************************************/
+/*       Ramp definitions           */
+/************************************/
+#if ((ANLG_FAM == 1) || (ANLG_FAM == 2) || (ANLG_FAM == 3))
+  typedef struct
+  {
+    UWORD8  ramp_up     [16];                                       // Ramp-up profile
+    UWORD8  ramp_down   [16];                                       // Ramp-down profile
+  }
+  T_TX_RAMP;
+#endif
+
+
+// RF structure definition
+//========================
+
+enum RfRevision {
+    RF_IGNORE      = 0x0000,
+    RF_SL2         = 0x1000,
+    RF_GAIA_20X    = 0x2000,
+    RF_GAIA_20A    = 0x2001,
+    RF_GAIA_20B    = 0x2002,
+    RF_ATLAS_20B   = 0x2020,
+    RF_PASCAL_20   = 0x2030
+};
+
+// Number of bands supported
+#define GSM_BANDS 2
+
+#define MULTI_BAND1                0
+#define MULTI_BAND2                1
+
+// RF table sizes
+#define RF_RX_CAL_CHAN_SIZE       10                                 // number of AGC sub-bands
+#define RF_RX_CAL_TEMP_SIZE       11                                 // number of temperature ranges
+
+#define RF_TX_CHAN_CAL_TABLE_SIZE  4                                 // channel calibration table size 
+#define RF_TX_NUM_SUB_BANDS        8                                 // number of sub-bands in channel calibration table
+#define RF_TX_LEVELS_TABLE_SIZE   32                                 // level table size  
+#define RF_TX_RAMP_SIZE           16                                 // number of ramp definitions
+#define RF_TX_CAL_TEMP_SIZE        5                                 // number of temperature ranges
+
+#define AGC_TABLE_SIZE            27
+
+#define TEMP_TABLE_SIZE          131                                 // number of elements in ADC->temp conversion table
+
+
+// RX parameters and tables
+//-------------------------
+
+// AGC parameters and tables
+typedef struct
+{
+  UWORD16 low_agc_noise_thr;
+  UWORD16 high_agc_sat_thr;
+  UWORD16 low_agc;
+  UWORD16 high_agc;
+  UWORD8  il2agc_pwr[121];
+  UWORD8  il2agc_max[121];
+  UWORD8  il2agc_av[121];
+}
+T_AGC;
+
+// Calibration parameters
+typedef struct
+{
+  UWORD16 g_magic;
+  UWORD16 lna_att;
+  UWORD16 lna_switch_thr_low;
+  UWORD16 lna_switch_thr_high;
+}
+T_RX_CAL_PARAMS;   
+
+// RX temperature compensation
+typedef struct
+{
+  WORD16 temperature;
+  WORD16 agc_calib;
+}
+T_RX_TEMP_COMP;
+
+// RF RX structure
+typedef struct
+{
+  T_AGC              agc;
+}
+T_RF_RX; //common
+
+// RF RX structure
+typedef struct
+{
+  T_RX_CAL_PARAMS rx_cal_params;
+  T_RF_AGC_BAND   agc_bands[RF_RX_CAL_CHAN_SIZE];
+  T_RX_TEMP_COMP  temp[RF_RX_CAL_TEMP_SIZE];
+}
+T_RF_RX_BAND;
+
+
+// TX parameters and tables
+//-------------------------
+
+// TX temperature compensation
+typedef struct
+{
+  WORD16 temperature;
+  #if (ORDER2_TX_TEMP_CAL==1)
+    WORD16 a;
+    WORD16 b;
+    WORD16 c;
+  #else
+    WORD16 apc_calib;
+  #endif
+}
+T_TX_TEMP_CAL;
+
+
+// Ramp up and ramp down delay
+typedef struct
+{
+  UWORD16 up;
+  UWORD16 down;
+}
+T_RAMP_DELAY;
+
+typedef struct 
+{
+  UWORD16 arfcn_limit;
+  WORD16  chan_cal;
+} 
+T_TX_CHAN_CAL; 
+
+// RF TX structure
+typedef struct
+{
+  T_RAMP_DELAY   ramp_delay;
+  UWORD8         guard_bits;  // number of guard bits needed for ramp up
+  UWORD8         prg_tx;
+}
+T_RF_TX; //common
+  
+// RF TX structure
+typedef struct
+{
+  T_TX_LEVEL           levels[RF_TX_LEVELS_TABLE_SIZE];
+  T_TX_CHAN_CAL        chan_cal_table[RF_TX_CHAN_CAL_TABLE_SIZE][RF_TX_NUM_SUB_BANDS];
+  T_TX_RAMP            ramp_tables[RF_TX_RAMP_SIZE];
+  T_TX_TEMP_CAL        temp[RF_TX_CAL_TEMP_SIZE];
+}
+T_RF_TX_BAND;
+
+// band structure 
+typedef struct
+{
+  T_RF_RX_BAND  rx;
+  T_RF_TX_BAND  tx;
+  UWORD8        swap_iq;
+}
+T_RF_BAND;  
+  
+// RF structure 
+typedef struct
+{
+  // common for all bands
+  UWORD16      rf_revision;
+  UWORD16      radio_band_support;
+  T_RF_RX      rx;
+  T_RF_TX      tx;
+  T_AFC_PARAMS afc;
+}
+T_RF;
+
+/************************************/
+/*       MADC definitions           */
+/************************************/
+// Omega: 5 external channels if touch screen not used, 3 otherwise
+enum ADC_INDEX {
+   ADC_VBAT,
+   ADC_VCHARG,
+   ADC_ICHARG,
+   ADC_VBACKUP,
+   ADC_BATTYP,
+   ADC_BATTEMP,
+   ADC_ADC3,                          // name of this ??
+   ADC_RFTEMP,
+   ADC_ADC4,
+   ADC_INDEX_END                      // ADC_INDEX_END must be the end of the enums
+};
+
+typedef struct
+{
+     WORD16 converted[ADC_INDEX_END]; // converted
+    UWORD16 raw[ADC_INDEX_END];       // raw from ADC
+}
+T_ADC;
+
+/************************************/
+/*       MADC calibration           */
+/************************************/
+typedef struct
+{
+   UWORD16 a[ADC_INDEX_END];
+   WORD16 b[ADC_INDEX_END];
+}
+T_ADCCAL;
+
+// Conversion table: ADC value -> temperature
+typedef struct 
+{
+    UWORD16 adc;                      // ADC reading is 10 bits
+    WORD16  temp;                     // temp is in approx. range -30..+80
+}
+T_TEMP;
+
+typedef struct
+{
+    char *name;
+    void *addr;
+    int  size;
+}
+T_CONFIG_FILE;
+
+typedef struct
+{
+  char      *name;                    // name of ffs file suffix
+  T_RF_BAND *addr;                    // address to default flash structure
+  UWORD16   max_carrier;              // max carrier 
+  UWORD16   max_txpwr;                // max tx power
+}
+T_BAND_CONFIG;
+
+typedef struct
+{
+  UWORD8  band[GSM_BANDS];            // index to band address
+  UWORD8  txpwr_tp;                   // tx power turning point  
+  UWORD16 first_arfcn;                // first index
+}
+T_STD_CONFIG;
+
+enum GSMBAND_DEF 
+{
+  BAND_NONE,
+  BAND_EGSM900,
+  BAND_DCS1800,
+  BAND_PCS1900,
+  BAND_GSM850,
+  BAND_PCS1900_US,
+  // put new bands here
+  BAND_GSM900             // last entry
+};
+
+/************************************/
+/* ABB (Omega) Initialization       */
+/************************************/
+
+#if ((ANLG_FAM == 1) || (ANLG_FAM == 2))
+  #define ABB_TABLE_SIZE  16
+#endif
+
+#if (ANLG_FAM == 3)
+  #define ABB_TABLE_SIZE  22
+#endif
+
+// Note that this translation is probably not needed at all. But until L1 is
+// (maybe) changed to simply initialize the ABB from a table of words, we
+// use this to make things more easy-readable.
+#if (ANLG_FAM == 1)
+  enum ABB_REGISTERS {
+    ABB_AFCCTLADD = 0,
+    ABB_VBUCTRL,
+    ABB_VBDCTRL,
+    ABB_BBCTRL,
+    ABB_APCOFF,
+    ABB_BULIOFF,
+    ABB_BULQOFF,
+    ABB_DAI_ON_OFF,
+    ABB_AUXDAC,
+    ABB_VBCTRL,
+    ABB_APCDEL1
+  };
+#endif
+
+#if (ANLG_FAM == 2)
+  enum ABB_REGISTERS {
+    ABB_AFCCTLADD = 0,
+    ABB_VBUCTRL,
+    ABB_VBDCTRL,
+    ABB_BBCTRL,
+    ABB_BULGCAL,
+    ABB_APCOFF,
+    ABB_BULIOFF,
+    ABB_BULQOFF,
+    ABB_DAI_ON_OFF,
+    ABB_AUXDAC,
+    ABB_VBCTRL1,
+    ABB_VBCTRL2,
+    ABB_APCDEL1,
+    ABB_APCDEL2
+  };
+#endif
+
+#if (ANLG_FAM == 3)
+  enum ABB_REGISTERS {
+    ABB_AFCCTLADD = 0,
+    ABB_VBUCTRL,
+    ABB_VBDCTRL,
+    ABB_BBCTRL,
+    ABB_BULGCAL,
+    ABB_APCOFF,
+    ABB_BULIOFF,
+    ABB_BULQOFF,
+    ABB_DAI_ON_OFF,
+    ABB_AUXDAC,
+    ABB_VBCTRL1,
+    ABB_VBCTRL2,
+    ABB_APCDEL1,
+    ABB_APCDEL2,
+    ABB_VBPOP,
+    ABB_VAUDINITD,
+    ABB_VAUDCTRL,
+    ABB_VAUOCTRL,
+    ABB_VAUSCTRL,
+    ABB_VAUDPLL
+  };
+#endif
+
+#endif
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/gsm-fw/L1/cust0/l1_rf12.h	Sun Nov 17 04:50:45 2013 +0000
@@ -0,0 +1,638 @@
+/************* Revision Controle System Header *************
+ *                  GSM Layer 1 software
+ *
+ *        Filename l1_rf12.h
+ *  Copyright 2003 (C) Texas Instruments  
+ * 
+ ************* Revision Controle System Header *************/
+
+#ifndef __L1_RF_H__
+#define __L1_RF_H__
+
+#define RF_RITA_10 0x2030 // Check with TIDK
+
+//#define RF_HW_BAND_EGSM
+//#define RF_HW_BAND_DCS
+#define RF_HW_BAND_PCS 0x4
+#define RF_HW_BAND_DUAL_US  0x80
+#define RF_HW_BAND_DUAL_EXT 0x20
+
+//#define RF_HW_BAND_SUPPORT (0x0020 | RF_HW_BAND_PCS)  // radio_band_support E-GSM/DCS + PCS
+// radio_band_support E-GSM/DCS + GSM850/PCS
+#define RF_HW_BAND_SUPPORT (RF_HW_BAND_DUAL_EXT | RF_HW_BAND_DUAL_US)
+
+// L1 RF SW Multiband configuration
+//--------------------------
+
+// RF_SW_MULTIBAND_SUPPORT values
+#define SINGLE_BAND_900                 1
+#define SINGLE_BAND_1800                2
+#define SINGLE_BAND_850                 3
+#define SINGLE_BAND_1900                4
+#define DUAL_BAND_900_1800              5
+#define DUAL_BAND_850_1900              6
+#define TRI_BAND_900_1800_1900          7
+#define TRI_BAND_850_1900_1800          8
+#define QUAD_BAND                       9
+
+//IMPORTANT  !: To change RF_SW_MULTIBAND_SUPPORT value, it must be synchronized with other multiband settings in the software
+// To match the protocol stack settings( e.g EF_RFCAP ) in order to make sure that the value of STD sent in MPHC_INIT_L1_REQ is supported by L1
+// And also match the RF HW support: RF_HW_BAND_SUPPORT
+#define   RF_SW_MULTIBAND_SUPPORT   QUAD_BAND  
+
+ // Generate band dependancy options
+#define RF_SW_BAND900   ((RF_SW_MULTIBAND_SUPPORT == SINGLE_BAND_900)||(RF_SW_MULTIBAND_SUPPORT == DUAL_BAND_900_1800) \
+    					||(RF_SW_MULTIBAND_SUPPORT == TRI_BAND_900_1800_1900) ||(RF_SW_MULTIBAND_SUPPORT == QUAD_BAND) )
+
+ #define RF_SW_BAND1800  ((RF_SW_MULTIBAND_SUPPORT == SINGLE_BAND_1800) ||(RF_SW_MULTIBAND_SUPPORT == DUAL_BAND_900_1800) \
+    					 ||(RF_SW_MULTIBAND_SUPPORT == TRI_BAND_900_1800_1900) ||(RF_SW_MULTIBAND_SUPPORT == TRI_BAND_850_1900_1800) \
+    					 ||(RF_SW_MULTIBAND_SUPPORT == QUAD_BAND))
+
+ #define RF_SW_BAND850    ((RF_SW_MULTIBAND_SUPPORT == SINGLE_BAND_850)||(RF_SW_MULTIBAND_SUPPORT == DUAL_BAND_850_1900) \
+    					 ||(RF_SW_MULTIBAND_SUPPORT == TRI_BAND_850_1900_1800) ||(RF_SW_MULTIBAND_SUPPORT == QUAD_BAND)) 
+
+ #define RF_SW_BAND1900  ((RF_SW_MULTIBAND_SUPPORT == SINGLE_BAND_1900)||(RF_SW_MULTIBAND_SUPPORT == DUAL_BAND_850_1900) \
+ 					 ||(RF_SW_MULTIBAND_SUPPORT == TRI_BAND_900_1800_1900)||(RF_SW_MULTIBAND_SUPPORT == TRI_BAND_850_1900_1800) \
+ 					||(RF_SW_MULTIBAND_SUPPORT == QUAD_BAND))
+
+/************************************/
+/* SYNTHESIZER setup time...        */
+/************************************/
+#define RX_SYNTH_SETUP_TIME (PROVISION_TIME - TRF_R1)//RX Synthesizer setup time in qbit.
+#define TX_SYNTH_SETUP_TIME (- TRF_T1)               //TX Synthesizer setup time in qbit.
+
+/************************************/
+/* time for TPU scenario ending...  */
+/************************************/
+//
+// The following values are used to take into account any TPU activity AFTER
+// BDLON (or BDLENA) down (for RX) and BULON down (for TX)
+// - If there are no TPU commands after BDLON (or BDLENA) down and BULON down,
+//   these defines must be ZERO
+// - If there IS some TPU command after BDLON (or BDLENA) and BULON down,
+//   these defines must be equal to the time difference (in qbits) between 
+//   the BDLON (or BDLENA) or BULON time and the last TPU command on 
+//   the TPU scenario
+#define RX_TPU_SCENARIO_ENDING  0   // execution time of AFTER BDLENA down
+#define TX_TPU_SCENARIO_ENDING  0   // execution time of AFTER BULON down
+
+
+/******************************************************/
+/* TXPWR configuration...                             */
+/* Fixed TXPWR value when GSM management is disabled. */
+/******************************************************/
+
+#if ((ANLG_FAM == 1) || (ANLG_FAM == 2) || (ANLG_FAM == 3))
+//  #define FIXED_TXPWR       ((0xFC<<6) | AUXAPC | FALSE)  // TXPWR=10, value=252
+//#define FIXED_TXPWR         ((0x65<<6) | AUXAPC | FALSE)  
+  #define FIXED_TXPWR       ((0x74<<6) | AUXAPC | FALSE)  // TXPWR=15
+#endif
+
+
+/************************************/
+/* ANALOG delay (in qbits)          */
+/************************************/
+#define  DL_DELAY_RF      1   // time spent in the Downlink global RF chain by the modulated signal 
+#define  UL_DELAY_1RF     7   // time spent in the first  uplink RF block
+#define  UL_DELAY_2RF     0   // time spent in the second uplink RF block
+#if (ANLG_FAM == 1)
+  #define  UL_ABB_DELAY   3   // modulator input to output delay
+#endif
+#if ((ANLG_FAM == 2) || (ANLG_FAM == 3))
+  #define  UL_ABB_DELAY   3   // modulator input to output delay
+#endif
+
+/************************************/
+/* TX Propagation delay...          */
+/************************************/
+ #if ((ANLG_FAM == 1) || (ANLG_FAM == 2) || (ANLG_FAM == 3))
+  #define  PRG_TX       (DL_DELAY_RF + UL_DELAY_2RF + (GUARD_BITS*4) + UL_DELAY_1RF + UL_ABB_DELAY)   // = 40
+#endif
+
+/************************************/
+/* Initial value for APC DELAY      */
+/************************************/
+#if (ANLG_FAM == 1)
+//#define APCDEL_DOWN     (32 - GUARD_BITS*4)          // minimum value: 2
+  #define APCDEL_DOWN      2                           // minimum value: 2
+  #define APCDEL_UP       (6+5)                        // minimum value: 6
+#endif
+
+#if (ANLG_FAM == 2) || (ANLG_FAM == 3)
+//#define APCDEL_DOWN     (32 - GUARD_BITS*4)          // minimum value: 2
+  #define APCDEL_DOWN     (2+0)                        // minimum value: 2
+  #define APCDEL_UP       (6+3+1)                      // minimum value: 6
+                                                       // REMOVE // Jerome Modif for ARF7: (6+3) instead of (6+8)
+#endif
+
+#define GUARD_BITS 7
+
+/************************************/
+/* Initial value for AFC...         */
+/************************************/
+#define  EEPROM_AFC    ((150)*8)      // F13.3 required!!!!! (default : -952*8, initial deviation of -2400 forced)
+
+#define  SETUP_AFC_AND_RF     6       // AFC converges in 2 frames and RF BAND GAP stable after 4 frames
+                                      // Rita (RF=12) LDO wakeup requires 6 frames
+
+/************************************/
+/* Baseband registers               */
+/************************************/
+#if (ANLG_FAM == 1)
+   // Omega registers values will be programmed at 1st DSP communication interrupt 
+  #define  C_DEBUG1           0x0001                            // Enable f_tx delay of 400000 cyc DEBUG 
+  #define  C_AFCCTLADD      ((0x000 << 6) | AFCCTLADD | TRUE)   // Value at reset
+  #define  C_VBUCTRL        ((0x106 << 6) | VBUCTRL   | TRUE)   // Uplink gain amp 0dB, Sidetone gain to mute
+  #define  C_VBDCTRL        ((0x026 << 6) | VBDCTRL   | TRUE)   // Downlink gain amp 0dB, Volume control 0 dB
+  // RITA does not need an APCOFFSET because the PACTRL is internal: 
+// REMOVE //#define  C_APCOFF          0x1016 | (0x3c << 6) | TRUE   // value at reset-Changed from 0x0016- CR 27.12  
+  #define  C_APCOFF         ((0x040 << 6) | APCOFF    | TRUE)
+  #define  C_BULIOFF        ((0x0FF << 6) | BULIOFF   | TRUE)   // value at reset
+  #define  C_BULQOFF        ((0x0FF << 6) | BULQOFF   | TRUE)   // value at reset
+  #define  C_DAI_ON_OFF      (0x000)                            // value at reset
+  #define  C_AUXDAC         ((0x000 << 6) | AUXDAC    | TRUE)   // value at reset
+  #define  C_VBCTRL         ((0x00B << 6) | VBCTRL    | TRUE)   // VULSWITCH=1, VDLAUX=1, VDLEAR=1 
+  // BULRUDEL will be initialized on rach only ....
+  #define  C_APCDEL1        (((APCDEL_DOWN-2) << 11)  | ((APCDEL_UP-6) << 6) | APCDEL1) 
+  #define  C_BBCTRL         ((0x181 << 6) | BBCTRL    | TRUE)   // OUTLEV1=OUTLEV1=SELVMID1=SELVMID0=1 for B-sample 'modified'
+#endif
+
+#if (ANLG_FAM == 2)
+
+  // IOTA registers values will be programmed at 1st DSP communication interrupt
+
+  #define  C_DEBUG1          0x0001          // Enable f_tx delay of 400000 cyc DEBUG 
+  #define  C_AFCCTLADD      ((0x000 << 6) | AFCCTLADD | TRUE)   // Value at reset
+  #define  C_VBUCTRL        ((0x0C9 << 6) | VBUCTRL   | TRUE)   // Uplink gain amp 3 dB, Sidetone gain to -17dB
+  #define  C_VBDCTRL        ((0x006 << 6) | VBDCTRL   | TRUE)   // Downlink gain amp 0dB, Volume control -12 dB
+ // RITA does not need an APCOFFSET because the PACTRL is internal: 
+  // REMOVE //#define  C_APCOFF          0x1016 | (0x3c << 6) | TRUE   // x2 slope 128 
+#if (RF_PA == 0 || RF_PA == 3) 
+  #define  C_APCOFF         ((0x040 << 6) | APCOFF    | TRUE) // x2 slope 128 
+#elif (RF_PA == 1 || RF_PA == 2 || RF_PA == 4) 
+  #define  C_APCOFF         ((0x070 << 6) | APCOFF    | TRUE) // x2 slope 128 
+#endif
+  #define  C_BULIOFF        ((0x0FF << 6) | BULIOFF   | TRUE)   // value at reset
+  #define  C_BULQOFF        ((0x0FF << 6) | BULQOFF   | TRUE)   // value at reset
+  #define  C_DAI_ON_OFF     ((0x000 << 6) | APCOFF    | TRUE)   // value at reset
+  #define  C_AUXDAC         ((0x000 << 6) | AUXDAC    | TRUE)   // value at reset
+
+
+// audio patch for H2-sample:
+#if (RAZ_VULSWITCH_REGAUDIO == 1)
+  #define  C_VBCTRL1        ((0x003 << 6) | VBCTRL1   | TRUE)   // VBDFAUXG = 1, VULSWITCH=0, VDLAUX=1, VDLEAR=1 // jkb h2sample change
+#else
+  #define  C_VBCTRL1        ((0x00B << 6) | VBCTRL1   | TRUE)   // VULSWITCH=1, VDLAUX=1, VDLEAR=1 
+#endif
+
+
+  #define  C_VBCTRL2        ((0x000 << 6) | VBCTRL2   | TRUE)   // MICBIASEL=0, VDLHSO=0, MICAUX=0
+  // BULRUDEL will be initialized on rach only ....
+  #define  C_APCDEL1        (((APCDEL_DOWN-2) << 11)  | ((APCDEL_UP-6) << 6) | APCDEL1)  
+  #define  C_APCDEL2        ((0x000 << 6) | APCDEL2   | TRUE)                          //
+  #define  C_BBCTRL         ((0x2C1 << 6) | BBCTRL    | TRUE)   // Internal autocalibration, Output common mode=1.35V
+                                             // Monoslot, Vpp=8/15*Vref                                             
+  #define  C_BULGCAL        ((0x000 << 6) | BULGCAL   | TRUE) // IAG=0 dB, QAG=0 dB 
+#endif
+
+#if (ANLG_FAM == 3)
+
+  // SYREN registers values will be programmed at 1st DSP communication interrupt
+
+  #define  C_DEBUG1          0x0001                      // Enable f_tx delay of 400000 cyc DEBUG 
+  #define  C_AFCCTLADD      ((0x000 << 6) | AFCCTLADD | TRUE)   // Value at reset
+  #define  C_VBUCTRL        ((0x0C9 << 6) | VBUCTRL   | TRUE)   // Uplink gain amp 3dB, Sidetone gain to -17 dB
+  #define  C_VBDCTRL        ((0x006 << 6) | VBDCTRL   | TRUE)   // Downlink gain amp 0dB, Volume control -12 dB
+#if (RF_PA == 0 || RF_PA == 3) 
+  #define  C_APCOFF         ((0x040 << 6) | APCOFF    | TRUE)  // x2 slope 128 
+#elif (RF_PA == 1 || RF_PA == 2 || RF_PA == 4) 
+  #define  C_APCOFF         ((0x070 << 6) | APCOFF    | TRUE)  // x2 slope 128 
+#endif
+  #define  C_BULIOFF        ((0x0FF << 6) | BULIOFF   | TRUE)   // value at reset
+  #define  C_BULQOFF        ((0x0FF << 6) | BULQOFF   | TRUE)   // value at reset
+  #define  C_DAI_ON_OFF     ((0x000 << 6) | APCOFF    | TRUE)   // value at reset
+  #define  C_AUXDAC         ((0x000 << 6) | AUXDAC    | TRUE)   // value at reset
+  #define  C_VBCTRL1        ((0x108 << 6) | VBCTRL1   | TRUE)   // VULSWITCH=1 AUXI 28,2 dB  
+  #define  C_VBCTRL2        ((0x001 << 6) | VBCTRL2   | TRUE)   // HSMIC on, SPKG gain @ 2,5dB 
+
+  // BULRUDEL will be initialized on rach only ....
+  #define  C_APCDEL1        (((APCDEL_DOWN-2) << 11)  | ((APCDEL_UP-6)<<6) | APCDEL1)  
+  #define  C_APCDEL2        ((0x000 << 6) | APCDEL2   | TRUE)                          //
+  #define  C_BBCTRL         ((0x2C1 << 6) | BBCTRL    | TRUE)   // Internal autocalibration, Output common mode=1.35V
+                                                         // Monoslot, Vpp=8/15*Vref                                             
+  #define  C_BULGCAL        ((0x000 << 6) | BULGCAL   | TRUE) // IAG=0 dB, QAG=0 dB 
+
+  #define  C_VBPOP          ((0x004 << 6) | VBPOP     | TRUE)  // HSOAUTO enabled only
+  #define  C_VAUDINITD       2                           // vaud_init_delay init 2 frames
+  #define  C_VAUDCTRL       ((0x000 << 6) | VAUDCTRL  | TRUE)  // Init to zero
+  #define  C_VAUOCTRL       ((0x155 << 6) | VAUOCTRL  | TRUE)  // Speech on all outputs
+  #define  C_VAUSCTRL       ((0x000 << 6) | VAUSCTRL  | TRUE)  // Init to zero
+  #define  C_VAUDPLL        ((0x000 << 6) | VAUDPLL   | TRUE)  // Init to zero
+
+  // SYREN registers values programmed by L1 directly through SPI (ABB_on)
+
+  #define  C_BBCFG          (0x44)                               // Syren Like BDLF Filter - DC OFFSET removal OFF
+
+#endif
+
+
+/************************************/
+/* Automatic frequency compensation */
+/************************************/
+/********************* C_Psi_sta definition *****************************/
+/* C_Psi_sta = (2*pi*Fr)        / (N * Fb)                              */
+/*      (1)  = (2*pi*V*ppm*0.9) / (N*V*Fb)                              */
+/*           regarding Vega V/N   = 2.4/4096                            */
+/*           regarding VCO  ppm/V = 16 / 1   (average slope of the VCO) */
+/*      (1)  = (2*pi*2.4*16*0.9) / (4096*1*270.83)                      */
+/*           = 0.000195748                                              */
+/* C_Psi_sta_inv = 1/C_Psi_sta = 5108                                   */
+/************************************************************************/
+
+#define  C_Psi_sta_inv    5419L    // (1/C_Psi_sta)
+#define  C_Psi_st         10L      // C_Psi_sta * 0.8 F0.16
+#define  C_Psi_st_32      634112L  // F0.32
+#define  C_Psi_st_inv     6773L    // (1/C_Psi_st)
+
+#if (VCXO_ALGO == 1)
+// Linearity parameters
+  #define  C_AFC_DAC_CENTER     ((111)*8)
+  #define  C_AFC_DAC_MIN        ((-1196)*8)
+  #define  C_AFC_DAC_MAX        ((1419)*8)
+
+  #define  C_AFC_SNR_THR        2560     //  1/0.4    * 2**10
+#endif
+
+typedef struct
+{
+  WORD16  eeprom_afc;
+  UWORD32 psi_sta_inv;
+  UWORD32 psi_st;
+  UWORD32 psi_st_32;
+  UWORD32 psi_st_inv;
+
+  #if (VCXO_ALGO)
+  // VCXO adjustment parameters
+  // Parameters used when assuming linearity
+  WORD16  dac_center;
+  WORD16  dac_min;
+  WORD16  dac_max;
+    WORD16  snr_thr;
+  #endif
+}
+T_AFC_PARAMS;
+
+/************************************/
+/* Swap IQ definitions...           */
+/************************************/
+/* 0=No Swap, 1=Swap RX only, 2=Swap TX only, 3=Swap RX and TX */
+#if (RF_PG == R_PG_10)
+    // PG 1.0 -> 1 (Swap RX only)
+    // GSM 850 => TX is ALWAYS swapped compared to GSM 900
+    #define  SWAP_IQ_GSM    1
+    #define  SWAP_IQ_DCS    1
+    #define  SWAP_IQ_PCS    1
+    #define  SWAP_IQ_GSM850 3   // Swap TX compared to GSM 900
+#else
+    // All PG versions ABOVE 1.0 -> 0 (No Swap)
+    // GSM 850 => TX is ALWAYS swapped compared to GSM 900
+    #define  SWAP_IQ_GSM    0
+    #define  SWAP_IQ_DCS    0
+    #define  SWAP_IQ_PCS    0
+    #define  SWAP_IQ_GSM850 2   // Swap TX compared to GSM 900
+#endif
+
+/************************************/
+/************************************/
+// typedef
+/************************************/
+/************************************/
+
+/*************************************************************/
+/* Define structure for apc of TX Power                 ******/
+/*************************************************************/
+typedef struct 
+{ // pcm-file "rf/tx/level.gsm|dcs"
+  UWORD16 apc;            // 0..31
+  UWORD8  ramp_index;     // 0..RF_TX_RAMP_SIZE
+  UWORD8  chan_cal_index; // 0..RF_TX_CHAN_CAL_TABLE_SIZE
+} 
+T_TX_LEVEL;
+
+/************************************/
+/* Automatic Gain Control           */
+/************************************/
+/* Define structure for sub-band definition of TX Power ******/ 
+typedef struct 
+   {
+   UWORD16  upper_bound;     //highest physical arfcn of the sub-band 
+   WORD16    agc_calib;      // AGC  for each TXPWR
+   }T_RF_AGC_BAND;
+
+/************************************/
+/*       Ramp definitions           */
+/************************************/
+#if ((ANLG_FAM == 1) || (ANLG_FAM == 2) || (ANLG_FAM == 3))
+  typedef struct
+  {
+    UWORD8  ramp_up     [16];  // Ramp-up profile
+    UWORD8  ramp_down   [16];  // Ramp-down profile
+  }
+  T_TX_RAMP;
+#endif
+
+
+// RF structure definition
+//========================
+
+// Number of bands supported
+#define GSM_BANDS 2
+
+#define MULTI_BAND1     0
+#define MULTI_BAND2     1
+// RF table sizes
+#define RF_RX_CAL_CHAN_SIZE 10       // number of AGC sub-bands
+#define RF_RX_CAL_TEMP_SIZE 11       // number of temperature ranges
+
+#define RF_TX_CHAN_CAL_TABLE_SIZE  4 // channel calibration table size 
+#define RF_TX_NUM_SUB_BANDS        8 // number of sub-bands in channel calibration table
+#define RF_TX_LEVELS_TABLE_SIZE   32 // level table size  
+#define RF_TX_RAMP_SIZE           16 // number of ramp definitions
+#define RF_TX_CAL_TEMP_SIZE        5 // number of temperature ranges
+
+#define AGC_TABLE_SIZE            20 
+#define MIN_AGC_INDEX              6
+
+#define TEMP_TABLE_SIZE          131 // number of elements in ADC->temp conversion table
+
+
+// RX parameters and tables
+//-------------------------
+
+// AGC parameters and tables
+typedef struct
+{
+  UWORD16 low_agc_noise_thr;
+  UWORD16 high_agc_sat_thr;
+  UWORD16 low_agc;
+  UWORD16 high_agc;
+  UWORD8  il2agc_pwr[121];
+  UWORD8  il2agc_max[121];
+  UWORD8  il2agc_av[121];
+}
+T_AGC;
+
+// Calibration parameters
+typedef struct
+{
+  UWORD16 g_magic;
+  UWORD16 lna_att;
+  UWORD16 lna_switch_thr_low;
+  UWORD16 lna_switch_thr_high;
+}
+T_RX_CAL_PARAMS;   
+
+// RX temperature compensation
+typedef struct
+{
+  WORD16 temperature;
+  WORD16 agc_calib;
+}
+T_RX_TEMP_COMP;
+
+// RF RX structure
+typedef struct
+{
+  T_AGC              agc;
+}
+T_RF_RX; //common
+
+// RF RX structure
+typedef struct
+{
+  T_RX_CAL_PARAMS rx_cal_params;
+  T_RF_AGC_BAND   agc_bands[RF_RX_CAL_CHAN_SIZE];
+  T_RX_TEMP_COMP  temp[RF_RX_CAL_TEMP_SIZE];
+}
+T_RF_RX_BAND;
+
+
+// TX parameters and tables
+//-------------------------
+
+// TX temperature compensation
+typedef struct
+{
+  WORD16 temperature;
+  #if (ORDER2_TX_TEMP_CAL==1)
+  WORD16 a;
+  WORD16 b;
+  WORD16 c;
+  #else
+  WORD16 apc_calib;          
+  #endif
+}
+T_TX_TEMP_CAL;
+
+// Ramp up and ramp down delay
+typedef struct
+{
+  UWORD16 up;
+  UWORD16 down;
+}
+T_RAMP_DELAY;
+
+typedef struct 
+{
+  UWORD16 arfcn_limit;
+  WORD16  chan_cal;
+} 
+T_TX_CHAN_CAL; 
+
+// RF TX structure
+typedef struct
+{
+  T_RAMP_DELAY   ramp_delay;
+  UWORD8         guard_bits;  // number of guard bits needed for ramp up
+  UWORD8         prg_tx;
+}
+T_RF_TX; //common
+  
+// RF TX structure
+typedef struct
+{
+  T_TX_LEVEL           levels[RF_TX_LEVELS_TABLE_SIZE];
+  T_TX_CHAN_CAL        chan_cal_table[RF_TX_CHAN_CAL_TABLE_SIZE][RF_TX_NUM_SUB_BANDS];
+  T_TX_RAMP            ramp_tables[RF_TX_RAMP_SIZE];
+  T_TX_TEMP_CAL        temp[RF_TX_CAL_TEMP_SIZE];
+}
+T_RF_TX_BAND;
+
+// band structure 
+typedef struct
+{
+  T_RF_RX_BAND  rx;
+  T_RF_TX_BAND  tx;
+  UWORD8        swap_iq;
+}
+T_RF_BAND;  
+  
+// RF structure 
+typedef struct
+{
+  // common for all bands
+  UWORD16      rf_revision;
+  UWORD16      radio_band_support;
+  T_RF_RX      rx;
+  T_RF_TX      tx;
+  T_AFC_PARAMS afc;
+}
+T_RF;
+
+/************************************/
+/*       MADC definitions           */
+/************************************/
+// Omega: 5 external channels if touch screen not used, 3 otherwise
+enum ADC_INDEX {
+   ADC_VBAT,
+   ADC_VCHARG,
+   ADC_ICHARG,
+   ADC_VBACKUP,
+   ADC_BATTYP,
+   ADC_BATTEMP,
+   ADC_ADC3,     // name of this ??
+   ADC_RFTEMP,
+   ADC_ADC4,
+   ADC_INDEX_END // ADC_INDEX_END must be the end of the enums
+};
+
+typedef struct
+{
+    WORD16 converted[ADC_INDEX_END];  // converted
+    UWORD16 raw[ADC_INDEX_END];       // raw from ADC
+}
+T_ADC;
+
+/************************************/
+/*       MADC calibration           */
+/************************************/
+typedef struct
+{
+   UWORD16 a[ADC_INDEX_END];
+   WORD16 b[ADC_INDEX_END];
+}
+T_ADCCAL;
+
+// Conversion table: ADC value -> temperature
+typedef struct 
+{
+    UWORD16 adc;  // ADC reading is 10 bits
+    WORD16  temp; // temp is in approx. range -30..+80
+}
+T_TEMP;
+
+typedef struct
+{
+    char *name;
+    void *addr;
+    int  size;
+}
+T_CONFIG_FILE;
+
+typedef struct
+{
+  char      *name;         // name of ffs file suffix
+  T_RF_BAND *addr;         // address to default flash structure
+  UWORD16   max_carrier;   // max carrier 
+  UWORD16   max_txpwr;     // max tx power
+}
+T_BAND_CONFIG;
+
+typedef struct
+{
+  UWORD8  band[GSM_BANDS]; // index to band address
+  UWORD8  txpwr_tp;        // tx power turning point  
+  UWORD16 first_arfcn;     // first index
+}
+T_STD_CONFIG;
+enum GSMBAND_DEF 
+{
+  BAND_NONE,
+  BAND_EGSM900,
+  BAND_DCS1800,
+  BAND_PCS1900,
+  BAND_GSM850,
+  // put new bands here
+  BAND_GSM900  //last entry
+};
+
+/************************************/
+/* ABB (Omega) Initialization       */
+/************************************/
+
+#if ((ANLG_FAM == 1) || (ANLG_FAM == 2))
+#define ABB_TABLE_SIZE 16
+#elif (ANLG_FAM == 3)
+  #define ABB_TABLE_SIZE 22
+#endif
+
+// Note that this translation is probably not needed at all. But until L1 is
+// (maybe) changed to simply initialize the ABB from a table of words, we
+// use this to make things more easy-readable.
+
+#if (ANLG_FAM == 1)
+  enum ABB_REGISTERS {
+    ABB_AFCCTLADD = 0,
+    ABB_VBUCTRL,
+    ABB_VBDCTRL,
+    ABB_BBCTRL,
+    ABB_APCOFF,
+    ABB_BULIOFF,
+    ABB_BULQOFF,
+    ABB_DAI_ON_OFF,
+    ABB_AUXDAC,
+    ABB_VBCTRL,
+    ABB_APCDEL1
+  };
+#elif (ANLG_FAM == 2)
+  enum ABB_REGISTERS {
+    ABB_AFCCTLADD = 0,
+    ABB_VBUCTRL,
+    ABB_VBDCTRL,
+    ABB_BBCTRL,
+    ABB_BULGCAL,
+    ABB_APCOFF,
+    ABB_BULIOFF,
+    ABB_BULQOFF,
+    ABB_DAI_ON_OFF,
+    ABB_AUXDAC,
+    ABB_VBCTRL1,
+    ABB_VBCTRL2,
+    ABB_APCDEL1,
+    ABB_APCDEL2
+  };
+#elif (ANLG_FAM == 3)
+  enum ABB_REGISTERS {
+    ABB_AFCCTLADD = 0,
+    ABB_VBUCTRL,
+    ABB_VBDCTRL,
+    ABB_BBCTRL,
+    ABB_BULGCAL,
+    ABB_APCOFF,
+    ABB_BULIOFF,
+    ABB_BULQOFF,
+    ABB_DAI_ON_OFF,
+    ABB_AUXDAC,
+    ABB_VBCTRL1,
+    ABB_VBCTRL2,
+    ABB_APCDEL1,
+    ABB_APCDEL2,
+    ABB_VBPOP,
+    ABB_VAUDINITD,
+    ABB_VAUDCTRL,
+    ABB_VAUOCTRL,
+    ABB_VAUSCTRL,
+    ABB_VAUDPLL
+  };
+#endif
+#endif
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/gsm-fw/L1/cust0/l1_rf2.h	Sun Nov 17 04:50:45 2013 +0000
@@ -0,0 +1,529 @@
+/************* Revision Controle System Header *************
+ *                  GSM Layer 1 software
+ *
+ *        Filename l1_rf2.h
+ *  Copyright 2003 (C) Texas Instruments  
+ * 
+ ************* Revision Controle System Header *************/
+
+#ifndef __L1_RF_H__
+#define __L1_RF_H__
+
+/************************************/
+/************************************/
+//  # define 
+/************************************/
+/************************************/
+/* SYNTHESIZER setup time...        */
+/************************************/
+
+#define RX_SYNTH_SETUP_TIME          215L  // Synthesizer setup time in quarter bit.
+#define TX_SYNTH_SETUP_TIME          270L  // Synthesizer setup time in quarter bit.
+
+/************************************/
+/* time for TPU scenario ending...  */
+/************************************/
+
+#define RX_TPU_SCENARIO_ENDING      (4-3)  // execution time of BDLENA down
+                                           // minus serialization time
+#define TX_TPU_SCENARIO_ENDING      (4-3)  // execution time of BULON down
+                                           // minus serialization time
+
+/************************************/
+/* TXPWR configuration...           */
+/************************************/
+
+#if ((ANLG_FAM == 1) || (ANLG_FAM == 2) || (ANLG_FAM == 3))
+  #define FIXED_TXPWR       ((0x1FF << 6) | AUXAPC | FALSE)            // TXPWR=15
+//  #define FIXED_TXPWR       ((0xFF << 6) | AUXAPC | FALSE)
+#endif
+
+/************************************/
+/* TX Propagation delay...          */
+/************************************/
+
+#if ((ANLG_FAM == 1) || (ANLG_FAM == 2) || (ANLG_FAM == 3))
+//  #define  PRG_TX                ( 52L ) 
+  #define  PRG_TX                ( 8L) 
+#endif
+
+/************************************/
+/*(ANALOG)delay (in qbits)          */
+/************************************/
+
+#define  UL_ABB_DELAY   0   // modulator input to output delay
+
+/************************************/
+/* Initial value for AFC...         */
+/************************************/
+
+#define  EEPROM_AFC    ((-952-2400)*8)        // F13.3 required!!!!! (default : -952*8, initial deviation of -2400 forced)
+
+#define  SETUP_AFC_AND_RF            2        // time to have a stable output of the AFC and RF Band Gap(in Frames)
+                                              // !! minimum Value : 1 Frame due to the fact there is no
+                                              // hisr() in the first wake-up frame !!!!
+
+#if (ANLG_FAM == 1)
+  /************************************/
+  /* Omega power on...                */
+  /************************************/
+  // Omega registers values will be programmed at 1st DSP communication interrupt
+  #define  C_DEBUG1          (0x0000                  | FALSE)      // Enable f_tx delay of 400000 cyc DEBUG 
+  #define  C_AFCCTLADD      ((0x000 << 6) | AFCCTLADD | TRUE )      // Value at reset
+  #define  C_VBUCTRL        ((0x0C9 << 6) | VBUCTRL   | TRUE )      // Uplink gain amp 3 dB, Sidetone gain to -17 dB
+  #define  C_VBDCTRL        ((0x006 << 6) | VBDCTRL   | TRUE )      // Downlink gain amp 0dB, Volume control -12 dB
+  #define  C_BBCTRL         ((0x000 << 6) | BBCTRL    | TRUE )      // value at reset
+  #define  C_APCOFF         ((0x000 << 6) | APCOFF    | TRUE )
+  #define  C_BULIOFF        ((0x0FF << 6) | BULIOFF   | TRUE )      // value at reset
+  #define  C_BULQOFF        ((0x0FF << 6) | BULQOFF   | TRUE )      // value at reset
+  #define  C_DAI_ON_OFF       0x0000                                // value at reset
+  #define  C_AUXDAC         ((0x000 << 6) | AUXDAC    | TRUE )      // value at reset
+  #define  C_VBCTRL         ((0x00B << 6) | VBCTRL    | TRUE )      // VULSWITCH=0, VDLAUX=1, VDLEAR=1 
+
+  // BULRUDEL will be initialized on rach only ....
+  #define  C_APCDEL1        ((0x000 << 6) | APCDEL1   | FALSE) 
+#endif
+
+#if (ANLG_FAM == 2)
+  /************************************/
+  /* Iota power on...                 */
+  /************************************/
+  // Iota registers values will be programmed at 1st DSP communication interrupt
+  #define  C_DEBUG1          (0x0000                  | FALSE)      // Enable f_tx delay of 400000 cyc DEBUG 
+  #define  C_AFCCTLADD      ((0x000 << 6) | AFCCTLADD | TRUE )      // Value at reset
+  #define  C_VBUCTRL        ((0x0C9 << 6) | VBUCTRL   | TRUE )      // Uplink gain amp 3 dB, Sidetone gain to -17 dB
+  #define  C_VBDCTRL        ((0x006 << 6) | VBDCTRL   | TRUE )      // Downlink gain amp 0dB, Volume control -12 dB
+  #define  C_BBCTRL         ((0x000 << 6) | BBCTRL    | TRUE )      // value at reset
+  #define  C_BULGCAL        ((0x000 << 6) | BULGCAL   | TRUE )      // IAG=0 dB, QAG=0 dB
+  #define  C_APCOFF         ((0x000 << 6) | APCOFF    | TRUE )      // value at reset
+  #define  C_BULIOFF        ((0x0FF << 6) | BULIOFF   | TRUE )      // value at reset
+  #define  C_BULQOFF        ((0x0FF << 6) | BULQOFF   | TRUE )      // value at reset
+  #define  C_AUXDAC         ((0x000 << 6) | AUXDAC    | TRUE )      // value at reset
+  #define  C_DAI_ON_OFF       0x0000                                // value at reset
+  #define  C_VBCTRL1        ((0x00B << 6) | VBCTRL1   | TRUE )      // VULSWITCH=1, VDLAUX=1, VDLEAR=1 
+  #define  C_VBCTRL2        ((0x000 << 6) | VBCTRL2   | TRUE )      // MICBIASEL=0, VDLHSO=0, MICAUX=0
+  
+// BULRUDEL will be initialized on rach only ....
+  #define  C_APCDEL1        ((0x000 << 6) | APCDEL1   | TRUE )
+  #define  C_APCDEL2        ((0x000 << 6) | APCDEL2   | TRUE )
+#endif
+
+#if (ANLG_FAM == 3)
+  // SYREN registers values will be programmed at 1st DSP communication interrupt
+  #define  C_DEBUG1          (0x0000                  | FALSE)      // Enable f_tx delay of 400000 cyc DEBUG 
+  #define  C_AFCCTLADD      ((0x000 << 6) | AFCCTLADD | TRUE )      // Value at reset
+  #define  C_VBUCTRL        ((0x0C9 << 6) | VBUCTRL   | TRUE )      // Side tone -17 dB, PGA_UL 3 dB
+  #define  C_VBDCTRL        ((0x006 << 6) | VBDCTRL   | TRUE )      // PGA_DL 0dB, Volume -12 dB
+  #define  C_BBCTRL         ((0x000 << 6) | BBCTRL    | TRUE )      // Internal autocalibration, Output common mode=1.35V
+                                                                    // Monoslot, Vpp=8/15*Vref 
+  #define  C_BULGCAL        ((0x000 << 6) | BULGCAL   | TRUE )      // IAG=0 dB, QAG=0 dB
+  #define  C_APCOFF         ((0x000 << 6) | APCOFF    | TRUE )      // value at reset
+  #define  C_BULIOFF        ((0x0FF << 6) | BULIOFF   | TRUE )      // value at reset
+  #define  C_BULQOFF        ((0x0FF << 6) | BULQOFF   | TRUE )      // value at reset
+  #define  C_DAI_ON_OFF       0x0000                                // value at reset
+  #define  C_AUXDAC         ((0x000 << 6) | AUXDAC    | TRUE )      // value at reset
+  #define  C_VBCTRL1        ((0x108 << 6) | VBCTRL1   | TRUE )      // VULSWITCH=1 AUXI 28,2 dB
+  #define  C_VBCTRL2        ((0x001 << 6) | VBCTRL2   | TRUE )      // HSMIC on, SPKG gain @ 2,5dB
+
+  // BULRUDEL will be initialized on rach only ....
+  #define  C_APCDEL1        ((0x000 << 6) | APCDEL1   | TRUE )
+  #define  C_APCDEL2        ((0x000 << 6) | APCDEL2   | TRUE )
+
+  #define  C_VBPOP          ((0x004 << 6) | VBPOP     | TRUE )      // HSOAUTO enabled only
+  #define  C_VAUDINITD        2                                     // vaud_init_delay init 2 frames
+  #define  C_VAUDCTRL       ((0x000 << 6) | VAUDCTRL  | TRUE )      // Init to zero
+  #define  C_VAUOCTRL       ((0x155 << 6) | VAUOCTRL  | TRUE )      // Speech on all outputs
+  #define  C_VAUSCTRL       ((0x000 << 6) | VAUSCTRL  | TRUE )      // Init to zero
+  #define  C_VAUDPLL        ((0x000 << 6) | VAUDPLL   | TRUE )      // Init to zero
+
+  // SYREN registers values programmed by L1 directly through SPI (ABB_on)
+
+  #define  C_BBCFG            0x44                                  // Syren Like BDLF Filter - DC OFFSET removal OFF
+
+#endif
+
+/************************************/
+/* Automatic frequency compensation */
+/************************************/
+
+/********************* C_Psi_sta definition *****************************/
+/* C_Psi_sta = (2*pi*Fr)        / (N * Fb)                              */
+/*      (1)  = (2*pi*V*ppm*0.9) / (N*V*Fb)                              */
+/*           regarding Vega V/N   = 2.4/4096                            */
+/*           regarding VCO  ppm/V = 16 / 1   (average slope of the VCO) */
+/*      (1)  = (2*pi*2.4*16*0.9) / (4096*1*270.83)                      */
+/*           = 0.000195748                                              */
+/* C_Psi_sta_inv = 1/C_Psi_sta = 5108                                   */
+/************************************************************************/
+
+#define  C_Psi_sta_inv    9307L    // (1/C_Psi_sta)
+#define  C_Psi_st         6        // C_Psi_sta * 0.8 F0.16
+#define  C_Psi_st_32      369173L  // F0.32
+#define  C_Psi_st_inv     11634L   // (1/C_Psi_st)
+
+typedef struct
+{
+  WORD16  eeprom_afc;
+  UWORD32 psi_sta_inv;
+  UWORD32 psi_st;
+  UWORD32 psi_st_32;
+  UWORD32 psi_st_inv;
+}
+T_AFC_PARAMS;
+
+/************************************/
+/* Swap IQ definitions...           */
+/************************************/
+/* 0=No Swap, 1=Swap RX only, 2=Swap TX only, 3=Swap RX and TX */
+
+#define  SWAP_IQ_GSM     0
+#define  SWAP_IQ_DCS     0
+#define  SWAP_IQ_PCS     0  // not supported by rf2   
+#define  SWAP_IQ_GSM850  0  // not supported by rf2  
+
+/************************************/
+/************************************/
+// typedef
+/************************************/
+/************************************/
+
+/*************************************************************/
+/* Define structure for apc of TX Power                 ******/
+/*************************************************************/
+  typedef struct 
+{ // pcm-file "rf/tx/level.gsm|dcs"
+  UWORD16 apc;             // 0..31
+  UWORD8  ramp_index;      // 0..RF_TX_RAMP_SIZE
+  UWORD8  chan_cal_index;  // 0..RF_TX_CHAN_CAL_TABLE_SIZE
+} 
+T_TX_LEVEL;
+
+/************************************/
+/* Automatic Gain Control           */
+/************************************/
+/* Define structure for sub-band definition of TX Power ******/ 
+typedef struct 
+   {
+   UWORD16  upper_bound;       // highest physical arfcn of the sub-band 
+   WORD16    agc_calib;        // AGC  for each TXPWR
+   }T_RF_AGC_BAND;
+
+/************************************/
+/*       Ramp definitions           */
+/************************************/
+
+#if ((ANLG_FAM == 1) || (ANLG_FAM == 2) || (ANLG_FAM == 3))
+  typedef struct
+  {
+    UWORD8  ramp_up     [16];  // Ramp-up profile
+    UWORD8  ramp_down   [16];  // Ramp-down profile
+  }
+  T_TX_RAMP;
+#endif
+
+
+// RF structure definition
+//========================
+
+enum RfRevision {
+    RF_IGNORE      = 0x0000,
+    RF_SL2         = 0x1000,
+    RF_GAIA_20X    = 0x2000,
+    RF_GAIA_20A    = 0x2001,
+    RF_GAIA_20B    = 0x2002,
+    RF_ATLAS_20B   = 0x2020,
+    RF_PASCAL_20   = 0x2030
+};
+
+// Number of bands supported
+#define GSM_BANDS 2
+
+#define MULTI_BAND1               0
+#define MULTI_BAND2               1
+// RF table sizes
+#define RF_RX_CAL_CHAN_SIZE       9  // number of AGC sub-bands
+#define RF_RX_CAL_TEMP_SIZE      11  // number of temperature ranges
+
+#define RF_TX_CHAN_CAL_TABLE_SIZE 4  // channel calibration table size 
+#define RF_TX_NUM_SUB_BANDS       8  // number of sub-bands in channel calibration table
+#define RF_TX_LEVELS_TABLE_SIZE  32  // level table size  
+#define RF_TX_RAMP_SIZE          15  // number of ramp definitions
+#define RF_TX_CAL_TEMP_SIZE       5  // number of temperature ranges
+
+#define AGC_TABLE_SIZE            1
+
+#define TEMP_TABLE_SIZE         131  // number of elements in ADC->temp conversion table
+
+
+// RX parameters and tables
+//-------------------------
+
+// AGC parameters and tables
+typedef struct
+{
+  UWORD16 low_agc_noise_thr;
+  UWORD16 high_agc_sat_thr;
+  UWORD16 low_agc;
+  UWORD16 high_agc;
+  UWORD8  il2agc_pwr[121];
+  UWORD8  il2agc_max[121];
+  UWORD8  il2agc_av[121];
+}
+T_AGC;
+
+// Calibration parameters
+typedef struct
+{
+  UWORD16 g_magic;
+  UWORD16 lna_att;
+  UWORD16 lna_switch_thr_low;
+  UWORD16 lna_switch_thr_high;
+}
+T_RX_CAL_PARAMS;   
+
+// RX temperature compensation
+typedef struct
+{
+  WORD16 temperature;
+  WORD16 agc_calib;
+}
+T_RX_TEMP_COMP;
+
+// RF RX structure
+typedef struct
+{
+  T_AGC           agc;
+}
+T_RF_RX; //common
+
+// RF RX structure
+typedef struct
+{
+  T_RX_CAL_PARAMS rx_cal_params;
+  T_RF_AGC_BAND   agc_bands[RF_RX_CAL_CHAN_SIZE];
+  T_RX_TEMP_COMP  temp[RF_RX_CAL_TEMP_SIZE];
+}
+T_RF_RX_BAND;
+
+
+// TX parameters and tables
+//-------------------------
+
+// TX temperature compensation
+typedef struct
+{
+  WORD16 temperature;
+  #if (ORDER2_TX_TEMP_CAL==1)
+    WORD16 a;
+    WORD16 b;
+    WORD16 c;
+  #else
+    WORD16 apc_calib;
+  #endif
+}
+T_TX_TEMP_CAL;
+
+// Ramp up and ramp down delay
+typedef struct
+{
+  UWORD16 up;
+  UWORD16 down;
+}
+T_RAMP_DELAY;
+
+typedef struct 
+{
+  UWORD16 arfcn_limit;
+  WORD16  chan_cal;
+} 
+T_TX_CHAN_CAL; 
+
+// RF TX structure
+typedef struct
+{
+  T_RAMP_DELAY   ramp_delay;
+  UWORD8         guard_bits;  // number of guard bits needed for ramp up
+  UWORD8         prg_tx;
+}
+T_RF_TX; //common
+
+// RF TX structure
+typedef struct
+{
+  T_TX_LEVEL           levels[RF_TX_LEVELS_TABLE_SIZE];
+  T_TX_CHAN_CAL        chan_cal_table[RF_TX_CHAN_CAL_TABLE_SIZE][RF_TX_NUM_SUB_BANDS];
+  T_TX_RAMP            ramp_tables[RF_TX_RAMP_SIZE];
+  T_TX_TEMP_CAL        temp[RF_TX_CAL_TEMP_SIZE];
+}
+T_RF_TX_BAND;
+  
+// band structure 
+typedef struct
+{
+  T_RF_RX_BAND  rx;
+  T_RF_TX_BAND  tx;
+  UWORD8        swap_iq;
+}
+T_RF_BAND;  
+  
+// RF structure 
+typedef struct
+{
+  // common for all bands
+  UWORD16      rf_revision;
+  UWORD16      radio_band_support;
+  T_RF_RX      rx;
+  T_RF_TX      tx;
+  T_AFC_PARAMS afc;
+}
+T_RF;
+
+/************************************/
+/*       MADC definitions           */
+/************************************/
+// Omega: 5 external channels if touch screen not used, 3 otherwise
+enum ADC_INDEX {
+   ADC_VBAT,
+   ADC_VCHARG,
+   ADC_ICHARG,
+   ADC_VBACKUP,
+   ADC_BATTYP,
+   ADC_BATTEMP,
+   ADC_RFTEMP,
+   ADC_ADC3,
+   ADC_ADC4,
+   ADC_INDEX_END // ADC_INDEX_END must be the end of the enums
+};
+
+typedef struct
+{
+    WORD16 converted[ADC_INDEX_END]; // converted
+    UWORD16 raw[ADC_INDEX_END];      // raw from ADC
+}
+T_ADC;
+
+/************************************/
+/*       MADC calibration           */
+/************************************/
+typedef struct
+{
+   UWORD16 a[ADC_INDEX_END];
+   WORD16 b[ADC_INDEX_END];
+}
+T_ADCCAL;
+
+// Conversion table: ADC value -> temperature
+typedef struct 
+{
+    UWORD16 adc;  // ADC reading is 10 bits
+    WORD16  temp; // temp is in approx. range -30..+80
+}
+T_TEMP;
+
+typedef struct
+{
+    char *name;
+    void *addr;
+    int  size;
+}
+T_CONFIG_FILE;
+
+typedef struct
+{
+  char      *name;         // name of ffs file suffix
+  T_RF_BAND *addr;         // address to default flash structure
+  UWORD16   max_carrier;   // max carrier 
+  UWORD16   max_txpwr;     // max tx power
+}
+T_BAND_CONFIG;
+
+typedef struct
+{
+  UWORD8  band[GSM_BANDS]; // index to band address
+  UWORD8  txpwr_tp;        // tx power turning point  
+  UWORD16 first_arfcn;     // first index
+}
+T_STD_CONFIG;
+
+enum GSMBAND_DEF 
+{
+  BAND_NONE,
+  BAND_EGSM900,
+  BAND_DCS1800,
+  BAND_PCS1900,
+  BAND_GSM850,
+  // put new bands here
+  BAND_GSM900  //last entry
+};
+
+
+/************************************/
+/* ABB (Omega) Initialization       */
+/************************************/
+#if ((ANLG_FAM == 1) || (ANLG_FAM == 2))
+  #define ABB_TABLE_SIZE 16
+#endif
+
+#if (ANLG_FAM == 3)
+  #define ABB_TABLE_SIZE 22
+#endif
+
+// Note that this translation is probably not needed at all. But until L1 is
+// (maybe) changed to simply initialize the ABB from a table of words, we
+// use this to make things more easy-readable.
+#if (ANLG_FAM == 1)
+  enum ABB_REGISTERS {
+    ABB_AFCCTLADD = 0,
+    ABB_VBUCTRL,
+    ABB_VBDCTRL,
+    ABB_BBCTRL,
+    ABB_APCOFF,
+    ABB_BULIOFF,
+    ABB_BULQOFF,
+    ABB_DAI_ON_OFF,
+    ABB_AUXDAC,
+    ABB_VBCTRL,
+    ABB_APCDEL1
+  };
+#elif (ANLG_FAM == 2)
+  enum ABB_REGISTERS {
+    ABB_AFCCTLADD = 0,
+    ABB_VBUCTRL,
+    ABB_VBDCTRL,
+    ABB_BBCTRL,
+    ABB_BULGCAL,
+    ABB_APCOFF,
+    ABB_BULIOFF,
+    ABB_BULQOFF,
+    ABB_DAI_ON_OFF,
+    ABB_AUXDAC,
+    ABB_VBCTRL1,
+    ABB_VBCTRL2,
+    ABB_APCDEL1,
+    ABB_APCDEL2
+  };
+#elif (ANLG_FAM == 3)
+  enum ABB_REGISTERS {
+    ABB_AFCCTLADD = 0,
+    ABB_VBUCTRL,
+    ABB_VBDCTRL,
+    ABB_BBCTRL,
+    ABB_BULGCAL,
+    ABB_APCOFF,
+    ABB_BULIOFF,
+    ABB_BULQOFF,
+    ABB_DAI_ON_OFF,
+    ABB_AUXDAC,
+    ABB_VBCTRL1,
+    ABB_VBCTRL2,
+    ABB_APCDEL1,
+    ABB_APCDEL2,
+    ABB_VBPOP,
+    ABB_VAUDINITD,
+    ABB_VAUDCTRL,
+    ABB_VAUOCTRL,
+    ABB_VAUSCTRL,
+    ABB_VAUDPLL
+  };
+#endif
+#endif
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/gsm-fw/L1/cust0/l1_rf35.h	Sun Nov 17 04:50:45 2013 +0000
@@ -0,0 +1,475 @@
+/************* Revision Controle System Header *************
+ *                  GSM Layer 1 software
+ *
+ *        Filename l1_rf35.h
+ *  Copyright 2003 (C) Texas Instruments  
+ * 
+ ************* Revision Controle System Header *************/
+
+#ifndef __L1_RF_H__
+#define __L1_RF_H__
+
+/************************************/
+/* SYNTHESIZER setup time...        */
+/************************************/
+#define RX_SYNTH_SETUP_TIME (PROVISION_TIME - TRF_R1)//RX Synthesizer setup time in qbit.
+#define TX_SYNTH_SETUP_TIME (- TRF_T1)               //TX Synthesizer setup time in qbit.
+
+/************************************/
+/* time for TPU scenario ending...  */
+/************************************/
+#define RX_TPU_SCENARIO_ENDING  DLT_1B - SL_SU_DELAY2 // execution time of BDLENA down
+                                                      // minus serialization time
+#define TX_TPU_SCENARIO_ENDING  DLT_1B - SL_SU_DELAY2 // execution time of BULON down
+                                                      // minus serialization time
+
+/******************************************************/
+/* TXPWR configuration...                             */
+/* Fixed TXPWR value when GSM management is disabled. */
+/******************************************************/
+#if ((ANLG_FAM == 1) || (ANLG_FAM == 2))
+//  #define FIXED_TXPWR       0x3f12  // TXPWR=10, value=252
+//  #define FIXED_TXPWR       0x0a12  // TXPWR=15, value=40
+  #define FIXED_TXPWR       0x1a12  // TXPWR=15, EVA4, CRTP1
+#endif
+
+
+/************************************/
+/* ANALOG delay (in qbits)          */
+/************************************/
+#define  DL_DELAY_RF      1   // time spent in the Downlink global RF chain by the modulated signal 
+#define  UL_DELAY_1RF     5   // time spent in the first  uplink RF block
+#define  UL_DELAY_2RF     0   // time spent in the second uplink RF block
+#if (ANLG_FAM == 1)
+  #define  UL_ABB_DELAY   6   // modulator input to output delay
+#endif
+#if (ANLG_FAM == 2)
+  #define  UL_ABB_DELAY   3   // modulator input to output delay
+#endif
+
+/************************************/
+/* TX Propagation delay...          */
+/************************************/
+#if ((ANLG_FAM == 1) || (ANLG_FAM == 2))
+  #define  PRG_TX       (DL_DELAY_RF + UL_DELAY_2RF + (GUARD_BITS*4) + UL_DELAY_1RF + UL_ABB_DELAY)   // = 40 + NB_MARGIN
+#endif
+
+/************************************/
+/* Initial value for APC DELAY      */
+/************************************/
+#if (ANLG_FAM == 1)
+//#define APCDEL_DOWN     (32 - GUARD_BITS*4)          // minimum value: 2
+  #define APCDEL_DOWN      2                           // minimum value: 2
+  #define APCDEL_UP       (6+5)                        // minimum value: 6
+#endif
+#if (ANLG_FAM == 2)
+//#define APCDEL_DOWN     (32 - GUARD_BITS*4)          // minimum value: 2
+  #define APCDEL_DOWN      2                           // minimum value: 2
+  #define APCDEL_UP       (6+2)                        // minimum value: 6
+#endif
+
+#define GUARD_BITS 7
+
+/************************************/
+/* Initial value for AFC...         */
+/************************************/
+#define  EEPROM_AFC    ((-55)*8)      // F13.3 required!!!!! (default : -952*8, initial deviation of -2400 forced)
+
+#define SETUP_AFC_AND_RF              2       // time to have a stable output of the AFC (in Frames)
+                                              // !! minimum Value : 1 Frame due to the fact there is no
+                                              // hisr() in the first wake-up frame !!!!
+
+/************************************/
+/* Baseband registers               */
+/************************************/
+#if (ANLG_FAM == 1)
+  // Omega registers values will be programmed at 1st DSP communication interrupt
+  #define  C_DEBUG1          0x0000          // Enable f_tx delay of 400000 cyc DEBUG 
+  #define  C_AFCCTLADD       0x002a | TRUE   // Value at reset
+  #define  C_VBUCTRL         0x418e | TRUE   // Uplink gain amp 0dB, Sidetone gain to mute
+  #define  C_VBDCTRL         0x098c | TRUE   // Downlink gain amp 0dB, Volume control 0 dB
+  #define  C_BBCTRL          0x604c | TRUE   // OUTLEV1=OUTLEV1=SELVMID1=SELVMID0=1 for B-sample 'modified'
+  #define  C_APCOFF          0x1016 | (0x34 << 6)/*(0x3c << 6)*/ | TRUE   // value at reset-Changed from 0x0016- CR 27.12
+  #define  C_BULIOFF         0x3fc4 | TRUE   // value at reset
+  #define  C_BULQOFF         0x3fc6 | TRUE   // value at reset
+  #define  C_DAI_ON_OFF      0x0000          // value at reset
+  #define  C_AUXDAC          0x0018 | TRUE   // value at reset
+  #define  C_VBCTRL          0x02d0 | TRUE   // VULSWITCH=1, VDLAUX=1, VDLEAR=1 
+  // BULRUDEL will be initialized on rach only ....
+  #define  C_APCDEL1         (((APCDEL_DOWN-2)<<11) | ((APCDEL_UP-6)<<6) | 0x0004) 
+  #define  C_BBCTRL          0x604c | TRUE   // OUTLEV1=OUTLEV1=SELVMID1=SELVMID0=1 for B-sample 'modified'
+#endif
+#if (ANLG_FAM == 2)
+  // IOTA registers values will be programmed at 1st DSP communication interrupt
+  #define  C_DEBUG1          0x0001          // Enable f_tx delay of 400000 cyc DEBUG 
+  #define  C_AFCCTLADD       0x002a | TRUE   // Value at reset
+  #define  C_VBUCTRL         0x418e | TRUE   // No uplink mute, Side tone mute, PGA_UL 0dB
+  #define  C_VBDCTRL         0x098c | TRUE   // PGA_DL 0dB, Volume 0dB
+  #define  C_APCOFF          0x1016 | TRUE   // x2 slope 128
+  #define  C_BULIOFF         0x3fc4 | TRUE   // value at reset
+  #define  C_BULQOFF         0x3fc6 | TRUE   // value at reset
+  #define  C_DAI_ON_OFF      0x0000          // value at reset
+  #define  C_AUXDAC          0x0018 | TRUE   // value at reset
+  #define  C_VBCTRL          0x02d0 | TRUE   // VULSWITCH=1, VDLAUX=1, VDLEAR=1 
+  #define  C_VBCTRL2         0x0016 | TRUE   // MICBIASEL=0, VDLHSO=0, MICAUX=0
+
+  // BULRUDEL will be initialized on rach only ....
+  #define  C_APCDEL1          (((APCDEL_DOWN-2)<<11) | ((APCDEL_UP-6)<<6) | 0x0004)  
+  #define  C_APCDEL2         0x0034  
+  #define  C_BBCTRL          0x304c | TRUE   // Internal autocalibration, Output common mode=1.35V
+                                             // Monoslot, Vpp=8/15*Vref                                             
+  #define  C_BULGCAL         0x001c | TRUE   // IAG=0 dB, QAG=0 dB
+#endif
+
+/************************************/
+/* Automatic frequency compensation */
+/************************************/
+/********************* C_Psi_sta definition *****************************/
+/* C_Psi_sta = (2*pi*Fr)        / (N * Fb)                              */
+/*      (1)  = (2*pi*V*ppm*0.9) / (N*V*Fb)                              */
+/*           regarding Vega V/N   = 2.4/4096                            */
+/*           regarding VCO  ppm/V = 16 / 1   (average slope of the VCO) */
+/*      (1)  = (2*pi*2.4*16*0.9) / (4096*1*270.83)                      */
+/*           = 0.000195748                                              */
+/* C_Psi_sta_inv = 1/C_Psi_sta = 5108                                   */
+/************************************************************************/
+#define  C_Psi_sta_inv    11677L    // (1/C_Psi_sta)                   
+#define  C_Psi_st         4L        // C_Psi_sta * 0.8 F0.16          
+#define  C_Psi_st_32      294257L  // F0.32                          
+#define  C_Psi_st_inv     14596L   // (1/C_Psi_st)                   
+
+typedef struct
+{
+  WORD16  eeprom_afc;
+  UWORD32 psi_sta_inv;
+  UWORD32 psi_st;
+  UWORD32 psi_st_32;
+  UWORD32 psi_st_inv;
+}
+T_AFC_PARAMS;
+
+/************************************/
+/* Swap IQ definitions...           */
+/************************************/
+/* 0=No Swap, 1=Swap RX only, 2=Swap TX only, 3=Swap RX and TX */
+#define  SWAP_IQ_GSM  0
+#define  SWAP_IQ_DCS  3
+#define  SWAP_IQ_PCS  3
+#define  SWAP_IQ_GSM850  0   //TBD
+
+/************************************/
+/* RF bands supported               */
+/************************************/
+#define RF_HW_BAND_SUPPORT (0x0020 | 0x0004)  // radio_band_support E-GSM/DCS + PC
+
+/************************************/
+/************************************/
+// typedef
+/************************************/
+/************************************/
+
+/*************************************************************/
+/* Define structure for apc of TX Power                 ******/
+/*************************************************************/
+  typedef struct 
+{ // pcm-file "rf/tx/level.gsm|dcs"
+  UWORD16 apc;            // 0..31
+  UWORD8  ramp_index;     // 0..RF_TX_RAMP_SIZE
+  UWORD8  chan_cal_index; // 0..RF_TX_CHAN_CAL_TABLE_SIZE
+} 
+T_TX_LEVEL;
+
+/************************************/
+/* Automatic Gain Control           */
+/************************************/
+/* Define structure for sub-band definition of TX Power ******/ 
+typedef struct 
+   {
+   UWORD16  upper_bound;    //highest physical arfcn of the sub-band 
+   WORD16    agc_calib;      // AGC  for each TXPWR
+   }T_RF_AGC_BAND;
+
+/************************************/
+/*       Ramp definitions           */
+/************************************/
+#if ((ANLG_FAM == 1) || (ANLG_FAM == 2))
+  typedef struct
+  {
+    UWORD8  ramp_up     [16];  // Ramp-up profile
+    UWORD8  ramp_down   [16];  // Ramp-down profile
+  }
+  T_TX_RAMP;
+#endif
+
+
+// RF structure definition
+//========================
+
+enum RfRevision {
+    RF_IGNORE      = 0x0000,
+    RF_SL2         = 0x1000,
+    RF_GAIA_20X    = 0x2000,
+    RF_GAIA_20A    = 0x2001,
+    RF_GAIA_20B    = 0x2002,
+    RF_ATLAS_20B   = 0x2020,
+    RF_PASCAL_20   = 0x2030
+};
+
+// Number of bands supported
+#define GSM_BANDS 2
+
+#define MULTI_BAND1     0
+#define MULTI_BAND2     1
+// RF table sizes
+#define RF_RX_CAL_CHAN_SIZE 10 // number of AGC sub-bands
+#define RF_RX_CAL_TEMP_SIZE 11 // number of temperature ranges
+
+#define RF_TX_CHAN_CAL_TABLE_SIZE 4  // channel calibration table size 
+#define RF_TX_NUM_SUB_BANDS       8  // number of sub-bands in channel calibration table
+#define RF_TX_LEVELS_TABLE_SIZE   32 // level table size  
+#define RF_TX_RAMP_SIZE     16 // number of ramp definitions
+#define RF_TX_CAL_TEMP_SIZE  5 // number of temperature ranges
+
+#define AGC_TABLE_SIZE      36
+
+#define TEMP_TABLE_SIZE    131 // number of elements in ADC->temp conversion table
+
+
+// RX parameters and tables
+//-------------------------
+
+// AGC parameters and tables
+typedef struct
+{
+  UWORD16 low_agc_noise_thr;
+  UWORD16 high_agc_sat_thr;
+  UWORD16 low_agc;
+  UWORD16 high_agc;
+  UWORD8  il2agc_pwr[121];
+  UWORD8  il2agc_max[121];
+  UWORD8  il2agc_av[121];
+}
+T_AGC;
+
+// Calibration parameters
+typedef struct
+{
+  UWORD16 g_magic;
+  UWORD16 lna_att;
+  UWORD16 lna_switch_thr_low;
+  UWORD16 lna_switch_thr_high;
+}
+T_RX_CAL_PARAMS;   
+
+// RX temperature compensation
+typedef struct
+{
+  WORD16 temperature;
+  WORD16 agc_calib;
+}
+T_RX_TEMP_COMP;
+
+// RF RX structure
+typedef struct
+{
+  T_AGC           agc;
+}
+T_RF_RX; //common
+
+// RF RX structure
+typedef struct
+{
+  T_RX_CAL_PARAMS rx_cal_params;
+  T_RF_AGC_BAND   agc_bands[RF_RX_CAL_CHAN_SIZE];
+  T_RX_TEMP_COMP  temp[RF_RX_CAL_TEMP_SIZE];
+}
+T_RF_RX_BAND;
+
+
+// TX parameters and tables
+//-------------------------
+
+// TX temperature compensation
+typedef struct
+{
+  WORD16 temperature;
+  WORD16 apc_calib;
+}
+T_TX_TEMP_CAL;
+
+// Ramp up and ramp down delay
+typedef struct
+{
+  UWORD16 up;
+  UWORD16 down;
+}
+T_RAMP_DELAY;
+
+typedef struct 
+{
+  UWORD16 arfcn_limit;
+  WORD16  chan_cal;
+} 
+T_TX_CHAN_CAL; 
+
+// RF TX structure
+typedef struct
+{
+  T_RAMP_DELAY   ramp_delay;
+  UWORD8         guard_bits;  // number of guard bits needed for ramp up
+  UWORD8         prg_tx;
+}
+T_RF_TX; //common
+  
+// RF TX structure
+typedef struct
+{
+  T_TX_LEVEL           levels[RF_TX_LEVELS_TABLE_SIZE];
+  T_TX_CHAN_CAL        chan_cal_table[RF_TX_CHAN_CAL_TABLE_SIZE][RF_TX_NUM_SUB_BANDS];
+  T_TX_RAMP            ramp_tables[RF_TX_RAMP_SIZE];
+  T_TX_TEMP_CAL        temp[RF_TX_CAL_TEMP_SIZE];
+}
+T_RF_TX_BAND;
+
+// band structure 
+typedef struct
+{
+  T_RF_RX_BAND  rx;
+  T_RF_TX_BAND  tx;
+  UWORD8        swap_iq;
+}
+T_RF_BAND;  
+  
+// RF structure 
+typedef struct
+{
+  // common for all bands
+  UWORD8       rf_revision;
+  UWORD16      radio_band_support;
+  T_RF_RX      rx;
+  T_RF_TX      tx;
+  T_AFC_PARAMS afc;
+}
+T_RF;
+
+/************************************/
+/*       MADC definitions           */
+/************************************/
+// Omega: 5 external channels if touch screen not used, 3 otherwise
+enum ADC_INDEX {
+   ADC_VBAT,
+   ADC_VCHARG,
+   ADC_ICHARG,
+   ADC_VBACKUP,
+   ADC_BATTEMP,
+   ADC_RFTEMP,
+   ADC_ADC3,
+   ADC_ADC4,
+   ADC_ADC5,
+   ADC_INDEX_END // ADC_INDEX_END must be the end of the enums
+};
+
+typedef struct
+{
+    WORD16 converted[ADC_INDEX_END]; // converted
+    UWORD16 raw[ADC_INDEX_END];      // raw from ADC
+}
+T_ADC;
+
+/************************************/
+/*       MADC calibration           */
+/************************************/
+typedef struct
+{
+   UWORD16 a[ADC_INDEX_END];
+   WORD16 b[ADC_INDEX_END];
+}
+T_ADCCAL;
+
+// Conversion table: ADC value -> temperature
+typedef struct 
+{
+    UWORD16 adc;  // ADC reading is 10 bits
+    WORD16  temp; // temp is in approx. range -30..+80
+}
+T_TEMP;
+
+typedef struct
+{
+    char *name;
+    void *addr;
+    int  size;
+}
+T_CONFIG_FILE;
+
+typedef struct
+{
+  char      *name;         // name of ffs file suffix
+  T_RF_BAND *addr;         // address to default flash structure
+  UWORD16   max_carrier;  // max carrier 
+  UWORD16   max_txpwr;    // max tx power
+}
+T_BAND_CONFIG;
+
+typedef struct
+{
+    UWORD8  band[GSM_BANDS]; // index to band address
+    UWORD8  txpwr_tp; // tx power turning point  
+    UWORD16  first_arfcn;      // first index
+}
+T_STD_CONFIG;
+
+enum GSMBAND_DEF 
+{
+  BAND_NONE,
+  BAND_EGSM900,
+  BAND_DCS1800,
+  BAND_PCS1900,
+  BAND_GSM850,
+  // put new bands here
+  BAND_GSM900  //last entry
+};
+
+
+/************************************/
+/* ABB (Omega) Initialization       */
+/************************************/
+
+#define ABB_TABLE_SIZE 16
+
+// Note that this translation is probably not needed at all. But until L1 is
+// (maybe) changed to simply initialize the ABB from a table of words, we
+// use this to make things more easy-readable.
+#if (ANLG_FAM == 1)
+enum ABB_REGISTERS {
+    ABB_AFCCTLADD = 0,
+    ABB_VBUCTRL,
+    ABB_VBDCTRL,
+    ABB_BBCTRL,
+    ABB_APCOFF,
+    ABB_BULIOFF,
+    ABB_BULQOFF,
+    ABB_DAI_ON_OFF,
+    ABB_AUXDAC,
+    ABB_VBCTRL,
+    ABB_APCDEL1
+};
+#elif (ANLG_FAM == 2)
+  enum ABB_REGISTERS {
+    ABB_AFCCTLADD = 0,
+    ABB_VBUCTRL,
+    ABB_VBDCTRL,
+    ABB_BBCTRL,
+    ABB_BULGCAL,
+    ABB_APCOFF,
+    ABB_BULIOFF,
+    ABB_BULQOFF,
+    ABB_DAI_ON_OFF,
+    ABB_AUXDAC,
+    ABB_VBCTRL,
+    ABB_VBCTRL2,
+    ABB_APCDEL1,
+    ABB_APCDEL2
+  };
+#endif
+#endif
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/gsm-fw/L1/cust0/l1_rf8.h	Sun Nov 17 04:50:45 2013 +0000
@@ -0,0 +1,573 @@
+/************* Revision Controle System Header *************
+ *                  GSM Layer 1 software
+ *
+ *        Filename l1_rf8.h
+ *  Copyright 2003 (C) Texas Instruments  
+ * 
+ ************* Revision Controle System Header *************/
+
+#ifndef __L1_RF_H__
+#define __L1_RF_H__
+
+/************************************/
+/* SYNTHESIZER setup time...        */
+/************************************/
+
+#define RX_SYNTH_SETUP_TIME (PROVISION_TIME - TRF_R1)  //RX Synthesizer setup time in qbit.
+#define TX_SYNTH_SETUP_TIME (- TRF_T1)                 //TX Synthesizer setup time in qbit.
+
+
+/************************************/
+/* time for TPU scenario ending...  */
+/************************************/
+
+#define RX_TPU_SCENARIO_ENDING  DLT_1B - SL_SU_DELAY2  // execution time of BDLENA down
+                                                       // minus serialization time
+#define TX_TPU_SCENARIO_ENDING  DLT_1B - SL_SU_DELAY2  // execution time of BULON down
+                                                       // minus serialization time
+
+/******************************************************/
+/* TXPWR configuration...                             */
+/* Fixed TXPWR value when GSM management is disabled. */
+/******************************************************/
+
+#if ((ANLG_FAM == 1) || (ANLG_FAM == 2) || (ANLG_FAM == 3))
+//  #define FIXED_TXPWR       ((0xFC << 6) | AUXAPC | FALSE)            // TXPWR=10, value=252
+//  #define FIXED_TXPWR       ((0x28 << 6) | AUXAPC | FALSE)  
+  #define FIXED_TXPWR       ((0x68 << 6) | AUXAPC | FALSE)            // TXPWR=15
+#endif
+
+
+/************************************/
+/*(ANALOG)delay (in qbits)          */
+/************************************/
+
+#define  DL_DELAY_RF      1   // time spent in the Downlink global RF chain by the modulated signal 
+#define  UL_DELAY_1RF     5   // time spent in the first  uplink RF block
+#define  UL_DELAY_2RF     0   // time spent in the second uplink RF block
+
+#if (ANLG_FAM == 1)
+  #define  UL_ABB_DELAY   0   // modulator input to output delay, theoretical value is 6, needs to be checked
+#endif
+
+#if ((ANLG_FAM == 2) || (ANLG_FAM == 3))
+  #define  UL_ABB_DELAY   3   // modulator input to output delay
+#endif
+
+/************************************/
+/* TX Propagation delay...          */
+/************************************/
+
+#if ((ANLG_FAM == 1) || (ANLG_FAM == 2) || (ANLG_FAM == 3))
+  #define  PRG_TX       (DL_DELAY_RF + UL_DELAY_2RF + (GUARD_BITS*4) + UL_DELAY_1RF + UL_ABB_DELAY)   // = 40
+#endif
+
+/************************************/
+/* Initial value for APC DELAY      */
+/************************************/
+
+#if (ANLG_FAM == 1)
+//#define APCDEL_DOWN     (32 - GUARD_BITS*4)          // minimum value: 2
+  #define APCDEL_DOWN      2                           // minimum value: 2
+  #define APCDEL_UP       (6+5)                        // minimum value: 6
+#endif
+
+#if (ANLG_FAM == 2) || (ANLG_FAM == 3)
+//#define APCDEL_DOWN     (32 - GUARD_BITS*4)          // minimum value: 2
+  #define APCDEL_DOWN     (2+0)                           // minimum value: 2
+  #define APCDEL_UP       (6+2)                        // minimum value: 6
+#endif
+
+#define GUARD_BITS 7
+
+/************************************/
+/* Initial value for AFC...         */
+/************************************/
+
+#define  EEPROM_AFC    ((-1180)*8)            // F13.3 required!!!!! (default : -952*8, initial deviation of -2400 forced)
+
+#define SETUP_AFC_AND_RF              2       // time to have a stable output of the AFC and RF BAND GAP(in Frames)
+                                              // !! minimum Value : 1 Frame due to the fact there is no
+                                              // hisr() in the first wake-up frame !!!!
+
+/************************************/
+/* Baseband registers               */
+/************************************/
+
+#if (ANLG_FAM == 1)
+  // Omega registers values will be programmed at 1st DSP communication interrupt
+  #define  C_DEBUG1          (0x0000                  | FALSE)      // Enable f_tx delay of 400000 cyc DEBUG 
+  #define  C_AFCCTLADD      ((0x000 << 6) | AFCCTLADD | TRUE )      // Value at reset
+  #define  C_VBUCTRL        ((0x0C9 << 6) | VBUCTRL   | TRUE )      // Side tone -17 dB, PGA_UL 3 dB
+  #define  C_VBDCTRL        ((0x006 << 6) | VBDCTRL   | TRUE )      // PGA_DL 0dB, Volume -12 dB
+  #define  C_APCOFF         ((0x040 << 6) | APCOFF    | TRUE)
+  #define  C_BULIOFF        ((0x0FF << 6) | BULIOFF   | TRUE )      // value at reset
+  #define  C_BULQOFF        ((0x0FF << 6) | BULQOFF   | TRUE )      // value at reset
+  #define  C_DAI_ON_OFF     ((0x000 << 6) | APCOFF    | TRUE )      // value at reset
+  #define  C_AUXDAC         ((0x000 << 6) | AUXDAC    | TRUE )      // value at reset
+  #define  C_VBCTRL         ((0x00B << 6) | VBCTRL    | TRUE )      // VULSWITCH=1, VDLAUX=1, VDLEAR=1 
+ 
+ // BULRUDEL will be initialized on rach only ....
+  #define  C_APCDEL1        (((APCDEL_DOWN-2) << 11)  | ((APCDEL_UP-6) << 6) | APCDEL1) 
+  #define  C_BBCTRL         ((0x181 << 6) | BBCTRL    | TRUE)       // OUTLEV1=OUTLEV1=SELVMID1=SELVMID0=1 for B-sample 'modified'
+#endif
+
+#if (ANLG_FAM == 2)
+  // IOTA registers values will be programmed at 1st DSP communication interrupt
+  #define  C_DEBUG1          (0x0000                  | TRUE )      // Enable f_tx delay of 400000 cyc DEBUG 
+  #define  C_AFCCTLADD      ((0x000 << 6) | AFCCTLADD | TRUE )      // Value at reset
+  #define  C_VBUCTRL        ((0x0C9 << 6) | VBUCTRL   | TRUE )      // Side tone -17 dB, PGA_UL 3 dB
+  #define  C_VBDCTRL        ((0x006 << 6) | VBDCTRL   | TRUE )      // PGA_DL 0dB, Volume -12 dB
+  #define  C_APCOFF         ((0x040 << 6) | APCOFF    | TRUE)
+  #define  C_BULIOFF        ((0x0FF << 6) | BULIOFF   | TRUE )      // value at reset
+  #define  C_BULQOFF        ((0x0FF << 6) | BULQOFF   | TRUE )      // value at reset
+  #define  C_DAI_ON_OFF     ((0x000 << 6) | APCOFF    | TRUE )      // value at reset
+  #define  C_AUXDAC         ((0x000 << 6) | AUXDAC    | TRUE )      // value at reset
+  #define  C_VBCTRL1        ((0x00B << 6) | VBCTRL1   | TRUE )      // VULSWITCH=1, VDLAUX=1, VDLEAR=1 
+  #define  C_VBCTRL2        ((0x000 << 6) | VBCTRL2   | TRUE )      // MICBIASEL=0, VDLHSO=0, MICAUX=0
+
+  // BULRUDEL will be initialized on rach only ....
+  #define  C_APCDEL1        (((APCDEL_DOWN-2) << 11)  | ((APCDEL_UP-6) << 6) | APCDEL1)  
+  #define  C_APCDEL2        ((0x000 << 6) | APCDEL2   | TRUE )                          //
+  
+  #define  C_BBCTRL         ((0x0C1 << 6) | BBCTRL    | TRUE )      // Internal autocalibration, Output common mode=1.35V
+                                                                    // Monoslot, Vpp=8/15*Vref                                             
+  #define  C_BULGCAL        ((0x000 << 6) | BULGCAL   | TRUE )      // IAG=0 dB, QAG=0 dB
+#endif
+
+#if (ANLG_FAM == 3)
+  // SYREN registers values will be programmed at 1st DSP communication interrupt
+  #define  C_DEBUG1          (0x0000                  | TRUE )      // Enable f_tx delay of 400000 cyc DEBUG 
+  #define  C_AFCCTLADD      ((0x000 << 6) | AFCCTLADD | TRUE )      // Value at reset
+  #define  C_VBUCTRL        ((0x0C9 << 6) | VBUCTRL   | TRUE )      // Side tone - 17 dB, PGA_UL 3dB
+  #define  C_VBDCTRL        ((0x006 << 6) | VBDCTRL   | TRUE )      // PGA_DL 0dB, Volume -12 dB
+  #define  C_APCOFF         ((0x07C << 6) | APCOFF    | TRUE)
+  #define  C_BULIOFF        ((0x0FF << 6) | BULIOFF   | TRUE )      // value at reset
+  #define  C_BULQOFF        ((0x0FF << 6) | BULQOFF   | TRUE )      // value at reset
+  #define  C_DAI_ON_OFF     ((0x000 << 6) | APCOFF    | TRUE )      // value at reset
+  #define  C_AUXDAC         ((0x000 << 6) | AUXDAC    | TRUE )      // value at reset
+  #define  C_VBCTRL1        ((0x108 << 6) | VBCTRL1   | TRUE )      // VULSWITCH=1 AUXI 28,2 dB
+  #define  C_VBCTRL2        ((0x001 << 6) | VBCTRL2   | TRUE )      // HSMIC on, SPKG gain @ 2,5dB
+
+  // BULRUDEL will be initialized on rach only ....
+  #define  C_APCDEL1        (((APCDEL_DOWN-2) << 11)  | ((APCDEL_UP-6)<<6) | APCDEL1)  
+  #define  C_APCDEL2        ((0x000 << 6) | APCDEL2   | TRUE )
+  #define  C_BBCTRL         ((0x0C1 << 6) | BBCTRL    | TRUE )      // Internal autocalibration, Output common mode=1.35V
+                                                                    // Monoslot, Vpp=8/15*Vref
+  #define  C_BULGCAL        ((0x000 << 6) | BULGCAL   | TRUE )      // IAG=0 dB, QAG=0 dB
+
+  #define  C_VBPOP          ((0x004 << 6) | VBPOP     | TRUE )      // HSOAUTO enabled only
+  #define  C_VAUDINITD       2                          // vaud_init_delay init 2 frames
+  #define  C_VAUDCTRL       ((0x000 << 6) | VAUDCTRL  | TRUE )      // Init to zero
+  #define  C_VAUOCTRL       ((0x155 << 6) | VAUOCTRL  | TRUE )      // Speech on all outputs
+  #define  C_VAUSCTRL       ((0x000 << 6) | VAUSCTRL  | TRUE )      // Init to zero
+  #define  C_VAUDPLL        ((0x000 << 6) | VAUDPLL   | TRUE )      // Init to zero
+
+  // SYREN registers values programmed by L1 directly through SPI (ABB_on)
+
+  #define  C_BBCFG           0x44      // Syren Like BDLF Filter - DC OFFSET removal OFF
+
+#endif
+
+
+/************************************/
+/* Automatic frequency compensation */
+/************************************/
+/********************* C_Psi_sta definition *****************************/
+/* C_Psi_sta = (2*pi*Fr)        / (N * Fb)                              */
+/*      (1)  = (2*pi*V*ppm*0.9) / (N*V*Fb)                              */
+/*           regarding Vega V/N   = 2.4/4096                            */
+/*           regarding VCO  ppm/V = 16 / 1   (average slope of the VCO) */
+/*      (1)  = (2*pi*2.4*16*0.9) / (4096*1*270.83)                      */
+/*           = 0.000195748                                              */
+/* C_Psi_sta_inv = 1/C_Psi_sta = 5108                                   */
+/************************************************************************/
+
+#define  C_Psi_sta_inv    11677L    // (1/C_Psi_sta)                   
+#define  C_Psi_st         4L        // C_Psi_sta * 0.8 F0.16          
+#define  C_Psi_st_32      294257L  // F0.32                          
+#define  C_Psi_st_inv     14596L   // (1/C_Psi_st)                   
+
+typedef struct
+{
+  WORD16  eeprom_afc;
+  UWORD32 psi_sta_inv;
+  UWORD32 psi_st;
+  UWORD32 psi_st_32;
+  UWORD32 psi_st_inv;
+}
+T_AFC_PARAMS;
+
+/************************************/
+/* Swap IQ definitions...           */
+/************************************/
+/* 0=No Swap, 1=Swap RX only, 2=Swap TX only, 3=Swap RX and TX */
+
+  #define  SWAP_IQ_GSM     0
+  #define  SWAP_IQ_DCS     3
+  #define  SWAP_IQ_PCS     3   
+  #define  SWAP_IQ_GSM850  0   //TBD
+
+/************************************/
+/* RF bands supported               */
+/************************************/
+
+#define RF_HW_BAND_SUPPORT (0x0020 | 0x0004)  // radio_band_support E-GSM/DCS + PC
+
+/************************************/
+/************************************/
+// typedef
+/************************************/
+/************************************/
+
+/*************************************************************/
+/* Define structure for apc of TX Power                 ******/
+/*************************************************************/
+
+typedef struct 
+{ // pcm-file "rf/tx/level.gsm|dcs"
+  UWORD16 apc;            // 0..31
+  UWORD8  ramp_index;     // 0..RF_TX_RAMP_SIZE
+  UWORD8  chan_cal_index; // 0..RF_TX_CHAN_CAL_TABLE_SIZE
+} 
+T_TX_LEVEL;
+
+/************************************/
+/* Automatic Gain Control           */
+/************************************/
+/* Define structure for sub-band definition of TX Power ******/ 
+
+typedef struct 
+   {
+   UWORD16  upper_bound;    //highest physical arfcn of the sub-band 
+   WORD16    agc_calib;      // AGC  for each TXPWR
+   }T_RF_AGC_BAND;
+
+/************************************/
+/*       Ramp definitions           */
+/************************************/
+
+#if ((ANLG_FAM == 1) || (ANLG_FAM == 2) || (ANLG_FAM == 3))
+  typedef struct
+  {
+    UWORD8  ramp_up     [16];  // Ramp-up profile
+    UWORD8  ramp_down   [16];  // Ramp-down profile
+  }
+  T_TX_RAMP;
+#endif
+
+
+// RF structure definition
+//========================
+
+enum RfRevision {
+    RF_IGNORE      = 0x0000,
+    RF_SL2         = 0x1000,
+    RF_GAIA_20X    = 0x2000,
+    RF_GAIA_20A    = 0x2001,
+    RF_GAIA_20B    = 0x2002,
+    RF_ATLAS_20B   = 0x2020,
+    RF_PASCAL_20   = 0x2030
+};
+
+// Number of bands supported
+#define GSM_BANDS 2
+
+#define MULTI_BAND1     0
+#define MULTI_BAND2     1
+
+// RF table sizes
+#define RF_RX_CAL_CHAN_SIZE 10 // number of AGC sub-bands
+#define RF_RX_CAL_TEMP_SIZE 11 // number of temperature ranges
+
+#define RF_TX_CHAN_CAL_TABLE_SIZE 4  // channel calibration table size 
+#define RF_TX_NUM_SUB_BANDS       8  // number of sub-bands in channel calibration table
+#define RF_TX_LEVELS_TABLE_SIZE   32 // level table size  
+#define RF_TX_RAMP_SIZE     16 // number of ramp definitions
+#define RF_TX_CAL_TEMP_SIZE  5 // number of temperature ranges
+
+#define AGC_TABLE_SIZE      36
+
+#define TEMP_TABLE_SIZE    131 // number of elements in ADC->temp conversion table
+
+
+// RX parameters and tables
+//-------------------------
+
+// AGC parameters and tables
+typedef struct
+{
+  UWORD16 low_agc_noise_thr;
+  UWORD16 high_agc_sat_thr;
+  UWORD16 low_agc;
+  UWORD16 high_agc;
+  UWORD8  il2agc_pwr[121];
+  UWORD8  il2agc_max[121];
+  UWORD8  il2agc_av[121];
+}
+T_AGC;
+
+// Calibration parameters
+typedef struct
+{
+  UWORD16 g_magic;
+  UWORD16 lna_att;
+  UWORD16 lna_switch_thr_low;
+  UWORD16 lna_switch_thr_high;
+}
+T_RX_CAL_PARAMS;   
+
+// RX temperature compensation
+typedef struct
+{
+  WORD16 temperature;
+  WORD16 agc_calib;
+}
+T_RX_TEMP_COMP;
+
+// RF RX structure
+typedef struct
+{
+  T_AGC           agc;
+}
+T_RF_RX; //common
+
+// RF RX structure
+typedef struct
+{
+  T_RX_CAL_PARAMS rx_cal_params;
+  T_RF_AGC_BAND   agc_bands[RF_RX_CAL_CHAN_SIZE];
+  T_RX_TEMP_COMP  temp[RF_RX_CAL_TEMP_SIZE];
+}
+T_RF_RX_BAND;
+
+
+// TX parameters and tables
+//-------------------------
+
+// TX temperature compensation
+typedef struct
+{
+  WORD16 temperature;
+  #if (ORDER2_TX_TEMP_CAL==1)
+    WORD16 a;
+    WORD16 b;
+    WORD16 c;
+  #else
+    WORD16 apc_calib;
+  #endif
+}
+T_TX_TEMP_CAL;
+
+
+// Ramp up and ramp down delay
+typedef struct
+{
+  UWORD16 up;
+  UWORD16 down;
+}
+T_RAMP_DELAY;
+
+typedef struct 
+{
+  UWORD16 arfcn_limit;
+  WORD16  chan_cal;
+} 
+T_TX_CHAN_CAL; 
+
+// RF TX structure
+typedef struct
+{
+  T_RAMP_DELAY   ramp_delay;
+  UWORD8         guard_bits;  // number of guard bits needed for ramp up
+  UWORD8         prg_tx;
+}
+T_RF_TX; //common
+
+// RF TX structure
+typedef struct
+{
+  T_TX_LEVEL           levels[RF_TX_LEVELS_TABLE_SIZE];
+  T_TX_CHAN_CAL        chan_cal_table[RF_TX_CHAN_CAL_TABLE_SIZE][RF_TX_NUM_SUB_BANDS];
+  T_TX_RAMP            ramp_tables[RF_TX_RAMP_SIZE];
+  T_TX_TEMP_CAL        temp[RF_TX_CAL_TEMP_SIZE];
+}
+T_RF_TX_BAND;
+
+// band structure 
+typedef struct
+{
+  T_RF_RX_BAND  rx;
+  T_RF_TX_BAND  tx;
+  UWORD8        swap_iq;
+}
+T_RF_BAND;  
+  
+// RF structure 
+typedef struct
+{
+  // common for all bands
+  UWORD16      rf_revision;
+  UWORD16      radio_band_support;
+  T_RF_RX      rx;
+  T_RF_TX      tx;
+  T_AFC_PARAMS afc;
+}
+T_RF;
+
+/************************************/
+/*       MADC definitions           */
+/************************************/
+// Omega: 5 external channels if touch screen not used, 3 otherwise
+enum ADC_INDEX {
+   ADC_VBAT,
+   ADC_VCHARG,
+   ADC_ICHARG,
+   ADC_VBACKUP,
+   ADC_BATTYP,
+   ADC_BATTEMP,
+   ADC_ADC3,     // name of this ??
+   ADC_RFTEMP,
+   ADC_ADC4,
+   ADC_INDEX_END // ADC_INDEX_END must be the end of the enums
+};
+
+typedef struct
+{
+    WORD16 converted[ADC_INDEX_END]; // converted
+    UWORD16 raw[ADC_INDEX_END];      // raw from ADC
+}
+T_ADC;
+
+/************************************/
+/*       MADC calibration           */
+/************************************/
+typedef struct
+{
+   UWORD16 a[ADC_INDEX_END];
+   WORD16 b[ADC_INDEX_END];
+}
+T_ADCCAL;
+
+// Conversion table: ADC value -> temperature
+typedef struct 
+{
+    UWORD16 adc;  // ADC reading is 10 bits
+    WORD16  temp; // temp is in approx. range -30..+80
+}
+T_TEMP;
+
+typedef struct
+{
+    char *name;
+    void *addr;
+    int  size;
+}
+T_CONFIG_FILE;
+
+typedef struct
+{
+  char      *name;         // name of ffs file suffix
+  T_RF_BAND *addr;         // address to default flash structure
+  UWORD16   max_carrier;  // max carrier 
+  UWORD16   max_txpwr;    // max tx power
+}
+T_BAND_CONFIG;
+
+typedef struct
+{
+  UWORD8  band[GSM_BANDS]; // index to band address
+  UWORD8  txpwr_tp; // tx power turning point  
+  UWORD16 first_arfcn;  // first index
+}
+T_STD_CONFIG;
+
+enum GSMBAND_DEF 
+{
+  BAND_NONE,
+  BAND_EGSM900,
+  BAND_DCS1800,
+  BAND_PCS1900,
+  BAND_GSM850,
+  // put new bands here
+  BAND_GSM900  //last entry
+};
+
+
+/************************************/
+/* ABB (Omega) Initialization       */
+/************************************/
+
+#if ((ANLG_FAM == 1) || (ANLG_FAM == 2))
+  #define ABB_TABLE_SIZE 16
+#endif
+
+#if (ANLG_FAM == 3)
+  #define ABB_TABLE_SIZE 22
+#endif
+
+// Note that this translation is probably not needed at all. But until L1 is
+// (maybe) changed to simply initialize the ABB from a table of words, we
+// use this to make things more easy-readable.
+
+#if (ANLG_FAM == 1)
+  enum ABB_REGISTERS {
+    ABB_AFCCTLADD = 0,
+    ABB_VBUCTRL,
+    ABB_VBDCTRL,
+    ABB_BBCTRL,
+    ABB_APCOFF,
+    ABB_BULIOFF,
+    ABB_BULQOFF,
+    ABB_DAI_ON_OFF,
+    ABB_AUXDAC,
+    ABB_VBCTRL,
+    ABB_APCDEL1
+  };
+#endif
+
+#if (ANLG_FAM == 2)
+  enum ABB_REGISTERS {
+    ABB_AFCCTLADD = 0,
+    ABB_VBUCTRL,
+    ABB_VBDCTRL,
+    ABB_BBCTRL,
+    ABB_BULGCAL,
+    ABB_APCOFF,
+    ABB_BULIOFF,
+    ABB_BULQOFF,
+    ABB_DAI_ON_OFF,
+    ABB_AUXDAC,
+    ABB_VBCTRL1,
+    ABB_VBCTRL2,
+    ABB_APCDEL1,
+    ABB_APCDEL2
+  };
+#endif
+
+#if (ANLG_FAM == 3)
+  enum ABB_REGISTERS {
+    ABB_AFCCTLADD = 0,
+    ABB_VBUCTRL,
+    ABB_VBDCTRL,
+    ABB_BBCTRL,
+    ABB_BULGCAL,
+    ABB_APCOFF,
+    ABB_BULIOFF,
+    ABB_BULQOFF,
+    ABB_DAI_ON_OFF,
+    ABB_AUXDAC,
+    ABB_VBCTRL1,
+    ABB_VBCTRL2,
+    ABB_APCDEL1,
+    ABB_APCDEL2,
+    ABB_VBPOP,
+    ABB_VAUDINITD,
+    ABB_VAUDCTRL,
+    ABB_VAUOCTRL,
+    ABB_VAUSCTRL,
+    ABB_VAUDPLL
+  };
+#endif
+#endif
+
--- a/gsm-fw/L1/include/l1_confg.h	Sat Nov 16 20:55:06 2013 +0000
+++ b/gsm-fw/L1/include/l1_confg.h	Sun Nov 17 04:50:45 2013 +0000
@@ -71,6 +71,7 @@
 #define	MELODY_E2	1
 #define	TESTMODE	1
 #define	TRACE_TYPE	4
+#define	VCXO_ALGO	1
 
 #if CONFIG_GPRS
 #  define L1_GPRS	1
--- a/gsm-fw/L1/include/l1_ctl.h	Sat Nov 16 20:55:06 2013 +0000
+++ b/gsm-fw/L1/include/l1_ctl.h	Sun Nov 17 04:50:45 2013 +0000
@@ -50,10 +50,8 @@
   #define  ALGO_AFC_KALMAN_PREDICTOR 3 // Kalman filter + rgap predictor
 #endif
 
-#if ((ANLG_FAM == 1) || (ANLG_FAM == 2) || (ANLG_FAM == 3))
+#if ((ANALOG == 1) || (ANALOG == 2) || (ANALOG == 3))
    // clipping related to AFC DAC linearity range
   #define  C_max_step        32000   //   4000 * 2**3                    
   #define  C_min_step       -32000   //  -4000 * 2**3                   
 #endif
-
-
--- a/gsm-fw/L1/include/l1_macro.h	Sat Nov 16 20:55:06 2013 +0000
+++ b/gsm-fw/L1/include/l1_macro.h	Sun Nov 17 04:50:45 2013 +0000
@@ -10,7 +10,7 @@
 #include "l1_confg.h"
 
 #if(L1_DYN_DSP_DWNLD == 1)
-  #include "l1_dyn_dwl_const.h"
+  #include "../dyn_dwl_include/l1_dyn_dwl_const.h"
 #endif
 
 #if (TRACE_TYPE==5) && NUCLEUS_TRACE
--- a/gsm-fw/bsp/abb+spi/abb.c	Sat Nov 16 20:55:06 2013 +0000
+++ b/gsm-fw/bsp/abb+spi/abb.c	Sun Nov 17 04:50:45 2013 +0000
@@ -27,26 +27,24 @@
 /**********************************************************************************/
 
 #include "../../include/config.h"
+#include "../../L1/include/l1_confg.h"
+#include "../../L1/include/l1_macro.h"
 
 #include "abb.h"
-#include "l1_macro.h"
-#include "l1_confg.h"
-#include "clkm/clkm.h"         // for wait_ARM_cycles function
+#include "../clkm.h"         // for wait_ARM_cycles function
 #include "abb_inline.h"
-#include "ulpd/ulpd.h"        // for FRAME_STOP definition
-#include "nucleus.h"      // for NUCLEUS functions and types
-#include "l1_types.h"
+#include "../ulpd.h"        // for FRAME_STOP definition
+#include "../../nucleus/nucleus.h"      // for NUCLEUS functions and types
+#include "../../L1/include/l1_types.h"
 
-#if (OP_L1_STANDALONE == 0)
-  #include "main/sys_types.h"
-  #include "rv/general.h"
-  #include "buzzer/buzzer.h"	     // for BZ_KeyBeep_OFF function
-#else
-  #include "sys_types.h"
+#include "../../include/sys_types.h"
+#include "../../riviera/rv/general.h"
+#if 0
+#include "buzzer/buzzer.h"	     // for BZ_KeyBeep_OFF function
 #endif
 
 #if (VCXO_ALGO == 1)
-  #include "l1_ctl.h"
+  #include "../../L1/include/l1_ctl.h"
 #endif
 
 #if (RF_FAM == 35)