# HG changeset patch
# User Michael Spacefalcon <msokolov@ivan.Harhan.ORG>
# Date 1409283284 0
# Node ID 262fcce108594541304c26b68ea2e1c999e38c46
# Parent  c5286d24539e433063a05e9105fd507c7cc181ba
gsm-fw/L1/audio_cfile/*.c: s/ANLG_FAM/ANALOG/

diff -r c5286d24539e -r 262fcce10859 gsm-fw/L1/audio_cfile/l1audio_abb.c
--- 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
 
diff -r c5286d24539e -r 262fcce10859 gsm-fw/L1/audio_cfile/l1audio_func.c
--- a/gsm-fw/L1/audio_cfile/l1audio_func.c	Fri Aug 29 03:25:51 2014 +0000
+++ b/gsm-fw/L1/audio_cfile/l1audio_func.c	Fri Aug 29 03:34:44 2014 +0000
@@ -739,10 +739,10 @@
     void l1_audio_lim_update_mul_low_high()
     {
 #if (CODE_VERSION != SIMULATION)
-  #if (ANLG_FAM == 3)
+  #if (ANALOG == 3)
       WORD16 volume_q15 = ABB_Read_DLGain();
   #endif
-  #if (ANLG_FAM == 11)
+  #if (ANALOG == 11)
     WORD16 volume_q15 = (WORD16)(l1_audio_abb_Read_DLGain());
   #endif
 #else
diff -r c5286d24539e -r 262fcce10859 gsm-fw/L1/audio_cfile/l1audio_stereo.c
--- a/gsm-fw/L1/audio_cfile/l1audio_stereo.c	Fri Aug 29 03:25:51 2014 +0000
+++ b/gsm-fw/L1/audio_cfile/l1audio_stereo.c	Fri Aug 29 03:34:44 2014 +0000
@@ -163,18 +163,18 @@
 #include "l1audio_macro.h"
 
 //add the extern reference of abb_write_done
-#if (ANLG_FAM == 11)
+#if (ANALOG == 11)
 #include "bspTwl3029_I2c.h"
 #include "bspTwl3029_Aud_Map.h"
 #endif
 
-#if (ANLG_FAM == 11)
+#if (ANALOG == 11)
 Bsp_Twl3029_I2cTransReqArray l1audio_i2cTransArray;
 #endif
 
 #if (L1_STEREOPATH == 1) && (CODE_VERSION == NOT_SIMULATION)
 
-#if (ANLG_FAM == 11)
+#if (ANALOG == 11)
  #include "bspTwl3029_Int_Map.h"
 
 
@@ -326,7 +326,7 @@
 /*-------------------------------------------------------*/
 void l1s_stereopath_drv_config_ABB(UWORD8 mono_stereo,UWORD8 sampling_frequency)
 {
-#if (ANLG_FAM == 3)
+#if (ANALOG == 3)
     UWORD16 regist;
 
     // Get the VAUDCTRL register
@@ -371,7 +371,7 @@
 
 #endif
 
-#if (ANLG_FAM == 11)
+#if (ANALOG == 11)
     // Call to the Triton API which would configure the Audio path.
     UWORD8 monostereo;
     UWORD8 pll;
@@ -419,7 +419,7 @@
 /*-------------------------------------------------------*/
 void l1s_stereopath_drv_start_ABB(void)
 {
-#if (ANLG_FAM == 3)
+#if (ANALOG == 3)
     // Get VAUDPLL register
     UWORD16 regist = l1s_dsp_com.dsp_ndb_ptr->d_vaud_pll >> 6;
 
@@ -436,7 +436,7 @@
     // update DSP API
     l1s_dsp_com.dsp_ndb_ptr->d_togbr2 = ABB_L1_WRITE(TOGBR2, regist);
 #endif
-#if (ANLG_FAM == 11)
+#if (ANALOG == 11)
     //Call back function
     BspTwl3029_I2C_Callback stereo_callbackFunc;
     //Set the call back function to be called after the Audio start
@@ -466,7 +466,7 @@
 /*-------------------------------------------------------*/
 void l1s_stereopath_drv_stop_ABB(void)
 {
-#if (ANLG_FAM == 3)
+#if (ANALOG == 3)
     UWORD16 regist;
 
     // Reset AUDON bit of the PWRDNRG register
@@ -482,7 +482,7 @@
     // update DSP API
     l1s_dsp_com.dsp_ndb_ptr->d_vaud_pll = ABB_L1_WRITE(VAUDPLL, regist);
 #endif
-#if (ANLG_FAM == 11)
+#if (ANALOG == 11)
     //Call back function
     BspTwl3029_I2C_Callback stereo_callbackFunc;
 
diff -r c5286d24539e -r 262fcce10859 gsm-fw/L1/audio_cfile/l1audio_sync.c
--- a/gsm-fw/L1/audio_cfile/l1audio_sync.c	Fri Aug 29 03:25:51 2014 +0000
+++ b/gsm-fw/L1/audio_cfile/l1audio_sync.c	Fri Aug 29 03:34:44 2014 +0000
@@ -341,7 +341,7 @@
 
 #endif
 
-#if (ANLG_FAM == 11)
+#if (ANALOG == 11)
 //sundi: add the abb_write_done variable for I2C write acknowledgement
 //UWORD8 abb_write_done = 0;
 #endif
@@ -6444,7 +6444,7 @@
     void l1s_stereopath_drv_manager(void)
     {
     //sundi: change in the enum values for the ABB states
-#if (ANLG_FAM == 11)
+#if (ANALOG == 11)
       enum states
       {
         IDLE                		   = 0,
@@ -6513,7 +6513,7 @@
       {
         case IDLE:
         {
-#if (ANLG_FAM == 11)
+#if (ANALOG == 11)
 	   //Sundi:Set the abb_write_done variable to 0. This variable gets set in I2C call back fn.
 	   l1s.abb_write_done = 0;
 #endif
@@ -6521,7 +6521,7 @@
           l1s_stereopath_drv_config_ABB(l1a_l1s_com.stereopath_drv_task.parameters.mono_stereo,
                                         l1a_l1s_com.stereopath_drv_task.parameters.sampling_frequency);
 
-#if (ANLG_FAM == 11)
+#if (ANALOG == 11)
           // Must wait for the PLL to be locked. The value of 1 is subtracted from the standard value
           // in order to take care of the extra state added - ABB_CONFIGURE_DONE.
           wait_pll_on_counter = L1S_STEREOPATH_DRV_WAIT_PLL_COUNTER - 1;
@@ -6533,7 +6533,7 @@
 
           // Reset the command
           l1a_l1s_com.stereopath_drv_task.command.start = FALSE;
-#if (ANLG_FAM == 11)
+#if (ANALOG == 11)
           //sundi: change the state to ABB_CONFIGURE_DONE to wait for I2C write ACK.
           *state = ABB_CONFIGURE_DONE;
 
@@ -6542,7 +6542,7 @@
 #endif
         }
         break;
-#if (ANLG_FAM == 11)
+#if (ANALOG == 11)
 	//sundi: add the new state
 	case ABB_CONFIGURE_DONE:
 	{
@@ -6561,13 +6561,13 @@
         {
           if (wait_pll_on_counter == 0)
           {
-#if (ANLG_FAM == 11)
+#if (ANALOG == 11)
             //Sundi:Set the abb_write_done variable to 0. This variable gets set in I2C call back fn.
             l1s.abb_write_done = 0;
 #endif
             // PLL is locked, the ABB can be started
             l1s_stereopath_drv_start_ABB();
-#if (ANLG_FAM == 11)
+#if (ANALOG == 11)
             //sundi: Change state to ABB_START_DONE
             *state = ABB_START_DONE;
 #else
@@ -6578,7 +6578,7 @@
             wait_pll_on_counter--;
         }
         break;
-#if (ANLG_FAM == 11)
+#if (ANALOG == 11)
         //sundi: Add the new state ABB_START_DONE
 	 case ABB_START_DONE:
 	 {
@@ -6670,13 +6670,13 @@
         {
           // Stop the Cport
           l1s_stereopath_drv_stop_CPORT();
-#if (ANLG_FAM == 11)
+#if (ANALOG == 11)
 	   //Set the abb_write_done variable to 0. This variable gets set in I2C call back fn.
 	   l1s.abb_write_done = 0;
 #endif
           // Stop the ABB
           l1s_stereopath_drv_stop_ABB();
-#if (ANLG_FAM == 11)
+#if (ANALOG == 11)
           //sundi: change state to ABB_STOP_DONE
           *state = ABB_STOP_DONE;
 #else
@@ -6684,7 +6684,7 @@
 #endif
         }
         break;
-#if (ANLG_FAM == 11)
+#if (ANALOG == 11)
 	//sundi: Add a new state ABB_STOP_DONE
 	 case ABB_STOP_DONE:
 	 {