--- a/gsm-fw/L1/audio_cfile/l1audio_abb.c	Fri Aug 29 03:25:51 2014 +0000
+++ b/gsm-fw/L1/audio_cfile/l1audio_abb.c	Fri Aug 29 03:34:44 2014 +0000
@@ -116,7 +116,7 @@
 
 #include "l1audio_abb.h"
 
-#if (ANLG_FAM == 11)
+#if (ANALOG == 11)
   #include "types.h"
   #include "bspTwl3029_I2c.h"
   #include "bspTwl3029_Aud_Map.h"
@@ -132,7 +132,7 @@
   #include "nucleus.h"
 #endif
 
-#if (ANLG_FAM == 3)
+#if (ANALOG == 3)
 extern T_L1S_DSP_COM l1s_dsp_com;
 extern void l1_audio_lim_partial_update();
 
@@ -214,9 +214,9 @@
  */
 void ABB_Audio_Config (UWORD16 data)
 {
-#if (ANLG_FAM == 1)
+#if (ANALOG == 1)
   l1s_dsp_com.dsp_ndb_ptr->d_vbctrl = ABB_L1_WRITE (VBCTRL, data);
-#elif ((ANLG_FAM == 2) || (ANLG_FAM == 3)  )
+#elif ((ANALOG == 2) || (ANALOG == 3)  )
   l1s_dsp_com.dsp_ndb_ptr->d_vbctrl1 = ABB_L1_WRITE (VBCTRL1, data);
 #endif
 }
@@ -230,7 +230,7 @@
  */
 void ABB_Audio_Config_2 (UWORD16 data)
 {
-#if ((ANLG_FAM == 2) || (ANLG_FAM == 3))
+#if ((ANALOG == 2) || (ANALOG == 3))
   l1s_dsp_com.dsp_ndb_ptr->d_vbctrl2 = ABB_L1_WRITE (VBCTRL2, data);
 #endif
 }
@@ -244,7 +244,7 @@
  */
 void ABB_Audio_Control (UWORD16 data)
 {
-#if (ANLG_FAM == 3)
+#if (ANALOG == 3)
   l1s_dsp_com.dsp_ndb_ptr->d_vaud_cfg = ABB_L1_WRITE (VAUDCTRL, data);
 #endif
 }
@@ -258,7 +258,7 @@
  */
 void ABB_Audio_On_Off (UWORD16 data)
 {
-#if (ANLG_FAM == 3)
+#if (ANALOG == 3)
   l1s_dsp_com.dsp_ndb_ptr->d_vauo_onoff = ABB_L1_WRITE (VAUOCTRL, data);
 #endif
 }
@@ -272,7 +272,7 @@
  */
 void ABB_Audio_Volume (UWORD16 data)
 {
-#if (ANLG_FAM == 3)
+#if (ANALOG == 3)
   l1s_dsp_com.dsp_ndb_ptr->d_vaus_vol = ABB_L1_WRITE (VAUSCTRL, data);
 #endif
 }
@@ -286,7 +286,7 @@
  */
 void ABB_Audio_PLL (UWORD16 data)
 {
-#if (ANLG_FAM == 3)
+#if (ANALOG == 3)
   l1s_dsp_com.dsp_ndb_ptr->d_vaud_pll = ABB_L1_WRITE (VAUDPLL, data);
 #endif
 }
@@ -300,7 +300,7 @@
  */
 void ABB_Audio_VBPop (UWORD16 data)
 {
-#if (ANLG_FAM == 3)
+#if (ANALOG == 3)
   l1s_dsp_com.dsp_ndb_ptr->d_vbpop = ABB_L1_WRITE (VBPOP, data);
 #endif
 }
@@ -314,7 +314,7 @@
  */
 void ABB_Audio_Delay_Init (UWORD8 delay)
 {
-#if (ANLG_FAM == 3)
+#if (ANALOG == 3)
   l1s_dsp_com.dsp_ndb_ptr->d_vau_delay_init = delay;
 #endif
 }
@@ -518,7 +518,7 @@
 
   // Read last programmed volume
     //Sundi: change for Triton
-    #if (ANLG_FAM == 1) || (ANLG_FAM == 2) || (ANLG_FAM == 3)
+    #if (ANALOG == 1) || (ANALOG == 2) || (ANALOG == 3)
   volume_index = (API)((l1s_dsp_com.dsp_ndb_ptr->d_vbdctrl >> 10) & 0x7);
   pga_index    = (API)((l1s_dsp_com.dsp_ndb_ptr->d_vbdctrl >>  6) & 0xF);
     #endif
@@ -526,9 +526,9 @@
   // Convert volume into gain (dB)
   return((ABB_DL_volume_read_gain[volume_index] * ABB_DL_PGA_read_gain[pga_index]) >> 15);
   }
-#endif // ANLG_FAM == 3
+#endif // ANALOG == 3
 
-#if (ANLG_FAM == 11)
+#if (ANALOG == 11)
   // Downlink volume gain read in unsigned Q15 (in VBDCTRL)
   const WORD16 L1_audio_abb_DL_volume_read_gain[] =
   {
@@ -585,7 +585,7 @@
   {
 
   }
-#endif // ANLG_FAM == 11
+#endif // ANALOG == 11
 
 #endif // CODE_VERSION != SIMULATION