diff src/ui/bmi/mmiCPHS.c @ 92:c0052fe355d3

src/ui/bmi/*.[ch]: rm trailing white space
author Mychaela Falconia <falcon@freecalypso.org>
date Sun, 08 Nov 2020 06:39:16 +0000
parents 67bfe9f274f6
children fbe284e160c1
line wrap: on
line diff
--- a/src/ui/bmi/mmiCPHS.c	Sun Nov 08 05:12:05 2020 +0000
+++ b/src/ui/bmi/mmiCPHS.c	Sun Nov 08 06:39:16 2020 +0000
@@ -2,29 +2,29 @@
 
 					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:		CPHS
  $File: 	    MmiCPHS.c
- $Revision:		1.0							  
-									      
- $Author:		Condat(UK)							   
- $Date: 	    25/01/02							  
-									       
+ $Revision:		1.0
+
+ $Author:		Condat(UK)
+ $Date: 	    25/01/02
+
 ********************************************************************************
-									      
+
  Description
 
     This module provides the CPHS functionality
 
-  
+
 ********************************************************************************
  $History: MmiCall.c
  	Nov 27, 2006 OMAPS00098359 a0393213(R.Prabakar)
@@ -33,7 +33,7 @@
        Oct 11, 2006 REF:OMAPS00098287  x0039928
        Description : CPHS 4.2: MMI variable als_status is not updated proplery with the SIM contents.
        Solution     : als_status update is deffered until the idle screen is displayed.
-       		      
+
        May 30, 2006 REF:OMAPS00079650  a0393213 (R.Prabakar)
        Description : CPHS Call Forwarding feature implementation
        Solution     : As part of this implementation, E_CPHS_SET_DV_STAT and E_CPHS_GET_DV_STAT in cphs_mfw_cb()
@@ -44,34 +44,34 @@
 	Solution:Made the following changes
 		       1. Aoc_flag variable is defined and it will be set based on the CSP information.
 		       2. New function info_num_msg_cb() added to support info numbers.
-		       
+
 	May 30, 2006  DR: OMAPS00070657 x0pleela
 	Description: CPHS feature on Locosto-Lite
 	Solution: For ALS feature,
 			a) Defined a new macro "MAX_LINE_NAME_LEN"
 			b) Defined new structure "T_ALS_DATA" for editing Line 1 and 2 names
 			c) Defined new flag "Als_flag" to store the staus of ALS bit from CSP data
-			d) Added new functions cphs_Line_Edit_cb(), cphs_edit_line_exec_cb(), 
-				cphs_edit_line_create(), cphs_edit_line1(), cphs_edit_line2(), 
+			d) Added new functions cphs_Line_Edit_cb(), cphs_edit_line_exec_cb(),
+				cphs_edit_line_create(), cphs_edit_line1(), cphs_edit_line2(),
 				mmi_cphs_get_als_info(), mmi_cphs_get_als_info(), mmi_cphs_set_als_value(),
 				mmi_cphs_get_als_value(), mmi_get_als_selectedLine()
-	
+
 	Jun 14, 2005 REF: MMI-FIX-30439 x0018858
    	Description: The homezone/cityzone tags were not being displayed properly.
-   	Solution: Modified to save the tags properly in caches and also made the 
+   	Solution: Modified to save the tags properly in caches and also made the
 	appropriate modifications to update the same properly during mobility.
 
 	Aug 16, 2004    REF: CRR 24323   Deepa M.D
 	Bug:Clenup of sprintf used for tracing
 	Fix:Replace the char buf[]; sprintf (buf, "...", ...); TRACE_EVENT (buf); statements by TRACE_EVENT_PX
 
-    	Jun 23, 2004        	REF: CRR MMI-SPR-13599  Rashmi C N(Sasken) 
+    	Jun 23, 2004        	REF: CRR MMI-SPR-13599  Rashmi C N(Sasken)
   	Solution:			The CF state is maintained in flash. During bootup the CF icon in the idle screen
   					 is displayed depending upon its state in the ffs
 
 
 //  May 31, 2004        REF: CRR 17291  xvilliva
-//	Bug:	After power cycle the setting of the used line which have been made 
+//	Bug:	After power cycle the setting of the used line which have been made
 //			from the BMI is lost.
 //	Fix:	1.The global g_pin2 is defined here.
 //		2. sAT_PlusCLCK() is called while locking and unlocking ALS.
@@ -79,17 +79,17 @@
 //		NOTE:- ALSPresent() was giving faulty status earlier.
 
 
-  25/01/02			Original Condat(UK) BMI version. (MC)	
-	   
+  25/01/02			Original Condat(UK) BMI version. (MC)
+
  $End
 
 *******************************************************************************/
 
 
 /******************************************************************************
-									      
+
 				Include Files
-									      
+
 *******************************************************************************/
 
 /* includes */
@@ -162,7 +162,7 @@
 #include "mmiColours.h"
 
 #include "MmiCPHS.h"
-// Jun 23 2004        REF: CRR MMI-SPR-13599  Rashmi C N(Sasken) 
+// Jun 23 2004        REF: CRR MMI-SPR-13599  Rashmi C N(Sasken)
 #include "mfw_ffs.h"
 /* SPR759 - SH */
 #ifdef MMI_HOMEZONE_ENABLED
@@ -171,7 +171,7 @@
 
 /* 30th May,2006     OMAPS00079650     a0393213 (R.Prabakar)
     Description : CPHS Call Forwarding feature implementation*/
-    
+
 #include "MmiServices.h"
 //x0pleela 08 June, 2006  DR:OMAPS00079607
 //Including this header file to get the definition of getRoamingStatus()
@@ -182,9 +182,9 @@
 
 
 /******************************************************************************
-									      
+
 			       Definitions
-									      
+
 *******************************************************************************/
 //#define CPHS_PROV_TEST /*Test to bypass the reading of the CPHS field from the SIM card*/
 char g_pin2[MAX_PIN+1];//xvilliva SPR17291
@@ -194,11 +194,11 @@
 
 {
 	INFO_NUM_LIST,
-	MAILBOX_LIST, 
+	MAILBOX_LIST,
 	MAILBOX_LIST_CALL
 }
 	T_MENU_TYPE;
-	
+
 
 static MfwMnuAttr InfoNum_menuAttrib =
 {
@@ -211,7 +211,7 @@
 
 };
 
-typedef struct 
+typedef struct
 {
 	 /* administrative data */
 
@@ -251,7 +251,7 @@
   ListMenuData	   * menu_list_data;
 } T_INFO_NUM_INFO;
 
