--- a/src/ui/bmi/mmiSettings.c	Sun Nov 08 05:12:05 2020 +0000
+++ b/src/ui/bmi/mmiSettings.c	Sun Nov 08 06:39:16 2020 +0000
@@ -2,39 +2,39 @@
 
 					CONDAT (UK)
 
-********************************************************************************                                                                              
+********************************************************************************
 
  This software product is the property of Condat (UK) Ltd and may not be
- disclosed to any third party without the express permission of the owner.                                 
-                                                                              
+ disclosed to any third party without the express permission of the owner.
+
 ********************************************************************************
 
- $Project name:	Basic MMI                                                      
- $Project code:	BMI (6349)                                                           
+ $Project name:	Basic MMI
+ $Project code:	BMI (6349)
  $Module:		Settings
  $File:		    MmiSettings.c
- $Revision:		1.0                                                       
-                                                                              
- $Author:		Condat(UK)                                                         
- $Date:		    25/10/00                                                      
-                                                                               
+ $Revision:		1.0
+
+ $Author:		Condat(UK)
+ $Date:		    25/10/00
+
 ********************************************************************************
-                                                                              
+
  Description:
 
-	
+
 ********************************************************************************
  $History: MmiSettings.c
- 
+
 	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.
-	
+
       Oct 30 2006, OMAPS00098881 x0039928(sumanth)
       Removal of power variant
 
- 	xashmic 27 Sep 2006, OMAPS00096389 
+ 	xashmic 27 Sep 2006, OMAPS00096389
 	ENH - a) Providing static menu for re-selection of enum options for enumeration
 	b) Popup menu displayed on connect event, can be enabled or disabled via menu option
 
@@ -46,12 +46,12 @@
 	Solution: For ALS feature,
 			a) Updating function "setUserSettings2Default ()" to memset Line1 and line2
 				fields of FFS_flashData
-	
+
 	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.
-   	
+
      	May 04, 2005  REF: CRR 30285  x0021334
     	Description: SMS Status Request in idle and dedicated mode (using Menu) setting does not work
     	Solution: status of sms status request is read and focus is set accrodingly.
@@ -62,7 +62,7 @@
 
 	Aug 25, 2004    REF: CRR 24904   Deepa M.D
 	Bug:cleanup compile switches used for Go-lite
-	Fix:COLOURDISPLAY compiler switch has been added to the functions which are 
+	Fix:COLOURDISPLAY compiler switch has been added to the functions which are
 	used only for the normal color build.
 
         xrashmic 7 Dec, 2004 MMI-SPR-23965
@@ -71,43 +71,43 @@
 
         xrashmic 29 Nov, 2004 MMI-SPR-26161
         Description: The downloaded object through wap was not visible to the MMI
-        Solution: The downloaded wap object is available in the object manager 
+        Solution: The downloaded wap object is available in the object manager
         and can be used by the MMS
- 
+
  	Jul 28, 2004 REF: CRR 20899 xkundadu
 	Description: No identification for user whether 'Any-key-Answer' is On/Off
-	Solution: The menu focus will be on the 'On' menu  if the 'Any key 
+	Solution: The menu focus will be on the 'On' menu  if the 'Any key
 			answer' is enabled, otherwise focus will be on 'Off' menu item.
 			Changed "submenu" to "menuItem" to call a function, to set focus to
 			the selected option.Added  function settingsFocusCurSelAnyKeyAns()
 			to set the focus to selected item.
- 
+
 
 	Jul 29, 2004 REF: CRR 20898 xkundadu
 	Description: No identification for user whether 'Auto-Answer' is On/Off
-	Solution: The menu focus will be on the 'On' menu  if the 'Auto 
+	Solution: The menu focus will be on the 'On' menu  if the 'Auto
 			answer' is enabled, otherwise focus will be on 'Off' menu item.
 			Changed 'submenu' to 'menuItem' to call a function, which sets the
-			focus to the selected option. Added the function 
+			focus to the selected option. Added the function
 			settingsFocusCurSelAutoAns() to set the focus to selected item.
- 
+
 
 	 Jul 22,2004 CRR:20896 xrashmic - SASKEN
 	 Description: The current time format is not highlighted
-	 Fix: Instead of providing the submenu directly we call a function 
+	 Fix: Instead of providing the submenu directly we call a function
 	 where we set the menu and also higlight the previously selected menu item
