--- a/src/ui/mfw/mfw_aud.c	Tue Jan 19 05:41:26 2021 +0000
+++ b/src/ui/mfw/mfw_aud.c	Tue Jan 19 06:10:27 2021 +0000
@@ -13,15 +13,15 @@
    HISTORY:
 
 	Mar 28, 2007  DR: OMAPS00122762 x0039928
-	Description: MM: Deleting a PCM Voice Memo message in one particular memory, 
+	Description: MM: Deleting a PCM Voice Memo message in one particular memory,
 	delete them in all memories
 	Solution: voice memo position and pcm voice memo position is provided for all the devices.
-	
+
     July 03,2006 REF :OMAPS00083150  x0047075
     Description :Audio muted on call swap / hold
-    Solution :Function call hl_drv_enable_vocoder() and hl_drv_disable_vocoder() are replaced with hl_drv_set_vocoder_state()  
+    Solution :Function call hl_drv_enable_vocoder() and hl_drv_disable_vocoder() are replaced with hl_drv_set_vocoder_state()
 	Mar 15, 2006   ER: OMAPS00067709  x0pleela
-	Description: Voice Buffering implementation on C+ for PTT via PCM API 
+	Description: Voice Buffering implementation on C+ for PTT via PCM API
 	Solution: Defined new macros of folder and file names for PCM voice memo and Voice buffering
 			Defined new macros for Microphone and network gain of PCM VM and Voice buffering
 			Defined new functions set_voice_memo_type, get_voice_memo_type, set_voice_buffering_rec_stop_reason
@@ -33,12 +33,12 @@
 		Changes: Added code to call respective audio APIs for PCM voice memo and voice buffering
 
 	Feb 24, 2006    ER: OMAPS00067709 x0pleela
-	Description: Voice Buffering implementation on C+ for PTT via PCM API 
-	Solution: Defined a global variable gPcm_voice_Memo which indicates which Voice memo is active 
+	Description: Voice Buffering implementation on C+ for PTT via PCM API
+	Solution: Defined a global variable gPcm_voice_Memo which indicates which Voice memo is active
 			and corresponding audio APIs will be invoked and duplication of code is avoided
-	
+
 	Feb 24, 2006    ER: OMAPS00067709 x0pleela
-	Description: Voice Buffering implementation on C+ for PTT via PCM API 
+	Description: Voice Buffering implementation on C+ for PTT via PCM API
 	Solution: Adding new macros PCM_VM_FILE_NAME, PCM_VM_FOLDER to define new files for PCM voice memo
 			Following functions are implemented to support PCM voice memo feature
 				mfw_aud_vm_pcm_delete_file: Delete the file which held the PCM Voice Memo
@@ -48,10 +48,10 @@
 				mfw_aud_vm_pcm_stop_record: Stop recording a PCM Voice Memo
 				mfw_aud_vm_pcm_get_duration: Get the duration of the previously recorded PCM Voice Memo
 				mfw_aud_vm_pcm_set_duration: Set the duration of the previously recorded PCM Voice Memo
-	
+
     Apr 06, 2006    ERT: OMAPS00070660 x0039928(sumanth)
-    Description: Need to reduce flash foot-print for Locosto Lite 
-    Solution: Voice Memo feature is put under the flag #ifndef FF_NO_VOICE_MEMO to compile 
+    Description: Need to reduce flash foot-print for Locosto Lite
+    Solution: Voice Memo feature is put under the flag #ifndef FF_NO_VOICE_MEMO to compile
     out voice memo feature if the above flag is enabled.
 
     Mar 03, 2005 REF: CRR MMI-ENH-28950 xnkulkar
@@ -61,8 +61,8 @@
 
     Aug 25, 2004  REF: CRR 20655  xnkulkar
     Description: Voice Memo functionality not working
-    Solution:	  The voice recording functionality was failing because 
-    			 " mmi" folder is not present. As a solution, we create the 
+    Solution:	  The voice recording functionality was failing because
+    			 " mmi" folder is not present. As a solution, we create the
     			 "mmi" folder and then proceed with recording.
 */
 
@@ -102,7 +102,7 @@
 //fix from AS team
 #ifdef FF_PCM_VM_VB
 #include "l1audio_cust.h"
-#endif 
+#endif
 /*
 ** Local Variable Definitions
 */
