diff src/ui/bmi/mmiServices.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 897bdea4cb0b
line wrap: on
line diff
--- a/src/ui/bmi/mmiServices.c	Sun Nov 08 05:12:05 2020 +0000
+++ b/src/ui/bmi/mmiServices.c	Sun Nov 08 06:39:16 2020 +0000
@@ -2,48 +2,48 @@
 
 					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)                                                           
- $Module:		Supplementary services 
+ $Project name:	Basic MMI
+ $Project code:	BMI (6349)
+ $Module:		Supplementary services
  $File:		    MmiServices.c
- $Revision:		1.0                                                       
-                                                                              
- $Author:		Condat(UK)                                                         
- $Date:		    25/10/00                                                      
-                                                                               
+ $Revision:		1.0
+
+ $Author:		Condat(UK)
+ $Date:		    25/10/00
+
 ********************************************************************************
-                                                                              
+
  Description
 
     This module provides the supplementary services functionality
 
-  
+
 ********************************************************************************
  $History: MmiServices.c
 
 	May 03, 2007 DR: OMAPS00129383 x0pleela
  	Description:[ACI] MTC related call forwarded SS notification not differentiable on BAT/ATI level
- 	Solution: Replaced BASIC_SERVICE_CODE with TELETELE_BEARER_SERVICE_CODE to activate 
+ 	Solution: Replaced BASIC_SERVICE_CODE with TELETELE_BEARER_SERVICE_CODE to activate
  			and de-activate both Tele and Bearere services
- 	
+
   	Feb 27, 2007 ER: OMAPS00113891 x0pleela
  	Description:[ACI] MTC related call forwarded SS notification not differentiable on BAT/ATI level
  	Solution: Did the following changes:
 	 		- Externed call_data variable
-			- In function showssNotify(), 
-				>> handling the case MFW_SS_MT_FORWARDED: where  
-					incoming call dialog will be displayed with proper string for TTY/normal forwarded 
+			- In function showssNotify(),
+				>> handling the case MFW_SS_MT_FORWARDED: where
+					incoming call dialog will be displayed with proper string for TTY/normal forwarded
 					incoming call.
 				>>New case MFW_SS_MT_CALL_FORWARDED is added to display a dialog "Incoming
 					call forwarde" to the subscriber who has forwarded his all incoming calls
- 	
+
  	Nov 27, 2006 OMAPS00098359 a0393213(R.Prabakar)
  	Description: CPHS 4.2 : Call Divert doesn't work properly for Line 2
 
@@ -54,19 +54,19 @@
 	Aug 28, 2006  DR: OMAPS00083503 x0pleela
 	Description: Result of ss_check_ss_string may be ignored
 	Solution:	Defined new enumeration T_SS_APLHA for DCS
-			services(): Checking for dcs and if UCS2 character then display a dialog 
+			services(): Checking for dcs and if UCS2 character then display a dialog
 						saying font not supported. Else proceed with the transaction
-			showUSSDError():This function displays a dialog saying USSD message received, 
+			showUSSDError():This function displays a dialog saying USSD message received,
 					Font not supported for UCS2 characters
- 
+
 
  	Aug 23, 2006 DR: OMAPS00090419 x0pleela
  	Descroption:FT Nice/France, Orange (wk32/06) - Call Barring - misleading message:
- 	Solution:Commented  the code (function getCBService()) which appends the ss string with *11 
+ 	Solution:Commented  the code (function getCBService()) which appends the ss string with *11
  			or *89 as it is not a valid SS string for checking status, activation and deactivation of
  			call barring feature in functions servicesCallBarringCheck, servicesCallBarringDeactivate,
- 			servicesCallBarringActivate 
- 			
+ 			servicesCallBarringActivate
+
        May 30, 2006 REF:OMAPS00079650  a0393213 (R.Prabakar)
        Description : CPHS Call Forwarding feature implementation
        Solution     : As part of implementation, in this file, call to cphs_set_divert_status is called whenever necessary.
@@ -76,26 +76,26 @@
 	Description: CPHS feature on Locosto-Lite
 	Solution: For ALS feature,
  			a) Defined new enumeration "SERVICE_CB_SERVICE" for SS similar to Line 1 and Line 2
- 			b) Defined new function "getCBService()" to update psstring based on the current 
+ 			b) Defined new function "getCBService()" to update psstring based on the current
  				line activated while processing SS
 
 	Apr 10, 2006    REF: OMAPS00052691 x0039928
-	Description: FT USA [Cingular(WK42)] - T 8.6 Call Waiting Accept - 
+	Description: FT USA [Cingular(WK42)] - T 8.6 Call Waiting Accept -
 	                  ATD *43# returns "Unknown status"
-	Solution: Proper Text is displyed when network returns status STAT_NONE( 0 ) for 
+	Solution: Proper Text is displyed when network returns status STAT_NONE( 0 ) for
 	              call waiting activation.
 
 	Dec 07, 2005    REF: OMAPS00050087 x0039928
 	Description: Deactivated is displayed while activate Hide Id option is selected
 	Solution: String "Not Activated" is displayed if the Hide Id activation fails.
-	
+
 	July 09, 2005   REF : MMI-22565 - a0876501
 	Description:	IMEI CD byte calculation added
 	Solution:	Increased the IMEI_LEN from 15 to 17 for displaying the Cd byte.
 
  	Jun 16, 2005    REF: CRR 31543   x0021334
 	Issue: SATK: cannot get TR for send ussd command
-	Solution: When the user presses "Hang up" key when the SAT USSD session is in progress,  
+	Solution: When the user presses "Hang up" key when the SAT USSD session is in progress,
 	              a call is made to function 'sAT_end_ussd()' to end the USSD session.
 
  	May 12, 2005 REF: CRR 30892  x0021334
@@ -106,15 +106,15 @@
 	Description:	IMEI retreival  by posting a call to ACI sAT_xx API
 	Solution:		The direct call to cl_get_imeisv() is replaced with the
 					call to the mmi_imei_store() which inturn calls sAT_Dn() and
-					retrieves the IMEI info and stores it onto the global 
+					retrieves the IMEI info and stores it onto the global
 					variable "imei"
-					
+
 	Feb 17, 2005   REF : CRR 17657 x0012850 Divya.P.V
 	Bug : Unable to compose a one or two digit number
 	Fix :  This bug is reproducible when a very long message is sent by the service provider when an invalid one or two digit number is dialled.
 		The read only editor with the service provider message that comes up when a one or two digit is dialled
 		was not handled properly. So altered the editor handling to cater for the long message.
-		
+
 	Oct 20, 2004    REF: CRR 25772  Deepa M.D
 	Bug:	Not displaying proper RSK name in call divert edit screens
 	Fix:	The RSK name will be changed based on whether the editor content is empty or not.
@@ -126,33 +126,33 @@
         Jun 21,2004 CRR:13650 xpradipg - SASKEN
 
     Jul 16, 2004        REF: CRR 18409  xvilliva
-    Bug:  CHW : message "Deactivated" when it should be "Activated". 
-    Fix:  The alert displayed depends on the status code received. If we 
-	      receive the status as zero or 0xFF, we now show an alert saying 
+    Bug:  CHW : message "Deactivated" when it should be "Activated".
+    Fix:  The alert displayed depends on the status code received. If we
+	      receive the status as zero or 0xFF, we now show an alert saying
 	      "unknown status" instead of "Deactivated".
 
 
     Jun 21,2004 CRR:13650 xpradipg - SASKEN
- 
-    	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
-  					
-    	Jun 10, 2004        	REF: CRR MMI-SPR-13614  Rashmi C N(Sasken) 
-  	Solution:			The condition for which Call Forward is activated/deactivated or its staus is checked, 
+
+    	Jun 10, 2004        	REF: CRR MMI-SPR-13614  Rashmi C N(Sasken)
+  	Solution:			The condition for which Call Forward is activated/deactivated or its staus is checked,
 					is displayed in the message along with the activation/deactivation message
 
 Jun 21,2004 CRR:13650 xpradipg - SASKEN
 Description: CBA : no basic service sent when using the menu
 Fix: Basic service code 10(All teleservices) is sent for activation and deactivation thru menus
 
-				
+
 
 	Jun 04,2004 CRR:13601 xpradipg - SASKEN
 	Description: CFO interrogation display : Timer to long
 	Fix: Timer is enabled for the information dialog. It times out after 5 seconds from the last key
 	     press.
-	        
+
 	Jun 03, 2004 CRR:13649 - xpradipg-SASKEN
 	subject: CBA : Management of password
   	solution: password is promted on selecting activation/deactivation option as against the previous
@@ -160,18 +160,18 @@
 
 
  	Issue Number : SPR#12882 on 29/03/04 by VadiRaj
- 	
-	25/10/00			Original Condat(UK) BMI version.	
-	   
+
+	25/10/00			Original Condat(UK) BMI version.
+
  $End
- 
+
 *******************************************************************************/
 
 
 /******************************************************************************
-                                                                              
+
                                 Include Files
-                                                                              
+
 *******************************************************************************/
 
 #define BUGS 0
@@ -270,7 +270,7 @@
 extern void msgsGetVoiceAddress(CHAR *Buffer);
 extern void InfoDialogTimRestart(T_MFW_HND win);
 
-/* x0039928 - Lint warning removal 
+/* x0039928 - Lint warning removal
 static void (*show) (void); */
 
 static void showWait (T_MFW_HND win);
@@ -377,7 +377,7 @@
 
 
 
-#define  SS_STAT_NONE  0    //xvilliva 18409, not registered, not active, 
+#define  SS_STAT_NONE  0    //xvilliva 18409, not registered, not active,
 							//not provisioned,not quiescent
 
 //x0pleela 03 May, 2007 DR: OMAPS00129383
@@ -388,7 +388,7 @@
 //basic service code for "all teleservices"
 #define BASIC_SERVICE_CODE "10"
 int ss_Code;
-//    Jun 10, 2004        REF: CRR MMI-SPR-13614  Rashmi C N(Sasken) 
+//    Jun 10, 2004        REF: CRR MMI-SPR-13614  Rashmi C N(Sasken)
 // ss_Code-- This holds the current CF code for which the activation/deactivation or the staus is being checked
 // This would be used while displaying the status or activation/deactivation message
 
@@ -417,7 +417,7 @@
 typedef enum
 {
 	CFVoice = 0,
-	CFAuxVoice, /*MC, ALS line 2*/ 
+	CFAuxVoice, /*MC, ALS line 2*/
 	CFFax,
 	CFData,
 	CFAll
@@ -428,8 +428,8 @@
 typedef enum
 {
 	CBVoice = 0,
-	CBAuxVoice /*MC, ALS line 2*/ 
-	
+	CBAuxVoice /*MC, ALS line 2*/
+
 }SERVICE_CB_SERVICE;
 #endif
 
@@ -465,9 +465,9 @@
 static SERVICE_CF_TYPE       CFType;        /* Type of Call Forwarding */
 static SERVICE_CF_SERVICE    CFService;     /* basic service for Call Forwarding */
 //x0pleela 25 May, 2006  DR: OMAPS00070657
-/* x0039928 - Lint warning removal 
+/* x0039928 - Lint warning removal
 #ifdef FF_CPHS
-static SERVICE_CB_SERVICE    CBService;     // basic service for Call Barring 
+static SERVICE_CB_SERVICE    CBService;     // basic service for Call Barring
 #endif
 */
 static SERVICE_CF_ACTION     CFAction;      /* action for Call Forwarding */
@@ -477,7 +477,7 @@
 //new enum added to indicate the action to be taken in the callback function for password
 static SERVICE_CB_ACTION	   CBFlag;	/*to indicate the action after retriving the password*/
 //CRR:13649
-/* x0039928 - Lint warning removal 
+/* x0039928 - Lint warning removal
 static char                 CFNumber[MAX_LEN];  number to forward calls to */
 
 
@@ -617,12 +617,12 @@
 
  $Function:    	servicesInit
 
- $Description:	
-
- $Returns:		
-
- $Arguments:	
- 
+ $Description:
+
+ $Returns:
+
+ $Arguments:
+
 *******************************************************************************/
 
 
@@ -658,10 +658,10 @@
 
  $Description:	exit services handling
 
- $Returns:		
-
- $Arguments:	
- 
+ $Returns:
+
+ $Arguments:
+
 *******************************************************************************/
 
 
@@ -681,10 +681,10 @@
 
  $Description:	Creation of an instance for the Services dialog.
 
- $Returns:		
-
- $Arguments:	
- 
+ $Returns:
+
+ $Arguments:
+
 *******************************************************************************/
 
 
@@ -747,12 +747,12 @@
 
  $Function:    	services_destroy
 
- $Description:	
-
- $Returns:		
-
- $Arguments:	
- 
+ $Description:
+
+ $Returns:
+
+ $Arguments:
+
 *******************************************************************************/
 
 
@@ -780,7 +780,7 @@
         SEND_EVENT(ss_data.info_wait, DIALOG_DESTROY, 0, 0);
         ss_data.info_wait = 0;
     }