-#ifdef FF_CPHS_REL4  
+#ifdef FF_CPHS_REL4
 typedef struct
 {
   T_MMI_CONTROL    mmi_control;
@@ -274,7 +274,7 @@
 #ifdef FF_CPHS
 #define MAX_LINE_NAME_LEN (20+1)
 
-typedef struct 
+typedef struct
 {
 	 /* administrative data */
 
@@ -320,9 +320,9 @@
 
 
 /******************************************************************************
-									      
+
 			       Static Global variables
-									      
+
 *******************************************************************************/
 
 static T_MFW_HND cphs_wait_dialog_win = NULL;
@@ -353,9 +353,9 @@
 static T_MENU_TYPE type_of_list = INFO_NUM_LIST;
 
 /******************************************************************************
-									      
+
 			       Function Prototypes
-									      
+
 *******************************************************************************/
 int InfoNumbers2(void); // RAVI
 
@@ -390,30 +390,30 @@
 
 
 /******************************************************************************
-									      
+
 			       Public functions
-									      
+
 *******************************************************************************/
 /*******************************************************************************
 
  $Function:	mmi_cphs_init()
 
  $Description:	initiatialise cphs module
- 
+
  $Returns:		mfw handle
 
  $Arguments:	none
-		
+
 *******************************************************************************/
 T_MFW_HND mmi_cphs_init()
-{	
+{
 	T_MFW_HND status;
 
 	TRACE_FUNCTION("mmi_cphs_init()");
 	cphs_init();			//initialise MFW CPHS module
 
 	status = cphs_create(NULL, 0xFFFFF, cphs_mfw_cb); //create handler for MFW CPHS EVENTS
-	
+
 	info_num_level = 0;
 	info_num_index = 1;
 
@@ -433,7 +433,7 @@
 }
 
 void mmi_cphs_refresh()
-{	
+{
 //x0pleela 02 June, 2006  DR: OMAPS00079688
 //Initialising CPHS
 #ifdef FF_CPHS
@@ -445,20 +445,20 @@
 #endif
 	cphs_support_check();	//check if cphs supported
 	/*retrieval of other values set off by callback function cphs_mfw_cb
-	so when the CPHS status is retrieved, the operator name is then requested and 
+	so when the CPHS status is retrieved, the operator name is then requested and
 	when it has returned, then the CSP is requested etc etec  */
-		
+
 }
 /*******************************************************************************
 
  $Function:	cphs_E_plus_ALS_supported
 
- $Description:	returns TRUE if SIM is from E-plus, FALSE otherwise 
- 
+ $Description:	returns TRUE if SIM is from E-plus, FALSE otherwise
+
  $Returns:		status BOOL
 
  $Arguments:	none
-		
+
 *******************************************************************************/
 BOOL cphs_E_plus_ALS_supported()
 {	char IMSI[17];
@@ -467,19 +467,19 @@
 	int i=0;
 	T_ACI_RETURN result;
 //	char debug[40];  // RAVI
-	
+
 	result = qAT_PlusCIMI(CMD_SRC_LCL, IMSI);
 	while (result != AT_CMPL  && i < 5)
 	{
 		i++;
 	}
-		
+
 	strncpy(MNC_MCC, IMSI, 5);
 	MNC_MCC[5] =0;//terminate string
 	TRACE_EVENT("E-plus IMSI?");
 	TRACE_EVENT(MNC_MCC);
 	if (!strncmp(E_plus_MNC_MCC, MNC_MCC, 5)) //if e-plus IMSI
-	{	
+	{
 		return TRUE;
 
 	}
@@ -494,11 +494,11 @@
  $Function:	cphs_als_status
 
  $Description:	display which ALS line is enabled
- 
+
  $Returns:		status int
 
  $Arguments:	menu, tag (not used)
-		
+
 *******************************************************************************/
 int cphs_als_status(MfwMnu* m, MfwMnuItem* i)
 {	T_MFW_HND		parent	     = mfwParent( mfw_header());
@@ -532,12 +532,12 @@
 
  $Function:	       cphs_lock_als
 
- $Description:	       Lock ALS Line Selection from menu 
- 
+ $Description:	       Lock ALS Line Selection from menu
+
  $Returns:		status int
 
  $Arguments:	       menu, tag (not used)
-		
+
 *******************************************************************************/
 int cphs_lock_als(MfwMnu* m, MfwMnuItem* i)
 {
@@ -550,10 +550,10 @@
 	if (!ALSPresent(NULL, NULL, NULL))
 #endif
 	{
-		//xvilliva SPR17291 
+		//xvilliva SPR17291
 		//We call sAT_PlusCLCK(), to update the value in FFS. This is the value used by
 		//ACI to estabilish a call on Line1 or Line2.
-#ifndef FF_2TO1_PS 
+#ifndef FF_2TO1_PS
             /*a0393213 warnings removal - CLCK_FAC_Al changed to FAC_Al as a result of ACI enum change*/
 		sAT_PlusCLCK(CMD_SRC_LCL,FAC_Al,CLCK_MOD_Lock,g_pin2,
 				((als_status.selectedLine == MFW_SERV_LINE1) ? CLASS_Vce : CLASS_AuxVce));//
@@ -579,12 +579,12 @@
 
  $Function:	       cphs_unlock_als
 
- $Description:	       Unlock ALS Line Selection from menu 
- 
+ $Description:	       Unlock ALS Line Selection from menu
+
  $Returns:		status int
 
  $Arguments:	       menu, tag (not used)
-		
+
 *******************************************************************************/
 int cphs_unlock_als(MfwMnu* m, MfwMnuItem* i)
 {
@@ -599,7 +599,7 @@
 	{
 		//xvilliva SPR17291
 		//We call sAT_PlusCLCK(), to update the value in FFS. This is the value used by
-		//ACI to estabilish a call on Line1 or Line2. 
+		//ACI to estabilish a call on Line1 or Line2.
 #ifndef FF_2TO1_PS
              /*a0393213 warnings removal - CLCK_FAC_Al changed to FAC_Al as a result of ACI enum change*/
 		sAT_PlusCLCK(CMD_SRC_LCL,FAC_Al,CLCK_MOD_Unlock,g_pin2,((als_status.selectedLine == MFW_SERV_LINE1) ? CLASS_Vce : CLASS_AuxVce));//
@@ -628,7 +628,7 @@
  $Function:     item_flag_isMWISFilePresent
 
  $Description:  return 0 if MWIS file is present else 1
- 
+
 *******************************************************************************/
 int item_flag_isMWISFilePresent(struct MfwMnuTag *m, struct MfwMnuAttrTag *ma, struct MfwMnuItemTag *mi)
 {
@@ -644,7 +644,7 @@
  $Function:     item_flag_isMBDNFileNotPresent
 
  $Description:  return 1 if MBDN file is present else 0
- 
+
 *******************************************************************************/
 int item_flag_isMBDNFileNotPresent(struct MfwMnuTag *m, struct MfwMnuAttrTag *ma, struct MfwMnuItemTag *mi)
 {
@@ -659,7 +659,7 @@
  $Function:     item_flag_isMBDNFilePresent
 
  $Description:  return 0 if MBDN file is present else 1
- 
+
 *******************************************************************************/
 
 int item_flag_isMBDNFilePresent(struct MfwMnuTag *m, struct MfwMnuAttrTag *ma, struct MfwMnuItemTag *mi)
@@ -676,18 +676,18 @@
 
  $Function:	       mmi_msp_interrogate_done
 
- $Description:	       Interrogation is finished. 
- 
+ $Description:	       Interrogation is finished.
+
  $Returns:		void
 
  $Arguments:	       void
-		
+
 *******************************************************************************/
 
 void mmi_msp_interrogate_done(void)
 {
 	TRACE_FUNCTION("mmi_msp_interrogate_done()");
-	
+
 	/*a0393213 cphs rel4*/
 	if(isCFISFilePresent())
 	cphs_get_divert_status();
@@ -702,18 +702,18 @@
  $Function:	       mmi_msp_interrogate
 
  $Description:	       Start MSP interrogation
- 
+
  $Returns:		void
 
  $Arguments:	       void
-		
+
 *******************************************************************************/
 
 void mmi_msp_interrogate(void)
 {
 	char actstr[8];
 	TRACE_FUNCTION("mmi_msp_interrogate()");
-	
+
 	interrogate = 1;
 	strcpy(actstr, "*#59#");
        ss_execute_transaction((UBYTE*)actstr, 0);
@@ -724,25 +724,25 @@
  $Function:	       msp_cb
 
  $Description:	      Window event handler
- 
+
  $Returns:		status int
 
  $Arguments:	       event, window handler
-		
+
 *******************************************************************************/
 
 static int mwis_cb (MfwEvt e, MfwWin *w)    /* yyy window event handler */
 {
 	TRACE_EVENT ("mwis_cb()");
-	
+
 	switch (e)
 	{
 	case MfwWinVisible:  /* window is visible  */
 		break;
-	case MfwWinFocussed: /* input focus / selected	 */	
-	case MfwWinDelete:   /* window will be deleted	 */   
-		
-	default:	    
+	case MfwWinFocussed: /* input focus / selected	 */
+	case MfwWinDelete:   /* window will be deleted	 */
+
+	default:
 		return MFW_EVENT_REJECTED;
 	}
 	return MFW_EVENT_CONSUMED;
@@ -753,25 +753,25 @@
  $Function:	       msp_cb
 
  $Description:	      Window event handler
- 
+
  $Returns:		status int
 
  $Arguments:	       event, window handler
-		
+
 *******************************************************************************/
 
 static int msp_cb (MfwEvt e, MfwWin *w)    /* yyy window event handler */
 {
 	TRACE_EVENT ("msp_cb()");
-	
+
 	switch (e)
 	{
 	case MfwWinVisible:  /* window is visible  */
 		break;
-	case MfwWinFocussed: /* input focus / selected	 */	
-	case MfwWinDelete:   /* window will be deleted	 */   
-		
-	default:	    
+	case MfwWinFocussed: /* input focus / selected	 */
+	case MfwWinDelete:   /* window will be deleted	 */
+
+	default:
 		return MFW_EVENT_REJECTED;
 	}
 	return MFW_EVENT_CONSUMED;
@@ -782,11 +782,11 @@
  $Function:	       MSPPresent
 
  $Description:	       MSP is provisioned.
- 
+
  $Returns:		status USHORT
 
- $Arguments:	       menu tag, attribute, item tag 
-		
+ $Arguments:	       menu tag, attribute, item tag
+
 *******************************************************************************/
 
 USHORT MSPPresent( struct MfwMnuTag *m, struct MfwMnuAttrTag *ma, struct MfwMnuItemTag *mi )
@@ -803,11 +803,11 @@
  $Function:	       cphs_select_profile
 
  $Description:	       Select a profile for registration
- 
+
  $Returns:		void
 
  $Arguments:	       profile id
-		
+
 *******************************************************************************/
 
 void cphs_select_profile(int pf_id)
@@ -845,11 +845,11 @@
  $Function:	       msp_menu_destroy
 
  $Description:	       Destroy menu
- 
+
  $Returns:		void
 
  $Arguments:	       window handler
-		
+
 *******************************************************************************/
 
 static void msp_menu_destroy(MfwHnd window)
@@ -867,7 +867,7 @@
 	if (data)
 	{
 		win_delete(data->msp_win);
-		
+
 		/*
 		** Free Memory
 		*/
@@ -880,11 +880,11 @@
  $Function:	       mwis_menu_destroy
 
  $Description:	       Destroy menu
- 
+
  $Returns:		void
 
  $Arguments:	       window handler
-		
+
 *******************************************************************************/
 
 static void mwis_menu_destroy(MfwHnd window)
@@ -902,7 +902,7 @@
 	if (data)
 	{
 		win_delete(data->mwis_win);
-		
+
 		/*
 		** Free Memory
 		*/
@@ -915,11 +915,11 @@
  $Function:	       MwisList_cb
 
  $Description:	       Callback for MWIS list
- 
+
  $Returns:		void
 
  $Arguments:	       parent window, list data
-		
+
 *******************************************************************************/
 
 void MwisList_cb(T_MFW_HND * Parent, ListMenuData * ListData)
@@ -947,7 +947,7 @@
 		}
 
 		mwis_menu_destroy(data->mwis_win);
-		
+
 	}
 }
 
@@ -956,11 +956,11 @@
  $Function:	       mwis_exec_cb
 
  $Description:	       Dialog function to display the mwis list
- 
+
  $Returns:		void
 
  $Arguments:	       window handler, event, value and parameter
-		
+
 *******************************************************************************/
 
 void mwis_exec_cb (T_MFW_HND win, USHORT event, SHORT value, void * parameter)
@@ -987,7 +987,7 @@
 			TRACE_EVENT("Failed memory alloc 1 ");
 			return;
 		}
-	
+
 		data->menu_list_data->List = (T_MFW_MNU_ITEM *)ALLOC_MEMORY( 4 * sizeof(T_MFW_MNU_ITEM) );
 
 		if(data->menu_list_data->List == 0)
@@ -1030,7 +1030,7 @@
 		data->menu_list_data->Strings = TRUE;
 		data->menu_list_data->Attr   = &InfoNum_menuAttrib;
 		data->menu_list_data->autoDestroy    = FALSE;
-		
+
 		/* Create the dynamic menu window */
 	    listDisplayListMenu(win, data->menu_list_data,(ListCbFunc)MwisList_cb,0);
 
@@ -1046,11 +1046,11 @@
  $Function:	       mmi_build_mwis_menu
 
  $Description:	       Create mwis menu
- 
+
  $Returns:		window handler
 
  $Arguments:	       parent window handler
-		
+
 *******************************************************************************/
 
 static T_MFW_HND mmi_build_mwis_menu( MfwHnd parent_window)
@@ -1070,7 +1070,7 @@
 	}
 
 	TRACE_EVENT(">>>> mwis menu window created: " );
-    /* 
+    /*
      * connect the dialog data to the MFW-window
      */
 
@@ -1093,11 +1093,11 @@
  $Function:	       MspList_cb
 
  $Description:	       Callback for MSP list
- 
+
  $Returns:		void
 
  $Arguments:	       parent window, list data
-		
+
 *******************************************************************************/
 
 void MspList_cb(T_MFW_HND * Parent, ListMenuData * ListData)
@@ -1156,11 +1156,11 @@
  $Function:	       msp_exec_cb
 
  $Description:	       Dialog function to display the msp list
- 
+
  $Returns:		void
 
  $Arguments:	       window handler, event, value and parameter
-		
+
 *******************************************************************************/
 
 void msp_exec_cb (T_MFW_HND win, USHORT event, SHORT value, void * parameter)
@@ -1185,7 +1185,7 @@
 			TRACE_EVENT("Failed memory alloc 1 ");
 			return;
 		}
-	
+
 		data->menu_list_data->List = (T_MFW_MNU_ITEM *)ALLOC_MEMORY( msp_info->count * sizeof(T_MFW_MNU_ITEM) );
 
 		if(data->menu_list_data->List == 0)
@@ -1213,7 +1213,7 @@
 		data->menu_list_data->Strings = TRUE;
 		data->menu_list_data->Attr   = &InfoNum_menuAttrib;
 		data->menu_list_data->autoDestroy    = FALSE;
-		
+
 		/* Create the dynamic menu window */
 	    listDisplayListMenu(win, data->menu_list_data,(ListCbFunc)MspList_cb,0);
 
@@ -1230,11 +1230,11 @@
  $Function:	       mmi_build_msp_menu
 
  $Description:	       Create MSP menu
- 
+
  $Returns:		window handler
 
  $Arguments:	       parent window handler
-		
+
 *******************************************************************************/
 
 static T_MFW_HND mmi_build_msp_menu( MfwHnd parent_window)
@@ -1254,7 +1254,7 @@
 	}
 
 	TRACE_EVENT(">>>> msp menu window created: " );
-    /* 
+    /*
      * connect the dialog data to the MFW-window
      */
 
@@ -1276,11 +1276,11 @@
  $Function:	       build_profile_list
 
  $Description:	       generate profile list
- 
+
  $Returns:		status int
 
  $Arguments:	       menu, menu item
-		
+
 *******************************************************************************/
 
 int build_profile_list(MfwMnu* m, MfwMnuItem* i)
@@ -1289,7 +1289,7 @@
 		T_MFW_HND parent_win = mfw_parent(mfw_header());
 
 		TRACE_FUNCTION("build_profile_list()");
-		
+
 		win = mmi_build_msp_menu(parent_win);
 		if (win NEQ NULL)
 		{
@@ -1306,7 +1306,7 @@
 		TRACE_FUNCTION("build_profile_list()");
 
 		mwis_flag = TRUE;
-		
+
 		win = mmi_build_msp_menu(parent_win);
 		if (win NEQ NULL)
 		{
@@ -1320,15 +1320,15 @@
 
  $Function:	cphs_line1_select
 
- $Description:	Enable ALS Line1 from menu 
- 
+ $Description:	Enable ALS Line1 from menu
+
  $Returns:		status int
 
  $Arguments:	menu, tag (not used)
-		
+
 *******************************************************************************/
 int cphs_line1_select(MfwMnu* m, MfwMnuItem* i)
-{	
+{
 	T_MFW_HND		parent	     = mfwParent( mfw_header());
 	TRACE_FUNCTION("cphs_line1_select");
 #ifndef CPHS_PROV_TEST
@@ -1347,22 +1347,22 @@
 
  $Function:	cphs_line2_select
 
- $Description:	Enable ALS Line2 from menu 
- 
+ $Description:	Enable ALS Line2 from menu
+
  $Returns:		status int
 
  $Arguments:	menu, tag (not used)
-		
+
 *******************************************************************************/
 int cphs_line2_select(MfwMnu* m, MfwMnuItem* i)
-{	
+{
 
 	T_MFW_HND		parent	     = mfwParent( mfw_header());
 	TRACE_FUNCTION("cphs_line2_select");
 #ifndef CPHS_PROV_TEST
 	if (!ALSPresent(NULL, NULL, NULL))
 #endif
-	{	
+	{
 		cphs_select_line(MFW_SERV_LINE2);
 		/*cphs_get_divert_status();*//*a0393213 - the call forward icon is now shown taking both the lines into consideration*/
 	}
@@ -1378,7 +1378,7 @@
 /*******************************************************************************
 
  $Function:    	cphs_Line_Edit_cb
- 
+
  $Description:	Callback function for  Line rename editor
 
  $Returns:		none
@@ -1389,11 +1389,11 @@
 *******************************************************************************/
 
 static void cphs_Line_Edit_cb(T_MFW_HND win, USHORT Identifier, SHORT reason)
-{	
+{
 	T_MFW_WIN   * win_data = ((T_MFW_HDR *) win)->data;
 	T_ALS_DATA* data     = (T_ALS_DATA *)win_data->user;
       T_DISPLAY_DATA   display_info;
-      
+
 switch (reason)
 	{
 	       case INFO_KCD_ALTERNATELEFT:
@@ -1408,11 +1408,11 @@
 
 
                            	dlg_initDisplayData_TextId(&display_info, TxtNull, TxtNull,   TxtDone, TxtNull, COLOUR_STATUS_WELCOME);
-		
+
 				dlg_initDisplayData_events( &display_info, NULL, TWO_SECS, KEY_ALL );
 
 		  		info_dialog(win,&display_info);
-		  		
+
 		  #ifdef NEW_EDITOR
 			AUI_edit_Destroy(data->input_number_win);
 		#else /* NEW_EDITOR */
@@ -1421,7 +1421,7 @@
 			data->input_number_win = 0;
 		//dspl_ClearAll();
 
-		
+
 		winDelete(win);
 		}
             break;
@@ -1437,20 +1437,20 @@
 			data->input_number_win = 0;
 		//dspl_ClearAll();
 		winDelete(win);
-		
+
 			}
 			break;
 
 		default:
 			TRACE_EVENT("Err: Default");
 			break;
-                           
-                           
-                           }   
+
+
+                           }
 }
 
 static void cphs_edit_line_exec_cb(T_MFW_HND win, USHORT event, SHORT identifier, void *parameter)
-{	
+{
     T_MFW_WIN      * win_data = ((T_MFW_HDR *) win)->data;
     T_ALS_DATA* data = (T_ALS_DATA *)win_data->user;
 #ifdef NEW_EDITOR
@@ -1462,13 +1462,13 @@
 		strcpy((char *) data->edt_buf_name,(char*)MmiRsrcGetText(TxtLine1));
 	else
 		strcpy((char *) data->edt_buf_name,(char*)MmiRsrcGetText(TxtLine2));
-		
+
 	TRACE_FUNCTION ("cphs_edit_line_exec_cb()");
 
 	switch (event)
 	{
 		case E_INIT:
-			
+
 	#ifdef NEW_EDITOR
 			AUI_edit_SetDefault(&editor_data);
 			AUI_edit_SetDisplay(&editor_data, PHNO_EDITOR, COLOUR_EDITOR_XX, EDITOR_FONT);
@@ -1482,27 +1482,27 @@
 
 			SmsSend_loadEditDefault(&editor_data);
 
-			bookSetEditAttributes( PHNO_EDITOR, COLOUR_EDITOR_XX, 0, edtCurBar1, 0, 
+			bookSetEditAttributes( PHNO_EDITOR, COLOUR_EDITOR_XX, 0, edtCurBar1, 0,
 			(char *) data->edt_data.NumberBuffer, /*MAX_SEARCH_CHAR*/NUMBER_LENGTH, &editor_data.editor_attr);
-			editor_data.editor_attr.text     = (char *)data->edt_buf_name; 
-
-			editor_data.editor_attr.size     = MAX_LINE_NAME_LEN; 
-
-			editor_data.TextId               = TxtNull;  				 							  
+			editor_data.editor_attr.text     = (char *)data->edt_buf_name;
+
+			editor_data.editor_attr.size     = MAX_LINE_NAME_LEN;
+
+			editor_data.TextId               = TxtNull;
 			editor_data.LeftSoftKey          = TxtSoftOK;
 			editor_data.AlternateLeftSoftKey = TxtSoftOK;
 			editor_data.RightSoftKey         = TxtDelete;
-			editor_data.Identifier           = identifier ; 
+			editor_data.Identifier           = identifier ;
 			editor_data.mode				 = E_EDIT_DIGITS_MODE;
 			editor_data.Callback             = (T_EDIT_CB)cphs_Line_Edit_cb;
 			editor_data.destroyEditor		 = FALSE;
-			data->input_number_win =editor_start(data->win, &editor_data);  /* start the editor */ 
+			data->input_number_win =editor_start(data->win, &editor_data);  /* start the editor */
 
 
 			/* SPR#1428 - SH - New Editor changes */
-			
+
 #endif
-			
+
 			break;
 		default:
 			TRACE_EVENT("Err: Default");
@@ -1515,11 +1515,11 @@
  $Function:    	cphs_edit_line_create
 
  $Description:	Create a window for entering the text
- 
+
  $Returns:		window handle
 
  $Arguments:	parent_window - parent window.
- 				
+
 *******************************************************************************/
 
 
@@ -1552,12 +1552,12 @@
 
  $Function:	cphs_edit_line1
 
- $Description:	edit line name from menu 
- 
+ $Description:	edit line name from menu
+
  $Returns:		status int
 
  $Arguments:	menu, tag (not used)
-		
+
 *******************************************************************************/
 int  cphs_edit_line1(MfwMnu* m, MfwMnuItem* i)
 {
@@ -1573,12 +1573,12 @@
 
  $Function:	cphs_edit_line2
 
- $Description:	edit line name from menu 
- 
+ $Description:	edit line name from menu
+
  $Returns:		status int
 
  $Arguments:	menu, tag (not used)
-		
+
 *******************************************************************************/
 int  cphs_edit_line2(MfwMnu* m, MfwMnuItem* i)
 {
@@ -1594,19 +1594,19 @@
 
  $Function:	menu_cphs_call_mailbox_number
 
- $Description:	edit mailbox numbers from menu 
- 
+ $Description:	edit mailbox numbers from menu
+
  $Returns:		status int
 
  $Arguments:	menu, tag (not used)
-		
+
 *******************************************************************************/
 int menu_cphs_call_mailbox_number(MfwMnu* m, MfwMnuItem* i)
 {   T_MFW_HND		parent	     = mfwParent( mfw_header());
 	T_MFW_CPHS_INFO configuration;
-	
+
 	TRACE_FUNCTION("menu_cphs_call_mailbox_number");
-	
+
 	type_of_list = MAILBOX_LIST_CALL;
 	cphs_config(&configuration);
 	/***************************Go-lite Optimization changes Start***********************/
@@ -1617,18 +1617,18 @@
 		cphs_get_mailbox();
 	else
 		M_callVoice(m, i);
-    return MFW_EVENT_CONSUMED;		
+    return MFW_EVENT_CONSUMED;
 }
 /*******************************************************************************
 
  $Function:	menu_cphs_edit_mailbox_number
 
- $Description:	edit mailbox numbers from menu 
- 
+ $Description:	edit mailbox numbers from menu
+
  $Returns:		status int
 
  $Arguments:	menu, tag (not used)
-		
+
 *******************************************************************************/
 int menu_cphs_edit_mailbox_number(MfwMnu* m, MfwMnuItem* i)
 {   T_MFW_HND		parent	     = mfwParent( mfw_header());
@@ -1636,7 +1636,7 @@
 
 	TRACE_FUNCTION("menu_cphs_edit_mailbox_number");
 	type_of_list = MAILBOX_LIST;
-	
+
 	cphs_config(&configuration);
 	/***************************Go-lite Optimization changes Start***********************/
 	//Aug 16, 2004    REF: CRR 24323   Deepa M.D
@@ -1646,7 +1646,7 @@
 		cphs_get_mailbox();
 	else
 		M_exeVoice(m, i);
-    return MFW_EVENT_CONSUMED;		
+    return MFW_EVENT_CONSUMED;
 }
 
 
@@ -1656,7 +1656,7 @@
  $Function:	menu_cphs_rel4_show_mailbox_number
 
  $Description:	menu handler function for any item in MailBox menu
- 		
+
 *******************************************************************************/
 int menu_cphs_rel4_show_mailbox_number(MfwMnu* m, MfwMnuItem* i)
 {
@@ -1684,22 +1684,22 @@
        	case 2:
        		TRACE_EVENT("electronic selected");
        		mailbox_type=T_MFW_CPHS_REL4_MAILBOX_ELECTRONIC;
-       		break;		
+       		break;
        	case 3:
        		TRACE_EVENT("other selected");
        		mailbox_type=T_MFW_CPHS_REL4_MAILBOX_OTHER;
-       		break;			
+       		break;
        	default:
        		TRACE_ERROR("menu index out of range");
        		break;
-         	}  	
+         	}
           qAT_PercentMBI(CMD_SRC_LCL,msp_id);
-		  
+
 	    dlg_initDisplayData_TextId( &display_info, TxtNull, TxtNull, TxtPleaseWait, TxtNull, COLOUR_STATUS_WAIT);
 	    dlg_initDisplayData_events( &display_info, NULL, FOREVER, 0 );
 
           mailbox_waiting_dialog=info_dialog (mfw_parent(mfwFocus), &display_info);
-  
+
   	}
 }
 #endif
@@ -1707,12 +1707,12 @@
 
  $Function:	InfoNumbers
 
- $Description:	displays information number list from CPHS 
+ $Description:	displays information number list from CPHS
 
  $Returns:		MFW_EVENT_CONSUMED always
 
  $Arguments:	m, menu, i, item
- 
+
 *******************************************************************************/
 
 int InfoNumbers( MfwMnu *m, MfwMnuItem *i )
@@ -1720,7 +1720,7 @@
 	T_MFW_HND win;
     T_MFW_HND parent_win = mfw_parent(mfw_header());
 	T_MFW_CPHS_INFO config_info;
-	
+
 	cphs_config(&config_info);
 	/***************************Go-lite Optimization changes Start***********************/
 //Aug 16, 2004    REF: CRR 24323   Deepa M.D
@@ -1731,7 +1731,7 @@
 		{	type_of_list = INFO_NUM_LIST;
 			info_num_level = 1;
 			win = buildInfoNumberMenu(parent_win);
-			
+
 			if (win NEQ NULL)
 			{
 				SEND_EVENT (win, E_INIT, 0, 0);
@@ -1742,7 +1742,7 @@
 	}
 	else
 		ShowMessage(parent_win, TxtNotSupported, TxtNull);
-	
+
 	return MFW_EVENT_CONSUMED;
 }
 
@@ -1756,10 +1756,10 @@
  $Returns:		see above
 
  $Arguments:	none
- 
+
 *******************************************************************************/
 T_MFW_CPHS_OP_NAME* CphsRequestOperatorName()
-{	
+{
 	return &operator_name;
 }
 
@@ -1771,7 +1771,7 @@
 
  $Returns:		TRUE if it is, FALSe if it isn't
  $Arguments:	none
- 
+
 *******************************************************************************/
 UBYTE CphsPresent()
 {
@@ -1794,7 +1794,7 @@
 
  $Returns:		TRUE if it is, FALSe if it isn't
  $Arguments:	none
- 
+
 *******************************************************************************/
 USHORT CphsMailboxPresent( /*struct MfwMnuTag *m, struct MfwMnuAttrTag *ma, struct MfwMnuItemTag *mi*/ )
 {	T_MFW_CPHS_INFO config_info;
@@ -1815,15 +1815,15 @@
  $Description:	indicates whether a CPHS SIM supports ALS by checking CSP
 
  $Returns:		0 if it does, 1 if it doesn't
- $Arguments:	menu tag, menu attribute tag, menu item tag (none of them used, 
+ $Arguments:	menu tag, menu attribute tag, menu item tag (none of them used,
 				this is merely the format for menu display/suppression functions)
- 
+
 *******************************************************************************/
 USHORT ALSPresent( struct MfwMnuTag *m, struct MfwMnuAttrTag *ma, struct MfwMnuItemTag *mi )
-{ 
-	//xvilliva SPR17291 - The pre-existing code was returning ALS not supported 
-	//		      even if it the SIM supported. Changed the code to call 
-	//		      tAT_PercentALS() and qAT_PercentALS(). 		
+{
+	//xvilliva SPR17291 - The pre-existing code was returning ALS not supported
+	//		      even if it the SIM supported. Changed the code to call
+	//		      tAT_PercentALS() and qAT_PercentALS().
 
 #ifndef FF_CPHS
 	T_ACI_ALS_MOD ALSmode = (T_ACI_ALS_MOD)0;  // RAVI
@@ -1854,9 +1854,9 @@
  $Description:	       Indicates whether a CPHS SIM's support of ALS has been locked by the User
 
  $Returns:		0 if it hasn't, 1 if it has
- $Arguments:	       menu tag, menu attribute tag, menu item tag (none of them used, 
+ $Arguments:	       menu tag, menu attribute tag, menu item tag (none of them used,
 				this is merely the format for menu display/suppression functions)
- 
+
 *******************************************************************************/
 USHORT CphsALSUnlocked( struct MfwMnuTag *m, struct MfwMnuAttrTag *ma, struct MfwMnuItemTag *mi )
 {
@@ -1866,7 +1866,7 @@
 		retVal = 1;
 	else
 		retVal = 0;
-	
+
 	return (retVal);
 }
 /*******************************************************************************
@@ -1876,19 +1876,19 @@
  $Description:	       Indicates whether a CPHS SIM's support of ALS has been locked by the User
 
  $Returns:		0 if it has, 1 if it hasn't
- $Arguments:	       menu tag, menu attribute tag, menu item tag (none of them used, 
+ $Arguments:	       menu tag, menu attribute tag, menu item tag (none of them used,
 				this is merely the format for menu display/suppression functions)
- 
+
 *******************************************************************************/
 USHORT CphsALSLocked( struct MfwMnuTag *m, struct MfwMnuAttrTag *ma, struct MfwMnuItemTag *mi )
 {
 	USHORT retVal;
-	
+
 	if (als_status.status == MFW_LINE_LOCKED)
 		retVal = 0;
 	else
 		retVal = 1;
-	
+
 	return (retVal);
 }
 /*******************************************************************************
@@ -1899,11 +1899,11 @@
 
  $Returns:		0 if it does, 1 if it doesn't
  $Arguments:	none
- 
+
 *******************************************************************************/
 USHORT InfoNumbersPresent( struct MfwMnuTag *m, struct MfwMnuAttrTag *ma, struct MfwMnuItemTag *mi )
 {	T_MFW_CPHS_INFO config_info;
-	
+
 	int i,len;
 	cphs_config(&config_info);
 	/***************************Go-lite Optimization changes Start***********************/
@@ -1911,7 +1911,7 @@
 	TRACE_EVENT_P1("InfoNum config: %d", config_info.iNum);
 	/***************************Go-lite Optimization changes end***********************/
 	len = strlen((char*)customer_service_profile.csp); /* x0039928 - Lint warning fix */
-	for(i=0; i<len; i+=2)	
+	for(i=0; i<len; i+=2)
 	{
 		if (customer_service_profile.csp[i] ==CPHS_INFONUMS_BYTE_VALUE)
 			if (customer_service_profile.csp[(i+1)] & INFONUM_MASK)
@@ -1927,16 +1927,16 @@
 				cphs_mfw_cb handles callback from this
  $Returns:		status of line passed as parameter
  $Arguments:	line
- 
+
 *******************************************************************************/
 T_MFW_CFLAG_STATUS GetCphsVoicemailStatus(UBYTE line)
-{	
-	cphs_get_mailbox_status (); 
+{
+	cphs_get_mailbox_status ();
 	TRACE_EVENT("Requesting voicemail status");
-	
+
 	/*SPR 2653, removed unneccessary code*/
 	/*requesting the mailbox status will trigger an event from the MFW if
-	CPHS is supported and that event will cause a voicemail indication window if a 
+	CPHS is supported and that event will cause a voicemail indication window if a
 	voicemail flag has been set in the SIM*/
 		return MFW_CFLAG_NotPresent;
 
@@ -1950,11 +1950,11 @@
 				cphs_mfw_cb handles callback from this
  $Returns:		status of line passed as parameter
  $Arguments:	line
- 
+
 *******************************************************************************/
 
 T_MFW_CFLAG_STATUS GetCphsDivertStatus(UBYTE line)
-{	
+{
 	switch (line)
 	{
 		case MFW_SERV_LINE1:	return call_forwarding_status.line1; //break;  // RAVI
@@ -1969,13 +1969,13 @@
 
  $Function:	GetCphsRel4DivertStatus
 
- $Description:	get current call forwarding status 
+ $Description:	get current call forwarding status
  $Arguments:	none
- 
+
 *******************************************************************************/
 #ifdef FF_CPHS_REL4
 T_MFW_CPHS_REL4_DV_STAT GetCphsRel4DivertStatus()
-{	
+{
 	TRACE_FUNCTION("GetCphsRel4DivertStatus()");
 	return call_forwarding_status_rel4;
 }
@@ -1989,7 +1989,7 @@
  $Arguments:	none
  $Returns	    : TRUE - if present
  			FALSE - if absent
- 
+
 *******************************************************************************/
 BOOL isCFISFilePresent()
 {
@@ -2014,7 +2014,7 @@
  $Arguments:	none
  $Returns	    : TRUE - if present
  			FALSE - if absent
- 
+
 *******************************************************************************/
 BOOL isMWISFilePresent(void)
 {
@@ -2029,7 +2029,7 @@
 		TRACE_EVENT("MWIS NOT PRESENT");
 		FALSE;
 	}
-		
+
 }
 
 /*******************************************************************************
@@ -2040,7 +2040,7 @@
  $Arguments:	none
  $Returns	    : TRUE - if present
  			FALSE - if absent
- 
+
 *******************************************************************************/
 BOOL isMBDNFilePresent(void)
 {
@@ -2055,7 +2055,7 @@
 		TRACE_EVENT("MBDN NOT PRESENT");
 		FALSE;
 	}
-		
+
 }
 #endif
 
@@ -2065,10 +2065,10 @@
  $Description:	gets current als line
  $Returns:		current als line
  $Arguments:	line
- 
+
 *******************************************************************************/
 UBYTE GetAlsLine()
-{	
+{
 	return als_status.selectedLine;
 }
 
@@ -2078,7 +2078,7 @@
  $Description:	Displays screen with passed text ids
  $Returns:		nothing
  $Arguments:	parent window, 2 text ids
- 
+
 *******************************************************************************/
 void ShowMessage(T_MFW_HND win, USHORT TextId1, USHORT TextId2)
 {
@@ -2102,7 +2102,7 @@
  $Description:	Displays the "Pls. wait" Dialog
  $Returns:	Nothing
  $Arguments:	parent window
- 
+
 *******************************************************************************/
 void mmi_cphs_wait_dialog(T_MFW_HND win)
 {
@@ -2126,7 +2126,7 @@
  $Description:	Deletes the "Pls. wait" Dialog
  $Returns:	Nothing
  $Arguments:	None
- 
+
 *******************************************************************************/
 void mmi_cphs_wait_dialog_destroy(void)
 {
@@ -2134,16 +2134,16 @@
 	{
 		SEND_EVENT( cphs_wait_dialog_win, DIALOG_DESTROY, 0, &mmi_cphs_wait_dialog_data );
 	}
-	
+
 	cphs_wait_dialog_win = NULL;
 	memset( (void *)&mmi_cphs_wait_dialog_data, 0, sizeof(T_DISPLAY_DATA) );
 }
 
 
 /******************************************************************************
-									      
+
 			     Private functions
-									      
+
 *******************************************************************************/
 
 T_MFW_HND	edit_mailbox_start(T_MFW_HND parent_window)
@@ -2153,11 +2153,11 @@
 	    if (win NEQ NULL)
 		{
 		SEND_EVENT(win, MAILBOX, NULL, NULL);
-	       
-		} 
+
+		}
 
 	   return win;
-} 
+}
 
 
 
@@ -2176,7 +2176,7 @@
 	data->mailbox_win = win_create (parent, 0, E_WIN_VISIBLE, (MfwCb)cphs_win_cb);
 	if (data->mailbox_win EQ NULL)
 	{
-		
+
 		return NULL;
 	}
 	// connect the dialog data to the MFW-window
@@ -2193,10 +2193,10 @@
 void mailbox_destroy(MfwHnd own_window)
 {
   T_MFW_WIN * win_data;
-  T_MMI_CPHS_DATA   * data = NULL; 
+  T_MMI_CPHS_DATA   * data = NULL;
 
   if (own_window)
-	{	
+	{
 
 	win_data = ((T_MFW_HDR *)own_window)->data;
 		if (win_data != NULL) //PATCH TB
@@ -2205,11 +2205,11 @@
 	  if (data)
 		{
 		TRACE_EVENT ("mailbox_destroy()");
-			
+
 			win_delete (data->win);
 		  // Free Memory
 			FREE_MEMORY ((void *)data, sizeof (T_MMI_CPHS_DATA));
-	
+
 		}
 	  else
 		{
@@ -2221,7 +2221,7 @@
 void cphs_dialog_cb(T_MFW_HND win, USHORT e,  SHORT identifier, void *parameter)
 {	TRACE_EVENT("cphs_dialog_cb()");
 	switch(e)
-	{	case (MAILBOX): 
+	{	case (MAILBOX):
 			cphs_get_mailbox();break;
 		default: break;
 	}
@@ -2230,7 +2230,7 @@
 static int cphs_win_cb (T_MFW_EVENT event, T_MFW_WIN * win)
 {
     T_MMI_CPHS_DATA	* data = (T_MMI_CPHS_DATA *)win->user;
-	
+
     TRACE_FUNCTION ("cphs_win_cb()");
 
     if(data EQ 0)
@@ -2254,7 +2254,7 @@
  $Description:	Show the list of mailbox numbers
  $Returns:		nothing
  $Arguments:	none
- 
+
 *******************************************************************************/
 void show_cphs_mb_numbers()
 {
@@ -2280,7 +2280,7 @@
  $Description:	Show the passed mailbox number in editor
  $Returns:		status int
  $Arguments:	mailbox number entry
- 
+
 *******************************************************************************/
 
 int show_cphs_mb_number(T_MFW_CPHS_ENTRY* mb_number)
@@ -2296,7 +2296,7 @@
 
 	memset( temp_number, 0, (MFW_CPHS_VM_NUMBER_MAXLEN - 10) );
 
-	//if it's an international number without a '+' 
+	//if it's an international number without a '+'
 	if (mb_number->ton == MFW_TON_INTERNATIONAL && mb_number->number[0] != '+')
 	{	strcat(temp_number, "+");	//put a + in front of number
 		strncat(temp_number, (char*)mb_number->number, (PHB_MAX_LEN - 1) );
@@ -2318,15 +2318,15 @@
 #else /* NEW_EDITOR */
 	editor_attr_init(&editor_data.editor_attr, 0, edtCurBar1, NULL, (char*)mb_number->number, PHB_MAX_LEN-1, COLOUR_EDITOR);
 	editor_data_init(&editor_data, (T_EDIT_CB)mailbox_edit_cb, TxtSoftOK, TxtDelete, NULL, 1, DIGITS_MODE, FOREVER);
-	editor_data.Identifier		=  0; 
+	editor_data.Identifier		=  0;
 	editor_data.hide				= FALSE;
-	editor_data.destroyEditor		= TRUE; 
-	editor_data.TextString		= NULL; /*MC SPR 1257, stops glitch in Chinese*/ 
-
-
-	editor_start(parent_win,&editor_data);	/* start the editor */ 
+	editor_data.destroyEditor		= TRUE;
+	editor_data.TextString		= NULL; /*MC SPR 1257, stops glitch in Chinese*/
+
+
+	editor_start(parent_win,&editor_data);	/* start the editor */
 #endif /* NEW_EDITOR */
-	return 1; 
+	return 1;
 }
 
 #ifdef FF_CPHS_REL4
@@ -2336,7 +2336,7 @@
  $Description:	Show the passed cphs rel4 mailbox number in editor
  $Returns:		status int
  $Arguments:	mailbox number entry
- 
+
 *******************************************************************************/
 
 int show_cphs_rel4_mb_number(T_MFW_MBDN* mb_number)
@@ -2352,7 +2352,7 @@
 
 	memset(temp_number, 0, MAX_MB_NUM_LEN);
 
-	//if it's an international number without a '+' 
+	//if it's an international number without a '+'
 	if (mb_number->type.ton == MFW_TON_INTERNATIONAL && mb_number->number[0] != '+')
 	{	strcat(temp_number, "+");	//put a + in front of number
 		strcat(temp_number, (char*)mb_number->number);
@@ -2379,23 +2379,23 @@
 			break;
 		case T_MFW_CPHS_REL4_MAILBOX_OTHER:
 			AUI_edit_SetTextStr(&editor_data, TxtSoftOK, NULL, TxtOther, NULL);
-			break;			
+			break;
 		}
 	AUI_edit_Start(parent_win, &editor_data);
 #else /* NEW_EDITOR */
 	editor_attr_init(&editor_data.editor_attr, 0, edtCurNone, NULL, (char*)mb_number->number, MAX_MB_NUM_LEN-1, COLOUR_EDITOR);
 	editor_data_init(&editor_data, NULL, TxtSoftOK, NULL, NULL, 1, DIGITS_MODE, FOREVER);
-	editor_data.Identifier		=  0; 
+	editor_data.Identifier		=  0;
 	editor_data.hide				= FALSE;
-	editor_data.destroyEditor		= TRUE; 
-	editor_data.TextString		= NULL; /*MC SPR 1257, stops glitch in Chinese*/ 
-
-
-	editor_start(parent_win,&editor_data);	/* start the editor */ 
+	editor_data.destroyEditor		= TRUE;
+	editor_data.TextString		= NULL; /*MC SPR 1257, stops glitch in Chinese*/
+
+
+	editor_start(parent_win,&editor_data);	/* start the editor */
 #endif /* NEW_EDITOR */
 // ADDED BY RAVI - 29-11-2005
 #if (BOARD == 61)
-	return 1; 
+	return 1;
 #endif
 // END RAVI
 }
@@ -2407,22 +2407,22 @@
  $Description:	callback for mailbox editor screen
  $Returns:		nothing
  $Arguments:	window, identifier, reason
- 
+
 *******************************************************************************/
 static void mailbox_edit_cb( T_MFW_HND win, USHORT Identifier,UBYTE reason)
 {
-	T_MFW set_mailbox_errcode = MFW_CPHS_OK;	
-	UBYTE write_error_number[MFW_CPHS_VM_NUMBER_MAXLEN]; 
+	T_MFW set_mailbox_errcode = MFW_CPHS_OK;
+	UBYTE write_error_number[MFW_CPHS_VM_NUMBER_MAXLEN];
 
 	TRACE_FUNCTION("mailbox_edit_cb()");
 	switch (reason )
     {
 		case INFO_KCD_LEFT:
-		{	
+		{
 			memcpy( (void *)&write_error_number[0], (void *)&cphs_voicemail_num.number[0], MFW_CPHS_VM_NUMBER_MAXLEN );
 			memset ( (void *)&cphs_voicemail_num.number[0], 0, MFW_CPHS_VM_NUMBER_MAXLEN );
 			memcpy ( (void *)&cphs_voicemail_num.number[0], (void *)temp_ed, MFW_CPHS_VM_NUMBER_MAXLEN );
-			
+
 			set_mailbox_errcode = cphs_set_mailbox(&cphs_voicemail_num);
 
 			if ( set_mailbox_errcode == MFW_CPHS_OK )
@@ -2430,15 +2430,15 @@
 				mmi_cphs_wait_dialog(win); /* Display the "Pls. wait" Dialog as SIM Write consumes quite some time */
 			}
 			else
-			{				
-				memcpy( (void *)&cphs_voicemail_numbers.entries[cphs_voicemail_num.list_index].number[0], 
+			{
+				memcpy( (void *)&cphs_voicemail_numbers.entries[cphs_voicemail_num.list_index].number[0],
 					    (void *)&write_error_number[0], MFW_CPHS_VM_NUMBER_MAXLEN);
 			}
-			
+
 			break;
 		}
-		
-			
+
+
 		default:
 		{
 		    /* otherwise no action to be performed  */
@@ -2456,18 +2456,18 @@
  $Description:	Callback handler for mfw_cphs events
  $Returns:		status int
  $Arguments:	event, parameter pointer
- 
+
 *******************************************************************************/
 int cphs_mfw_cb(T_MFW_EVENT event, void* para)
 {	T_MFW_HND parent = mfwParent( mfw_header());
-	
+
 //   T_MFW_CPHS_VC_NUM* number_list =(T_MFW_CPHS_VC_NUM* )para;  // RAVI
 
 //	T_MFW_CPHS_PARA* parameter = (T_MFW_CPHS_PARA*)para;  // RAVI
 //	T_MFW_CPHS_STATUS temp;  // RAVI
 	TRACE_FUNCTION("cphs_mfw_cb");
 	switch(event)
-	{	case E_CPHS_IND: 
+	{	case E_CPHS_IND:
 			TRACE_EVENT("Getting cphs status");
 			if(para != NULL)
 			{	cphs_status =(* (T_MFW_CPHS_STATUS*)para);
@@ -2476,22 +2476,22 @@
 				if (cphs_status != MFW_CPHS_OK)
 				{
 					/***************************Go-lite Optimization changes Start***********************/
-					//Aug 16, 2004    REF: CRR 24323   Deepa M.D	
+					//Aug 16, 2004    REF: CRR 24323   Deepa M.D
 					TRACE_EVENT_P1("cphs not supported, apparently%d", cphs_status);
 					/***************************Go-lite Optimization changes end***********************/
 				}
 				cphs_operator_name();
 			}
-			break;	      
+			break;
 		case E_CPHS_OP_NAME:
                      //x0012849: Jagannatha  26 May, 2006  ER: OMAPS00079607 -Support AOC in CPHS
 			TRACE_EVENT("case: E_CPHS_OP_NAME");
 			if(para != NULL)
-			{	
-			       int csp_status; //x0012849: Jagannatha  26 May, 2006  ER: OMAPS00079607 - No need to include this under FF_CPHS flag. 
+			{
+			       int csp_status; //x0012849: Jagannatha  26 May, 2006  ER: OMAPS00079607 - No need to include this under FF_CPHS flag.
 				memcpy(&operator_name, para, sizeof(T_MFW_CPHS_OP_NAME));
-				TRACE_EVENT("operator name callback");				
-									     
+				TRACE_EVENT("operator name callback");
+
 			if (operator_name.longName.data[0] == NULL)
 				TRACE_EVENT("Blank long name");
 
@@ -2507,15 +2507,15 @@
 			if( csp_status < MFW_CPHS_OK)
 			{
  		           TRACE_EVENT("E_CPHS_OP_NAME : AOC is set to TRUE");
-                         setAOCflag(TRUE);  
+                         setAOCflag(TRUE);
 			}
 			#endif
 			}
- 		       break;   
+ 		       break;
 		case E_CPHS_GET_VC_NUM:
-		{	
+		{
 			if (para!= NULL)
-			{	
+			{
 			memcpy(&cphs_voicemail_numbers, para, sizeof(T_MFW_CPHS_VC_NUM));
 			/***************************Go-lite Optimization changes Start***********************/
 			//Aug 16, 2004    REF: CRR 24323   Deepa M.D
@@ -2523,7 +2523,7 @@
 			/***************************Go-lite Optimization changes end***********************/
 				show_cphs_mb_numbers();
 			}
-			
+
 		}
 		break;
 		#ifdef FF_CPHS_REL4
@@ -2536,7 +2536,7 @@
 				switch(mailbox_type)
 					{
 					case T_MFW_CPHS_REL4_MAILBOX_VOICE:
-						if(cphs_rel4_mbdn.valid & 0x01) 
+						if(cphs_rel4_mbdn.valid & 0x01)
 							cphs_mfw_cb(E_CPHS_REL4_GET_MBDN,&(cphs_rel4_mbdn.mailbox_numbers[0]));
 						else
 							cphs_rel4_get_mailbox_no( cphs_rel4_mbi.voice);
@@ -2559,12 +2559,12 @@
 						else
 							cphs_rel4_get_mailbox_no( cphs_rel4_mbi.other);
 						break;
-					}				
+					}
 				}
 			break;
 		case E_CPHS_REL4_GET_MBDN:
 			/*destroy the dialog showing waiting*/
-			SEND_EVENT(mailbox_waiting_dialog, DIALOG_DESTROY, 0, 0);			
+			SEND_EVENT(mailbox_waiting_dialog, DIALOG_DESTROY, 0, 0);
 			if(para!=NULL)
 				{
 
@@ -2592,16 +2592,16 @@
 							show_cphs_rel4_mb_number(&cphs_rel4_mbdn.mailbox_numbers[3]);
 						break;
 					}
-												
+
 				}
 			break;
 		#endif
-		 case E_CPHS_SET_VC_NUM:   
+		 case E_CPHS_SET_VC_NUM:
 		{		//result of writing mailbox number
 			UBYTE write_result;
 			if(para != NULL)
 			{	write_result = *(UBYTE*)para;
-				mmi_cphs_wait_dialog_destroy(); /* Delete the "Pls. wait" screen */  
+				mmi_cphs_wait_dialog_destroy(); /* Delete the "Pls. wait" screen */
 				if (write_result == MFW_SIMOP_WRITE_OK)
 					ShowMessage(parent, TxtSaved, TxtNull);
 				else
@@ -2609,12 +2609,12 @@
 			}
 		 }
 		 break;
-			 case E_CPHS_GET_VC_STAT:  
-			 {	
+			 case E_CPHS_GET_VC_STAT:
+			 {
 				MfwHnd	idle_win =idle_get_window();
 				// UBYTE line;  // RAVI
 
-			 	/*a0393213 cphs rel4 - the parameter sent are of different type for CPHS Rel4 and non-CPHS Rel4*/			 	  
+			 	/*a0393213 cphs rel4 - the parameter sent are of different type for CPHS Rel4 and non-CPHS Rel4*/
 				#ifdef FF_CPHS_REL4
 			 	if(!isMWISFilePresent() )
 			 	{
@@ -2626,7 +2626,7 @@
 					if (cphs_voicemail_status->line1 == MFW_CFLAG_SET)
 					{
 					//x0pleela 01 June, 2006  DR: OMAPS00079692
-					//Commented below line to avoid displaying a popup msg showing the line # 
+					//Commented below line to avoid displaying a popup msg showing the line #
 					//Idle screen will be updated with the voice mail icon
     					       //ShowMessage(idle_win, TxtVoicemail, TxtLine1);
 
@@ -2634,11 +2634,11 @@
     					       iconsSetState(iconIdVoice);
     				      }
 
-				
+
 					if (cphs_voicemail_status->line2 == MFW_CFLAG_SET)
-					{	
+					{
 					//x0pleela 01 June, 2006  DR: OMAPS00079692
-					//Commented below line to avoid displaying a popup msg showing the line # 
+					//Commented below line to avoid displaying a popup msg showing the line #
 					//Idle screen will be updated with the voice mail icon
 						//ShowMessage(idle_win, TxtVoicemail, TxtLine2);
 
@@ -2646,10 +2646,10 @@
     					      iconsSetState(iconIdVoice);
 					}
 
-					 /* SPR#1929 - DS - Remove voicemail icon from idle screen if 
+					 /* SPR#1929 - DS - Remove voicemail icon from idle screen if
                                   * there is no voicemail waiting on either line1/line2. Port of 1960.
                                   */
-					if ( (cphs_voicemail_status->line1 != MFW_CFLAG_SET) && 
+					if ( (cphs_voicemail_status->line1 != MFW_CFLAG_SET) &&
 					     (cphs_voicemail_status->line2 != MFW_CFLAG_SET) )
     				      {
     				            iconsDeleteState(iconIdVoice);
@@ -2660,8 +2660,8 @@
 				else
 				{
 					if(is_message_waiting())
-					{						 
-						iconsSetState(iconIdVoice);						
+					{
+						iconsSetState(iconIdVoice);
 					}
 					else
 					{
@@ -2673,8 +2673,8 @@
 
 			 }
 			 break;
-			case E_CPHS_SET_VC_STAT:  
-		 
+			case E_CPHS_SET_VC_STAT:
+
 			{		//result of resetting mailbox status
 				// UBYTE write_result;  // RAVI
 
@@ -2684,8 +2684,8 @@
 			}
 			break;
 			 case E_CPHS_GET_DV_STAT:
-			 {	
-			 	/*a0393213 cphs rel4 - the parameter sent are of different type for CPHS Rel4 and non-CPHS Rel4*/			 	  
+			 {
+			 	/*a0393213 cphs rel4 - the parameter sent are of different type for CPHS Rel4 and non-CPHS Rel4*/
 				#ifdef FF_CPHS_REL4
 			 	if(!isCFISFilePresent() )
 			 	{
@@ -2693,26 +2693,26 @@
 					UBYTE line;
 					//check for divert on active line
 					line = GetAlsLine();
-					
+
 					TRACE_EVENT_P4("cphs_mfw_cb():E_CPHS_GET_DV_STAT %d %x %x %x", ((T_MFW_CPHS_DV_STAT*)para)->result,
-						                   ((T_MFW_CPHS_DV_STAT*)para)->line1,((T_MFW_CPHS_DV_STAT*)para)->line2,line); 
+						                   ((T_MFW_CPHS_DV_STAT*)para)->line1,((T_MFW_CPHS_DV_STAT*)para)->line2,line);
 
 					/* 30th May,2006     OMAPS00079650     a0393213 (R.Prabakar)
 					    Description : CPHS Call Forwarding feature implementation
 					    Solution     : call_forwarding_status is updated. The data is not written into flash as it would be done
 					    in E_CPHS_SET_DV_STAT. However the present code is not disturbed*/
-	    
+
 					#ifdef FF_CPHS
 						if(((T_MFW_CPHS_DV_STAT*)para)->result == MFW_SIMOP_READ_ERR)
 						{
 
 						if(FFS_flashData.CFState==TRUE)
 							{
-							if (line == MFW_SERV_LINE2) 
+							if (line == MFW_SERV_LINE2)
 							   ((T_MFW_CPHS_DV_STAT*)para)->line2=MFW_CFLAG_SET;
 							else
 								((T_MFW_CPHS_DV_STAT*)para)->line1=MFW_CFLAG_SET;
-								
+
 							}
 						else
 							{
@@ -2734,32 +2734,32 @@
 						else//if (line == MFW_SERV_LINE1)
 						DivertStatus = GetCphsDivertStatus(MFW_SERV_LINE1);*/
 
-						//set the call forwarding icon 
-					if ((GetCphsDivertStatus(MFW_SERV_LINE1)==MFW_CFLAG_SET) || 
+						//set the call forwarding icon
+					if ((GetCphsDivertStatus(MFW_SERV_LINE1)==MFW_CFLAG_SET) ||
 					    (GetCphsDivertStatus(MFW_SERV_LINE2)==MFW_CFLAG_SET))
 						{
 							iconsSetState(iconIdCallFor);
 							#ifndef FF_CPHS
-								//  Jun 23, 2004        REF: CRR MMI-SPR-13599  Rashmi C N(Sasken) 
-								//              Setting the Current state of CF in Flash						
+								//  Jun 23, 2004        REF: CRR MMI-SPR-13599  Rashmi C N(Sasken)
+								//              Setting the Current state of CF in Flash
 				                         FFS_flashData.CFState=TRUE;
 							#endif
 						}
-						//gid rid of call forwarding icon 
-					if ((GetCphsDivertStatus(MFW_SERV_LINE1)==MFW_CFLAG_NOTSet) && 
+						//gid rid of call forwarding icon
+					if ((GetCphsDivertStatus(MFW_SERV_LINE1)==MFW_CFLAG_NOTSet) &&
 					    (GetCphsDivertStatus(MFW_SERV_LINE2)==MFW_CFLAG_NOTSet))
 						{
-							iconsDeleteState(iconIdCallFor); 
+							iconsDeleteState(iconIdCallFor);
 							#ifndef FF_CPHS
-								//  Jun 23, 2004        REF: CRR MMI-SPR-13599  Rashmi C N(Sasken) 
+								//  Jun 23, 2004        REF: CRR MMI-SPR-13599  Rashmi C N(Sasken)
 								//              Setting the Current state of CF in Flash
 				                        FFS_flashData.CFState=FALSE;
 							#endif
 						}
-						
+
 				            #ifndef FF_CPHS
-							//  Jun 23, 2004        REF: CRR MMI-SPR-13599  Rashmi C N(Sasken) 
-							//              Writng the Current state of CF into ffs	
+							//  Jun 23, 2004        REF: CRR MMI-SPR-13599  Rashmi C N(Sasken)
+							//              Writng the Current state of CF into ffs
 							flash_write();
 					      #endif
 					}
@@ -2778,9 +2778,9 @@
 							cphs_rel4_get_mailbox_status();
 					#endif
 			 }
-			 break; 
-			 case E_CPHS_SET_DV_STAT:    
-			 {		
+			 break;
+			 case E_CPHS_SET_DV_STAT:
+			 {
 			 	//result of setting divert status
 				// UBYTE write_result;  // RAVI
 				/* 30th May,2006     OMAPS00079650     a0393213 (R.Prabakar)
@@ -2792,7 +2792,7 @@
 				#endif
 					#ifdef FF_CPHS
 	                			if(para != NULL)
-						{	
+						{
 					   		UBYTE write_result;
 					    		write_result = *(UBYTE*)para;
 							if (write_result == MFW_SIMOP_WRITE_OK)
@@ -2800,7 +2800,7 @@
 							if (write_result == MFW_SIMOP_WRITE_ERR)
 								{
 								TRACE_EVENT("cphs_mfw_cb:Unable to set call forward flag in sim");
-								
+
 								if(ss_data.cfu_services&0x01)
 									{
 									FFS_flashData.CFState=TRUE;
@@ -2813,7 +2813,7 @@
 								}
 						}
 					#endif
-										
+
 						cphs_get_divert_status(); //refresh divert status
 				#ifdef FF_CPHS_REL4
 					}
@@ -2822,18 +2822,18 @@
 					if(call_forwarding_status_rel4.voice==MFW_CFLAG_SET)
 						iconsSetState(iconIdCallFor);
 					else
-						iconsDeleteState(iconIdCallFor);						
+						iconsDeleteState(iconIdCallFor);
 					}
 				#endif
 
 			 }
 			 break;
-			 case E_CPHS_GET_ALS_STATUS:  
+			 case E_CPHS_GET_ALS_STATUS:
 				{	if(para != NULL)
 						memcpy(&als_status, para, sizeof(T_MFW_CPHS_ALS_STATUS));
 				}
 				break;
-			 case E_CPHS_SET_LINE: 
+			 case E_CPHS_SET_LINE:
 			 {		//result of set ALS line
 				UBYTE write_result;
 				if(para != NULL)
@@ -2853,11 +2853,11 @@
 				mmi_cphs_get_als_info();
 #else
 				cphs_get_als_info(&als_status);//refresh current line
-#endif				
+#endif
 				/*cphs_get_divert_status(); //refresh divert status*//*a0393213 - the call forward icon is now shown taking both the lines into consideration*/
 			 }
 			 break;
-			 case E_CPHS_SET_ALS_STATUS: 
+			 case E_CPHS_SET_ALS_STATUS:
 			 {		//result of setting ALS status
 				UBYTE write_result;
 				if(para != NULL)
@@ -2870,23 +2870,23 @@
 			 }
 			 break;
 			 case E_CPHS_GET_CSP:
-			 { 
+			 {
                             #ifdef FF_CPHS
                             //x0012849: Jagannatha  26 May, 2006  ER: OMAPS00079607 -Support AOC in CPHS
                             int i;
-                            #endif					  
+                            #endif
 			      TRACE_EVENT("Reached E_CPHS_GET_CSP");
 			 	if(para != NULL)
-				{	
+				{
 					memcpy(&customer_service_profile, para, sizeof(T_MFW_CPHS_CSP));
 
 					 /***************************Go-lite Optimization changes Start***********************/
 					 //Aug 16, 2004    REF: CRR 24323   Deepa M.D
-					 TRACE_EVENT_P7("CSP: %x,%x,%x,%x,%x,%x,%x", customer_service_profile.csp[0], customer_service_profile.csp[1], 
+					 TRACE_EVENT_P7("CSP: %x,%x,%x,%x,%x,%x,%x", customer_service_profile.csp[0], customer_service_profile.csp[1],
 						 customer_service_profile.csp[2], customer_service_profile.csp[3], customer_service_profile.csp[4], customer_service_profile.csp[5],
 						 customer_service_profile.csp[6]);
 					 TRACE_EVENT_P3("%x,%x,%x", customer_service_profile.csp[7], customer_service_profile.csp[8], customer_service_profile.csp[9]);
-					 TRACE_EVENT_P7("CSP: %x,%x,%x,%x,%x,%x,%x", customer_service_profile.csp[10], customer_service_profile.csp[11], 
+					 TRACE_EVENT_P7("CSP: %x,%x,%x,%x,%x,%x,%x", customer_service_profile.csp[10], customer_service_profile.csp[11],
 						 customer_service_profile.csp[12], customer_service_profile.csp[13], customer_service_profile.csp[14], customer_service_profile.csp[15],
 						 customer_service_profile.csp[16]);
 					 TRACE_EVENT_P3("%x,%x,%x", customer_service_profile.csp[17], customer_service_profile.csp[18], customer_service_profile.csp[19]);
@@ -2894,10 +2894,10 @@
 
                                    //x0012849: Jagannatha  26 May, 2006  ER: OMAPS00079607 -Support AOC in CPHS
 			              #ifdef FF_CPHS
-			              TRACE_EVENT_P2("AOC : Service group code =%d  value =%d", 
+			              TRACE_EVENT_P2("AOC : Service group code =%d  value =%d",
 			                  customer_service_profile.csp[4], customer_service_profile.csp[5]);
                                     // No need to check if Aoc_flag is already set to TRUE.
-                        
+
 				 	 /*check for Byte 1 service group code =03 and Byte2 bit 6 =1*/
 					 for (i=0;i<20; i++)
 					 {
@@ -2909,12 +2909,12 @@
 				 			if( customer_service_profile.csp[i] & 0x20)
 				 			{
              					              TRACE_EVENT("E_CPHS_GET_CSP: AOC flag is SET in CPHS ");
-                                                        setAOCflag(TRUE); 
+                                                        setAOCflag(TRUE);
 				 				break;
 				 			}
 				 			else {
                                                      TRACE_EVENT("E_CPHS_GET_CSP: AOC flag is NOT SET in CPHS ");
-                                                     setAOCflag(FALSE);  													 
+                                                     setAOCflag(FALSE);
                                                  }
 				 		}
 						//check for ALS bit
@@ -2931,18 +2931,18 @@
 						      mmi_cphs_set_als_value( FALSE);
 				  		}
 						else
-							i++;	
+							i++;
 				 	 }
-					
+
 				       #endif
 				       cphs_get_info_num(1, info_num_index);
 				}
 
-			 }break;  			 
+			 }break;
 			 case E_CPHS_GET_INFO_NUM:
-			 {	
+			 {
 				if(para != NULL)
-				{	
+				{
 					memcpy(&current_info_num, para, sizeof( T_MFW_CPHS_INFONUM_ENTRY));
 
 					TRACE_EVENT("Getting info number");
@@ -2960,23 +2960,23 @@
 						}
 					}
 				 }
-			 
-			 break; 
+
+			 break;
 			 case E_CPHS_GET_INFO_LIST:
-				{ 
+				{
 					if (para == NULL)
-					{	
+					{
 						TRACE_EVENT("Invalid info num list");
 					}
 					else
-					{	//populate next pointer 
-					       //RAVI - 29-11-2005 
+					{	//populate next pointer
+					       //RAVI - 29-11-2005
 					      /* x0045876, 14-Aug-2006 (WR - assignment in condition)*/
 					       info_numbers[info_num_level] = (T_MFW_CPHS_INFONUM_LIST*) ALLOC_MEMORY(sizeof(T_MFW_CPHS_INFONUM_LIST));
 						if (info_numbers[info_num_level])
 							memcpy(info_numbers[info_num_level], para, sizeof(T_MFW_CPHS_INFONUM_LIST));
 
-						
+
 							TRACE_EVENT("Getting info numbers!!");
 							if (info_numbers[info_num_level]->count != 0)
 							{
@@ -2987,7 +2987,7 @@
 								if (info_num_level)
 								{	info_num_level++;
 									InfoNumbers2();
-									
+
 								}
 							}
 							else
@@ -3009,7 +3009,7 @@
 					TRACE_EVENT_P3("Sim Read, Field: %d (Record: %d) Errcode: %d",temp.requested_field, temp.record, temp.sim_result);
 					/***************************Go-lite Optimization changes end***********************/
 					/* SPR759 - SH - Read Sim for homezone, calls appropriate functions */
-					#ifdef MMI_HOMEZONE_ENABLED	
+					#ifdef MMI_HOMEZONE_ENABLED
 						if (temp.requested_field>=HZ_SIM_PARAMETERS
 							&& temp.requested_field < (HZ_SIM_CELL_CACHE+HZ_ZONES_MAX) )
 						{
@@ -3040,7 +3040,7 @@
 					#endif
 				}
 				break;
-#ifdef FF_CPHS_REL4				
+#ifdef FF_CPHS_REL4
 			    case E_CPHS_MSP_IND:
 				{
 					if(para != NULL)
@@ -3067,10 +3067,10 @@
 					}
 			    	}
 				break;
-#endif				
+#endif
 			 default: break;
 				}
-	
+
 
 	return TRUE;
 }
@@ -3088,16 +3088,16 @@
  $Description:	Displays info number sub-menus
  $Returns:		status int
  $Arguments:	nothing
- 
+
 *******************************************************************************/
 //for sub-menus
 int InfoNumbers2( )
 {
 	T_MFW_HND win;
     T_MFW_HND parent_win = mfw_parent(mfw_header());
-    
+
 	TRACE_FUNCTION("InfoNumbers2");
-	
+
 	if (info_numbers != NULL)
 	{	type_of_list = INFO_NUM_LIST;
 		win = buildInfoNumberMenu(parent_win);
@@ -3107,7 +3107,7 @@
 			SEND_EVENT (win, E_INIT, 0, 0);
 		}
 	}
-	
+
 	return MFW_EVENT_CONSUMED;
 }
 /*******************************************************************************
@@ -3116,7 +3116,7 @@
  $Description:	Creates window for Information numbers
  $Returns:		window created
  $Arguments:	parent window
- 
+
 *******************************************************************************/
 static T_MFW_HND  buildInfoNumberMenu( MfwHnd parent_window)
 {
@@ -3135,7 +3135,7 @@
 	}
 
 	TRACE_EVENT(">>>> Info num window created: " );
-    /* 
+    /*
      * connect the dialog data to the MFW-window
      */
 
@@ -3156,38 +3156,38 @@
 //x0012849: Jagannatha  01 June, 2006  ER: OMAPS00079607 -To Support AcC and Info numbers
 /*******************************************************************************
  $Function:	info_num_msg_cb
- $Description:	Dialogue callback function of the information Numbers message window 
+ $Description:	Dialogue callback function of the information Numbers message window
  $Returns:		none
- $Arguments:	win - window handler, dialogue id, key pressed				
- 
+ $Arguments:	win - window handler, dialogue id, key pressed
+
 *******************************************************************************/
 #ifdef FF_CPHS
 void info_num_msg_cb(T_MFW_HND win, USHORT identifier, UBYTE reason)
 {
-    
-    T_MFW_HND parent = mfwParent( mfw_header());    
+
+    T_MFW_HND parent = mfwParent( mfw_header());
     TRACE_FUNCTION ("info_num_msg_cb");
-    switch (reason) 
+    switch (reason)
     {
-        case INFO_KCD_LEFT: 
+        case INFO_KCD_LEFT:
             // This code is not executed for the case - If mobile is in roaming and service is Network specific.
             if (info_numbers[info_num_level-1]->entry[identifier].entryStat & 0x80) //if bit 8 set/*a0393213 warnings removal - Dialog.Identifier changed to identifier*/
-            {	
+            {
                 TRACE_EVENT("CPHS INFO:Should be number entry");
                 if (info_num_level < 4)
             	      cphs_select_info_num(info_num_index);
             }
             else
-            {	
+            {
                  if (info_num_level < 4)
-                 {	
+                 {
                      TRACE_EVENT("CPHS INFO:Should be dir entry");
                      cphs_get_info_num(info_num_level+1, info_num_index+1);
-                 } 
+                 }
             }
             break;
 
-        default: 
+        default:
             break;
     }
 }
@@ -3196,26 +3196,26 @@
  $Function:	info_num_display_cb
 
  $Description:	Dialogue callback function of the information Numbers display window
- 
+
  $Returns:		none
 
  $Arguments:	win - window handler, dialogue id, key pressed
-				
- 
+
+
 *******************************************************************************/
 
 void info_num_display_cb(T_MFW_HND win, USHORT identifier, UBYTE reason)
 {
 
    // char buf [40];  // RAVI
-    
+
 	TRACE_FUNCTION ("info_num_display_cb");
 
-      switch (reason) 
+      switch (reason)
       {
 	case INFO_KCD_LEFT: callNumber((UBYTE*)current_info_num.number);
 	default: break;  // RAVI - Deafault corrected to default.
-	
+
       }
 }
 /*******************************************************************************
@@ -3223,13 +3223,13 @@
  $Function:	info_num_exec_cb
 
  $Description:	Exec callback function of the information Numbers window
- 
+
  $Returns:		none
 
  $Arguments:	win - window handler
 				event - mfw event
 				parameter - optional data.
- 
+
 *******************************************************************************/
 void info_num_exec_cb (T_MFW_HND win, USHORT event, SHORT value, void * parameter)
 {
@@ -3245,7 +3245,7 @@
 	MmiRsrcGetText(TxtFax);
 	MmiRsrcGetText(TxtData);
     TRACE_FUNCTION (">>>>> info_num_exec_cb()");
-	
+
     switch (event)
 	{
 	case E_INIT:
@@ -3269,7 +3269,7 @@
 			}
 		else
 			numberOfEntries = info_numbers[info_num_level-1]->count;
-		
+
 		data->menu_list_data->List = (T_MFW_MNU_ITEM *)ALLOC_MEMORY( 4 * sizeof(T_MFW_MNU_ITEM) );
 
 		if(data->menu_list_data->List == 0)
@@ -3277,7 +3277,7 @@
 			TRACE_EVENT("Failed memory alloc 2");
 			return;
 		}
-		
+
 		for (i = 0; i < numberOfEntries ; i++)
 		{
 			mnuInitDataItem(&data->menu_list_data->List[i]);
@@ -3285,7 +3285,7 @@
 				data->menu_list_data->List[i].str  = (char *)cphs_voicemail_numbers.entries[i].alpha.data;
 			else
 				data->menu_list_data->List[i].str  = (char *)info_numbers[info_num_level-1]->entry[i].alpha.data;
-			data->menu_list_data->List[i].flagFunc = item_flag_none; 
+			data->menu_list_data->List[i].flagFunc = item_flag_none;
 		}
 
 		data->menu_list_data->ListLength =numberOfEntries;
@@ -3303,27 +3303,27 @@
 		data->menu_list_data->Strings = TRUE;
 		data->menu_list_data->Attr   = &InfoNum_menuAttrib;
 		data->menu_list_data->autoDestroy    = FALSE;
-		
-		
+
+
 		/* Create the dynamic menu window */
 	    listDisplayListMenu(win, data->menu_list_data,(ListCbFunc)InfonumList_cb,0);
-		  
+
 		break;
 
 	case LISTS_REASON_VISIBLE:
 	case LISTS_REASON_RESUME:
 	{
 		dspl_ClearAll();	// sbh - clear screen before update
-	
+
 		if (type_of_list == MAILBOX_LIST)
-		{	
+		{
 			softKeys_displayId( TxtSoftSelect, TxtSoftBack, 0, COLOUR_LIST_SUBMENU);
 		}
 		else if (type_of_list == MAILBOX_LIST_CALL)
 		{
-			softKeys_displayId( TxtSoftCall, TxtSoftBack, 0, COLOUR_LIST_SUBMENU);			
+			softKeys_displayId( TxtSoftCall, TxtSoftBack, 0, COLOUR_LIST_SUBMENU);
 		}
-	
+
 		break;
 	}
 
@@ -3336,9 +3336,9 @@
  $Function:	InfonumList_cb
 
  $Description:	Callback function for the info num list.
- 
+
  $Returns:		none
- 
+
  $Arguments:	Parent - parent window.
 				ListData - Menu item list
 *******************************************************************************/
@@ -3346,8 +3346,8 @@
 void InfonumList_cb(T_MFW_HND * Parent, ListMenuData * ListData)
 {
     T_MFW_WIN	    * win_data = ((T_MFW_HDR *)Parent)->data;
-    T_INFO_NUM_INFO * data     = (T_INFO_NUM_INFO *)win_data->user;	 
-	
+    T_INFO_NUM_INFO * data     = (T_INFO_NUM_INFO *)win_data->user;
+
 //	char debug[40];   // RAVI
 
 TRACE_FUNCTION("InfonumList_cb");
@@ -3360,9 +3360,9 @@
 	else if(ListData->Reason EQ LISTS_REASON_SELECT)
 	{
 		if (type_of_list == MAILBOX_LIST || type_of_list == MAILBOX_LIST_CALL) //get the correct voicemail num
-		{	
+		{
 			cphs_voicemail_numbers.entries[ListData->ListPosition].list_index = ListData->ListPosition;
-				
+
 			if (type_of_list == MAILBOX_LIST)
 			{	/*If we're editing*/
 				TRACE_FUNCTION_P2("List Posn2: %d, MBN: %s", ListData->ListPosition, cphs_voicemail_numbers.entries[ListData->ListPosition].number );
@@ -3370,43 +3370,43 @@
 				memcpy(&cphs_voicemail_num, &cphs_voicemail_numbers.entries[ListData->ListPosition], sizeof(T_MFW_CPHS_ENTRY));
 			}
 			else
-			{	
+			{
 				char temp_number[MFW_CPHS_VM_NUMBER_MAXLEN];
-			
+
 				memcpy(&cphs_voicemail_num, &cphs_voicemail_numbers.entries[ListData->ListPosition], sizeof(T_MFW_CPHS_ENTRY));
 				memset(temp_number, 0, MFW_CPHS_VM_NUMBER_MAXLEN);
-				
-				/*If we're calling the number*/ 
-				//if it's an international number without a '+' 
+
+				/*If we're calling the number*/
+				//if it's an international number without a '+'
 				if (cphs_voicemail_num.ton == MFW_TON_INTERNATIONAL && cphs_voicemail_num.number[0] != '+')
-				{	
+				{
 					strcat(temp_number, "+");	//put a + in front of number
-					strncat(temp_number, (char*)cphs_voicemail_num.number, strlen((char*)cphs_voicemail_num.number));					
+					strncat(temp_number, (char*)cphs_voicemail_num.number, strlen((char*)cphs_voicemail_num.number));
 					memset((void*)cphs_voicemail_num.number, 0, MFW_CPHS_VM_NUMBER_MAXLEN);
 					strncpy((char*)cphs_voicemail_num.number, temp_number, strlen((char *)temp_number));
 				}
-				
+
 				callNumber(cphs_voicemail_num.number);
 
 			}
 
-			
+
 		}
 		else
-		{	
+		{
 #ifdef FF_CPHS
 			T_DISPLAY_DATA Dialog;
                      //x0012849: Jagannatha  01 June, 2006  ER: OMAPS00079607 -To Support AcC and Info numbers
                      UBYTE inRoaming;
                      inRoaming = getRoamingStatus();
                      TRACE_EVENT_P1("Roaming status = %d", inRoaming);
-#endif					 
+#endif
                     //get the number/directory
 				info_num_index = info_numbers[info_num_level-1]->entry[ListData->ListPosition].index;
 				/***************************Go-lite Optimization changes Start***********************/
 				//Aug 16, 2004    REF: CRR 24323   Deepa M.D
-				TRACE_EVENT_P3("Index selected: %d, Level, %d, entryStat:%d",info_num_index, info_num_level, 
-					info_numbers[info_num_level-1]->entry[ListData->ListPosition].entryStat); 
+				TRACE_EVENT_P3("Index selected: %d, Level, %d, entryStat:%d",info_num_index, info_num_level,
+					info_numbers[info_num_level-1]->entry[ListData->ListPosition].entryStat);
 				/***************************Go-lite Optimization changes end***********************/
                             //x0012849: Jagannatha  01 June, 2006  ER: OMAPS00079607 -To Support AcC and Info numbers
                             //0x20 in Binary  0010 0000  - If bit 6 is set to 1 that indicates that service is specific to network.
@@ -3429,17 +3429,17 @@
 				}
 				else
 				{
-#endif				
+#endif
 					if (info_numbers[info_num_level-1]->entry[ListData->ListPosition].entryStat & 0x80) //if bit 8 set
-					{	
+					{
 						TRACE_EVENT("CPHS INFO:Should be number entry");
 						if (info_num_level < 4)
 							cphs_select_info_num(info_num_index);
 					}
 					else
-					{	
+					{
 						if (info_num_level < 4)
-						{		
+						{
 							TRACE_EVENT("CPHS INFO:Should be dir entry");
 							cphs_get_info_num(info_num_level+1, info_num_index+1);
 						}
@@ -3447,12 +3447,12 @@
 #ifdef FF_CPHS
 				}
 #endif
-					
-		}	
-			   
+
+		}
+
 	}
 
-	
+
 }
 
 /*******************************************************************************
@@ -3460,7 +3460,7 @@
  $Function:	InfoNum_destroy
 
  $Description:	Destroy the info num window.
-			
+
  $Returns:		none
 
  $Arguments:	own_window- current window
@@ -3471,9 +3471,9 @@
     T_MFW_WIN * win_data;
     T_INFO_NUM_INFO	* data;
 	UBYTE numberOfEntries;
-	
+
     TRACE_FUNCTION ("InfoNum_destroy()");
-	
+
     if (own_window)
 	{
 	    win_data = ((T_MFW_HDR *)own_window)->data;
@@ -3483,10 +3483,10 @@
 		{
 		    /*
 		     * Delete WIN handler
-		     */ 
+		     */
 		    win_delete (data->numbers_win);
 
-		    /*	   
+		    /*
 		     * Free Memory
 		     */
 		     if ( ( type_of_list == MAILBOX_LIST ) || ( type_of_list == MAILBOX_LIST_CALL ) )
@@ -3500,7 +3500,7 @@
 			{	//int i; // RAVI
 				FREE_MEMORY ((void *)data->menu_list_data->List, numberOfEntries * sizeof (T_MFW_MNU_ITEM));
 			    FREE_MEMORY ((void *)data->menu_list_data, sizeof (ListMenuData));
-			    if (type_of_list == INFO_NUM_LIST && info_num_level > 1)//if info numbers, 
+			    if (type_of_list == INFO_NUM_LIST && info_num_level > 1)//if info numbers,
 				{	FREE_MEMORY((void*)info_numbers[info_num_level-1], sizeof(T_MFW_CPHS_INFONUM_LIST));
 				info_numbers[info_num_level-1] = NULL;
 			    }
@@ -3520,27 +3520,27 @@
  $Function:	info_num_win_cb
 
  $Description:	Window callback function for the info numbers window.
- 
+
  $Returns:		none
 
  $Arguments:	w - mfw window handler
 				e - mfw event
-				
+
 *******************************************************************************/
 
 static int info_num_win_cb (MfwEvt e, MfwWin *w)    /* yyy window event handler */
 {
 	TRACE_EVENT ("info_num_win_cb()");
-	
+
 	switch (e)
 	{
 		case MfwWinVisible:  /* window is visible  */
 			break;
-			
-	case MfwWinFocussed: /* input focus / selected	 */	
-	case MfwWinDelete:   /* window will be deleted	 */   
-		
-	default:	    
+
+	case MfwWinFocussed: /* input focus / selected	 */
+	case MfwWinDelete:   /* window will be deleted	 */
+
+	default:
 		return MFW_EVENT_REJECTED;
 	}
 	return MFW_EVENT_CONSUMED;
@@ -3553,11 +3553,11 @@
  $Function:	mmi_cphs_get_als_info
 
  $Description:	Returns the current Line enabled
- 
+
  $Returns:		none
 
- $Arguments:	
-				
+ $Arguments:
+
 *******************************************************************************/
 //x0pleela 23 May, 2006  DR: OMAPS00070657
 #ifdef FF_CPHS
@@ -3572,7 +3572,7 @@
 	      	case ALS_MOD_SPEECH:
 			als_status.selectedLine = MFW_SERV_LINE1;
 			break;
-			
+
 	      case ALS_MOD_AUX_SPEECH:
 			als_status.selectedLine = MFW_SERV_LINE2;
 			break;
@@ -3588,11 +3588,11 @@
  $Function:	mmi_cphs_set_als_value
 
  $Description:	Set the Als flag based on the CSP data read from CPHS enabled SIM
- 
+
  $Returns:		none
 
- $Arguments:	
-				
+ $Arguments:
+
 *******************************************************************************/
 //x0pleela 29 May, 2006  DR: OMAPS00070657
 
@@ -3607,11 +3607,11 @@
  $Function:	mmi_cphs_get_als_value
 
  $Description:	Returns the Als flag value
- 
+
  $Returns:		none
 
- $Arguments:	
-				
+ $Arguments:
+
 *******************************************************************************/
 //x0pleela 29 May, 2006  DR: OMAPS00070657
 
@@ -3633,11 +3633,11 @@
  $Function:	mmi_get_als_selectedLine
 
  $Description:	Returns the current Line enabled
- 
+
  $Returns:		none
 
- $Arguments:	
-				
+ $Arguments:
+
 *******************************************************************************/
 //x0pleela 30 May, 2006  DR: OMAPS00070657
 T_MFW_LINE_INDEX mmi_get_als_selectedLine( void)