@@ -142,7 +142,7 @@
 
 //x0pleela 27 Feb, 2006   ER:OMAPS00067709
 #ifdef FF_PCM_VM_VB
-static T_VOICEMEMO VoiceMemoType;			/* Voice memo type*/	
+static T_VOICEMEMO VoiceMemoType;			/* Voice memo type*/
 
 //x0pleela 09 Mar, 2006  ER OMAPS00067709
 GLOBAL  T_voice_buffering voice_buffering_data; /* Voice buffering data */
@@ -239,7 +239,7 @@
 	//x0pleela 06 Mar, 2006  ER:OMAPS00067709
  	//deleting PCM Voice memo file
 	if( get_voice_memo_type() EQ PCM_VOICE_MEMO)
-#ifdef FF_MMI_FILEMANAGER		
+#ifdef FF_MMI_FILEMANAGER
 {
 	switch(FFS_flashData.PCM_voicememo_storage)
 	  {
@@ -250,7 +250,7 @@
 	  	case SNAP_STG_NORMS:
 			strcpy(path, "/NOR");
 			break;
-			
+
 		case SNAP_STG_NAND:
 			strcpy(path, "/NAND");
 			break;
@@ -262,15 +262,15 @@
 
 	  strcat(path, PCM_VM_FOLDER);
 	  configure_vm_filename(tmpFile, path, PCM_VM_FILE_NAME, 0);
-}	  
-#else	  
+}
+#else
 	  configure_vm_filename(tmpFile, PCM_VM_FOLDER, PCM_VM_FILE_NAME, 0);
 #endif
-	else 
+	else
 	{
 	  if (get_voice_memo_type() EQ AMR_VOICE_MEMO)
-#endif	  	
- #ifdef FF_MMI_FILEMANAGER	
+#endif
+ #ifdef FF_MMI_FILEMANAGER
  {
 	  switch(FFS_flashData.voicememo_storage)
 	  {
@@ -281,7 +281,7 @@
 		case SNAP_STG_NORMS:
 			strcpy(path, "/NOR");
 			break;
-			
+
 		case SNAP_STG_NAND:
 			strcpy(path, "/NAND");
 			break;
@@ -293,7 +293,7 @@
 
 	  strcat(path, VM_FOLDER);
 	  configure_vm_filename(tmpFile, path, VM_FILE_NAME, 0);
- }	  
+ }
 #else
 	  configure_vm_filename(tmpFile, VM_FOLDER, VM_FILE_NAME, 0);
 #endif
@@ -326,14 +326,14 @@
 	T_AUDIO_RET						audio_riv_retVal=AUDIO_ERROR;
 	T_AUDIO_VM_PLAY_PARAMETER		mfw_vm_play_param;
 
- #ifdef FF_MMI_FILEMANAGER	
+ #ifdef FF_MMI_FILEMANAGER
 	char path[AUDIO_PATH_NAME_MAX_SIZE];
 	 T_RFS_STAT fstat;         /* Mar 28, 2007  DR: OMAPS00122762 x0039928 */
  #endif
-	//x0pleela 01 Mar, 2006   ER:OMAPS00067709	
+	//x0pleela 01 Mar, 2006   ER:OMAPS00067709
 #ifdef FF_PCM_VM_VB
        T_AUDIO_VM_PCM_PLAY_PARAMETER  mfw_vm_pcm_play_param; /* Defined new variable for pcm VM */
-	T_AUDIO_VBUF_PCM_PLAY_PARAMETER  mfw_vbuf_pcm_play_param; /* Defined new variable for voice buffering*/	
+	T_AUDIO_VBUF_PCM_PLAY_PARAMETER  mfw_vbuf_pcm_play_param; /* Defined new variable for voice buffering*/
 	UBYTE vm_type; /*to store voice memo type */
 #endif
 
@@ -349,7 +349,7 @@
 	{
 		return MFW_AUD_VM_MEM_EMPTY;
 	}
-#ifdef FF_PCM_VM_VB		
+#ifdef FF_PCM_VM_VB
 	  	break;
 
 	  case PCM_VOICE_MEMO:
@@ -363,14 +363,14 @@
 	}
 #endif /*  FF_PCM_VM_VB	  */
 #endif