-	 
+
 //  Issue Number : SPR#12822 on 31/03/04 by vvadiraj
-	May 10, 2004    REF: CRR 15753  Deepa M.D 
+	May 10, 2004    REF: CRR 15753  Deepa M.D
 	Menuitem provided to set the validity period to maximum.
 $End
 *******************************************************************************/
 
 
 /*******************************************************************************
-                                                                              
+
                                 Include Files
-                                                                              
+
 *******************************************************************************/
 
 #define ENTITY_MFW
@@ -161,7 +161,7 @@
 #include "mfw_sat.h"
 #include "Mfw_td.h"
 
-#include "mfw_mme.h"//xashmic 27 Sep 2006, OMAPS00096389 
+#include "mfw_mme.h"//xashmic 27 Sep 2006, OMAPS00096389
 
 #include "dspl.h"
 
@@ -248,8 +248,8 @@
 #define OFF		1
 #define CLEAR	2
 
-	
-typedef struct 
+
+typedef struct
 {
     UBYTE setting;
     UBYTE status;
@@ -258,7 +258,7 @@
 //GW Added for settings not stored in FFS
 static unsigned int BMIsettings=0;  /* x0039928 - Lint warning fix */
 
-typedef enum 
+typedef enum
 {
     ENGLISH = 0,
     GERMAN,
@@ -278,26 +278,26 @@
     MAX
 }T_FACTORY_RESET_LIST;
 
-  
+
 
-T_settings DEFAULT_SETTINGS[] = 
-{ 
+T_settings DEFAULT_SETTINGS[] =
+{
 	{ENGLISH,		ON},		//select the Language:English as a default
-	{GERMAN,		OFF},   
-	{AUTOREDIAL,	OFF},		
-	{AUTOANSWER,	OFF},		
-	{ANYKEYANSWER,	OFF},		
-	{CALLTIMERS,	CLEAR},		
+	{GERMAN,		OFF},
+	{AUTOREDIAL,	OFF},
+	{AUTOANSWER,	OFF},
+	{ANYKEYANSWER,	OFF},
+	{CALLTIMERS,	CLEAR},
 	{KEYPAD_CLICK,	ON},		//only one of the Keypads are eligible
-	{KEYPAD_DTMF,	OFF},		
+	{KEYPAD_DTMF,	OFF},
 	{KEYPAD_SILENT,	OFF},
 #ifndef FF_NO_VOICE_MEMO
-	{VOICE_MEMO,	CLEAR},		
+	{VOICE_MEMO,	CLEAR},
 #endif
 #ifdef FF_POWER_MANAGEMENT
 	{LCD_REFRESH,           ON}, /*OMAPS00098881 (removing power variant) a0393213(Prabakar)*/
 #endif
-	{MAX,			0xFF}   
+	{MAX,			0xFF}
 };
 
 /*******************************************************************************
@@ -305,13 +305,13 @@
  $Function:    	SmsValidityPeriod
 
  $Description:	Store the validity period information, selected by the user.
-			
- 
+
+
  $Returns:		Execution status
- 
+
  $Arguments:	m - menu handler
  				i - Menu item selected
- 
+
 *******************************************************************************/
 int SmsValidityPeriod(MfwMnu* m, MfwMnuItem* i)
 {
@@ -319,9 +319,9 @@
 	UBYTE index = 0;  // RAVI - Assigned 0.
 	T_DISPLAY_DATA DisplayInfo;
 	int txtId = 0;  // RAVI - Assigned 0.
-		
+
     T_MFW_HND win  = mfwParent(mfw_header());
-	
+
     TRACE_FUNCTION(">>>> SmsValidityPeriod()");
 
       /*SPR#1952 - DS - Show the new period setting on pop-up dialog */
@@ -345,9 +345,9 @@
 		break;
 	case 4:
 		txtId = TxtMaxTime;
-		index = VP_REL_MAXIMUM;    //  May 10, 2004    REF: CRR 15753  Deepa M.D 
+		index = VP_REL_MAXIMUM;    //  May 10, 2004    REF: CRR 15753  Deepa M.D
 		break;
-		
+
 	}
 
 	/* API - 28/07/03 - CQ10203 -  Read the Data and then set the REL VP identifier*/
@@ -355,7 +355,7 @@
 
 	FFS_flashData.vp_rel = index;
 	flash_write();
-	
+
 	sms_parameter.vp_rel = FFS_flashData.vp_rel;
 	TRACE_EVENT_P1("sms_parameter.vp_rel = %d", sms_parameter.vp_rel);
 	/*API - CQ10203 END*/
@@ -366,10 +366,10 @@
 		dlg_initDisplayData_TextId( &DisplayInfo, TxtNull, TxtCancel,TxtFailed, TxtNull, COLOUR_STATUS);
 
 	dlg_initDisplayData_events( &DisplayInfo, (T_VOID_FUNC)NULL, THREE_SECS, KEY_RIGHT|KEY_CLEAR );
-	
+
 	// Display confirmation screen.
 	info_dialog(win,&DisplayInfo);
-	
+
 	return 1;
 }
 
@@ -380,12 +380,12 @@
  $Function:    	SmsStatusReportRequest
 
  $Description:	Activate/Deactivate SRR, selected by the user.
-			
+
  $Returns:		Execution status
- 
+
  $Arguments:	m - menu handler
  				i - Menu item selected
- 
+
 *******************************************************************************/
 int SmsStatusReportRequest(MfwMnu* m, MfwMnuItem* i)
 {
@@ -402,10 +402,10 @@
         	sms_info.srr = SMS_NOT_REQUESTED_SRR;
         else
         	sms_info.srr = SMS_REQUESTED_SRR;
-        
+
         if (sms_parameter(&sms_info, FALSE) == MFW_SMS_OK)
         {
-   	
+
             if (index == 0)
             	TextId2      = TxtOff;
             else
@@ -413,7 +413,7 @@
 
 		dlg_initDisplayData_TextId( &DisplayInfo, TxtSoftOK, TxtNull,TxtSRR, TextId2, COLOUR_POPUP);
 		dlg_initDisplayData_events( &DisplayInfo, (T_VOID_FUNC)NULL, THREE_SECS, KEY_RIGHT | KEY_LEFT );
-		
+
         	info_dialog(win,&DisplayInfo);
         }
     }
@@ -421,9 +421,9 @@
 }
 /* Marcus: Issue 1170: 30/09/2002: End */
 