-    
+
 
     if (data->input_number_win)
     {
@@ -795,12 +795,12 @@
 
  $Function:    	services_win_cb
 
- $Description:	
-
- $Returns:		
-
- $Arguments:	
- 
+ $Description:
+
+ $Returns:
+
+ $Arguments:
+
 *******************************************************************************/
 
 static int services_win_cb(T_MFW_EVENT e, T_MFW_SS_PARA * para)
@@ -824,12 +824,12 @@
 
  $Function:    	destroyInfoWindow
 
- $Description:	
-
- $Returns:		
-
- $Arguments:	
- 
+ $Description:
+
+ $Returns:
+
+ $Arguments:
+
 *******************************************************************************/
 
 static void destroyInfoWindow( void)
@@ -877,7 +877,7 @@
     case( 0x50 ):
     case( 0x40 ):
       alphabet = (dcs & 0x0C) >> 2;
-      /* According to 03.38, "Any reserved codings shall be assumed 
+      /* According to 03.38, "Any reserved codings shall be assumed
        * to be the GSM 7 bit default alphabet by a receiving entity".
        */
       if (alphabet EQ 3)
@@ -895,12 +895,12 @@
 
  $Function:    	services_ss_cb
 
- $Description:	
-
- $Returns:		
-
- $Arguments:	
- 
+ $Description:
+
+ $Returns:
+
+ $Arguments:
+
 *******************************************************************************/
 
 
@@ -917,17 +917,17 @@
     switch (e)
 	{
 	case E_SS_RES:
-        if (!ss_data.info_wait) 
+        if (!ss_data.info_wait)
         {
 			TRACE_FUNCTION ("show the wait screen");
-#ifdef FF_CPHS_REL4  
+#ifdef FF_CPHS_REL4
 		if(interrogate != 1)
 		{
-#endif		
+#endif
 			showWait( ss_data.win );
-#ifdef FF_CPHS_REL4  
+#ifdef FF_CPHS_REL4
 		}
-#endif		
+#endif
         }
         /*
          * ignore the event
@@ -983,7 +983,7 @@
 		if(!ss_data.info_win)
 	        SEND_EVENT(ss_data.win,E_SS_USSD_REQ,0, para);
 
-        destroyInfoWindow();		
+        destroyInfoWindow();
         break;
 
     /* just display the ussd info */
@@ -1012,7 +1012,7 @@
 	break;
 	//CQ-16432 - start
 	case E_SS_SAT_CPWD:
-	TRACE_EVENT("Received event E_SS_SAT_CPWD in BMI");	
+	TRACE_EVENT("Received event E_SS_SAT_CPWD in BMI");
 		if(!ss_data.info_win)
 			SEND_EVENT(ss_data.win,E_SS_SAT_CPWD,0, para);
         destroyInfoWindow();
@@ -1030,12 +1030,12 @@
 
  $Function:    	services
 
- $Description:	
-
- $Returns:		
-
- $Arguments:	
- 
+ $Description:
+
+ $Returns:
+
+ $Arguments:
+
 *******************************************************************************/
 
 void services (T_MFW_HND win, USHORT event, SHORT value, void * parameter)
@@ -1077,7 +1077,7 @@
 
         case ServicesUSSDEnter:
         {
-#ifdef NEW_EDITOR	
+#ifdef NEW_EDITOR
 				T_AUI_EDITOR_DATA editor_data;	/* SPR#1428 - SH - New Editor data */
 #else
         		T_EDITOR_DATA	editor_data;
@@ -1151,7 +1151,7 @@
 
 	case E_SS_CF_ICN_UPD:
 		TRACE_FUNCTION("E_SS_CF_ICN_UPD");
-		
+
 		if ((ss_cnf->cf_cnf.ss_code == SS_CF_CFU) ||
 		     (ss_cnf->cf_cnf.ss_code == SS_CF_ALL))
 		{
@@ -1162,20 +1162,20 @@
 			{
 				case CF_ACTIVE_STATUS:
 					iconsSetState(iconIdCallFor);
-//  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;
 					 break;
 
 				case CF_INACTIVE_STATUS:
 					iconsDeleteState(iconIdCallFor);
-//  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=FALSE;
 					break;
 			}
-//  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();
 			idleEvent(IdleUpdate);
 		}
@@ -1187,7 +1187,7 @@
       /*
        * check whether we received data what was requested / consistent
        */
-      
+
       switch(ss_cnf->cf_cnf.ss_code)
       {
         case SS_CODES_UNKNOWN:
@@ -1213,50 +1213,50 @@
 			/*
 			* Update icons for idle screen if CFU and telephony
 			*/
-			
+
       		/* 30th May,2006     OMAPS00079650     a0393213 (R.Prabakar)
                   Description : CPHS Call Forwarding feature implementation
                   Solution     : As part of the implemention, cphs_set_divert_status() is called whenever the divert status
                                     is changed*/
-                                                
+
 			TRACE_EVENT("services():E_SS_CF_CNF SS_CF_CFU");
 			switch (srv_check_CF_telephony_status ( &ss_cnf->cf_cnf ))
-			{			    
+			{
 				case CF_ACTIVE_STATUS:
 					#ifdef FF_CPHS
 					switch (CFService)
 					{
-						case (CFVoice):	
+						case (CFVoice):
 							    /*MC SPR 742, handle line 2, auxiliary telephony*/
 								#ifdef FF_CPHS_REL4
 								if(isCFISFilePresent() )
 									{	/*call_forwarding_status_rel4.voice updated*/
-										if(call_forwarding_status_rel4.voice != MFW_CFLAG_SET || 
+										if(call_forwarding_status_rel4.voice != MFW_CFLAG_SET ||
 											memcmp(call_forwarding_status_rel4.voice_dialling_number,ss_data.edt_buf_number,PHB_MAX_LEN)!=0)
 											{
 												call_forwarding_status_rel4.voice=MFW_CFLAG_SET;
 												memcpy(call_forwarding_status_rel4.voice_dialling_number,ss_data.edt_buf_number,PHB_MAX_LEN);
-												cphs_rel4_set_divert_status(	call_forwarding_status_rel4.voice, 
+												cphs_rel4_set_divert_status(	call_forwarding_status_rel4.voice,
 																			call_forwarding_status_rel4.fax,
 																			call_forwarding_status_rel4.data,
-																			call_forwarding_status_rel4.voice_dialling_number);									
+																			call_forwarding_status_rel4.voice_dialling_number);
 											}
 										break;
 									}
-								
+
 								#endif
-								
+
 		    			case CFAuxVoice:
 
-							if (GetAlsLine() == MFW_SERV_LINE2) 
+							if (GetAlsLine() == MFW_SERV_LINE2)
 								{
 								TRACE_EVENT("services():call forward activation successful for line2");
 									/*30th May,2006     OMAPS00079650     a0393213 (R.Prabakar)
 									    check to find whether we are doing unnecessary sim write*/
-								if(GetCphsDivertStatus(MFW_SERV_LINE2)!=MFW_CFLAG_SET)  
+								if(GetCphsDivertStatus(MFW_SERV_LINE2)!=MFW_CFLAG_SET)
 									cphs_set_divert_status(MFW_CFLAG_NotPresent, MFW_CFLAG_SET, MFW_CFLAG_NotPresent, MFW_CFLAG_NotPresent);
 								}
-						
+
 							else
 								{
 								TRACE_EVENT("services():call forward activation successful for line1");
@@ -1264,7 +1264,7 @@
 									cphs_set_divert_status(MFW_CFLAG_SET, MFW_CFLAG_NotPresent, MFW_CFLAG_NotPresent, MFW_CFLAG_NotPresent);
 								}
 						break;
-						case (CFData): 	
+						case (CFData):
 							/*a0393213 cphs rel4*/
 							#ifdef FF_CPHS_REL4
 							if(!isCFISFilePresent())
@@ -1279,10 +1279,10 @@
 										if(call_forwarding_status_rel4.data!= MFW_CFLAG_SET)
 											{
 												call_forwarding_status_rel4.data=MFW_CFLAG_SET;
-												cphs_rel4_set_divert_status(	call_forwarding_status_rel4.voice, 
+												cphs_rel4_set_divert_status(	call_forwarding_status_rel4.voice,
 																			call_forwarding_status_rel4.fax,
 																			call_forwarding_status_rel4.data,
-																			call_forwarding_status_rel4.voice_dialling_number);									
+																			call_forwarding_status_rel4.voice_dialling_number);
 											}
 								}
 							#endif
@@ -1302,16 +1302,16 @@
 										if(call_forwarding_status_rel4.fax!= MFW_CFLAG_SET)
 											{
 												call_forwarding_status_rel4.fax=MFW_CFLAG_SET;
-												cphs_rel4_set_divert_status(	call_forwarding_status_rel4.voice, 
+												cphs_rel4_set_divert_status(	call_forwarding_status_rel4.voice,
 																			call_forwarding_status_rel4.fax,
 																			call_forwarding_status_rel4.data,
-																			call_forwarding_status_rel4.voice_dialling_number);									
+																			call_forwarding_status_rel4.voice_dialling_number);
 											}
 								}
 							#endif
-							
+
 							break;
-						case (CFAll):	
+						case (CFAll):
 							/*a0393213 cphs rel4*/
 							#ifdef FF_CPHS_REL4
 							if(!isCFISFilePresent() )
@@ -1320,7 +1320,7 @@
 							if (GetAlsLine() == MFW_SERV_LINE2)
 								{
 								TRACE_EVENT("services():call forward activation successful for all");
-								if(GetCphsDivertStatus(MFW_SERV_LINE2)!=MFW_CFLAG_SET || 
+								if(GetCphsDivertStatus(MFW_SERV_LINE2)!=MFW_CFLAG_SET ||
 								   GetCphsDivertStatus(MFW_SERV_DATA)!=MFW_CFLAG_SET ||
 								   GetCphsDivertStatus(MFW_SERV_FAX)!=MFW_CFLAG_SET)
 									cphs_set_divert_status(MFW_CFLAG_NotPresent,MFW_CFLAG_SET,MFW_CFLAG_SET,MFW_CFLAG_SET);
@@ -1328,7 +1328,7 @@
 							else
 								{
 								TRACE_EVENT("services():call forward activation successful for all");
-								if(GetCphsDivertStatus(MFW_SERV_LINE1)!=MFW_CFLAG_SET || 
+								if(GetCphsDivertStatus(MFW_SERV_LINE1)!=MFW_CFLAG_SET ||
 								   GetCphsDivertStatus(MFW_SERV_DATA)!=MFW_CFLAG_SET ||
 								   GetCphsDivertStatus(MFW_SERV_FAX)!=MFW_CFLAG_SET)
 									cphs_set_divert_status(MFW_CFLAG_SET,MFW_CFLAG_NotPresent,MFW_CFLAG_SET,MFW_CFLAG_SET);
@@ -1338,19 +1338,19 @@
 							else
 								{
 										if(call_forwarding_status_rel4.voice!= MFW_CFLAG_SET ||
-										   call_forwarding_status_rel4.fax!= MFW_CFLAG_SET ||	
-										   call_forwarding_status_rel4.data!= MFW_CFLAG_SET || 
+										   call_forwarding_status_rel4.fax!= MFW_CFLAG_SET ||
+										   call_forwarding_status_rel4.data!= MFW_CFLAG_SET ||
 											memcmp(call_forwarding_status_rel4.voice_dialling_number,ss_data.edt_buf_number,PHB_MAX_LEN)!=0 )
 											{
 												call_forwarding_status_rel4.voice= MFW_CFLAG_SET;
-										  	 	call_forwarding_status_rel4.fax= MFW_CFLAG_SET;		
+										  	 	call_forwarding_status_rel4.fax= MFW_CFLAG_SET;
 										   		call_forwarding_status_rel4.data= MFW_CFLAG_SET;
 												memcpy(call_forwarding_status_rel4.voice_dialling_number,ss_data.edt_buf_number,PHB_MAX_LEN);
 
-												cphs_rel4_set_divert_status(	call_forwarding_status_rel4.voice, 
+												cphs_rel4_set_divert_status(	call_forwarding_status_rel4.voice,
 																			call_forwarding_status_rel4.fax,
 																			call_forwarding_status_rel4.data,
-																			call_forwarding_status_rel4.voice_dialling_number);									
+																			call_forwarding_status_rel4.voice_dialling_number);
 											}
 								}
 							#endif
@@ -1358,18 +1358,18 @@
 					}
 					#else
 						iconsSetState(iconIdCallFor);
-	//  Jun 23, 2004        REF: CRR MMI-SPR-13599  Rashmi C N(Sasken) 
-	//              Setting the Current state of CF in Flash						
-						FFS_flashData.CFState=TRUE;	
+	//  Jun 23, 2004        REF: CRR MMI-SPR-13599  Rashmi C N(Sasken)
+	//              Setting the Current state of CF in Flash
+						FFS_flashData.CFState=TRUE;
 						flash_write();
 					#endif
 					break;
 
 				case CF_INACTIVE_STATUS:
-				      #ifdef FF_CPHS	
+				      #ifdef FF_CPHS
 					switch (CFService)
 					{
-						case (CFVoice):	
+						case (CFVoice):
 							/*a0393213 cphs rel4*/
 							#ifdef FF_CPHS_REL4
 								if(isCFISFilePresent() )
@@ -1377,14 +1377,14 @@
 										if(call_forwarding_status_rel4.voice != MFW_CFLAG_NOTSet)
 											{
 												call_forwarding_status_rel4.voice=MFW_CFLAG_NOTSet;
-												cphs_rel4_set_divert_status(	call_forwarding_status_rel4.voice, 
+												cphs_rel4_set_divert_status(	call_forwarding_status_rel4.voice,
 																			call_forwarding_status_rel4.fax,
 																			call_forwarding_status_rel4.data,
-																			call_forwarding_status_rel4.voice_dialling_number);									
+																			call_forwarding_status_rel4.voice_dialling_number);
 											}
 										break;
 									}
-								
+
 								#endif
 							    /*MC SPR 742, handle line 2, auxiliary telephony*/
 		    			case CFAuxVoice:
@@ -1394,10 +1394,10 @@
 								TRACE_EVENT("services():call forward deactivation successful for line2");
 									/*30th May,2006     OMAPS00079650     a0393213 (R.Prabakar)
 									    check to find whether we are doing unnecessary sim write*/
-								if(GetCphsDivertStatus(MFW_SERV_LINE2)!=MFW_CFLAG_NOTSet)  
+								if(GetCphsDivertStatus(MFW_SERV_LINE2)!=MFW_CFLAG_NOTSet)
 									cphs_set_divert_status(MFW_CFLAG_NotPresent, MFW_CFLAG_NOTSet, MFW_CFLAG_NotPresent, MFW_CFLAG_NotPresent);
 								}
-						
+
 							else
 								{
 								TRACE_EVENT("services():call forward deactivation successful for line1");
@@ -1405,7 +1405,7 @@
 									cphs_set_divert_status(MFW_CFLAG_NOTSet, MFW_CFLAG_NotPresent, MFW_CFLAG_NotPresent, MFW_CFLAG_NotPresent);
 								}
 						break;
-						case (CFData): 	
+						case (CFData):
 							/*a0393213 cphs rel4*/
 							#ifdef FF_CPHS_REL4
 							if(!isCFISFilePresent() )
@@ -1420,15 +1420,15 @@
 										if(call_forwarding_status_rel4.data!= MFW_CFLAG_NOTSet)
 											{
 												call_forwarding_status_rel4.data=MFW_CFLAG_NOTSet;
-												cphs_rel4_set_divert_status(	call_forwarding_status_rel4.voice, 
+												cphs_rel4_set_divert_status(	call_forwarding_status_rel4.voice,
 																			call_forwarding_status_rel4.fax,
 																			call_forwarding_status_rel4.data,
-																			call_forwarding_status_rel4.voice_dialling_number);									
+																			call_forwarding_status_rel4.voice_dialling_number);
 											}
 								}
 							#endif
 							break;
-						case (CFFax):	
+						case (CFFax):
 							#ifdef FF_CPHS_REL4
 							if(!isCFISFilePresent() )
 								{
@@ -1442,15 +1442,15 @@
 										if(call_forwarding_status_rel4.fax!= MFW_CFLAG_NOTSet)
 											{
 												call_forwarding_status_rel4.fax=MFW_CFLAG_NOTSet;
-												cphs_rel4_set_divert_status(	call_forwarding_status_rel4.voice, 
+												cphs_rel4_set_divert_status(	call_forwarding_status_rel4.voice,
 																			call_forwarding_status_rel4.fax,
 																			call_forwarding_status_rel4.data,
-																			call_forwarding_status_rel4.voice_dialling_number);									
+																			call_forwarding_status_rel4.voice_dialling_number);
 											}
 								}
 							#endif
 								break;
-						case (CFAll):	
+						case (CFAll):
 							/*a0393213 cphs rel4*/
 							#ifdef FF_CPHS_REL4
 							if(!isCFISFilePresent() )
@@ -1459,7 +1459,7 @@
 							if (GetAlsLine() == MFW_SERV_LINE2)
 								{
 								TRACE_EVENT("services():call forward deactivation successful for all");
-								if(GetCphsDivertStatus(MFW_SERV_LINE2)!=MFW_CFLAG_NOTSet || 
+								if(GetCphsDivertStatus(MFW_SERV_LINE2)!=MFW_CFLAG_NOTSet ||
 								   GetCphsDivertStatus(MFW_SERV_DATA)!=MFW_CFLAG_NOTSet ||
 								   GetCphsDivertStatus(MFW_SERV_FAX)!=MFW_CFLAG_NOTSet)
 									cphs_set_divert_status(MFW_CFLAG_NotPresent, MFW_CFLAG_NOTSet, MFW_CFLAG_NOTSet, MFW_CFLAG_NOTSet);
@@ -1467,7 +1467,7 @@
 							else
 								{
 								TRACE_EVENT("services():call forward deactivation successful for all");
-								if(GetCphsDivertStatus(MFW_SERV_LINE1)!=MFW_CFLAG_NOTSet || 
+								if(GetCphsDivertStatus(MFW_SERV_LINE1)!=MFW_CFLAG_NOTSet ||
 								   GetCphsDivertStatus(MFW_SERV_DATA)!=MFW_CFLAG_NOTSet ||
 								   GetCphsDivertStatus(MFW_SERV_FAX)!=MFW_CFLAG_NOTSet)
 									cphs_set_divert_status(MFW_CFLAG_NOTSet, MFW_CFLAG_NotPresent, MFW_CFLAG_NOTSet, MFW_CFLAG_NOTSet);
@@ -1477,17 +1477,17 @@
 							else
 								{
 										if(call_forwarding_status_rel4.voice!= MFW_CFLAG_NOTSet ||
-										   call_forwarding_status_rel4.fax!= MFW_CFLAG_NOTSet ||		
+										   call_forwarding_status_rel4.fax!= MFW_CFLAG_NOTSet ||
 										   call_forwarding_status_rel4.data!= MFW_CFLAG_NOTSet )
 											{
 												call_forwarding_status_rel4.voice= MFW_CFLAG_NOTSet;
-										  	 	call_forwarding_status_rel4.fax= MFW_CFLAG_NOTSet;		
+										  	 	call_forwarding_status_rel4.fax= MFW_CFLAG_NOTSet;
 										   		call_forwarding_status_rel4.data= MFW_CFLAG_NOTSet;
-										
-												cphs_rel4_set_divert_status(	call_forwarding_status_rel4.voice, 
+
+												cphs_rel4_set_divert_status(	call_forwarding_status_rel4.voice,
 																			call_forwarding_status_rel4.fax,
 																			call_forwarding_status_rel4.data,
-																			call_forwarding_status_rel4.voice_dialling_number);									
+																			call_forwarding_status_rel4.voice_dialling_number);
 											}
 								}
 							#endif
@@ -1495,8 +1495,8 @@
 					}
 					   #else
 						 iconsDeleteState(iconIdCallFor);
-	//  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=FALSE;
 						flash_write();
 					   #endif
@@ -1524,7 +1524,7 @@
                */
               data->max_feature = srv_copy_feature_list_cf (data->mfw_ss_cf, &ss_cnf->cf_cnf);
               data->current_feature = /*CFService*/0;
-             
+
 
               if (data->max_feature EQ 0)
               {
@@ -1547,7 +1547,7 @@
                 /*
                  * now display status
                  */
-//    Jun 10, 2004        REF: CRR MMI-SPR-13614  Rashmi C N(Sasken) 
+//    Jun 10, 2004        REF: CRR MMI-SPR-13614  Rashmi C N(Sasken)
 // ss_Code-- This holds the current CF code for which the activation/deactivation or the staus is being checked
 // This would be used while displaying the status or activation/deactivation message
                  ss_Code=ss_cnf->cf_cnf.ss_code;
@@ -1599,20 +1599,20 @@
           /*
            * now display status
            */
-			if (ss_cnf->cw_cnf.ss_status EQ SS_STAT_UNKNOWN) 
+			if (ss_cnf->cw_cnf.ss_status EQ SS_STAT_UNKNOWN)
 			{
 				//SPR18409 xvilliva, If we receive the status as 0xFF,
-				//we show an alert saying "unknown status".  
+				//we show an alert saying "unknown status".
 				info_screen(win, TxtUnknown, TxtStatus, NULL);
 			}
 			else
 			{
 				// Apr 10, 2006    REF: OMAPS00052691 x0039928
-				// Fix: Proper text id is assigned for display if network returns 
+				// Fix: Proper text id is assigned for display if network returns
 				// status STAT_NONE for call waiting activation.
 				if (ss_cnf->cw_cnf.ss_status EQ SS_STAT_NONE)
 				{
-					if ((ss_cnf->cw_cnf.ss_category EQ SS_REGISTRATION) OR 
+					if ((ss_cnf->cw_cnf.ss_category EQ SS_REGISTRATION) OR
 						(ss_cnf->cw_cnf.ss_category EQ SS_ACTIVATION))
 							data->mfw_ss_cw->status  = TxtActivated;
 				}
@@ -1687,12 +1687,12 @@
 //	May 02, 2005   REF : LOCOSTO-ENH-30818 - xpradipg
 //	copy the IMEI onto the global variable and display the information
 #ifdef FF_MMI_ATC_MIGRATION
-			memset(imei,0x00,IMEI_LEN+1);   
+			memset(imei,0x00,IMEI_LEN+1);
     		memcpy(imei, ss_cnf->imei_info.imei_number, IMEI_LEN);
     		showIMEI(win,(char*)imei);
-#else    		
+#else
     		showIMEI2(win, ss_cnf);
-#endif     
+#endif
 			break;
 
         default:
@@ -1705,9 +1705,9 @@
             /* we must display the ussd info and then edit and send a user ussd */
     case E_SS_USSD_REQ:
 	{
-	
+
 	//x0pleela 24 Aug, 2006  DR: OMAPS00083503
-	//Checking dcs 
+	//Checking dcs
 #ifdef MMI_LITE
 	UBYTE alphabet;
 	alphabet = ss_getAlphabetCb ((UBYTE) ss_cnf->ussd_info.dcs );
@@ -1719,7 +1719,7 @@
 	}
 	else
 	{
-	
+
 #endif
         switch(ss_cnf->ussd_info.error)
         {
@@ -1745,11 +1745,11 @@
         TRACE_FUNCTION(" E_SS_USSD_CNF");
         switch(ss_cnf->ussd_info.error)
         {
-        
+
         case MFW_SS_NO_ERROR:
             TRACE_FUNCTION( "Handling USSD_CNF no error" );
 
-#ifdef FF_CPHS_REL4  
+#ifdef FF_CPHS_REL4
 	if(interrogate)
 	{
 	//	mfw_cphs_set_default_profile();
@@ -1771,14 +1771,14 @@
 	{
 #endif
 	showUSSDCNF(win, ss_cnf );
-#ifdef FF_CPHS_REL4  
+#ifdef FF_CPHS_REL4
 		}
 #endif
             break;
 
         default:
             TRACE_FUNCTION("ERROR in USSD_CNF");
-#ifdef FF_CPHS_REL4  
+#ifdef FF_CPHS_REL4
 	if(interrogate)
 	{
 		mfw_cphs_set_default_profile(1);
@@ -1792,7 +1792,7 @@
 		msp_register = FALSE;
 		TRACE_EVENT("msp profile id registeration failed");
 	}
-#endif				
+#endif
             		showError(win, (T_MFW_SS_ERROR)ss_cnf->ussd_info.error);
             break;
         }
@@ -1826,12 +1826,12 @@
 
  $Function:    	srv_check_CF_telephony_status
 
- $Description:	
-            
- $Returns:		
-
- $Arguments:	
- 
+ $Description:
+
+ $Returns:
+
+ $Arguments:
+
 *******************************************************************************/
 
 /*
@@ -1959,7 +1959,7 @@
 						ss_data.cfu_services = 0;
 					break;
 				}
-				
+
 			}
 		}
 		else if ((in_list->ss_category == SS_REGISTRATION) ||
@@ -1989,18 +1989,18 @@
 
  $Description:	copies only the interesting parts of the call forwarding
             feature list.
-            
- $Returns:		
-
- $Arguments:	
- 
+
+ $Returns:
+
+ $Arguments:
+
 *******************************************************************************/
 
 static UBYTE srv_copy_feature_list_cf (T_ss_feature_cf * out_list, T_MFW_SS_CF_CNF * in_list)
 {
   UBYTE found_entries = 0;
   UBYTE i, j;
- 
+
   TRACE_EVENT_P1("ss_feature_count %d",in_list->ss_feature_count);
 
   if (in_list->ss_feature_count == 0)
@@ -2008,12 +2008,12 @@
 
   for (i=0;i<in_list->ss_feature_count;i++)
   {	//MC got rid of pointer arithmetic
-  	
+
       T_MFW_FEATURE * pFeature = &in_list->ss_feature_list[i]; //SPR#1081 - DS - Removed mem allocation. Uses assignment instead.
 	T_ss_feature_cf_data * cf_data = &out_list->ss[found_entries];
     	UBYTE srvFound;
-    
-	TRACE_EVENT_P2("Telecom type:%d, service: %d ",pFeature->ss_telecom_type, pFeature->ss_telecom_service);		
+
+	TRACE_EVENT_P2("Telecom type:%d, service: %d ",pFeature->ss_telecom_type, pFeature->ss_telecom_service);
     /*
      * first check teleservice
      */
@@ -2034,7 +2034,7 @@
 	{
 		if (cf_data->service == out_list->ss[j].service)
 			srvFound = TRUE;
-	}		
+	}
 
 	if (!srvFound)
 	{
@@ -2047,31 +2047,31 @@
 			if (pFeature->ss_status & SS_STAT_ACTIVE)
 			{
 				iconsSetState(iconIdCallFor);
-//  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;
 			}
 	        /* Marcus: Issue 1652: 03/02/2003: Start */
 	        else if (pFeature->ss_status & SS_STAT_PROVISIONED)
 			{
 				iconsSetState(iconIdCallFor);
-//  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;
 		        }
 	        /* Marcus: Issue 1652: 03/02/2003: End */
 	        else
 		        {
 	            iconsDeleteState(iconIdCallFor);
-//  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=FALSE;
 		        }
-//  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();
-			
-		}			
+
+		}
 
 	      /*
 	       * third set forwarded to number
@@ -2111,11 +2111,11 @@
  $Function:    	srv_get_forwarded_to_number
 
  $Description:	sets the forwarded to number if available.
-            
- $Returns:		
-
- $Arguments:	
- 
+
+ $Returns:
+
+ $Arguments:
+
 *******************************************************************************/
 
 
@@ -2136,16 +2136,16 @@
  $Function:    	srv_get_service_type
 
  $Description:	checks if the service is interesting or not.
-            
- $Returns:		
-
- $Arguments:	
+
+ $Returns:
+
+ $Arguments:
 
  $History:
 
  //SPR#0776 - DS - Added default value for textId. Changed references from TxtNotImplemented
  				    to TxtNull.
- 
+
 *******************************************************************************/
 
 
@@ -2176,7 +2176,7 @@
         case MFW_TS_PLMN1: /*MC, this is returned for auxiliary telephony status, 742*/
           *textId = TxtVoice;
           return TRUE;
-	 
+
 	 case MFW_TS_ALL_SMS:
 	 case MFW_TS_SMS_MO:
 	 case MFW_TS_SMS_MT:
@@ -2241,12 +2241,12 @@
 
  $Function:    	srv_get_status
 
- $Description:	
-            
- $Returns:		
-
- $Arguments:	
- 
+ $Description:
+
+ $Returns:
+
+ $Arguments:
+
 *******************************************************************************/
 
 
@@ -2269,11 +2269,11 @@
 
  $Description:	 copies only the interesting parts of the call waiting
             service list.
-            
- $Returns:		
-
- $Arguments:	
- 
+
+ $Returns:
+
+ $Arguments:
+
 *******************************************************************************/
 
 static UBYTE srv_copy_feature_list_cw (T_ss_feature_cw * out_list, T_MFW_SS_CW_CNF * in_list)
@@ -2309,7 +2309,7 @@
 	{
 		if (cw_data->service == out_list->ss[j].service)
 			srvFound = TRUE;
-	}		
+	}
 
 	if (!srvFound)
 	{
@@ -2332,12 +2332,12 @@
 
  $Function:    	srv_copy_feature_list_cb
 
- $Description:	
-            
- $Returns:		
-
- $Arguments:	
- 
+ $Description:
+
+ $Returns:
+
+ $Arguments:
+
 *******************************************************************************/
 
 static UBYTE srv_copy_feature_list_cb (T_ss_feature_cb * out_list, T_MFW_SS_CB_CNF * in_list)
@@ -2397,7 +2397,7 @@
 	{
 		if (cb_data->service == out_list->ss[j].service)
 			srvFound = TRUE;
-	}		
+	}
 
 	if (!srvFound)
 		found_entries++;
@@ -2417,11 +2417,11 @@
  $Function:    	services_info_cb
 
  $Description:	Callback function from information dialog.
-            
- $Returns:		
-
- $Arguments:	
- 
+
+ $Returns:
+
+ $Arguments:
+
 *******************************************************************************/
 
 
@@ -2435,7 +2435,7 @@
 
      //Feb 17, 2005   REF : CRR 17657 x0012850 Divya.P.V
      //Bug : Unable to compose a one or two digit number
-     //Fix : This bug is reproducible when a very long message is sent by the service provider when an invalid one or two digit number is dialled. 
+     //Fix : This bug is reproducible when a very long message is sent by the service provider when an invalid one or two digit number is dialled.
      //The read only editor with the service provider message that comes up when a one or two digit is dialled
      //was not handled properly. So altered the editor handling to cater for the long message.
     T_MFW_WIN 	*win_data;
@@ -2447,15 +2447,15 @@
 
     //Feb 17, 2005   REF : CRR 17657 x0012850 Divya.P.V
     //Bug : Unable to compose a one or two digit number
-    //Fix : This bug is reproducible when a very long message is sent by the service provider when an invalid one or two digit number is dialled. 
+    //Fix : This bug is reproducible when a very long message is sent by the service provider when an invalid one or two digit number is dialled.
     //The read only editor with the service provider message that comes up when a one or two digit is dialled
-    //was not handled properly. So altered the editor handling to cater for the long message.	
+    //was not handled properly. So altered the editor handling to cater for the long message.
     if(win)
     {
          win_data   = ((T_MFW_HDR *)win)->data;
          if(win_data)
 	      data         = (T_ss * )win_data->user;
-     }  
+     }
 
   /*
    * Who has initiated the information screen
@@ -2507,11 +2507,11 @@
 		        AUI_edit_Destroy(data->info_win);
 		        data->info_win=NULL;
 		    }
-	     }			  
+	     }
             services_destroy(win);
           break;
       }
-	// May 12, 2005 REF: CRR 30892  x0021334	
+	// May 12, 2005 REF: CRR 30892  x0021334
 	// Set ss_data.info_win to NULL to pass the check in services_ss_cb() for notification
       ss_data.info_win = NULL;
       break;
@@ -2525,7 +2525,7 @@
        {
        	win_data = ((T_MFW_HDR *)win)->data;
         	data     = (T_ss *)win_data->user;
-	
+
 
         switch (reason)
         {
@@ -2554,20 +2554,20 @@
                 data->current_feature++;
               else
               	data->current_feature = 0;
-              
+
               showCBStatus (win, data);
 		//Jun 04,2004 CRR:13601 xpradipg - SASKEN
 		//Restart the timer if the key was pressed. We handle only right key since left key destroys
 		//the information dialog
 	       InfoDialogTimRestart(win);
             }
-	
+
             break;
 
           default:
             break;
         }
-	// May 12, 2005 REF: CRR 30892  x0021334	
+	// May 12, 2005 REF: CRR 30892  x0021334
 	// Set ss_data.info_win to NULL to pass the check in services_ss_cb() for notification
 	 ss_data.info_win = NULL;
 	}
@@ -2583,7 +2583,7 @@
 	{
 		win_data = ((T_MFW_HDR *)win)->data;
         	data     = (T_ss *)win_data->user;
-	
+
 
         switch (reason)
         {
@@ -2610,21 +2610,21 @@
                 data->current_feature++;
               else
               	data->current_feature = 0;
-              
+
               showCWStatus (win, data);
 		//Jun 04,2004 CRR:13601 xpradipg - SASKEN
 		//Restart the timer if the key was pressed. We handle only right key since left key destroys
 		//the information dialog
 		 InfoDialogTimRestart(win);
-		
+
             }
             break;
 
           default:
             break;
         }
-	// May 12, 2005 REF: CRR 30892  x0021334	
-	// Set ss_data.info_win to NULL to pass the check in services_ss_cb() for notification	
+	// May 12, 2005 REF: CRR 30892  x0021334
+	// Set ss_data.info_win to NULL to pass the check in services_ss_cb() for notification
 	 ss_data.info_win = NULL;
       }
 	}
@@ -2638,7 +2638,7 @@
 	 {
 		win_data = ((T_MFW_HDR *)win)->data;
         	data     = (T_ss *)win_data->user;
-	 
+
 
         switch (reason)
         {
@@ -2665,7 +2665,7 @@
                 data->current_feature++;
               else
               	data->current_feature = 0;
-              
+
               showCFStatus (win, data);
 		//Jun 04,2004 CRR:13601 xpradipg - SASKEN
 		//Restart the timer if the key was pressed. We handle only right key since left key destroys
@@ -2677,7 +2677,7 @@
           default:
             break;
         }
-	// May 12, 2005 REF: CRR 30892  x0021334	
+	// May 12, 2005 REF: CRR 30892  x0021334
 	// Set ss_data.info_win to NULL to pass the check in services_ss_cb() for notification
 	 ss_data.info_win = NULL;
 	}
@@ -2694,7 +2694,7 @@
 		{
 			dlg_initDisplayData_TextId(&display_info,  NULL, NULL, TxtCancelled, TxtNull, COLOUR_STATUS);
 			dlg_initDisplayData_events(&display_info, (T_VOID_FUNC)NULL, THREE_SECS, KEY_LEFT | KEY_RIGHT);
-			info_dialog (NULL, &display_info);	
+			info_dialog (NULL, &display_info);
 		}
 		else
 		{
@@ -2718,8 +2718,8 @@
         default:
             break;
       }
-	// May 12, 2005 REF: CRR 30892  x0021334	
-	// Set ss_data.info_win to NULL to pass the check in services_ss_cb() for notification	
+	// May 12, 2005 REF: CRR 30892  x0021334
+	// Set ss_data.info_win to NULL to pass the check in services_ss_cb() for notification
 	ss_data.info_win = NULL;
       break;
 
@@ -2745,18 +2745,18 @@
 
  $Function:    	servicesNumbers
 
- $Description:	
-            
- $Returns:		
-
- $Arguments:	
- 
+ $Description:
+
+ $Returns:
+
+ $Arguments:
+
 *******************************************************************************/
 
 
 int servicesNumbers(MfwMnu* m, MfwMnuItem* i){
     CFAction = CFActivate;
-	servicesDoOtherNumber();	
+	servicesDoOtherNumber();
 
 	// ADDED BY RAVI - 28-11-2005
 	return 1;
@@ -2768,12 +2768,12 @@
 
  $Function:    	servicesInfraRed
 
- $Description:	
-            
- $Returns:		
-
- $Arguments:	
- 
+ $Description:
+
+ $Returns:
+
+ $Arguments:
+
 *******************************************************************************/
 
 
@@ -2784,12 +2784,12 @@
 
  $Function:    	servicesExec
 
- $Description:	
-            
- $Returns:		
-
- $Arguments:	
- 
+ $Description:
+
+ $Returns:
+
+ $Arguments:
+
 *******************************************************************************/
 
 void servicesExec (int reason, MmiState next)
@@ -2901,13 +2901,13 @@
 
  $Function:    	showUSSDError
 
- $Description:	This function displays a dialog saying USSD message received, Font not supported 
+ $Description:	This function displays a dialog saying USSD message received, Font not supported
  			for UCS2 characters
-            
- $Returns:		
-
- $Arguments:	
- 
+
+ $Returns:
+
+ $Arguments:
+
 *******************************************************************************/
 
 //x0pleela 24 Aug, 2004  DR: OMAPS00083503
@@ -2918,7 +2918,7 @@
     T_DISPLAY_DATA   display_info;
 
     TRACE_FUNCTION("showUSSDError");
-	
+
 
 	dlg_initDisplayData_TextId( &display_info, TxtSoftOK, TxtNull, TxtUSSDMsgRxd,  TxtFontNotSupported, COLOUR_STATUS);
 	dlg_initDisplayData_events( &display_info, (T_VOID_FUNC)services_info_cb, FOREVER, KEY_HUP| KEY_LEFT );
@@ -2937,12 +2937,12 @@
 
  $Function:    	showWait
 
- $Description:	
-            
- $Returns:		
-
- $Arguments:	
- 
+ $Description:
+
+ $Returns:
+
+ $Arguments:
+
 *******************************************************************************/
 
 static void showWait (T_MFW_HND win)
@@ -2968,12 +2968,12 @@
 
  $Function:    	showOk
 
- $Description:	
-            
- $Returns:		
-
- $Arguments:	
- 
+ $Description:
+
+ $Returns:
+
+ $Arguments:
+
 *******************************************************************************/
 
 static void showOk (T_MFW_HND win)
@@ -2997,12 +2997,12 @@
 
  $Function:    	showFailed
 
- $Description:	
-            
- $Returns:		
-
- $Arguments:	
- 
+ $Description:
+
+ $Returns:
+
+ $Arguments:
+
 *******************************************************************************/
 
 static void showFailed (T_MFW_HND win)
@@ -3024,12 +3024,12 @@
 
  $Function:    	showError
 
- $Description:	
-            
- $Returns:		
-
- $Arguments:	
- 
+ $Description:
+
+ $Returns:
+
+ $Arguments:
+
 *******************************************************************************/
 
 static void showError (T_MFW_HND win, T_MFW_SS_ERROR ss_error)
@@ -3058,11 +3058,11 @@
 
  $Description:	Show result from E_SS_NOTIFY being returned. Short ss-related
             notification window.
-            
- $Returns:		
-
- $Arguments:	
- 
+
+ $Returns:
+
+ $Arguments:
+
 *******************************************************************************/
 
 static void showSSNotify (T_MFW_HND win, T_MFW_SS_NOTIFY  * ss_notify)
@@ -3086,29 +3086,29 @@
                   Description : CPHS Call Forwarding feature implementation
                   Solution     : As part of the implemention, cphs_set_divert_status() is called whenever the network notifies
                                     about unconditional forward*/
-                                    
+
 			#ifdef FF_CPHS
 					switch (CFService)
 					{
-						case (CFVoice):	
+						case (CFVoice):
 						    /*MC SPR 742, handle line 2, auxiliary telephony*/
 							    /*MC SPR 742, handle line 2, auxiliary telephony*/
 								#ifdef FF_CPHS_REL4
 								if(isCFISFilePresent() )
 									{	/*call_forwarding_status_rel4.voice updated*/
-										if(call_forwarding_status_rel4.voice != MFW_CFLAG_SET || 
+										if(call_forwarding_status_rel4.voice != MFW_CFLAG_SET ||
 											memcmp(call_forwarding_status_rel4.voice_dialling_number,ss_data.edt_buf_number,PHB_MAX_LEN)!=0)
 											{
 												call_forwarding_status_rel4.voice=MFW_CFLAG_SET;
 												memcpy(call_forwarding_status_rel4.voice_dialling_number,ss_data.edt_buf_number,PHB_MAX_LEN);
-												cphs_rel4_set_divert_status(	call_forwarding_status_rel4.voice, 
+												cphs_rel4_set_divert_status(	call_forwarding_status_rel4.voice,
 																			call_forwarding_status_rel4.fax,
 																			call_forwarding_status_rel4.data,
-																			call_forwarding_status_rel4.voice_dialling_number);									
+																			call_forwarding_status_rel4.voice_dialling_number);
 											}
 										break;
 									}
-								
+
 								#endif
 		    				case CFAuxVoice:
 
@@ -3116,10 +3116,10 @@
 								{
 								/*30th May,2006     OMAPS00079650     a0393213 (R.Prabakar)
 								   check to find whether we are doing unnecessary sim write*/
-								if(GetCphsDivertStatus(MFW_SERV_LINE2)!=MFW_CFLAG_SET)  
+								if(GetCphsDivertStatus(MFW_SERV_LINE2)!=MFW_CFLAG_SET)
 									cphs_set_divert_status(MFW_CFLAG_NotPresent, MFW_CFLAG_SET, MFW_CFLAG_NotPresent, MFW_CFLAG_NotPresent);
 								}
-						
+
 							else
 								{
 								if(GetCphsDivertStatus(MFW_SERV_LINE1)!=MFW_CFLAG_SET)
@@ -3142,10 +3142,10 @@
 										if(call_forwarding_status_rel4.data!= MFW_CFLAG_SET)
 											{
 												call_forwarding_status_rel4.data=MFW_CFLAG_SET;
-												cphs_rel4_set_divert_status(	call_forwarding_status_rel4.voice, 
+												cphs_rel4_set_divert_status(	call_forwarding_status_rel4.voice,
 																			call_forwarding_status_rel4.fax,
 																			call_forwarding_status_rel4.data,
-																			call_forwarding_status_rel4.voice_dialling_number);									
+																			call_forwarding_status_rel4.voice_dialling_number);
 											}
 								}
 							#endif
@@ -3165,10 +3165,10 @@
 										if(call_forwarding_status_rel4.fax!= MFW_CFLAG_SET)
 											{
 												call_forwarding_status_rel4.fax=MFW_CFLAG_SET;
-												cphs_rel4_set_divert_status(	call_forwarding_status_rel4.voice, 
+												cphs_rel4_set_divert_status(	call_forwarding_status_rel4.voice,
 																			call_forwarding_status_rel4.fax,
 																			call_forwarding_status_rel4.data,
-																			call_forwarding_status_rel4.voice_dialling_number);									
+																			call_forwarding_status_rel4.voice_dialling_number);
 											}
 								}
 							#endif
@@ -3181,14 +3181,14 @@
 							#endif
 							if (GetAlsLine() == MFW_SERV_LINE2)
 								{
-								if(GetCphsDivertStatus(MFW_SERV_LINE2)!=MFW_CFLAG_SET || 
+								if(GetCphsDivertStatus(MFW_SERV_LINE2)!=MFW_CFLAG_SET ||
 								   GetCphsDivertStatus(MFW_SERV_DATA)!=MFW_CFLAG_SET ||
 								   GetCphsDivertStatus(MFW_SERV_FAX)!=MFW_CFLAG_SET)
 									cphs_set_divert_status(MFW_CFLAG_NotPresent,MFW_CFLAG_SET,MFW_CFLAG_SET,MFW_CFLAG_SET);
 								}
 							else
 								{
-								if(GetCphsDivertStatus(MFW_SERV_LINE1)!=MFW_CFLAG_SET || 
+								if(GetCphsDivertStatus(MFW_SERV_LINE1)!=MFW_CFLAG_SET ||
 								   GetCphsDivertStatus(MFW_SERV_DATA)!=MFW_CFLAG_SET ||
 								   GetCphsDivertStatus(MFW_SERV_FAX)!=MFW_CFLAG_SET)
 									cphs_set_divert_status(MFW_CFLAG_SET,MFW_CFLAG_NotPresent,MFW_CFLAG_SET,MFW_CFLAG_SET);
@@ -3199,19 +3199,19 @@
 							else
 								{
 										if(call_forwarding_status_rel4.voice!= MFW_CFLAG_SET ||
-										   call_forwarding_status_rel4.fax!= MFW_CFLAG_SET ||		
-										   call_forwarding_status_rel4.data!= MFW_CFLAG_SET  || 
+										   call_forwarding_status_rel4.fax!= MFW_CFLAG_SET ||
+										   call_forwarding_status_rel4.data!= MFW_CFLAG_SET  ||
 											memcmp(call_forwarding_status_rel4.voice_dialling_number,ss_data.edt_buf_number,PHB_MAX_LEN)!=0)
 											{
 												call_forwarding_status_rel4.voice= MFW_CFLAG_SET;
-										  	 	call_forwarding_status_rel4.fax= MFW_CFLAG_SET;		
+										  	 	call_forwarding_status_rel4.fax= MFW_CFLAG_SET;
 										   		call_forwarding_status_rel4.data= MFW_CFLAG_SET;
 												memcpy(call_forwarding_status_rel4.voice_dialling_number,ss_data.edt_buf_number,PHB_MAX_LEN);
-										
-												cphs_rel4_set_divert_status(	call_forwarding_status_rel4.voice, 
+
+												cphs_rel4_set_divert_status(	call_forwarding_status_rel4.voice,
 																			call_forwarding_status_rel4.fax,
 																			call_forwarding_status_rel4.data,
-																			call_forwarding_status_rel4.voice_dialling_number);									
+																			call_forwarding_status_rel4.voice_dialling_number);
 											}
 								}
 							#endif
@@ -3220,13 +3220,13 @@
 
 			#else
 				 iconsSetState(iconIdCallFor);
-		//  Jun 23, 2004        REF: CRR MMI-SPR-13599  Rashmi C N(Sasken) 
-		//              Storing the Current state of CF in Flash						
+		//  Jun 23, 2004        REF: CRR MMI-SPR-13599  Rashmi C N(Sasken)
+		//              Storing the Current state of CF in Flash
 					FFS_flashData.CFState=TRUE;
 					 flash_write();
 			 #endif
     		}
-		 
+
 								/* Activate the CFU icon */
 		/* break; */ /***** NO BREAK ******/
 	case MFW_SS_MO_conFORWARD:		/* Conditional CF active */
@@ -3243,18 +3243,18 @@
     		if (call_tty_get())
 	   		call_data.inc_call_data.TextId   = TxtFwdIncomingTTYCall;
 		else
-			call_data.inc_call_data.TextId       = TxtFwdIncomingCall;	
+			call_data.inc_call_data.TextId       = TxtFwdIncomingCall;
 #else  /* MMI_TTY_ENABLED */
 	call_data.inc_call_data.TextId  = TxtFwdIncomingCall;
-#endif /* MMI_TTY_ENABLED */			
+#endif /* MMI_TTY_ENABLED */
 
 	//if incoming call window is not NULL, then destroy the same
  	if( call_data.win_incoming != NULL )
 		dialog_info_destroy(call_data.win_incoming);
-	
+
 	//call the incoming call dialog with new strings based on call forward condition
 	 call_data.win_incoming = info_dialog (call_data.win, &call_data.inc_call_data);
-	 
+
 		break;
 
 	//x0pleela 22 Feb, 2007  ER: OMAPS00113891
@@ -3300,7 +3300,7 @@
 		dlg_initDisplayData_TextId( &display_info, TxtSoftOK, TxtNull, TxtId1,  TxtId2, COLOUR_STATUS);
 		dlg_initDisplayData_events( &display_info, (T_VOID_FUNC)services_info_cb, THREE_SECS, KEY_CLEAR| KEY_LEFT );
         display_info.Identifier   = E_SS_NOTIFY;
-        
+
           /*
            * Call Info Screen
            */
@@ -3314,11 +3314,11 @@
  $Function:    	srv_display_status
 
  $Description:	Indicate a sensefull response to the user if only the .
-            
- $Returns:		
-
- $Arguments:	
- 
+
+ $Returns:
+
+ $Arguments:
+
 *******************************************************************************/
 
 
@@ -3356,11 +3356,11 @@
  $Description:	Indicate a sensefull response to the user if an
             activation / deactivation or interrogation leads to an
             empty list.
-            
- $Returns:		
-
- $Arguments:	
- 
+
+ $Returns:
+
+ $Arguments:
+
 *******************************************************************************/
 
 
@@ -3376,11 +3376,11 @@
   	case E_SS_CB_CNF:
 	  	TxtId1 = TxtCallBarringAll;
 		break;
-		
+
   	case E_SS_CW_CNF:
 	  	TxtId1 = TxtCallWaiting;
 		break;
-		
+
   	case E_SS_CF_CNF:
 	  	TxtId1 = TxtCallDivert;
 		break;
@@ -3434,20 +3434,20 @@
   if (TxtId2 != TxtNull )
   {
 	/*CQ10690 - API - 23/06/03 - Set the icon state to show on this return */
-  	if ( (TxtId2 == TxtActivated) && 
+  	if ( (TxtId2 == TxtActivated) &&
   	( (ss_code == SS_CF_CFU) || (ss_code == SS_CF_ALL) ) )
   	{
       		iconsSetState(iconIdCallFor);
-//  Jun 23, 2004        REF: CRR MMI-SPR-13599  Rashmi C N(Sasken) 
-//              Storing the Current state of CF in Flash						
+//  Jun 23, 2004        REF: CRR MMI-SPR-13599  Rashmi C N(Sasken)
+//              Storing the Current state of CF in Flash
 		FFS_flashData.CFState=TRUE;
 		 flash_write();
   	}
 	/*CQ10690 - END*/
 	if(event==E_SS_CF_CNF)
 	{
-//    Jun 10, 2004        REF: CRR MMI-SPR-13614  Rashmi C N(Sasken) 
-//	We are now passing the type of CF as the first stringID for the dialog info screen 
+//    Jun 10, 2004        REF: CRR MMI-SPR-13614  Rashmi C N(Sasken)
+//	We are now passing the type of CF as the first stringID for the dialog info screen
 // serviceGetType(ss_Code) this function would return the string id for the ss_code being passed
 
 	dlg_initDisplayData_TextId( &display_info, TxtSoftOK, TxtNull, serviceGetType((T_MFW_SS_CODES)ss_code),  TxtId2, COLOUR_STATUS);
@@ -3475,11 +3475,11 @@
  $Function:    showCWState
 
  $Description:	display CW state
-            
- $Returns:		
-
- $Arguments:	
- 
+
+ $Returns:
+
+ $Arguments:
+
 *******************************************************************************/
 
 
@@ -3509,7 +3509,7 @@
 	  dlg_initDisplayData_events( &display_info, (T_VOID_FUNC)services_info_cb, FIVE_SECS, KEY_CLEAR| KEY_LEFT | KEY_RIGHT );
   }
 
-  display_info.Identifier   = E_SS_CW_CNF; 
+  display_info.Identifier   = E_SS_CW_CNF;
 
   /*
    * Call Info Screen
@@ -3525,14 +3525,14 @@
 
 /*******************************************************************************
 
- $Function:    	showCLIStatus 
-
- $Description:	
-            
- $Returns:		
-
- $Arguments:	
- 
+ $Function:    	showCLIStatus
+
+ $Description:
+
+ $Returns:
+
+ $Arguments:
+
 *******************************************************************************/
 
 
@@ -3566,19 +3566,19 @@
 							display_info.TextId2 = TxtActivated;
 							// No CLIR suppress or invoke
 							cm_mo_prefix(0x04);
-//  Apr 22, 2004        REF: CRR MMI-SPR-16873  Rashmi C N(Sasken) 
-//		Maintaing the CLIR status in the flash. 
+//  Apr 22, 2004        REF: CRR MMI-SPR-16873  Rashmi C N(Sasken)
+//		Maintaing the CLIR status in the flash.
 							FFS_flashData.CLIR=TRUE;
   							flash_write();
-							break;						
+							break;
 						// Deactivate CLIR, so activate the sending of caller id
 						case CFDeactivate:
 							// By defaut the caller id is not sent
 							display_info.TextId2 = TxtDeActivated;
 							// CLIR suppress needed
 							cm_mo_prefix(0x08);
-//  Apr 22, 2004        REF: CRR MMI-SPR-16873  Rashmi C N(Sasken) 
-//		Maintaing the CLIR status in the flash. 
+//  Apr 22, 2004        REF: CRR MMI-SPR-16873  Rashmi C N(Sasken)
+//		Maintaing the CLIR status in the flash.
 							FFS_flashData.CLIR=FALSE;
   							flash_write();
 							break;
@@ -3591,7 +3591,7 @@
 							else
 								display_info.TextId2 = TxtActivated;*/
 							// Check if CLIR suppress is activated: caller id sent
-//  Apr 22, 2004        REF: CRR MMI-SPR-16873  Rashmi C N(Sasken) 
+//  Apr 22, 2004        REF: CRR MMI-SPR-16873  Rashmi C N(Sasken)
 //		Using the CLIR status maintained in the flash, when the status is checked
 							if (!FFS_flashData.CLIR)
 							{
@@ -3602,7 +3602,7 @@
 							{
 								display_info.TextId2 = TxtActivated;
 							}
-								
+
 							break;
 					}
 					break;
@@ -3616,8 +3616,8 @@
 							display_info.TextId2 =TxtActivated;
 							// CLIR invoke needed
 							cm_mo_prefix(0x0c);
-//  Apr 22, 2004        REF: CRR MMI-SPR-16873  Rashmi C N(Sasken) 
-//		Maintaing the CLIR status in the flash. 
+//  Apr 22, 2004        REF: CRR MMI-SPR-16873  Rashmi C N(Sasken)
+//		Maintaing the CLIR status in the flash.
 							FFS_flashData.CLIR=TRUE;
   							flash_write();
 							break;
@@ -3627,8 +3627,8 @@
 							display_info.TextId2 = TxtDeActivated;
 							// No CLIR suppress or invoke
 							cm_mo_prefix(0x04);
-//  Apr 22, 2004        REF: CRR MMI-SPR-16873  Rashmi C N(Sasken) 
-//		Maintaing the CLIR status in the flash. 
+//  Apr 22, 2004        REF: CRR MMI-SPR-16873  Rashmi C N(Sasken)
+//		Maintaing the CLIR status in the flash.
 							FFS_flashData.CLIR=FALSE;
  	 						flash_write();
 							break;
@@ -3641,7 +3641,7 @@
 							else
 								display_info.TextId2 = TxtDeActivated;*/
 							// Check if CLIR invoke is activated: caller id not sent
-//  Apr 22, 2004        REF: CRR MMI-SPR-16873  Rashmi C N(Sasken) 
+//  Apr 22, 2004        REF: CRR MMI-SPR-16873  Rashmi C N(Sasken)
 //		Using the CLIR status maintained in the flash, when the status is checked
 							if (FFS_flashData.CLIR)
 							{
@@ -3652,7 +3652,7 @@
 							{
 								display_info.TextId2 = TxtDeActivated;
 					}
-								
+
 					}
 					break;
 				case MFW_CL_PERM:
@@ -3662,13 +3662,13 @@
 				case MFW_CL_UNKNOWN:
 				default:
 					// The CLIR is active and permanent the caller id is not sent
-//  Apr 22, 2004        REF: CRR MMI-SPR-16873  Rashmi C N(Sasken) 
-//		Maintaing the CLIR status in the flash. 
+//  Apr 22, 2004        REF: CRR MMI-SPR-16873  Rashmi C N(Sasken)
+//		Maintaing the CLIR status in the flash.
 					FFS_flashData.CLIR=TRUE;
 					flash_write();
 					display_info.TextId2 = TxtActivated;
 					break;
-			}			
+			}
 		}
 		// CLIR service is not activated: The caller id is sent
 	else
@@ -3687,8 +3687,8 @@
 				break;
 		}
 		// No CLIR suppress or invoke
-//  Apr 22, 2004        REF: CRR MMI-SPR-16873  Rashmi C N(Sasken) 
-//		Maintaing the CLIR status in the flash. 
+//  Apr 22, 2004        REF: CRR MMI-SPR-16873  Rashmi C N(Sasken)
+//		Maintaing the CLIR status in the flash.
 		FFS_flashData.CLIR=FALSE;
 		flash_write();
 		cm_mo_prefix(0x04);
@@ -3703,14 +3703,14 @@
 #ifndef FF_MMI_ATC_MIGRATION   /* x0039928 -Lint warning fix */
 /*******************************************************************************
 
- $Function:    	showIMEI2 
-
- $Description:	
-            
- $Returns:		
-
- $Arguments:	
- 
+ $Function:    	showIMEI2
+
+ $Description:
+
+ $Returns:
+
+ $Arguments:
+
 *******************************************************************************/
 
 static void showIMEI2 (T_MFW_HND win, T_MFW_SS_PARA  * ss_cnf)
@@ -3723,7 +3723,7 @@
 #endif
     static char imei_array[IMEI_LEN+1];
     //GW IMEI number is 26 chars long!
-	memset(imei_array,0x00,IMEI_LEN+1);   
+	memset(imei_array,0x00,IMEI_LEN+1);
     memcpy(imei_array, ss_cnf->imei_info.imei_number, IMEI_LEN);
 
 	dlg_initDisplayData_TextId( &display_info, TxtSoftOK, TxtNull,TxtIMEI, TxtNull , COLOUR_STATUS);
@@ -3739,16 +3739,16 @@
 
 /*******************************************************************************
 
- $Function:    	showUSSDInfo 
+ $Function:    	showUSSDInfo
 
  $Description:	this is used for both USSD types (confirm and request).
  				The USSD request is keep going after "showUSSDInfo"
  				function and open the editor to enter the string.
 
- $Returns:		
-
- $Arguments:	
- 
+ $Returns:
+
+ $Arguments:
+
 *******************************************************************************/
 
 
@@ -3767,12 +3767,12 @@
 	ss_data.dcs = ss_cnf->ussd_info.dcs;
 
 	/* SPR#1428 - SH - New Editor changes */
-	
+
 #ifdef NEW_EDITOR
 	AUI_edit_SetDefault(&editor_data);
 	AUI_edit_SetDisplay(&editor_data, ZONE_FULL_SK_TITLE, COLOUR_EDITOR_XX, EDITOR_FONT);
 	AUI_edit_SetMode(&editor_data, ED_MODE_READONLY, ED_CURSOR_NONE);
-	
+
 	//x0pleela 29 Aug, 2006  DR: OMAPS00083503
 	//Dynamically changing the dcs value in editor settings
 	if( ss_getAlphabetCb ( ss_data.dcs EQ SS_ALPHA_16_Bit) )
@@ -3800,7 +3800,7 @@
 	editor_data.editor_attr.mode    = edtCurNone;
 	editor_data.editor_attr.controls   = 0;
 
-	editor_data.hide			    = FALSE;		    
+	editor_data.hide			    = FALSE;
 	editor_data.editor_attr.text	= (char*)ss_cnf->ussd_info.ussd;
 	editor_data.editor_attr.size	= sizeof(ss_cnf->ussd_info.ussd);
 
@@ -3826,7 +3826,7 @@
 	editor_data.destroyEditor	    = TRUE;
 
 	/* create the dialog handler */
-	editor_start(ss_data.win, &editor_data);  /* start the editor */ 
+	editor_start(ss_data.win, &editor_data);  /* start the editor */
 #endif /* NEW_EDITOR */
 
 }
@@ -3837,11 +3837,11 @@
  $Function:    	 showUSSDREQ
 
  $Description:	show USSD info from Request, and then allow user to enter a response.
-            
- $Returns:		
-
- $Arguments:	
- 
+
+ $Returns:
+
+ $Arguments:
+
 *******************************************************************************/
 
 
@@ -3859,11 +3859,11 @@
  $Function:    	 showUSSDCNF
 
  $Description:	display USSD message
-            
- $Returns:		
-
- $Arguments:	
- 
+
+ $Returns:
+
+ $Arguments:
+
 *******************************************************************************/
 
 
@@ -3871,7 +3871,7 @@
 {
 
     T_DISPLAY_DATA   display_info;
-    int nPixels = 0; 
+    int nPixels = 0;
     int nchar = 0;
 
     //Feb 17, 2005   REF : CRR 17657 x0012850 Divya.P.V
@@ -3881,7 +3881,7 @@
     //was not handled properly. So altered the editor handling to cater for the long message.
     T_MFW_WIN 	 *win_data;
     T_ss 	               *data = NULL;
-    T_AUI_EDITOR_DATA 		display_editor_info;	
+    T_AUI_EDITOR_DATA 		display_editor_info;
 
     TRACE_FUNCTION("showUSSDCNF");
 	/* API - 09-07-03 - CQ10728 - Add this check to use either the editor or the bubble depending
@@ -3896,14 +3896,14 @@
     if(win)
     {
          win_data   = ((T_MFW_HDR *)win)->data;
-	  if(win_data)	
+	  if(win_data)
     	      data         = (T_ss * )win_data->user;
-    }	
-	
+    }
+
 	nchar = strlen((char *)ss_cnf->ussd_info.ussd);
 	nPixels = dspl_GetTextExtent( (char *)ss_cnf->ussd_info.ussd, nchar);
 	/* API - 27-08-03 - CQ10728 - END */
-	
+
     if (nPixels >= SCREEN_SIZE_X && (data != NULL))   /* x0039928 - Lint warning removal */
     {
 	    //Feb 17, 2005   REF : CRR 17657 x0012850 Divya.P.V
@@ -3922,7 +3922,7 @@
 	   AUI_edit_SetBuffer(&display_editor_info, ATB_DCS_ASCII, (UBYTE*)ss_cnf->ussd_info.ussd, (USHORT)ss_cnf->ussd_info.len);
 
 	   AUI_edit_SetTextStr(&display_editor_info, TxtNull, TxtSoftBack,TxtNull,NULL);
-	   AUI_edit_SetEvents(&display_editor_info, 0, FALSE, FOREVER, (T_AUI_EDIT_CB)services_info_cb);  
+	   AUI_edit_SetEvents(&display_editor_info, 0, FALSE, FOREVER, (T_AUI_EDIT_CB)services_info_cb);
           display_editor_info.Identifier = ServicesUSSD_CNF_OK;
 	   data->info_win = AUI_edit_Start(data->win, &display_editor_info);
     }
@@ -3955,11 +3955,11 @@
  $Function:    	 sendUSSD
 
  $Description:	Send USSD message
-            
- $Returns:		
-
- $Arguments:	
- 
+
+ $Returns:
+
+ $Arguments:
+
 *******************************************************************************/
 
 static void sendUSSD (T_MFW_SS_PARA *ussd_senddata)
@@ -3991,11 +3991,11 @@
  $Function:    	 showCFStatus
 
  $Description:	display CFU state
-            
- $Returns:		
-
- $Arguments:	
- 
+
+ $Returns:
+
+ $Arguments:
+
 *******************************************************************************/
 
 
@@ -4004,7 +4004,7 @@
   T_DISPLAY_DATA   display_info;
   T_ss_feature_cf_data * pFeature;
 	static char str[50];
-								
+
 
   TRACE_FUNCTION("showCFStatus");
 
@@ -4013,8 +4013,8 @@
 
   if (data->max_feature == 1)
   {
-//    Jun 10, 2004        REF: CRR MMI-SPR-13614  Rashmi C N(Sasken) 
-//	We are now passing the type of CF as the first stringID for the dialog info screen 
+//    Jun 10, 2004        REF: CRR MMI-SPR-13614  Rashmi C N(Sasken)
+//	We are now passing the type of CF as the first stringID for the dialog info screen
 // serviceGetType(ss_Code) this function would return the string id for the ss_code being passed
 	  dlg_initDisplayData_TextId( &display_info, TxtSoftOK, TxtNull, serviceGetType((T_MFW_SS_CODES)ss_Code),  TxtNull, COLOUR_STATUS);
 
@@ -4024,8 +4024,8 @@
   }
   else
   {
-//    Jun 10, 2004        REF: CRR MMI-SPR-13614  Rashmi C N(Sasken) 
- //	We are now passing the type of CF as the first stringID for the dialog info screen 
+//    Jun 10, 2004        REF: CRR MMI-SPR-13614  Rashmi C N(Sasken)
+ //	We are now passing the type of CF as the first stringID for the dialog info screen
  // serviceGetType(ss_Code) this function would return the string id for the ss_code being passed
 	  dlg_initDisplayData_TextId( &display_info, TxtSoftOK, TxtSoftNext, serviceGetType((T_MFW_SS_CODES)ss_Code),  TxtNull, COLOUR_STATUS);
 	//Jun 04,2004 CRR:13601 xpradipg - SASKEN
@@ -4038,10 +4038,10 @@
   //Only show the number when activating call diverts
   if (pFeature->status == TxtActivated)
   {
-//    Jun 10, 2004        REF: CRR MMI-SPR-13614  Rashmi C N(Sasken) 
+//    Jun 10, 2004        REF: CRR MMI-SPR-13614  Rashmi C N(Sasken)
 // When call forward is activated, the service(i.e voice, fax or data) and the number to which it is forwarded
-// is passed as the second string for the dialog display. Only two strings or string IDs can be given for a 
-//dialog info screen. Hence, we are adding the service and the number into one string.	  
+// is passed as the second string for the dialog display. Only two strings or string IDs can be given for a
+//dialog info screen. Hence, we are adding the service and the number into one string.
 	strcat(str,(char*)MmiRsrcGetText(pFeature->service));
 	strcat(str,"   ");
 	strcat(str,pFeature->forwarded_to_number);
@@ -4070,11 +4070,11 @@
  $Function:    	 showCBStatus
 
  $Description:	display CB state
-            
- $Returns:		
-
- $Arguments:	
- 
+
+ $Returns:
+
+ $Arguments:
+
 *******************************************************************************/
 
 
@@ -4122,16 +4122,16 @@
  $Function:    	 getCFAction
 
  $Description:	To return a string corresponding to call forwarding action.
-            
- $Returns:		
-
- $Arguments:	
- 
+
+ $Returns:
+
+ $Arguments:
+
 *******************************************************************************/
 
 
 static void getCFAction(char * pSSstring)
-{ 
+{
     switch (CFAction)
     {
     case CFActivate:
@@ -4146,7 +4146,7 @@
     default:
         break;
     }
-   
+
 }
 
 
@@ -4156,11 +4156,11 @@
 
  $Description:	To return a string corresponding to call forwarding type:
             CFU, CFNRy, CFU, etc.
-            
- $Returns:		
-
- $Arguments:	
- 
+
+ $Returns:
+
+ $Arguments:
+
 *******************************************************************************/
 
 
@@ -4198,18 +4198,18 @@
 
  $Function:    	 getCFNumber
 
- $Description:	
-            
- $Returns:		
-
- $Arguments:	
- 
+ $Description:
+
+ $Returns:
+
+ $Arguments:
+
 *******************************************************************************/
 
 static void getCFNumber(char * pSSstring)
 {
 
-    strcat(pSSstring, ss_data.edt_buf_number); 
+    strcat(pSSstring, ss_data.edt_buf_number);
 }
 
 
@@ -4218,12 +4218,12 @@
 
  $Function:    	 getCFService
 
- $Description:	
-            
- $Returns:		
-
- $Arguments:	
- 
+ $Description:
+
+ $Returns:
+
+ $Arguments:
+
 *******************************************************************************/
 
 
@@ -4237,7 +4237,7 @@
         break;
     /*MC SPR 742, handle line 2, auxiliary telephony*/
     case CFAuxVoice:
-		strcat(pSSstring, "*89"); 
+		strcat(pSSstring, "*89");
         break;
     case CFFax:
         strcat(pSSstring, "*13");
@@ -4257,17 +4257,17 @@
  $Function:    	 servicesSendCallDivert
 
  $Description:	Send out Call Divert String to MFW according to static variables.
-            
- $Returns:		
-
- $Arguments:	
- 
+
+ $Returns:
+
+ $Arguments:
+
 *******************************************************************************/
 
 
 
 static int servicesSendCallDivert( char * divert_number)
-{	
+{
     char SS_string[60] = {'\0'};
 
     /* build up SS string according to menu selections */
@@ -4283,8 +4283,8 @@
 	/* 30th May,2006     OMAPS00079650     a0393213 (R.Prabakar)
       Description : CPHS Call Forwarding feature implementation
       Solution     : previous code is deleted because it was setting CF flag in flash before getting network confirmation*/
-		
-	
+
+
     TRACE_FUNCTION(SS_string);
 
 	if (ss_execute_transaction((UBYTE*)SS_string, 0) == MFW_SS_FAIL)
@@ -4301,24 +4301,24 @@
  $Function:    	 servicesActivateCLIR
 
  $Description:	activate CLIR
-            
- $Returns:		
-
- $Arguments:	
- 
+
+ $Returns:
+
+ $Arguments:
+
 *******************************************************************************/
 
 int servicesActivateCLIR(MfwMnu* m, MfwMnuItem* i) {
 	char actstr[8];
 
 	CFAction = CFActivate;
-	strcpy(actstr, "#31#");  
+	strcpy(actstr, "#31#");
 
 	if (ss_execute_transaction((UBYTE*)actstr, 0) == MFW_SS_FAIL)
 		showFailed( ss_data.win );
 	else
 	{
-	strcpy(actstr, "*#31#");   
+	strcpy(actstr, "*#31#");
 
 	if (ss_execute_transaction((UBYTE*)actstr, 0) == MFW_SS_FAIL)
         showFailed( ss_data.win );
@@ -4334,11 +4334,11 @@
  $Function:    	 servicesSuppressCLIR
 
  $Description:	suppress CLIR
-            
- $Returns:		
-
- $Arguments:	
- 
+
+ $Returns:
+
+ $Arguments:
+
 *******************************************************************************/
 
 
@@ -4346,13 +4346,13 @@
 	char actstr[8];
 
 	CFAction = CFDeactivate;
-	strcpy(actstr, "*31#");    
+	strcpy(actstr, "*31#");
 
 	if (ss_execute_transaction((UBYTE*)actstr, 0) == MFW_SS_FAIL)
 		showFailed( ss_data.win );
 	else
 	{
-	strcpy(actstr, "*#31#");    
+	strcpy(actstr, "*#31#");
 
 	if (ss_execute_transaction((UBYTE*)actstr, 0) == MFW_SS_FAIL)
         showFailed( ss_data.win );
@@ -4365,12 +4365,12 @@
 
  $Function:    	 servicesCheckCLIR
 
- $Description:	
-            
- $Returns:		
-
- $Arguments:	
- 
+ $Description:
+
+ $Returns:
+
+ $Arguments:
+
 *******************************************************************************/
 
 
@@ -4393,12 +4393,12 @@
 
  $Function:    	 servicesCheckCWaiting
 
- $Description:	
-            
- $Returns:		
-
- $Arguments:	
- 
+ $Description:
+
+ $Returns:
+
+ $Arguments:
+
 *******************************************************************************/
 
 int servicesCheckCWaiting(MfwMnu* m, MfwMnuItem* i) {
@@ -4418,11 +4418,11 @@
  $Function:    	 servicesActivateCWaiting
 
  $Description:	activate CallWaiting functionality
-            
- $Returns:		
-
- $Arguments:	
- 
+
+ $Returns:
+
+ $Arguments:
+
 *******************************************************************************/
 
 
@@ -4445,11 +4445,11 @@
  $Function:    	 servicesDeactivateCWaiting
 
  $Description:	deactivate CallWaiting functionality
-            
- $Returns:		
-
- $Arguments:	
- 
+
+ $Returns:
+
+ $Arguments:
+
 *******************************************************************************/
 
 
@@ -4474,11 +4474,11 @@
  $Function:    	servicesInterCFU
 
  $Description:	Interrogate the CFU functionality
-            
- $Returns:		
-
- $Arguments:	
- 
+
+ $Returns:
+
+ $Arguments:
+
 *******************************************************************************/
 
 
@@ -4509,11 +4509,11 @@
  $Function:    	ServiceGetStatus
 
  $Description:	return the code for the MMI text string for the service status.
-            
- $Returns:		
-
- $Arguments:	
- 
+
+ $Returns:
+
+ $Arguments:
+
 *******************************************************************************/
 
 
@@ -4537,11 +4537,11 @@
  $Function:    	serviceGetServiceType
 
  $Description:	return the code for the MMI text string for the service type.
-            
- $Returns:		
-
- $Arguments:	
- 
+
+ $Returns:
+
+ $Arguments:
+
 *******************************************************************************/
 
 
@@ -4672,12 +4672,12 @@
 
  $Function:    	serviceGetError
 
- $Description:	
-            
- $Returns:		
-
- $Arguments:	
- 
+ $Description:
+
+ $Returns:
+
+ $Arguments:
+
 *******************************************************************************/
 
 
@@ -4810,11 +4810,11 @@
 
  $Description:	Return code of text string that indicates the SS Type
             CW, CF, CFU, etc
-            
- $Returns:		
-
- $Arguments:	
- 
+
+ $Returns:
+
+ $Arguments:
+
 *******************************************************************************/
 
 
@@ -4919,11 +4919,11 @@
  $Function:    	serviceGetCategory
 
  $Description:	return the code for the MMI text string for the service category.
-            
- $Returns:		
-
- $Arguments:	
- 
+
+ $Returns:
+
+ $Arguments:
+
 *******************************************************************************/
 
 unsigned int serviceGetCategory( T_MFW_SS_CATEGORY cat )
@@ -4962,12 +4962,12 @@
 
  $Function:    	servicesDivertActivate
 
- $Description:	
-            
- $Returns:		
-
- $Arguments:	
- 
+ $Description:
+
+ $Returns:
+
+ $Arguments:
+
 *******************************************************************************/
 
 
@@ -4982,16 +4982,16 @@
 
  $Function:    	servicesDivertCheck
 
- $Description:	
-            
- $Returns:		
-
- $Arguments:	
+ $Description:
+
+ $Returns:
+
+ $Arguments:
 
  $History:
 
  //SPR#0776 - DS -Now takes service type into account by calling getCFServiceCheck.
- 
+
 *******************************************************************************/
 
 
@@ -5021,16 +5021,16 @@
 
  $Function:    	servicesDivertDeactivate
 
- $Description:	
-            
- $Returns:		
-
- $Arguments:	
+ $Description:
+
+ $Returns:
+
+ $Arguments:
 
  $History
 
  //SPR#0776 - DS -Now takes service type into account by calling getCFServiceCheck.
- 
+
 *******************************************************************************/
 
 
@@ -5063,12 +5063,12 @@
 
  $Function:    	servicesDivertVoice
 
- $Description:	
-            
- $Returns:		
-
- $Arguments:	
- 
+ $Description:
+
+ $Returns:
+
+ $Arguments:
+
 *******************************************************************************/
 
 
@@ -5087,12 +5087,12 @@
 
  $Function:    	servicesDivertFax
 
- $Description:	
-            
- $Returns:		
-
- $Arguments:	
- 
+ $Description:
+
+ $Returns:
+
+ $Arguments:
+
 *******************************************************************************/
 
 
@@ -5108,12 +5108,12 @@
 
  $Function:    	servicesDivertData
 
- $Description:	
-            
- $Returns:		
-
- $Arguments:	
- 
+ $Description:
+
+ $Returns:
+
+ $Arguments:
+
 *******************************************************************************/
 
 
@@ -5127,12 +5127,12 @@
 
  $Function:    	servicesDivertActionAll
 
- $Description:	
-            
- $Returns:		
-
- $Arguments:	
- 
+ $Description:
+
+ $Returns:
+
+ $Arguments:
+
 *******************************************************************************/
 
 
@@ -5148,12 +5148,12 @@
 
  $Function:    	servicesDivertBusy
 
- $Description:	
-            
- $Returns:		
-
- $Arguments:	
- 
+ $Description:
+
+ $Returns:
+
+ $Arguments:
+
 *******************************************************************************/
 
 
@@ -5167,12 +5167,12 @@
 
  $Function:    	servicesDivertNoAnswer
 
- $Description:	
-            
- $Returns:		
-
- $Arguments:	
- 
+ $Description:
+
+ $Returns:
+
+ $Arguments:
+
 *******************************************************************************/
 
 
@@ -5186,12 +5186,12 @@
 
  $Function:    	servicesDivertNotReachable
 
- $Description:	
-            
- $Returns:		
-
- $Arguments:	
- 
+ $Description:
+
+ $Returns:
+
+ $Arguments:
+
 *******************************************************************************/
 
 
@@ -5205,12 +5205,12 @@
 
  $Function:    	servicesDivertNoService
 
- $Description:	
-            
- $Returns:		
-
- $Arguments:	
- 
+ $Description:
+
+ $Returns:
+
+ $Arguments:
+
 *******************************************************************************/
 
 
@@ -5225,12 +5225,12 @@
 
  $Function:    	servicesDivertAllCalls
 
- $Description:	
-            
- $Returns:		
-
- $Arguments:	
- 
+ $Description:
+
+ $Returns:
+
+ $Arguments:
+
 *******************************************************************************/
 
 
@@ -5244,12 +5244,12 @@
 
  $Function:    	servicesDivertCancelAll
 
- $Description:	
-            
- $Returns:		
-
- $Arguments:	
- 
+ $Description:
+
+ $Returns:
+
+ $Arguments:
+
 *******************************************************************************/
 
 
@@ -5266,12 +5266,12 @@
 
  $Function:    	servicesBarringAllOutgoing
 
- $Description:	
-            
- $Returns:		
-
- $Arguments:	
- 
+ $Description:
+
+ $Returns:
+
+ $Arguments:
+
 *******************************************************************************/
 
 
@@ -5285,12 +5285,12 @@
 
  $Function:    	servicesBarringInternational
 
- $Description:	
-            
- $Returns:		
-
- $Arguments:	
- 
+ $Description:
+
+ $Returns:
+
+ $Arguments:
+
 *******************************************************************************/
 
 
@@ -5305,12 +5305,12 @@
 
  $Function:    	servicesBarringInternationalHome
 
- $Description:	
-            
- $Returns:		
-
- $Arguments:	
- 
+ $Description:
+
+ $Returns:
+
+ $Arguments:
+
 *******************************************************************************/
 
 
@@ -5325,12 +5325,12 @@
 
  $Function:    	servicesBarringAllIncoming
 
- $Description:	
-            
- $Returns:		
-
- $Arguments:	
- 
+ $Description:
+
+ $Returns:
+
+ $Arguments:
+
 *******************************************************************************/
 
 
@@ -5345,12 +5345,12 @@
 
  $Function:    	servicesBarringIncomingRoaming
 
- $Description:	
-            
- $Returns:		
-
- $Arguments:	
- 
+ $Description:
+
+ $Returns:
+
+ $Arguments:
+
 *******************************************************************************/
 
 
@@ -5366,11 +5366,11 @@
  $Function:    	services_get_voice_number_cb
 
  $Description:	callback function for the enter voicemail number window
-            
- $Returns:		
-
- $Arguments:	
- 
+
+ $Returns:
+
+ $Arguments:
+
 *******************************************************************************/
 
 
@@ -5381,7 +5381,7 @@
     T_services_input * data = (T_services_input *)win_data->user;
 
 	TRACE_FUNCTION("services_get_voice_number_cb");
-    
+
 	switch (reason)
 	{
 		case INFO_KCD_LEFT:
@@ -5400,7 +5400,7 @@
 				// T_MFW_HND phbk_win;  // RAVI
 				bookPhonebookStart(win,PhbkFromDivert);  // RAVI - Removed Assignment phbk_win = .
 			}
-				
+
             break;
 
         case INFO_KCD_HUP:
@@ -5417,7 +5417,7 @@
 static void services_get_voice_number_cb(T_MFW_HND win, USHORT reason)
 {
     TRACE_FUNCTION("services_get_voice_number_cb");
-    
+
 	switch (reason){
 		case SERVICES_INPUT_LEFT:
             TRACE_FUNCTION("SERVICES_INPUT_LEFT");
@@ -5438,11 +5438,11 @@
 
  $Description:	this function should access voicemail number if it is already
             entered, otherwise allow access to voicemail editing window
-            
- $Returns:		
-
- $Arguments:	
- 
+
+ $Returns:
+
+ $Arguments:
+
 *******************************************************************************/
 
 
@@ -5465,7 +5465,7 @@
     {
         T_ss * data = &ss_data;
         T_input_properties input;
-        
+
         memset(data->edt_buf_number,'\0',PHB_MAX_LEN);
 		input.abc = FALSE;
 		input.text = TxtEnterNumber;
@@ -5488,11 +5488,11 @@
  $Function:    	services_get_number_cb
 
  $Description:	callback function for the enter other number window
-            
- $Returns:		
-
- $Arguments:	
- 
+
+ $Returns:
+
+ $Arguments:
+
 *******************************************************************************/
 
 #ifdef NEW_EDITOR
@@ -5502,7 +5502,7 @@
   //  T_services_input * data = (T_services_input *)win_data->user;  // RAVI
 
 	TRACE_FUNCTION("services_get_voice_number_cb");
-    
+
 	switch (reason)
 	{
 		case INFO_KCD_LEFT:
@@ -5519,9 +5519,9 @@
 			if (bookPhoneBookLoading()==BOOK_SUCCESS)
 			{
 				//T_MFW_HND phbk_win;  // RAVI
-				bookPhonebookStart(win,PhbkFromDivert);  // RAVI - Removed assignment phbk_win = 
+				bookPhonebookStart(win,PhbkFromDivert);  // RAVI - Removed assignment phbk_win =
 			}
-				
+
             break;
 
         case INFO_KCD_HUP:
@@ -5539,7 +5539,7 @@
 static void services_get_number_cb(T_MFW_HND win,USHORT reason)
 {
     TRACE_FUNCTION("services_get_number_cb");
-    
+
 	switch (reason){
 		case SERVICES_INPUT_LEFT:
             TRACE_FUNCTION("SERVICES_INPUT_LEFT");
@@ -5560,11 +5560,11 @@
  $Function:    	servicesGetOtherNumber
 
  $Description:	Sets up an editor for entering another number.
-            
- $Returns:		
-
- $Arguments:	
- 
+
+ $Returns:
+
+ $Arguments:
+
 *******************************************************************************/
 
 
@@ -5578,7 +5578,7 @@
     T_input_properties input;
 
 	TRACE_EVENT("ServicesGetOtherNumber");
-	
+
     memset(data->edt_buf_number,'\0',PHB_MAX_LEN);
 	input.abc = FALSE;
 	input.text = TxtEnterNumber;
@@ -5598,12 +5598,12 @@
 
  $Function:    	servicesDoOtherNumber
 
- $Description:	
-            
- $Returns:		
-
- $Arguments:	
- 
+ $Description:
+
+ $Returns:
+
+ $Arguments:
+
 *******************************************************************************/
 
 
@@ -5626,11 +5626,11 @@
  $Function:    	servicesStoreVoiceMailNumber
 
  $Description:	Store number to Voicemail number (currently in SMS, should be in PCM?)
-            
- $Returns:		
-
- $Arguments:	
- 
+
+ $Returns:
+
+ $Arguments:
+
 *******************************************************************************/
 
 static void servicesStoreVoiceMailNumber( void )
@@ -5649,11 +5649,11 @@
  $Function:    	servicesStoreUSSD
 
  $Description:	Store selected USSD to NVM.
- 
- $Returns:		
-
- $Arguments:	
- 
+
+ $Returns:
+
+ $Arguments:
+
 *******************************************************************************/
 
 
@@ -5668,12 +5668,12 @@
 
  $Function:    	servicesActivateIRDA
 
- $Description:	
- 
- $Returns:		
-
- $Arguments:	
- 
+ $Description:
+
+ $Returns:
+
+ $Arguments:
+
 *******************************************************************************/
 
 
@@ -5688,12 +5688,12 @@
 
  $Function:    	servicesDeactivateIRDA
 
- $Description:	
- 
- $Returns:		
-
- $Arguments:	
- 
+ $Description:
+
+ $Returns:
+
+ $Arguments:
+
 *******************************************************************************/
 
 
@@ -5719,12 +5719,12 @@
 
  $Function:    	dialog_ext_info_dialog
 
- $Description:	
- 
- $Returns:		
-
- $Arguments:	
- 
+ $Description:
+
+ $Returns:
+
+ $Arguments:
+
 *******************************************************************************/
 
 
@@ -5747,12 +5747,12 @@
 
  $Function:    	dialog_ext_info_create
 
- $Description:	
- 
- $Returns:		
-
- $Arguments:	
- 
+ $Description:
+
+ $Returns:
+
+ $Arguments:
+
 *******************************************************************************/
 
 
@@ -5797,12 +5797,12 @@
 
  $Function:    	dialog_ext_info_destroy
 
- $Description:	
- 
- $Returns:		
-
- $Arguments:	
- 
+ $Description:
+
+ $Returns:
+
+ $Arguments:
+
 *******************************************************************************/
 
 
@@ -5843,12 +5843,12 @@
 
  $Function:    	dialog_ext_info
 
- $Description:	
- 
- $Returns:		
-
- $Arguments:	
- 
+ $Description:
+
+ $Returns:
+
+ $Arguments:
+
 *******************************************************************************/
 
 void dialog_ext_info (T_MFW_HND win, USHORT event, SHORT value, void * parameter)
@@ -5898,13 +5898,13 @@
 /*******************************************************************************
 
  $Function:    	dialog_ext_info_win_cb
- 
- $Description:	
- 
- $Returns:		
-
- $Arguments:	
- 
+
+ $Description:
+
+ $Returns:
+
+ $Arguments:
+
 *******************************************************************************/
 
 
@@ -5962,13 +5962,13 @@
 /*******************************************************************************
 
  $Function:    	dialog_ext_info_tim_cb
- 
- $Description:	
- 
- $Returns:		
-
- $Arguments:	
- 
+
+ $Description:
+
+ $Returns:
+
+ $Arguments:
+
 *******************************************************************************/
 
 
@@ -5993,13 +5993,13 @@
 /*******************************************************************************
 
  $Function:    	dialog_ext_info_kbd_cb
- 
- $Description:	
- 
- $Returns:		
-
- $Arguments:	
- 
+
+ $Description:
+
+ $Returns:
+
+ $Arguments:
+
 *******************************************************************************/
 
 static int dialog_ext_info_kbd_cb (T_MFW_EVENT event, T_MFW_KBD *keyboard)
@@ -6064,13 +6064,13 @@
 /*******************************************************************************
 
  $Function:    	dialog_ext_info_kbd_long_cb
- 
- $Description:	
- 
- $Returns:		
-
- $Arguments:	
- 
+
+ $Description:
+
+ $Returns:
+
+ $Arguments:
+
 *******************************************************************************/
 
 
@@ -6113,13 +6113,13 @@
 /*******************************************************************************
 
  $Function:    	services_input_create
- 
- $Description:	
- 
- $Returns:		
-
- $Arguments:	
- 
+
+ $Description:
+
+ $Returns:
+
+ $Arguments:
+
 *******************************************************************************/
 
 
@@ -6168,13 +6168,13 @@
 /*******************************************************************************
 
  $Function:    	services_input_destroy
- 
- $Description:	
- 
- $Returns:		
-
- $Arguments:	
- 
+
+ $Description:
+
+ $Returns:
+
+ $Arguments:
+
 *******************************************************************************/
 
 
@@ -6213,13 +6213,13 @@
 /*******************************************************************************
 
  $Function:    	services_input_start
- 
- $Description:	
- 
- $Returns:		
-
- $Arguments:	
- 
+
+ $Description:
+
+ $Returns:
+
+ $Arguments:
+
 *******************************************************************************/
 
 
@@ -6242,13 +6242,13 @@
 /*******************************************************************************
 
  $Function:    	services_input
- 
- $Description:	
- 
- $Returns:		
-
- $Arguments:	
- 
+
+ $Description:
+
+ $Returns:
+
+ $Arguments:
+
 *******************************************************************************/
 
 
@@ -6278,16 +6278,16 @@
 			//the change_rsk_on_empty flag is set to true.
 			AUI_edit_SetAltTextStr(&editor_data, 1, TxtNames, TRUE, TxtSoftBack);
 			AUI_edit_SetDisplay(&editor_data, SERVICE_CREATE_EDITOR, COLOUR_EDITOR_XX, EDITOR_FONT);
-		
+
 			if (properties->abc)
 			{
 				AUI_edit_SetMode(&editor_data, ED_MODE_ALPHA, ED_CURSOR_BAR);
-				AUI_edit_SetBuffer(&editor_data, ATB_DCS_ASCII, (UBYTE *)ss_data.edt_buf_name, sizeof(ss_data.edt_buf_name)); 
+				AUI_edit_SetBuffer(&editor_data, ATB_DCS_ASCII, (UBYTE *)ss_data.edt_buf_name, sizeof(ss_data.edt_buf_name));
 			}
 			else
 			{
 				AUI_edit_SetMode(&editor_data, 0, ED_CURSOR_UNDERLINE);
-				AUI_edit_SetBuffer(&editor_data, ATB_DCS_ASCII, (UBYTE *)ss_data.edt_buf_number, sizeof(ss_data.edt_buf_number)); 
+				AUI_edit_SetBuffer(&editor_data, ATB_DCS_ASCII, (UBYTE *)ss_data.edt_buf_number, sizeof(ss_data.edt_buf_number));
 
 			}
 			TRACE_EVENT("SERVICES_INPUT_INIT");
@@ -6309,7 +6309,7 @@
 			winShow(data->win);
 #endif /* NEW_EDITOR */
 			break;
-		
+
 		case SERVICES_INPUT_DESTROY:
             TRACE_FUNCTION("SERVICES_INPUT_DESTROY");
 			services_input_destroy(data->win);
@@ -6340,13 +6340,13 @@
 /*******************************************************************************
 
  $Function:    	services_input_win_cb
- 
- $Description:	
- 
- $Returns:		
-
- $Arguments:	
- 
+
+ $Description:
+
+ $Returns:
+
+ $Arguments:
+
 *******************************************************************************/
 
 static int services_input_win_cb (MfwEvt e, MfwWin *w){
@@ -6386,13 +6386,13 @@
 /*******************************************************************************
 
  $Function:    	services_input_kbd_cb
- 
- $Description:	
- 
- $Returns:		
-
- $Arguments:	
- 
+
+ $Description:
+
+ $Returns:
+
+ $Arguments:
+
 *******************************************************************************/
 
 static int services_input_kbd_cb (MfwEvt e, MfwKbd *k){
@@ -6403,7 +6403,7 @@
     T_services_input * data = (T_services_input *)win_data->user;
 
     TRACE_FUNCTION ("services_input_kbd_cb()");
-    
+
 	if (activeEditor() NEQ data->edt_input)
 		editActivate(data->edt_input,data->properties.abc);
 
@@ -6412,16 +6412,16 @@
         case KCD_MNUUP:
             edtChar(data->edt_input,ecRight);
         break;
-        
+
         case KCD_MNUDOWN:
             edtChar(data->edt_input,ecLeft);
 		break;
-		
+
         case KCD_LEFT:
             TRACE_FUNCTION("left key pressed");
 			data->properties.callback(data->parent_win,SERVICES_INPUT_LEFT);
 		break;
-		
+
         case KCD_HUP:
             /* if edit field is empty then exit, else delete one char */
 			data->properties.callback(data->parent_win,SERVICES_INPUT_CLEAR);
@@ -6438,7 +6438,7 @@
             else
                 services_input_destroy(data->win);
 		break;
-		
+
 	    case KCD_RIGHT:
 	    	// Check if there is a digit in the edit buffer softkey should be delete.
             if (strlen(data->properties.edt_attr_input->text) > 0)
@@ -6459,9 +6459,9 @@
 					T_MFW_HND phbk_win;
 					phbk_win = bookPhonebookStart(data->win,PhbkFromDivert);
 				}
-				
+
 	    	}
-            
+
         break;
         default:
 	        editEventKey (e,k);
@@ -6480,13 +6480,13 @@
 /*******************************************************************************
 
  $Function:    	services_input_kbd_long_cb
- 
- $Description:	
- 
- $Returns:		
-
- $Arguments:	
- 
+
+ $Description:
+
+ $Returns:
+
+ $Arguments:
+
 *******************************************************************************/
 
 
@@ -6512,13 +6512,13 @@
 /*******************************************************************************
 
  $Function:    	services_number_input_cb
- 
- $Description:	
- 
- $Returns:		
-
- $Arguments:	
- 
+
+ $Description:
+
+ $Returns:
+
+ $Arguments:
+
 *******************************************************************************/
 
 void services_number_input_cb(T_MFW_HND win, UBYTE identifier, USHORT reason){
@@ -6542,13 +6542,13 @@
 /*******************************************************************************
 
  $Function:    	servicesCallBarringCheck
- 
- $Description:	
- 
- $Returns:		
-
- $Arguments:	
- 
+
+ $Description:
+
+ $Returns:
+
+ $Arguments:
+
 *******************************************************************************/
 
 
@@ -6581,13 +6581,13 @@
 /*******************************************************************************
 
  $Function:    	servicesCallBarringDeactivate
- 
- $Description:	
- 
- $Returns:		
-
- $Arguments:	
- 
+
+ $Description:
+
+ $Returns:
+
+ $Arguments:
+
 *******************************************************************************/
 
 
@@ -6614,7 +6614,7 @@
 	//x0pleela 03 May, 2007  DR: OMAPs00129383
 	//Replaced BASIC_SERVICE_CODE with TELETELE_BEARER_SERVICE_CODE
 	//to deactivate both Tele and Bearere services
-	
+
 	//June 21, 2004 - CRR:13650 - CBA : no basic service sent when using the menu
 	//Adding the basic service code 10(all teleservices) to the SS string during deactivation
 	strcat(SS_string,TELE_BEARER_SERVICE_CODE);
@@ -6632,13 +6632,13 @@
 /*******************************************************************************
 
  $Function:    	servicesCallBarringDeactivatePassword
- 
+
  $Description:	Sets the flag for deactivating the selected barring service and prompts for the password
- 
- $Returns:		
-
- $Arguments:	
- 
+
+ $Returns:
+
+ $Arguments:
+
 *******************************************************************************/
 
 void servicesCallBarringDeactivatePassword(void)
@@ -6651,13 +6651,13 @@
 /*******************************************************************************
 
  $Function:    	servicesCallBarringActivate
- 
- $Description:	
- 
- $Returns:		
-
- $Arguments:	
- 
+
+ $Description:
+
+ $Returns:
+
+ $Arguments:
+
 *******************************************************************************/
 
 
@@ -6699,13 +6699,13 @@
 /*******************************************************************************
 
  $Function:    	servicesCallBarringActivatePassword
- 
+
  $Description:	Sets the flag for activating the selected barring service and prompts for the password
- 
- $Returns:		
-
- $Arguments:	
- 
+
+ $Returns:
+
+ $Arguments:
+
 *******************************************************************************/
 
 void servicesCallBarringActivatePassword(void)
@@ -6719,13 +6719,13 @@
 /*******************************************************************************
 
  $Function:    	servicesCallBarringCancelAll
- 
- $Description:	
- 
- $Returns:		
-
- $Arguments:	
- 
+
+ $Description:
+
+ $Returns:
+
+ $Arguments:
+
 *******************************************************************************/
 
 
@@ -6735,7 +6735,7 @@
 
     TRACE_FUNCTION("servicesCallBarringCancelAll");
 
-	
+
     strcat(SS_string, "#330*");
 	getCBPassword(SS_string);
     SS_string[strlen(SS_string)-1] = '#';
@@ -6751,13 +6751,13 @@
 /*******************************************************************************
 
  $Function:    	servicesCallBarringCancelAllPassword
- 
+
  $Description:	Sets the flag for cancelling all barring service and prompts for the password
- 
- $Returns:		
-
- $Arguments:	
- 
+
+ $Returns:
+
+ $Arguments:
+
 *******************************************************************************/
 void servicesCallBarringCancelAllPassword(void)
 {
@@ -6769,13 +6769,13 @@
 /*******************************************************************************
 
  $Function:    	getCBAction
- 
- $Description:	
- 
- $Returns:		
-
- $Arguments:	
- 
+
+ $Description:
+
+ $Returns:
+
+ $Arguments:
+
 *******************************************************************************/
 
 
@@ -6800,13 +6800,13 @@
 /*******************************************************************************
 
  $Function:    	getCBType
- 
- $Description:	
- 
- $Returns:		
-
- $Arguments:	
- 
+
+ $Description:
+
+ $Returns:
+
+ $Arguments:
+
 *******************************************************************************/
 
 
@@ -6839,13 +6839,13 @@
 /*******************************************************************************
 
  $Function:    	getCBPassword
- 
- $Description:	
- 
- $Returns:		
-
- $Arguments:	
- 
+
+ $Description:
+
+ $Returns:
+
+ $Arguments:
+
 *******************************************************************************/
 
 
@@ -6861,12 +6861,12 @@
 
  $Function:    	 getCBService
 
- $Description:	
-            
- $Returns:		
-
- $Arguments:	
- 
+ $Description:
+
+ $Returns:
+
+ $Arguments:
+
 *******************************************************************************/
 //x0pleela 25 May, 2006  DR: OMAPS00070657
 #ifdef FF_CPHS
@@ -6881,7 +6881,7 @@
         break;
     /*MC SPR 742, handle line 2, auxiliary telephony*/
     case CBAuxVoice:
-		strcat(pSSstring, "*89"); 
+		strcat(pSSstring, "*89");
         break;
     default:
         break;
@@ -6894,13 +6894,13 @@
 /*******************************************************************************
 
  $Function:    	requestSatCBPassword
- 
- $Description:	
- 
- $Returns:		
-
- $Arguments:	
- 
+
+ $Description:
+
+ $Returns:
+
+ $Arguments:
+
 *******************************************************************************/
 
 
@@ -6908,7 +6908,7 @@
 void requestSatCBPassword(void)
 {
 
-   
+
 #ifdef NEW_EDITOR
 	T_AUI_EDITOR_DATA editor_data; /* SPR#1428 - SH - New Editor changes */
 #else /* NEW_EDITOR */
@@ -6919,11 +6919,11 @@
 	TRACE_FUNCTION("requestSatCBPassword");
 	//SPR#1014 - DS - Reset editor data
 	memset(&editor_data, '\0', sizeof(editor_data));
-	
-    /*               
-     * Setup an editor to display a string                
+
+    /*
+     * Setup an editor to display a string
      */
-     
+
 	memset(satPassword,'\0',sizeof(satPassword));
 
 /* SPR#1428 - SH - New Editor changes */
@@ -6941,22 +6941,22 @@
 	TRACE_EVENT_P1("satPassword contents: %s",satPassword);
 #else /* NEW_EDITOR */
 	TRACE_FUNCTION("New editor is not defined");
-	bookSetEditAttributes( RPWD_EDITOR, COLOUR_EDITOR_XX, 0, edtCurBar1, 0, 
+	bookSetEditAttributes( RPWD_EDITOR, COLOUR_EDITOR_XX, 0, edtCurBar1, 0,
 		(char*)ss_data.edt_buf_cb_password,CB_PSW_LEN+1, &editor_data.editor_attr );
-     editor_data.LeftSoftKey          = TxtSoftOK;               
-     editor_data.AlternateLeftSoftKey = TxtNull;                
-     editor_data.RightSoftKey         = TxtSoftBack;               
-     editor_data.hide                 = TRUE;               
-     editor_data.mode                 = DIGITS_MODE;                
-     editor_data.timeout              = FOREVER;                
-     editor_data.Identifier           = CBCheckPassword;   
+     editor_data.LeftSoftKey          = TxtSoftOK;
+     editor_data.AlternateLeftSoftKey = TxtNull;
+     editor_data.RightSoftKey         = TxtSoftBack;
+     editor_data.hide                 = TRUE;
+     editor_data.mode                 = DIGITS_MODE;
+     editor_data.timeout              = FOREVER;
+     editor_data.Identifier           = CBCheckPassword;
      editor_data.destroyEditor        = TRUE;
-     editor_data.Callback   = (T_EDIT_CB)CB_password_cb;               
+     editor_data.Callback   = (T_EDIT_CB)CB_password_cb;
      editor_data.TextId = TxtPassword;
      editor_data.TextString       =   NULL;
-     editor_data.min_enter  = CB_PSW_LEN; 							 	               					  
+     editor_data.min_enter  = CB_PSW_LEN;
      editor_data.destroyEditor = TRUE;
-     ss_data.info_win = editor_start(ss_data.win, &editor_data);               
+     ss_data.info_win = editor_start(ss_data.win, &editor_data);
 #endif /* NEW_EDITOR */
 
 }
@@ -6965,13 +6965,13 @@
 /*******************************************************************************
 
  $Function:    	requestCBPassword
- 
- $Description:	
- 
- $Returns:		
-
- $Arguments:	
- 
+
+ $Description:
+
+ $Returns:
+
+ $Arguments:
+
 *******************************************************************************/
 
 
@@ -6986,11 +6986,11 @@
 TRACE_FUNCTION("requestCBPassword");
 	//SPR#1014 - DS - Reset editor data
 	memset(&editor_data, '\0', sizeof(editor_data));
-	
-    /*               
-     * Setup an editor to display a string                
+
+    /*
+     * Setup an editor to display a string
      */
-     
+
 	memset(ss_data.edt_buf_cb_password,'\0',sizeof(ss_data.edt_buf_cb_password));
 
 /* SPR#1428 - SH - New Editor changes */
@@ -7007,35 +7007,35 @@
 	ss_data.info_win = AUI_edit_Start(ss_data.win, &editor_data);  /* start the editor */
 #else /* NEW_EDITOR */
 TRACE_FUNCTION("Old_editor");
-	bookSetEditAttributes( RPWD_EDITOR, COLOUR_EDITOR_XX, 0, edtCurBar1, 0, 
+	bookSetEditAttributes( RPWD_EDITOR, COLOUR_EDITOR_XX, 0, edtCurBar1, 0,
 		(char*)ss_data.edt_buf_cb_password,CB_PSW_LEN+1, &editor_data.editor_attr );
-     editor_data.LeftSoftKey          = TxtSoftOK;               
-     editor_data.AlternateLeftSoftKey = TxtNull;                
-     editor_data.RightSoftKey         = TxtSoftBack;               
-     editor_data.hide                 = TRUE;               
-     editor_data.mode                 = DIGITS_MODE;                
-     editor_data.timeout              = FOREVER;                
-     editor_data.Identifier           = CBCheckPassword;   
+     editor_data.LeftSoftKey          = TxtSoftOK;
+     editor_data.AlternateLeftSoftKey = TxtNull;
+     editor_data.RightSoftKey         = TxtSoftBack;
+     editor_data.hide                 = TRUE;
+     editor_data.mode                 = DIGITS_MODE;
+     editor_data.timeout              = FOREVER;
+     editor_data.Identifier           = CBCheckPassword;
      editor_data.destroyEditor        = TRUE;
-     editor_data.Callback   = (T_EDIT_CB)CB_password_cb;               
+     editor_data.Callback   = (T_EDIT_CB)CB_password_cb;
      editor_data.TextId = TxtPassword;
      editor_data.TextString       =   NULL;
-     editor_data.min_enter  = CB_PSW_LEN; 							 	               					  
+     editor_data.min_enter  = CB_PSW_LEN;
      editor_data.destroyEditor = TRUE;
-     ss_data.info_win = editor_start(ss_data.win, &editor_data);               
+     ss_data.info_win = editor_start(ss_data.win, &editor_data);
 #endif /* NEW_EDITOR */
 }
 
 /*******************************************************************************
 
  $Function:    	CB_password_cb
- 
- $Description:	
- 
- $Returns:		
-
- $Arguments:	
- 
+
+ $Description:
+
+ $Returns:
+
+ $Arguments:
+
 *******************************************************************************/
 
 
@@ -7049,7 +7049,7 @@
 			case CBCheckPassword:
 				//Jun 02,2004 CRR:13649 xpradipg-SASKEN
 				//keyevents right and hangup are handled initially
-				switch (reason)				
+				switch (reason)
 				{
 				    case INFO_KCD_HUP:
 				// Change by Sasken ( VadiRaj) on March 29th 2004
@@ -7057,7 +7057,7 @@
 				// Subject: No functionality for the right softkey.
 				// Bug : No functionality for the right softkey
 				// Solution : Added functionality for the right "BACK" softeky
-					case INFO_KCD_RIGHT: 
+					case INFO_KCD_RIGHT:
 						ss_data.info_win = 0;
 						CBFlag=CBActionNone;;
 				    break;
@@ -7069,7 +7069,7 @@
 				switch(CBFlag)
 				{
 					case CBDeactivate:
-						CBFlag=CBActionNone;				//reset the flag 
+						CBFlag=CBActionNone;				//reset the flag
 						servicesCallBarringDeactivate();	//initiates the callbarring deactivation for the selected service
 						break;
 					case CBActivate:
@@ -7082,17 +7082,17 @@
 						break;
 					case CBNewPassword:
 						CBFlag=CBActionNone;				//reset the flag
-						enterNewCBPassword();			//prompt for the new password 
+						enterNewCBPassword();			//prompt for the new password
 				    break;
 				    default:
 						CBFlag=CBActionNone;;
 				    break;
 				}
 				ss_data.info_win = 0;
-			break;				
+			break;
 			case CBNewPassword:
 				ss_data.info_win = 0;
-				switch (reason)				
+				switch (reason)
 				{
 				    case INFO_KCD_LEFT:
 						confirmNewCBPassword();
@@ -7103,7 +7103,7 @@
 			break;
 			case CBConfirmNewPassword:
 				ss_data.info_win = 0;
-				switch (reason)				
+				switch (reason)
 				{
 				    case INFO_KCD_LEFT:
 						changeCBPassword();
@@ -7126,13 +7126,13 @@
 //Jun 02,2004 CRR:13649 xpradipg-SASKEN
 /*******************************************************************************
  $Function:    	enterOldCBPassword
- 
- $Description:	sets flag for changing the barring password and prompts to enter the current 
+
+ $Description:	sets flag for changing the barring password and prompts to enter the current
  			barring password
-  $Returns:		
-
- $Arguments:	
- 
+  $Returns:
+
+ $Arguments:
+
 *******************************************************************************/
 
 void enterOldCBPassword(void)
@@ -7144,13 +7144,13 @@
 /*******************************************************************************
 
  $Function:    	enterNewCBPassword
- 
- $Description:	
- 
- $Returns:		
-
- $Arguments:	
- 
+
+ $Description:
+
+ $Returns:
+
+ $Arguments:
+
 *******************************************************************************/
 
 
@@ -7178,35 +7178,35 @@
 
 	ss_data.info_win = AUI_edit_Start(ss_data.win, &editor_data);  /* start the editor */
 #else /* NEW_EDITOR */
-	bookSetEditAttributes( RPWD_EDITOR, 0, 0, edtCurBar1, 0, 
+	bookSetEditAttributes( RPWD_EDITOR, 0, 0, edtCurBar1, 0,
 		(char*)ss_data.edt_buf_cb_new_password,CB_PSW_LEN+1, &editor_data.editor_attr );
-     editor_data.LeftSoftKey          = TxtSoftOK;               
-     editor_data.AlternateLeftSoftKey = TxtNull;                
-     editor_data.RightSoftKey         = TxtDelete;               
-     editor_data.hide                 = TRUE;               
-     editor_data.mode                 = DIGITS_MODE;                
-     editor_data.timeout              = FOREVER;                
-     editor_data.Identifier           = CBNewPassword;  
+     editor_data.LeftSoftKey          = TxtSoftOK;
+     editor_data.AlternateLeftSoftKey = TxtNull;
+     editor_data.RightSoftKey         = TxtDelete;
+     editor_data.hide                 = TRUE;
+     editor_data.mode                 = DIGITS_MODE;
+     editor_data.timeout              = FOREVER;
+     editor_data.Identifier           = CBNewPassword;
      editor_data.destroyEditor        = TRUE;
-     editor_data.Callback   = (T_EDIT_CB)CB_password_cb;               
+     editor_data.Callback   = (T_EDIT_CB)CB_password_cb;
      editor_data.TextId = TxtNewPassword;
      editor_data.TextString       =   NULL;
-     editor_data.min_enter  = CB_PSW_LEN; 							 	               					  
+     editor_data.min_enter  = CB_PSW_LEN;
      editor_data.destroyEditor = TRUE;
-     ss_data.info_win = editor_start(ss_data.win, &editor_data);      
+     ss_data.info_win = editor_start(ss_data.win, &editor_data);
 #endif /* NEW_EDITOR */
 }
 
 /*******************************************************************************
 
  $Function:    	confirmNewCBPassword
- 
- $Description:	
- 
- $Returns:		
-
- $Arguments:	
- 
+
+ $Description:
+
+ $Returns:
+
+ $Arguments:
+
 *******************************************************************************/
 
 
@@ -7235,22 +7235,22 @@
 
 	ss_data.info_win = AUI_edit_Start(ss_data.win, &editor_data);  /* start the editor */
 #else /* NEW_EDITOR */
-	bookSetEditAttributes(  RPWD_EDITOR, 0, 0, edtCurBar1, 0, 
+	bookSetEditAttributes(  RPWD_EDITOR, 0, 0, edtCurBar1, 0,
 		(char*)ss_data.edt_buf_cb_conf_new_password,CB_PSW_LEN+1, &editor_data.editor_attr );
-	editor_data.LeftSoftKey          = TxtSoftOK;               
-     editor_data.AlternateLeftSoftKey = TxtNull;                
-     editor_data.RightSoftKey         = TxtDelete;               
-     editor_data.hide                 = TRUE;               
-     editor_data.mode                 = DIGITS_MODE;                
-     editor_data.timeout              = FOREVER;                
-     editor_data.Identifier           = CBConfirmNewPassword;  
+	editor_data.LeftSoftKey          = TxtSoftOK;
+     editor_data.AlternateLeftSoftKey = TxtNull;
+     editor_data.RightSoftKey         = TxtDelete;
+     editor_data.hide                 = TRUE;
+     editor_data.mode                 = DIGITS_MODE;
+     editor_data.timeout              = FOREVER;
+     editor_data.Identifier           = CBConfirmNewPassword;
      editor_data.destroyEditor        = TRUE;
-     editor_data.Callback   = (T_EDIT_CB)CB_password_cb;               
+     editor_data.Callback   = (T_EDIT_CB)CB_password_cb;
      editor_data.TextId = TxtConfirmPassword;
      editor_data.TextString       =   NULL;
-     editor_data.min_enter  = CB_PSW_LEN; 							 	               					  
-     editor_data.destroyEditor = TRUE;    
-     ss_data.info_win = editor_start(ss_data.win, &editor_data);       
+     editor_data.min_enter  = CB_PSW_LEN;
+     editor_data.destroyEditor = TRUE;
+     ss_data.info_win = editor_start(ss_data.win, &editor_data);
 #endif /* NEW_EDITOR */
 
 }
@@ -7258,12 +7258,12 @@
 /*******************************************************************************
 
  $Function:    	changeCBPassword
- 
- $Description:	
- 
- $Returns:		
-
- $Arguments:	
+
+ $Description:
+
+ $Returns:
+
+ $Arguments:
 
 *******************************************************************************/
 
@@ -7308,7 +7308,7 @@
 		if (ss_execute_transaction((UBYTE*)SS_string, 0) == MFW_SS_FAIL)
 			showFailed( ss_data.win );
 	}
-	
+
 
 }
 
@@ -7316,10 +7316,10 @@
 /*******************************************************************************
 
  $Function:    	featurePlaceholder
- 
+
  $Description:		Display screen dialog for not-yet-implemented features
- 
- $Returns:		None	
+
+ $Returns:		None
 
  $Arguments:		None
 
@@ -7349,5 +7349,5 @@
    */
 
   info_dialog(win, &display_info);
-  
+
 }