--- a/chipsetsw/layer1/audio_cfile/l1audio_afunc.c	Tue Jun 07 19:44:29 2016 +0000
+++ b/chipsetsw/layer1/audio_cfile/l1audio_afunc.c	Tue Jun 07 19:54:33 2016 +0000
@@ -116,9 +116,10 @@
     #if (L1_AAC == 1)
       #include "l1aac_defty.h"
     #endif
-#if (RF_FAM == 61)
-#include "l1_rf61.h"
-#endif 
+
+    #if (RF_FAM == 61)
+      #include "l1_rf61.h"
+    #endif 
 
     #include "l1_defty.h"
     #include "l1_msgty.h"
@@ -152,26 +153,8 @@
       #include "audio_macro_i.h"
       #include "audio_const_i.h"
     #endif
- #endif
-//      #include "audio_api.h"  //Thukaram Test
-#if (OP_L1_STANDALONE == 0)
-   
-      #include "typedefs.h"
-      #include "vsi.h"
-      #include "os_const.h"
-      #include "os.h"
-      #include "frm_glob.h"
+  #endif
 
-      #include "typedefs.h"
-      #include "vsi.h"
-      #include "os_const.h"
-      #include "os.h"
-      #include "frm_glob.h"
-
-   extern T_HANDLE mm_ext_data_pool_handle;
-   extern T_HANDLE mm_int_data_pool_handle; 
- #endif
-   UWORD8 dma_src_port;
   // This macro avoids to duplicate the code.
   #if (OP_RIV_AUDIO == 1)
     #define AUDIO_MSG (p_message)
@@ -202,7 +185,7 @@
                               sizeof (T_RV_HDR),
                               (T_RVF_BUFFER **) (&p_message));
 
-     /* If insufficient resources, then report a memory error and abort.               */
+     /* If insufficient resources, then report a memory error and abort. */
      if (mb_status == RVF_RED)
      {
        /* the memory is insufficient to continue the non regression test */
@@ -987,46 +970,4 @@
   }
 #endif // MELODY_E2
 
-#if (OP_L1_STANDALONE == 0)
-void *mem_Allocate(UWORD16 size)
-{
-
-void* p_buffer;
-
-      T_HANDLE hTask;
-
-    hTask = e_running[os_MyHandle()];
-
-          if(os_AllocateMemory( hTask , (T_VOID_STRUCT **)&p_buffer,size,OS_NO_SUSPEND, mm_int_data_pool_handle) != 0)
-          { 
-		if(os_AllocateMemory ( hTask, (T_VOID_STRUCT**)&p_buffer,size,OS_NO_SUSPEND, mm_ext_data_pool_handle) != 0)
-        			return NULL;
-		else
-		{
-			   dma_src_port =AUDIO_SP_SOURCE_EMIF;
-                     return p_buffer;
-		}
-	   }
-          else
-          {
-		  	   dma_src_port =AUDIO_SP_SOURCE_IMIF;
-		       return p_buffer;
-           }
-                
-
-}
-
-
-void mem_Deallocate(void *memoryBlock)
-{
-   T_HANDLE hTask;
-
-    hTask = e_running[os_MyHandle()];
-
-	if (memoryBlock)
-	{
-		os_DeallocateMemory(hTask, (T_VOID_STRUCT *) memoryBlock);
-	}
-  }
-#endif//op_l1_standalone=0
 #endif // AUDIO_TASK