-/* 
+/*
 March 2, 2005    REF: CRR 11536 x0018858
-Added a function to set the Reply path  
+Added a function to set the Reply path
 */
 //begin -11536
 /*******************************************************************************
@@ -431,9 +431,9 @@
  $Function:    	SmsReplyPathRequest
 
  $Description:	Activate/Deactivate  reply path, selected by the user.
-			
+
  $Returns:		Execution status
- 
+
  $Arguments:	m - menu handler
  				i - Menu item selected
 
@@ -457,7 +457,7 @@
             reply_path_bit= SMS_SET_RP;
 
         TRACE_EVENT_P1("The reply paTH BIT IS  = %d", reply_path_bit);
-   	
+
             if (index == 0)
             	TextId2      = TxtOff;
             else
@@ -465,9 +465,9 @@
 
 		dlg_initDisplayData_TextId( &DisplayInfo, TxtSoftOK, TxtNull,TxtRP, TextId2, COLOUR_POPUP);
 		dlg_initDisplayData_events( &DisplayInfo, (T_VOID_FUNC)NULL, THREE_SECS, KEY_RIGHT | KEY_LEFT );
-		
+
         	info_dialog(win,&DisplayInfo);
-        
+
     }
 	return 1;
 }
@@ -480,10 +480,10 @@
 
  $Description:	menu entry function
 
- $Returns:		
+ $Returns:
 
- $Arguments:	
- 
+ $Arguments:
+
 *******************************************************************************/
 int settingsVoiceMail(MfwMnu* m, MfwMnuItem* i)
 
@@ -501,10 +501,10 @@
 
  $Description:	menu entry function
 
- $Returns:		
+ $Returns:
 