-		
+
 //x0pleela 27 Feb, 2006   ER:OMAPS00067709
 //Set up the PCM Voice Memo filename in FFS
 #ifdef FF_PCM_VM_VB
 	//get the voice memo type
 	vm_type = get_voice_memo_type();
 	if( vm_type EQ PCM_VOICE_MEMO )
- #ifdef FF_MMI_FILEMANAGER	
+ #ifdef FF_MMI_FILEMANAGER
  {
 	  switch(FFS_flashData.PCM_voicememo_storage)
 	  {
@@ -400,15 +400,15 @@
 {
 	return MFW_AUD_VM_MEM_EMPTY;
 }
-#endif	  
- }	  
+#endif
+ }
 #else
 	  configure_vm_filename(mfw_vm_pcm_play_param.memo_name, PCM_VM_FOLDER, PCM_VM_FILE_NAME, 0);
 #endif
 	//x0pleela 09 Mar, 2006   ER:OMAPS00067709
 	//Set up the Voice buffering filename in FFS
 	else if (vm_type EQ VOICE_BUFFERING )
- #ifdef FF_MMI_FILEMANAGER	
+ #ifdef FF_MMI_FILEMANAGER
  {
 	  switch(FFS_flashData.voicebuffer_storage)
 	  {
@@ -419,7 +419,7 @@
 	  	case SNAP_STG_NORMS:
 			strcpy(path, "/NOR");
 			break;
-			
+
 		case SNAP_STG_NAND:
 			strcpy(path, "/NAND");
 			break;
@@ -431,15 +431,15 @@
 
 	  strcat(path, VOICE_BUFF_FOLDER);
 	  configure_vm_filename(mfw_vbuf_pcm_play_param.memo_name, path, VOICE_BUFF_FILE_NAME, 0);
- }	  
-#else		
+ }
+#else
 	  configure_vm_filename(mfw_vbuf_pcm_play_param.memo_name, VOICE_BUFF_FOLDER, VOICE_BUFF_FILE_NAME, 0);
 #endif
-	else 
+	else
 	{
 	  if (vm_type EQ AMR_VOICE_MEMO)
 #endif
- #ifdef FF_MMI_FILEMANAGER	
+ #ifdef FF_MMI_FILEMANAGER
  {
 	  switch(FFS_flashData.voicememo_storage)
 	  {
@@ -450,7 +450,7 @@
 	  	case SNAP_STG_NORMS:
 			strcpy(path, "/NOR");
 			break;
-			
+
 		case SNAP_STG_NAND:
 			strcpy(path, "/NAND");
 			break;
@@ -470,7 +470,7 @@
 	return MFW_AUD_VM_MEM_EMPTY;
 }
 #endif
- }	  
+ }
 #else
 		//Set up the Voice Memo filename in FFS
 		configure_vm_filename(mfw_vm_play_param.memo_name, VM_FOLDER, VM_FILE_NAME, 0);
@@ -490,7 +490,7 @@
     	  //update mfw_vm_pcm_play_param
   	  mfw_vm_pcm_play_param.memo_duration = mfw_aud_vm_get_duration();
   	  mfw_vm_pcm_play_param.speaker_gain = PCM_VM_MICROPHONE_GAIN;
-  	  mfw_vm_pcm_play_param.network_gain= 0; 
+  	  mfw_vm_pcm_play_param.network_gain= 0;
 
 	  //Start playing PCM Voice memo
   	  audio_riv_retVal = audio_vm_pcm_play_start(&mfw_vm_pcm_play_param,
@@ -501,7 +501,7 @@
 	  //update mfw_vbuf_pcm_play_param
   	  mfw_vbuf_pcm_play_param.memo_duration = PCM_VOICE_MEMO_MAX_DURATION;
   	  mfw_vbuf_pcm_play_param.speaker_gain = 0;
-  	  mfw_vbuf_pcm_play_param.network_gain= PCM_VM_NETWORK_GAIN; 
+  	  mfw_vbuf_pcm_play_param.network_gain= PCM_VM_NETWORK_GAIN;
 
 	  //x0pleela 06 Jul, 2006  DR: OMAPS00067709
 	  //Fix from AS team
@@ -542,7 +542,7 @@
 {
 	T_AUDIO_RET						audio_riv_retVal=AUDIO_ERROR;
 //x0pleela 06 Mar, 2006  ER:OMAPS00067709
-#ifdef FF_PCM_VM_VB  
+#ifdef FF_PCM_VM_VB
   UBYTE vm_type; //to store voice memo type
 #endif
 
@@ -559,13 +559,13 @@
 	//Stop playing PCM Voice memo
 	if( vm_type EQ PCM_VOICE_MEMO )
 	  audio_riv_retVal = audio_vm_pcm_play_stop(voice_memo_return_path);
-	//Stop playing 
+	//Stop playing
 	else if ( vm_type EQ VOICE_BUFFERING )
 	{
-	  audio_riv_retVal = audio_voice_buffering_pcm_play_stop (voice_memo_return_path); 
+	  audio_riv_retVal = audio_voice_buffering_pcm_play_stop (voice_memo_return_path);
 	  //x0pleela 06 Jul, 2006  DR: OMAPS00067709
 	  //Fix from AS team
-	  vocoder_mute_ul(0);  
+	  vocoder_mute_ul(0);
 	}
 	else
 	{
@@ -592,7 +592,7 @@
 	T_RFS_DIR f_dir, f_dir1;
 	char dir_path[FM_MAX_DIR_PATH_LENGTH];
 	UINT16 dir_path_uc[FM_MAX_DIR_PATH_LENGTH];
-	
+
 	memset(dir_path, 0, FM_MAX_DIR_PATH_LENGTH);
 	switch(vmtype)
 	{
@@ -606,7 +606,7 @@
 				case SNAP_STG_NORMS:
 					strcpy(dir_path, "/NOR/mmi");
 					break;
-					
+
 				case SNAP_STG_NAND:
 					strcpy(dir_path, "/NAND/mmi");
 					break;
@@ -616,7 +616,7 @@
 					break;
 			}
 			convert_u8_to_unicode(dir_path, dir_path_uc);
-			ffsResult = rfs_opendir(dir_path_uc,&f_dir);       
+			ffsResult = rfs_opendir(dir_path_uc,&f_dir);
 			TRACE_EVENT_P2("Opendir - ffsResult   %d  Dir path %s", ffsResult,dir_path);
 
 			if(RFS_ENOENT == ffsResult)
@@ -635,7 +635,7 @@
 				{
 					strcat(dir_path, "/vm");
 					convert_u8_to_unicode(dir_path, dir_path_uc);
-					ffsResult = rfs_opendir(dir_path_uc,&f_dir1);       
+					ffsResult = rfs_opendir(dir_path_uc,&f_dir1);
 					TRACE_EVENT_P2("Opendir - ffsResult   %d  Dir path %s", ffsResult,dir_path);
 
 					if(RFS_ENOENT == ffsResult)
@@ -644,9 +644,9 @@
 						TRACE_EVENT_P2("Makedir - ffsResult   %d  Dir path %s", ffsResult,dir_path);
 					}
 					else if (ffsResult > 0)
-						rfs_closedir(&f_dir1);	
+						rfs_closedir(&f_dir1);
 
-					rfs_closedir(&f_dir);	
+					rfs_closedir(&f_dir);
 				}
 			break;
 
@@ -660,7 +660,7 @@
 				case SNAP_STG_NORMS:
 					strcpy(dir_path, "/NOR/mmi");
 					break;
-					
+
 				case SNAP_STG_NAND:
 					strcpy(dir_path, "/NAND/mmi");
 					break;
@@ -670,7 +670,7 @@
 					break;
 			}
 			convert_u8_to_unicode(dir_path, dir_path_uc);
-			ffsResult = rfs_opendir(dir_path_uc,&f_dir);       
+			ffsResult = rfs_opendir(dir_path_uc,&f_dir);
 			TRACE_EVENT_P2("Opendir - ffsResult   %d  Dir path %s", ffsResult,dir_path);
 
 			if(RFS_ENOENT == ffsResult)
@@ -681,7 +681,7 @@
 				{
 					strcat(dir_path, "/pcmvm");
 					convert_u8_to_unicode(dir_path, dir_path_uc);
-					ffsResult = rfs_opendir(dir_path_uc,&f_dir1);       
+					ffsResult = rfs_opendir(dir_path_uc,&f_dir1);
 					TRACE_EVENT_P2("Opendir - ffsResult   %d  Dir path %s", ffsResult,dir_path);
 
 					if(RFS_ENOENT == ffsResult)
@@ -690,17 +690,17 @@
 						TRACE_EVENT_P2("Makedir - ffsResult   %d  Dir path %s", ffsResult,dir_path);
 					}
 					else if (ffsResult > 0)
-						rfs_closedir(&f_dir1);	
+						rfs_closedir(&f_dir1);
 
-					rfs_closedir(&f_dir);	
+					rfs_closedir(&f_dir);
 				}