- $Arguments:	
- 
+ $Arguments:
+
 *******************************************************************************/
 int settingsScNumber(MfwMnu* m, MfwMnuItem* i)
 {
@@ -517,10 +517,10 @@
 
  $Description:	init settings handling
 
- $Returns:		
+ $Returns:
 
- $Arguments:	
- 
+ $Arguments:
+
 *******************************************************************************/
 void settingsInit (void)
 {
@@ -539,10 +539,10 @@
 
  $Description:	exit settings handling
 
- $Returns:		
+ $Returns:
 
- $Arguments:	
- 
+ $Arguments:
+
 *******************************************************************************/
 void settingsExit (void)
 {
@@ -559,10 +559,10 @@
 
  $Description:	window event handler
 
- $Returns:		
+ $Returns:
 
- $Arguments:	
- 
+ $Arguments:
+
 *******************************************************************************/
 static int winEvent (MfwEvt e, MfwWin *w)
 {
@@ -590,7 +590,7 @@
  				Zero if the setting is OFF
 
  $Arguments:	flagBit - value indicating which setting is to be changed.
- 
+
 *******************************************************************************/
 int settingsGetStatus(int flagBit)
 {
@@ -600,7 +600,7 @@
 	}
 	else
 	{
-		return(FFS_flashData.settings_status & flagBit);	
+		return(FFS_flashData.settings_status & flagBit);
 	}
 }
 /*******************************************************************************
@@ -613,7 +613,7 @@
 
  $Arguments:	flagBit	- value indicating which setting is to be changed.
  				state 	- SET_SETTING - set the value
- 						- CLEAR_SETTING - clear the value. 
+ 						- CLEAR_SETTING - clear the value.
 GW SPR#2470 Created
 *******************************************************************************/
 void settingsSetStatus(unsigned int flagBit, int value)
@@ -640,10 +640,10 @@
 
  $Description:	auto redial switch on
 
- $Returns:		
+ $Returns:
 
- $Arguments:	
- 
+ $Arguments:
+
 *******************************************************************************/
 int settingsAutoRedialOn(MfwMnu* m, MfwMnuItem* i)
 {
@@ -667,10 +667,10 @@
 
  $Description:	auto redial switch off
 
- $Returns:		
+ $Returns:
 
- $Arguments:	
- 
+ $Arguments:
+
 *******************************************************************************/
 int settingsAutoRedialOff(MfwMnu* m, MfwMnuItem* i)
 {
@@ -693,10 +693,10 @@
 
  $Description:    Activate the silent Mode
 
- $Returns:		
+ $Returns:
 
- $Arguments:	
- 
+ $Arguments:
+
 *******************************************************************************/
 int settingsSilentModeOn(void)
 {
@@ -713,10 +713,10 @@
 
  $Description:	Deactivate the silent Mode
 
- $Returns:		
+ $Returns:
 
- $Arguments:	
- 
+ $Arguments:
+
 *******************************************************************************/
 int settingsSilentModeOff(void)
 {
@@ -732,12 +732,12 @@
 
  $Function:    	settingsKeyPadLockOn
 
- $Description:	
+ $Description:
 
- $Returns:		
+ $Returns:
 
- $Arguments:	
- 
+ $Arguments:
+
 *******************************************************************************/
 int settingsKeyPadLockOn(void)
 {
@@ -750,12 +750,12 @@
 
  $Function:    	settingsKeyPadLockOff
 
- $Description:	
+ $Description:
 
- $Returns:		
+ $Returns:
 
- $Arguments:	
- 
+ $Arguments:
+
 *******************************************************************************/
 int settingsKeyPadLockOff(void)
 {
@@ -768,12 +768,12 @@
 
  $Function:    	settingsAutoAnswerOn
 
- $Description:	
+ $Description:
 
- $Returns:		
+ $Returns:
 
- $Arguments:	
- 
+ $Arguments:
+
 *******************************************************************************/
 int settingsAutoAnswerOn(MfwMnu* m, MfwMnuItem* i)
 {
@@ -793,12 +793,12 @@
 
  $Function:    	settingsAutoAnswerOff
 
- $Description:	
+ $Description:
 
- $Returns:		
+ $Returns:
 
- $Arguments:	
- 
+ $Arguments:
+
 *******************************************************************************/
 int settingsAutoAnswerOff(MfwMnu* m, MfwMnuItem* i)
 {
@@ -822,12 +822,12 @@
 
  $Function:    	settingsAnyKeyAnswerOn
 
- $Description:	
+ $Description:
 
- $Returns:		
+ $Returns:
 
- $Arguments:	
- 
+ $Arguments:
+
 *******************************************************************************/
 int settingsAnyKeyAnswerOn(MfwMnu* m, MfwMnuItem* i)
 {
@@ -846,12 +846,12 @@
 
  $Function:    	settingsAnyKeyAnswerOff
 
- $Description:	
+ $Description:
 
- $Returns:		
+ $Returns:
 
- $Arguments:	
- 
+ $Arguments:
+
 *******************************************************************************/
 int settingsAnyKeyAnswerOff(MfwMnu* m, MfwMnuItem* i)
 {
@@ -859,7 +859,7 @@
     T_MFW_HND win = mfw_parent(mfw_header());
 
 	confirm_Init(win);
-	
+
 	FFS_flashData.settings_status &= ~SettingsAnyKeyAnswerOn;
 	flash_write();
     confirm_data.local_status = DEACTIVATE_CONFIRM;
@@ -873,18 +873,18 @@
 
  $Function:    	factoryReset
 
- $Description:	Reset all the user-settings, 
- 				At first it show up a confirmation screen 
- $Returns:		
+ $Description:	Reset all the user-settings,
+ 				At first it show up a confirmation screen
+ $Returns:
 
- $Arguments:	
- 
+ $Arguments:
+
 *******************************************************************************/
 int factoryReset(MfwMnu* m, MfwMnuItem* i)
 {
 
     T_MFW_HND win = mfw_parent(mfw_header());
-	
+
 	confirm_Init(win);
 
 	confirm_data.local_status = FACTORY_RESET;
@@ -899,12 +899,12 @@
 
  $Function:    	setUserSettings2Default
 
- $Description:	The user confirm to delete the user-settings. 
+ $Description:	The user confirm to delete the user-settings.
 
- $Returns:		
+ $Returns:
 
- $Arguments:	
- 
+ $Arguments:
+
 *******************************************************************************/
 void setUserSettings2Default (void)
 {
@@ -929,7 +929,7 @@
 	if (DEFAULT_SETTINGS[AUTOREDIAL].status EQ ON)
 	{
 		// set the Auto-redial
-		cm_set_redial(CM_REDIAL_AUTO);	
+		cm_set_redial(CM_REDIAL_AUTO);
 	}
 	else
 	{
@@ -954,7 +954,7 @@
 		// set the Anykeyanswer
 		FFS_flashData.settings_status |= SettingsAnyKeyAnswerOn;
 	}
-	else 
+	else
 	{
 		//switch off the Anykeyanswer
 		FFS_flashData.settings_status &= ~SettingsAnyKeyAnswerOn;
@@ -1005,7 +1005,7 @@
 		{
 			FFS_flashData.settings_status &= ~SettingsKeypadDTMF;
 		}
-	
+
 	}
 
 	//GW-SPR#1018- Trace is too big for the buffer and is causing a crash.
@@ -1021,11 +1021,11 @@
 	if (DEFAULT_SETTINGS[VOICE_MEMO].status EQ CLEAR)
 	{
 	/* Mar 28, 2007  DR: OMAPS00122762 x0039928 */
-#ifndef FF_MMI_FILEMANAGER	
+#ifndef FF_MMI_FILEMANAGER
 		// clear the voice memo
 		FFS_flashData.voice_memo_position = 0;
 #endif
-	
+
 	}
 #endif
 
@@ -1062,12 +1062,12 @@
 	/*API - 28/07/03 - CQ10203 - Add a call to set the validity period to default on Factory Reset*/
 	resetSMSValidityPeriod();
 	/*API - CQ10203 - END*/
-	
+
 	// PCM
 	// here should also update the user-data-settings !!
 	// in PCM
-//xashmic 27 Sep 2006, OMAPS00096389	
-//xashmic 9 Sep 2006, OMAPS00092732	
+//xashmic 27 Sep 2006, OMAPS00096389
+//xashmic 9 Sep 2006, OMAPS00092732
 //By default PS shutdown is disabled
 #ifdef FF_MMI_USBMS
 	FFS_flashData.usb_ms_flags=MFW_USBMS_DEFAULT;
@@ -1083,12 +1083,12 @@
 
  $Function:    	confirm_Init
 
- $Description:	
+ $Description:
 
- $Returns:		
+ $Returns:
 
- $Arguments:	
- 
+ $Arguments:
+
 *******************************************************************************/
 T_MFW_HND confirm_Init (T_MFW_HND parent_window)
 {
@@ -1098,12 +1098,12 @@
 
  $Function:    	confirm_Exit
 
- $Description:	
+ $Description:
 
- $Returns:		
+ $Returns:
 
- $Arguments:	
- 
+ $Arguments:
+
 *******************************************************************************/
 void confirm_Exit (T_MFW_HND own_window)
 {
@@ -1118,12 +1118,12 @@
 
  $Function:    	confirm_create
 
- $Description:	
+ $Description:
 
- $Returns:		
+ $Returns:
 
- $Arguments:	
- 
+ $Arguments:
+
 *******************************************************************************/
 T_MFW_HND confirm_create (T_MFW_HND parent_window)
 {
@@ -1145,7 +1145,7 @@
   win                      = ((T_MFW_HDR *)data->confirm_win)->data;
   win->user                = (void *) data;
 
- 
+
   winShow(data->confirm_win);
   /*
    * return window handle
@@ -1157,12 +1157,12 @@
 
  $Function:    	confirm_destroy
 
- $Description:	
+ $Description:
 
- $Returns:		
+ $Returns:
 
- $Arguments:	
- 
+ $Arguments:
+
 *******************************************************************************/
 void confirm_destroy (T_MFW_HND own_window)
 {
@@ -1191,12 +1191,12 @@
 
  $Function:    	confirm_win_cb
 
- $Description:	
+ $Description:
 
- $Returns:		
+ $Returns:
 
- $Arguments:	
- 
+ $Arguments:
+
 *******************************************************************************/
 static int confirm_win_cb (T_MFW_EVENT event, T_MFW_WIN * win)
 {
@@ -1211,12 +1211,12 @@
 
  $Function:    	confirm_dialog
 
- $Description:	
+ $Description:
 
- $Returns:		
+ $Returns:
 
- $Arguments:	
- 
+ $Arguments:
+
 *******************************************************************************/
 static void confirm_dialog(void)
 {
@@ -1256,24 +1256,24 @@
 
  $Function:    	confirm_dialog_cb
 
- $Description:	
- 
- $Returns:		
+ $Description:
 
- $Arguments:	
- 
+ $Returns:
+
+ $Arguments:
+
 *******************************************************************************/
 void confirm_dialog_cb(T_MFW_HND win, UBYTE identifier, UBYTE reason)
 {
 	TRACE_FUNCTION ("confirm_dialog_cb()");
 
-      switch (reason) 
+      switch (reason)
       {
         case INFO_KCD_LEFT:
 			// user confirm to reset all the user settings !
 			setUserSettings2Default ();
             confirm_Exit(win);
-          break;          
+          break;
 
         case INFO_TIMEOUT:
           /* no break; */
@@ -1291,12 +1291,12 @@
 
  $Function:    	confirm
 
- $Description:	
+ $Description:
 
- $Returns:		
+ $Returns:
 
- $Arguments:	
- 
+ $Arguments:
+
 *******************************************************************************/
 void confirm (T_MFW_HND win, USHORT event, SHORT value, void * parameter)
 {
@@ -1379,35 +1379,35 @@
 
 /***************************Go-lite Optimization changes Start***********************/
 //Aug 25, 2004    REF: CRR 24904   Deepa M.D
-//This function is used only for the Color build.Hence it is put under the 
+//This function is used only for the Color build.Hence it is put under the
 //COLOURDISPLAY compiler switch
-#ifdef COLOURDISPLAY 
+#ifdef COLOURDISPLAY
 void settingsFocusNwIconCurSel(void)
 {
 	UBYTE			SaveNwIcon;
 	T_MFW_HND 		setting_win;
 	T_MFW_HND 		win = mfw_parent(mfw_header());
-	
+
 	setting_win= bookMenuStart(win, NWIconAttributes(), 0);
 	SaveNwIcon=(FFS_flashData.ProviderNetworkShow == TRUE)?0:1;
 	SEND_EVENT(setting_win, DEFAULT_OPTION, NULL, &SaveNwIcon);
 }
-#endif 
+#endif
 /***************************Go-lite Optimization changes Start***********************/
 //SPR 12822:VVADIRAJ
 
 //	Jul 29, 2004 REF = CRR 20898 xkundadu
 /*******************************************************************************
  $Function:    	settingsFocusCurSelAutoAns
- 
- $Description:	This function sets the focus to the On or Off menu item of the 
+
+ $Description:	This function sets the focus to the On or Off menu item of the
  			'Auto Answer' menu in the Phone Settings main menu.
  			Check whether the 'Auto Answer' is enabled by reading the data
- 			stored in the FFS. Depending on that, set the focus to the menu 
+ 			stored in the FFS. Depending on that, set the focus to the menu
  			item.
- 			
- $Returns:	void	
- 
+
+ $Returns:	void
+
  $Arguments:	void
  *******************************************************************************/
 
@@ -1418,10 +1418,10 @@
 	// If it is 1, 'Off' menuItem will be selected, else 'On' menuitem
 	// will be selected.
 	UBYTE			menuItemIndex = 1;
-	
+
 	T_MFW_HND 		setting_win;
 	T_MFW_HND 		win = mfw_parent(mfw_header());
-	    
+
 	TRACE_FUNCTION ("settingsFocusCurSelAutoAns() ");
 
 	// Starting the menu corresponding to AutoAnswer.
@@ -1434,23 +1434,23 @@
 	{
 		menuItemIndex =  0;
 	}
-	
-	// Send the event to display the menu item and appropriate menuitem 
+
+	// Send the event to display the menu item and appropriate menuitem
 	// selected.
-	SEND_EVENT(setting_win, DEFAULT_OPTION, NULL, &menuItemIndex);	
-	
+	SEND_EVENT(setting_win, DEFAULT_OPTION, NULL, &menuItemIndex);
+
 }
 
 // Jul 22,2004 CRR:20896 xrashmic - SASKEN
 // Description: The time current time format is not highlighted
-// Fix: Instead of showing the submenu directly we call this function 
+// Fix: Instead of showing the submenu directly we call this function
 // where we set the menu and also higlight the previously selected menu item
 void settingsFocusTimeFormatCurSel(void)
 {
 	UBYTE			CurSel;
 	T_MFW_HND 		setting_win;
 	T_MFW_HND 		win = mfw_parent(mfw_header());
-	
+
 	setting_win= bookMenuStart(win, TimeFormatAttributes(), 0);
 	CurSel = FFS_flashData.time_format;
 	SEND_EVENT(setting_win, DEFAULT_OPTION, NULL, &CurSel);
@@ -1458,12 +1458,12 @@
 
 /*******************************************************************************
  $Function:    	settingsFocusCurSelAnyKeyAns
- $Description:	This function sets the focus to the On or Off menu item of the 
+ $Description:	This function sets the focus to the On or Off menu item of the
  			'AnyKey Answer' menu in the Phone Settings main menu.
  			Check whether the 'Any Key Answer' is enabled by reading the data
- 			stored in the FFS. Depending on that, set the focus to the menu 
+ 			stored in the FFS. Depending on that, set the focus to the menu
  			item
- $Returns:	void	
+ $Returns:	void
  $Arguments:	void
  *******************************************************************************/
 //	Jul 28, 2004 REF: CRR 20899 xkundadu
@@ -1473,10 +1473,10 @@
 	// If it is 1, 'Off' menuItem will be selected, else 'On' menuitem
 	// will be selected.
 	UBYTE			menuItemIndex = 1;
-	
+
 	T_MFW_HND 		setting_win;
 	T_MFW_HND 		win = mfw_parent(mfw_header());
-	    
+
 	TRACE_FUNCTION ("settingsFocusCurSelAnyKeyAns() ");
 
 	// Starting the menu corresponding to AnyKeyanswer.
@@ -1490,19 +1490,19 @@
 		//Set the focus to the 'On' menu item.
 		menuItemIndex =  0;
 	}
-	
-	// Send the event to display the menu items and set focus to appropriate  
+
+	// Send the event to display the menu items and set focus to appropriate
 	// menuitem.
-	SEND_EVENT(setting_win, DEFAULT_OPTION, NULL, &menuItemIndex);	
-	
+	SEND_EVENT(setting_win, DEFAULT_OPTION, NULL, &menuItemIndex);
+
 }
 
 // May 04, 2005 REF: CRR 30285 x0021334
 /*******************************************************************************
  $Function:    	settingsSmsStatusReportCurSel
- $Description:	This function sets the focus to the On or Off menu item of the 
+ $Description:	This function sets the focus to the On or Off menu item of the
  			'Status Report' submenu menu in the Messages Settings menu.
- $Returns:	void	
+ $Returns:	void
  $Arguments:	void
  *******************************************************************************/
 void settingsSmsStatusReportCurSel(void)
@@ -1510,7 +1510,7 @@
 	T_MFW_HND 		setting_win;
 	T_MFW_SMS_INFO sms_info;
 	T_MFW_HND 		win = mfw_parent(mfw_header());
-	
+
 	setting_win = bookMenuStart(win, SmsStatusReportAttributes(), 0);
 	if (sms_parameter(&sms_info, TRUE) == MFW_SMS_OK)
 	{