-				
+
 			}
 			else if(ffsResult > 0)
 			{
 				strcat(dir_path, "/pcmvm");
 				convert_u8_to_unicode(dir_path, dir_path_uc);
-				ffsResult = rfs_opendir(dir_path_uc,&f_dir1);       
+				ffsResult = rfs_opendir(dir_path_uc,&f_dir1);
 				TRACE_EVENT_P2("Opendir - ffsResult   %d  Dir path %s", ffsResult,dir_path);
 
 				if(RFS_ENOENT == ffsResult)
@@ -709,7 +709,7 @@
 					TRACE_EVENT_P2("Makedir - ffsResult   %d  Dir path %s", ffsResult,dir_path);
 				}
 			}
-		
+
 			break;
 
 		case VOICE_BUFFERING:
@@ -722,7 +722,7 @@
 				case SNAP_STG_NORMS:
 					strcpy(dir_path, "/NOR/mmi");
 					break;
-					
+
 				case SNAP_STG_NAND:
 					strcpy(dir_path, "/NAND/mmi");
 					break;
@@ -732,7 +732,7 @@
 					break;
 			}
 			convert_u8_to_unicode(dir_path, dir_path_uc);
-			ffsResult = rfs_opendir(dir_path_uc,&f_dir);       
+			ffsResult = rfs_opendir(dir_path_uc,&f_dir);
 			TRACE_EVENT_P2("Opendir - ffsResult   %d  Dir path %s", ffsResult,dir_path);
 
 			if(RFS_ENOENT == ffsResult)
@@ -744,7 +744,7 @@
 			{
 				strcat(dir_path, "/vb");
 				convert_u8_to_unicode(dir_path, dir_path_uc);
-				ffsResult = rfs_opendir(dir_path_uc,&f_dir1);       
+				ffsResult = rfs_opendir(dir_path_uc,&f_dir1);
 				TRACE_EVENT_P2("Opendir - ffsResult   %d  Dir path %s", ffsResult,dir_path);
 
 				if(RFS_ENOENT == ffsResult)
@@ -758,7 +758,7 @@
 			{
 				strcat(dir_path, "/vb");
 				convert_u8_to_unicode(dir_path, dir_path_uc);
-				ffsResult = rfs_opendir(dir_path_uc,&f_dir1);       
+				ffsResult = rfs_opendir(dir_path_uc,&f_dir1);
 				TRACE_EVENT_P2("Opendir - ffsResult   %d  Dir path %s", ffsResult,dir_path);
 
 				if(RFS_ENOENT == ffsResult)
@@ -767,9 +767,9 @@
 					TRACE_EVENT_P2("Makedir - ffsResult   %d  Dir path %s", ffsResult,dir_path);
 				}
 				else if (ffsResult > 0)
-						rfs_closedir(&f_dir1);	
+						rfs_closedir(&f_dir1);
 
-					rfs_closedir(&f_dir);	
+					rfs_closedir(&f_dir);
 			}
 			break;
 	}
@@ -792,12 +792,12 @@
 	T_AUDIO_VM_RECORD_PARAMETER		mfw_vm_record_param;
 	T_AUDIO_TONES_PARAMETER			mfw_vm_tones_param;
 
- #ifdef FF_MMI_FILEMANAGER	
+ #ifdef FF_MMI_FILEMANAGER
  	char path[FM_MAX_DIR_PATH_LENGTH];
  #else
 	char * mmiDir = "/mmi"; // Aug 25, 2004  REF: CRR 20655  xnkulkar
  #endif
- 
+
 //x0pleela 27 Feb, 2006   ER:OMAPS00067709
 //defining new variable for PCM recording
 #ifdef FF_PCM_VM_VB
@@ -808,7 +808,7 @@
 	TRACE_FUNCTION("mfw_aud_vm_start_record");
 	configure_callback_fn(callback_fn);
 
-#ifdef FF_MMI_FILEMANAGER	
+#ifdef FF_MMI_FILEMANAGER
 	memset(path, 0, FM_MAX_DIR_PATH_LENGTH);
 #endif
 //x0pleela 27 Feb, 2006   ER:OMAPS00067709
@@ -817,15 +817,15 @@
 	//get the voice memo type
 	vm_type = get_voice_memo_type();
 
-       // We now create the "mmi" folder and then proceed with recording.	
+       // We now create the "mmi" folder and then proceed with recording.
  #ifdef FF_MMI_FILEMANAGER
 	path_init(vm_type);
  #else
-       flash_makedir(mmiDir);  
+       flash_makedir(mmiDir);
  #endif
- 
+
 	if( vm_type EQ PCM_VOICE_MEMO )
- #ifdef FF_MMI_FILEMANAGER	
+ #ifdef FF_MMI_FILEMANAGER
  {
 	  switch(FFS_flashData.PCM_voicememo_storage)
 	  {
@@ -836,7 +836,7 @@
 	  	case SNAP_STG_NORMS:
 			strcpy(path, "/NOR");
 			break;
-			
+
 		case SNAP_STG_NAND:
 			strcpy(path, "/NAND");
 			break;
@@ -847,14 +847,14 @@
 	  	}
 	  strcat(path, PCM_VM_FOLDER);
 	  configure_vm_filename(mfw_vm_pcm_record_param.memo_name, path, PCM_VM_FILE_NAME, 0);
- }	  
-#else		
+ }
+#else
   	  //Set up, and create, the PCM Voice Memo filename in FFS
 	  configure_vm_filename(mfw_vm_pcm_record_param.memo_name, PCM_VM_FOLDER, PCM_VM_FILE_NAME, 0);
 #endif
 	//x0pleela 09 Mar, 2006   ER:OMAPS00067709
 	else if( vm_type EQ VOICE_BUFFERING)
- #ifdef FF_MMI_FILEMANAGER	
+ #ifdef FF_MMI_FILEMANAGER
  {
 	  switch(FFS_flashData.voicebuffer_storage)
 	  {
@@ -877,16 +877,16 @@
 
 	  strcat(path, VOICE_BUFF_FOLDER);
 	  configure_vm_filename(mfw_vbuf_pcm_record_param.memo_name, path, VOICE_BUFF_FILE_NAME, 0);
- }	  
-#else			
+ }
+#else
   	  //Set up, and create, the Voice Buffering filename in FFS
 	  configure_vm_filename(mfw_vbuf_pcm_record_param.memo_name, VOICE_BUFF_FOLDER, VOICE_BUFF_FILE_NAME, 0);
 #endif
-	else  
+	else
 	{
 	  if (vm_type EQ AMR_VOICE_MEMO)
 #endif /* FF_PCM_VM_VB */
- #ifdef FF_MMI_FILEMANAGER	
+ #ifdef FF_MMI_FILEMANAGER
  {
 	  switch(FFS_flashData.voicememo_storage)
 	  {
@@ -909,8 +909,8 @@
 
 	  strcat(path, VM_FOLDER);
 	 configure_vm_filename(mfw_vm_record_param.memo_name, path, VM_FILE_NAME, 0);
- }	  
-#else	
+ }
+#else
 	//Set up, and create, the Voice Memo filename in FFS
 	configure_vm_filename(mfw_vm_record_param.memo_name, VM_FOLDER, VM_FILE_NAME, 0);
 #endif
@@ -919,12 +919,12 @@
 #endif /* FF_PCM_VM_VB */
        //Aug 25, 2004  REF: CRR 20655  xnkulkar
 
-       
+
 //x0pleela 27 Feb, 2006   ER:OMAPS00067709
 #ifdef FF_PCM_VM_VB
 	if( vm_type EQ PCM_VOICE_MEMO )
 	//create PCM Voice memo file
- #ifdef FF_MMI_FILEMANAGER	
+ #ifdef FF_MMI_FILEMANAGER
 	  mfw_aud_vm_create_file(path, PCM_VM_FILE_NAME, 0);
  #else
   	  mfw_aud_vm_create_file(PCM_VM_FOLDER, PCM_VM_FILE_NAME, 0);
@@ -937,7 +937,7 @@
  #else
   	  mfw_aud_vm_create_file(VOICE_BUFF_FOLDER, VOICE_BUFF_FILE_NAME, 0);
  #endif
-	else 
+	else
 	{
 	   if (vm_type EQ AMR_VOICE_MEMO)
 #endif       /* FF_PCM_VM_VB */
@@ -960,7 +960,7 @@
 	  mfw_vm_pcm_record_param.microphone_gain = PCM_VM_MICROPHONE_GAIN;
 	  mfw_vm_pcm_record_param.network_gain = 0;
 
-  	  audio_riv_retVal = audio_vm_pcm_record_start(&mfw_vm_pcm_record_param, 
+  	  audio_riv_retVal = audio_vm_pcm_record_start(&mfw_vm_pcm_record_param,
 												  voice_memo_return_path);
 	}
 	else if( vm_type EQ VOICE_BUFFERING )
@@ -968,13 +968,13 @@
 	  mfw_vbuf_pcm_record_param.memo_duration = (UINT32)max_duration;
 	  mfw_vbuf_pcm_record_param.microphone_gain = PCM_VM_MICROPHONE_GAIN;
 	  mfw_vbuf_pcm_record_param.network_gain = 0;
-	  
-	  audio_riv_retVal = audio_voice_buffering_pcm_record_start( &mfw_vbuf_pcm_record_param, 
+
+	  audio_riv_retVal = audio_voice_buffering_pcm_record_start( &mfw_vbuf_pcm_record_param,
 	  													voice_memo_return_path);
 	}
 	else
 	{
-	  if (vm_type EQ AMR_VOICE_MEMO ) 
+	  if (vm_type EQ AMR_VOICE_MEMO )
 	  {
 #endif /* FF_PCM_VM_VB */
 
@@ -1014,7 +1014,7 @@
 #endif /* FF_PCM_VM_VB */
 	if (audio_riv_retVal != RV_OK)
 		return MFW_AUD_VM_RIVIERA_FAILED;
-	
+
 #endif
 
 	return MFW_AUD_VM_OK;
@@ -1036,7 +1036,7 @@
 	T_AUDIO_RET						audio_riv_retVal=AUDIO_ERROR;
 
 //x0pleela 06 Mar, 2006  ER:OMAPS00067709
-#ifdef FF_PCM_VM_VB  
+#ifdef FF_PCM_VM_VB
   UBYTE vm_type; //to store voice memo type
 #endif
 	TRACE_FUNCTION("mfw_aud_vm_stop_record");
@@ -1085,7 +1085,7 @@
 {
 	TRACE_FUNCTION("mfw_aud_vm_get_duration");
 //x0pleela 06 Mar, 2006  ER:OMAPS00067709
-#ifdef FF_PCM_VM_VB  
+#ifdef FF_PCM_VM_VB
   //x0pleela 27 Feb, 2006   ER:OMAPS00067709
   if( get_voice_memo_type() EQ PCM_VOICE_MEMO )
   //get PCM Voice memo recorded duration
@@ -1108,7 +1108,7 @@
 #ifdef FF_PCM_VM_VB
 	}
     return 0;
-#endif 
+#endif
 }
 
 
@@ -1126,7 +1126,7 @@
 {
 	TRACE_FUNCTION("mfw_aud_vm_set_duration");
 //x0pleela 06 Mar, 2006  ER:OMAPS00067709
-#ifdef FF_PCM_VM_VB  
+#ifdef FF_PCM_VM_VB
  if( get_voice_memo_type() EQ PCM_VOICE_MEMO )
     //Set PCM Voice memo recorded duration
  #ifdef FF_MMI_FILEMANAGER
@@ -1171,7 +1171,7 @@
     return;
 }
 #endif
-	
+
 /*
 ** Local Function Definitions
 */
@@ -1252,7 +1252,7 @@
 	strcpy(vm_filename, folder);
 	strcat(vm_filename, "/");
 	strcat(vm_filename, fname);
-#endif	
+#endif
 	return;
 }
 #endif
@@ -1277,7 +1277,7 @@
 // Mar 03, 2005 REF: CRR MMI-ENH-28950 xnkulkar
 // Call 'hl_drv_enable_vocoder()' instead of 'enable_tch_vocoder(TRUE)'
 //	enable_tch_vocoder(TRUE);
-	
+
 // July 03, 2006    REF:DR OMAPS00083150  x0047075
 //Fix:Use hl_drv_set_vocoder_state(TRUE) function instead of hl_drv_enable_vocoder() to enable the vocoder
 		hl_drv_set_vocoder_state(TRUE);