--- a/src/ui/mfw/mfw_cb.c	Tue Jan 19 05:41:26 2021 +0000
+++ b/src/ui/mfw/mfw_cb.c	Tue Jan 19 06:10:27 2021 +0000
@@ -16,20 +16,20 @@
        Aug 07, 2007 DR:OMAPS00137726 x0066814(Geetha)
        Description:HPLMN Manual Selection at power on -unable to perform manual selection at power ON
        Solution: In rAT_PlusCME, under case AT_CMD_NRG, added the code to list PLMN if Manual is the
-                    network regieteration mode during bootup. 
-   
+                    network regieteration mode during bootup.
+
        May 31, 2007 DR: OMAPS00133201 x0pleela
-       Description: MS keeps searching networks and doesn't list available PLMNs after 
+       Description: MS keeps searching networks and doesn't list available PLMNs after
        			performing manual selection
-	Solution : In function rAT_PlusCME(), for commands AT_CMD_COPS and 
-			AT_CMD_NRG, passing the error code as parameter to function 
+	Solution : In function rAT_PlusCME(), for commands AT_CMD_COPS and
+			AT_CMD_NRG, passing the error code as parameter to function
 			nm_error_cops()
 
 	June 05, 2007 DR:OMAPS00133241 x0061560(sateeshg)
        Description:ASTEC29607,SIM:The sim card should not return 9240 still.
        Solution     :Error indication from Aci E_PHB_ERROR sent to mmi.
-       
-		
+
+
    	May 10 2007 DR:OMAPS00127983 x066814
 	Description: PSTN caller name not displayed on MS
 	Solution: Added the following functions:
@@ -40,56 +40,56 @@
 
 	Oct 05, 2006    ER: OMAPS00094496 x0061088(Prachi)
  	Description:Enhance RSSI to 3 parameters: Strength, quality, min-access-level
- 	Solution:To solve the ER OMAPS0094496, rAT_PercentCSQ() is now receving four 
- 	parameters i.e. RSSI,Bit Error rate, Actual level, Minimum access level and also 
- 	rAT_PercentCSQ() is checking if actual level is less than minimum level and then 
+ 	Solution:To solve the ER OMAPS0094496, rAT_PercentCSQ() is now receving four
+ 	parameters i.e. RSSI,Bit Error rate, Actual level, Minimum access level and also
+ 	rAT_PercentCSQ() is checking if actual level is less than minimum level and then
  	calls globalSignalUpdate() to show the signal strength.
- 
+
 
 	Aug 01, 2006   DR: OMAPS00082374 x0pleela
-	Description: EONS Failures - unexpected output from the MMI: 2 carriers; on the top always T-Mobile 
+	Description: EONS Failures - unexpected output from the MMI: 2 carriers; on the top always T-Mobile
    	Solution: a) Added  the functionality which was removed before for rat_%CSTAT
-	
+
 	Jun 23, 2006    DR: OMAPS00082374 x0pleela
-   	Description: EONS Failures - unexpected output from the MMI: 2 carriers; on the top always T-Mobile 
+   	Description: EONS Failures - unexpected output from the MMI: 2 carriers; on the top always T-Mobile
    	Solution: a) Removed the usage of global variable gEons_alloc_active
 			b) Removed the call to function set_opn_sel_done(TRUE); in func rat_%CNIV
 			c) Removed the functionality added before for rat_%CSTAT
-   	
+
 	July  17, 2006  DR: OMAPS00082792  x0039928
 	Description:Changes to be done in MMI for Move all entries from SIM to FFS (Defect 76492)
 	Solution: Ready signal is sent to MMI when rAT_Ok is called by ACI for CPBW command
-	
+
     June 02, 2006    DR: OMAPS00078005 x0021334
     Descripton: Test for NITZ (Network Identity and Timezone) support - No New time was displayed
     Solution: New Time/Date received from network is sent to MFW by lower layer by invoking 'rAT_PercentCTZV'
     function. This function has now been implemented to pass on the received values to MMI
-    for user confirmation and RTC updation.   
+    for user confirmation and RTC updation.
 
 	May 18, 2006    DR: OMAPS00070657 x0pleela
-   	Description: CPHS feature on Locosto-Lite 
-   	Solution: 	Function "sendCPWIEvt" is called in rAT_PercentCPVWI to handle voice mail indication 
-   			
+   	Description: CPHS feature on Locosto-Lite
+   	Solution: 	Function "sendCPWIEvt" is called in rAT_PercentCPVWI to handle voice mail indication
+
 	xrashmic 1 Jul, 2006 OMAPS00075784
        Changed U8 to T_ACI_CME_ERR in rAT_PlusCME
 
-    June 15, 2006 OMAPS00079492 x0043642 
+    June 15, 2006 OMAPS00079492 x0043642
     Description : FT TMO (wk20/06) TC 9.1, 9.2 Multi Party, MS fails to return to idle mode
-    Solution    : call set_cmdHold() to assign MFW_CM_DISCONNECT_ALL to variable cmd_hold 
+    Solution    : call set_cmdHold() to assign MFW_CM_DISCONNECT_ALL to variable cmd_hold
                       when ATH command is entered.
 
 	May 15, 2006    DVT: OMAPS00077751 x0043642
     Description: MFW needs to implement rAT_PercentSATT needed for SAT class E
-    Solution:  Define a function  rAT_PercentSATT() 
+    Solution:  Define a function  rAT_PercentSATT()
 	May 15, 2006 DR: OMAPS00067919 x0pleela
-	Description: SIMP:On repeat Depersonalisation with invalid password MEPD unblock key should 
+	Description: SIMP:On repeat Depersonalisation with invalid password MEPD unblock key should
 				be asked not Puk1.
 	Solution:Made the following changes
 		       1. Added functionality for rAT_PlusCPIN
 			2. Made code changss in rat_plusCME for SIMP
 
      May 10, 2006    REF: DRT OMAPS00075829  xdeepadh
-    Description: Submission of ACI and SAP changes for Imaging ERs 
+    Description: Submission of ACI and SAP changes for Imaging ERs
     Solution: Using the mechanism where MFW can receive primitives without
     ACI to know about it.
 
@@ -97,17 +97,17 @@
     Apr 24, 2006    ERT: OMAPS00067603 x0043642
     Description: Engineering mode
     Solution:  Handle the response from ACI (through rAT_percentEINFO).
-       
+
 
 	Mar 15, 2006   ER: OMAPS00067709  x0pleela
-	Description: Voice Buffering implementation on C+ for PTT via PCM API 
+	Description: Voice Buffering implementation on C+ for PTT via PCM API
 	Solution: Functions  rAT_NO_CARRIER, rAT_NO_ANSWER
 			Changes: update the reason for calling record_stop
-   
+
  *   Mar 23, 2006    REF:DR OMAPS00069173  a0393213
  *   Description:   GSM - MOC - AT USB - Live Network . Display problem when a MO call is made through AT interface
  *   Solution: misplaced break statement corrected
- 
+
 
 	Feb 15, 2006    ER: OMAPS00065203 x0pleela
    	Description: Cingular Operator Name Prioritization implementation required
@@ -118,19 +118,19 @@
    	Description: Cingular Operator Name Prioritization implementation required
    	Solution: Implemented functionality for rAT_PercentCNIV
 		   	Implemented functionality for rAT_PercentCSTAT
-   			
-   	
+
+
  *
  *	Nov 02, 2005    DR OMAPS00052132   xdeepadh
  *	Bug:Not able to access the SMS inbox and also not able to send SMS in Locosto Lite build
  *	Fix: The ATI Enums usage has been put under the FF_ATI flag
 
 	Nov 03, 2005 DR: OMAPS00052032 - xpradipg
-	Description : Locosto: SIMP - integration of issues submitted by solDel on 
+	Description : Locosto: SIMP - integration of issues submitted by solDel on
 			     ME Personalization - changes as per the new interfaces
-	Solution	:   The return value of sAT_PlusCLCK of AT_EXCT is handled and 
+	Solution	:   The return value of sAT_PlusCLCK of AT_EXCT is handled and
 			    a please wait screen is displayed until the response is recieved
-   
+
  *
  * June 01, 2005  REF: CRR 31559  x0021334
  * Description: TCS2.1.1 SW not buildable without engineering mode
@@ -139,7 +139,7 @@
  * x0018858 24 Mar, 2005 MMI-FIX-11321
  * Issue Description :- If the inbox is full and a new message is receivd, no indication is received.
  * Fix: Added support for handling indication when message box is full and
- * there is a pending message. 
+ * there is a pending message.
 
  * x0047685, May 22 2006
  * Added R99 CC Interface changes.
@@ -463,13 +463,13 @@
 
 
 LOCAL void mfw_format_plmn_name(UBYTE dcs,UBYTE *in, UBYTE in_length,
-                                UBYTE *out, UBYTE max_out_length);		
+                                UBYTE *out, UBYTE max_out_length);
 
 
 /*May 10,2007 DR:OMAP00127983 x0066814(Geetha)-begin*/
 /*size of the name when converted from 7bit to 8bit alphabet*/
 #define CNAP_EXPANDED_SIZE (((sizeof(BUF_nameString)+1)*8)/7)
-//function to get the name from rAT_PercentCNAP 
+//function to get the name from rAT_PercentCNAP
 void set_cnap_name(T_namePresentationAllowed *cnap_name_info );
 //function to give the name from set_cnap_name to MMI
 GLOBAL T_MFW_PHB_TEXT *get_cnap_name();
@@ -497,11 +497,11 @@
 
 //x0pleela 21 Apr, 2006  DR: OMAPS00067919
 //Requesting for any of the SIMP category pin if enabled based on the "code"
-GLOBAL void rAT_PlusCPIN (T_ACI_CPIN_RSLT code) 
+GLOBAL void rAT_PlusCPIN (T_ACI_CPIN_RSLT code)
 {
 #ifdef SIM_PERS
 	TRACE_FUNCTION("rAT_PlusCPIN()");
-  sim_simlock_cpin_code(code );	
+  sim_simlock_cpin_code(code );
 #endif
 }
 
@@ -517,7 +517,7 @@
 GLOBAL void rAT_PlusCSIM  ( SHORT           rspLen,
                             UBYTE          *rsp    ) {}
 
-GLOBAL void rAT_PlusCNUM  (T_ACI_CNUM_MSISDN *msisdn, UBYTE num) 
+GLOBAL void rAT_PlusCNUM  (T_ACI_CNUM_MSISDN *msisdn, UBYTE num)
 {
 #ifdef FF_CPHS_REL4
 	static UBYTE     count = 0;
@@ -559,15 +559,15 @@
  $Function:    rAT_PercentSATT
 
  $Description:CallBack function, needed for target builds with SAT class E enabled
- 
+
  $Returns: void
 
  $Arguments: T_ACI_CMD_SRC  srcId
                     T_ACI_SATT_CS  cause
- 
+
 *******************************************************************************/
 
-GLOBAL void rAT_PercentSATT( T_ACI_CMD_SRC  srcId, T_ACI_SATT_CS  cause ) 
+GLOBAL void rAT_PercentSATT( T_ACI_CMD_SRC  srcId, T_ACI_SATT_CS  cause )
 {
     TRACE_FUNCTION("rAT_PercentSATT");
 }
@@ -646,10 +646,10 @@
       break;
 
     case AT_CMD_CPBW:
-// July  17, 2006  DR: OMAPS00082792  x0039928		
+// July  17, 2006  DR: OMAPS00082792  x0039928
 		phb_signal(E_PHB_READY, 0);
 	break;
-		
+
     case AT_CMD_COPS:
       nm_ok_cops ();
       break;
@@ -706,9 +706,9 @@
       break;
 
     case AT_CMD_CLCK:
-#ifdef SIM_PERS		
+#ifdef SIM_PERS
 //	Nov 03, 2005 DR: OMAPS00052032 - xpradipg
-//	if the flag is set then SIM Personalization has triggered the CLCK 
+//	if the flag is set then SIM Personalization has triggered the CLCK
 	if( (sim_unlock_in_prog EQ SIMP_BOOTUP) OR
 		(sim_unlock_in_prog EQ SIMP_MENU ) )
 	{
@@ -716,7 +716,7 @@
 		sim_unlock_in_prog = SIMP_NONE;
 	}
 	else
-#endif	
+#endif
       ss_ok_clck();
       break;
 
@@ -829,10 +829,10 @@
 
   switch ((int)cmdId) /*a0393213 lint warnings removal - typecasting done*/
   {
-//x0061560 Date May16,07 (sateeshg) OMAPS00133241 
+//x0061560 Date May16,07 (sateeshg) OMAPS00133241
   case AT_CMD_CPBW:
    	phb_signal(E_PHB_ERROR, 0);
-   	break;	
+   	break;
   case AT_CMD_COPS:
   	//x0pleela 30 May, 2007  DR: OMAPS00133201
   	//Passing the error code
@@ -856,8 +856,8 @@
     break;
   case AT_CMD_CFUN:
     /* OMAPS00075177 - 17,Apr-2006 */
-/* Signature of the function has been changed from U8 to T_ACI_CME_ERR. 
-   because, when calling this function, it is converting from T_ACI_CME_ERR to U8. 
+/* Signature of the function has been changed from U8 to T_ACI_CME_ERR.
+   because, when calling this function, it is converting from T_ACI_CME_ERR to U8.
    It is loosing the negative values( the enum T_ACI_CME_ERR has negative values )
 */
     sim_error_cfun ((T_ACI_CME_ERR)err);
@@ -876,7 +876,7 @@
     break;
 
   case AT_CMD_CLCK:
-#ifdef SIM_PERS  	
+#ifdef SIM_PERS
 //x0pleela 27 Apr, 2006  DR: OMAPS00067919
 	if(sim_unlock_in_prog EQ SIMP_BOOTUP)
 	{
@@ -886,14 +886,14 @@
 	}
 
 //	Nov 03, 2005 DR: OMAPS00052032 - xpradipg
-//	if the flag is set then SIM Personalization has triggered the CLCK 
+//	if the flag is set then SIM Personalization has triggered the CLCK
 	else if(sim_unlock_in_prog EQ SIMP_MENU)
 	{
-		sim_unlock_in_prog = SIMP_NONE;	/*a0393213 compiler warnings removal - FALSE changed to SIMP_NONE*/	
+		sim_unlock_in_prog = SIMP_NONE;	/*a0393213 compiler warnings removal - FALSE changed to SIMP_NONE*/
 		mfw_simlock_continue(SIMP_NONE);
 	}
 	else
-#endif	
+#endif
     ss_error_clck();
     break;
 
@@ -1210,7 +1210,7 @@
                     OR rslt->rsltPrm.rOK.cmdId EQ AT_CMD_CHUP)
                    {
                              //NM Berlin / UK integration 21.09.01
-                            //Nov 02, 2005    DR OMAPS00052132   xdeepadh                          
+                            //Nov 02, 2005    DR OMAPS00052132   xdeepadh
                             //The usage of ATI enum is put under the flag FF_ATI
 #if   defined (FF_ATI) || defined (NEPTUNE_BOARD)
                         /*June 15, 2006    DR:OMAPS00079492    x0043642 */
@@ -1228,20 +1228,20 @@
 					//NM Berlin / UK integration 21.09.01
 					//Nov 02, 2005    DR OMAPS00052132   xdeepadh
 					//The usage of ATI enum is put under the flag FF_ATI
-#ifdef FF_ATI	
+#ifdef FF_ATI
 					cm_ok_disconnect(CMD_SRC_ATI_1, rslt->rsltPrm.rOK.cId);
-#endif 	//FF_ATI  
-                        	} 
+#endif 	//FF_ATI
+                        	}
                     }
                 }
                 if (rslt->rsltPrm.rOK.cmdId EQ AT_CMD_CHLD)
                 	{
 				//NM Berlin / UK integration 21.09.01
-				//Nov 02, 2005    DR OMAPS00052132   xdeepadh   
+				//Nov 02, 2005    DR OMAPS00052132   xdeepadh
 				//The usage of ATI enum is put under the flag FF_ATI
-#ifdef FF_ATI					
+#ifdef FF_ATI
 				cm_result_cmd(CMD_SRC_ATI_1, Present);
-#endif      //FF_ATI  
+#endif      //FF_ATI
                 	}
 
 #ifdef GPRS /* JVJ 10-10-02 */
@@ -1462,7 +1462,7 @@
 +--------------------------------------------------------------------+
 
 
-   PURPOSE :  Function to process the data sent from rAT_PercentCNAP based on presentation mode for CNAP 
+   PURPOSE :  Function to process the data sent from rAT_PercentCNAP based on presentation mode for CNAP
 
 */
 /*May 10,2007 DR:OMAP00127983 x0066814(Geetha)-begin*/
@@ -1470,7 +1470,7 @@
                                       T_callingName *NameId)
 {
   T_namePresentationAllowed *cnap_name_info = NULL;
-    
+
   TRACE_FUNCTION("send_cnap_name_information()");
 
   switch(pres_mode)
@@ -1523,7 +1523,7 @@
 	TRACE_FUNCTION("All values present");
        cnap_name_expanded=mfwAlloc(CNAP_EXPANDED_SIZE+1);
 	dcs =(UBYTE)cnap_name_info->dataCodingScheme;
-		
+
 if( cmh_getAlphabetCb( (UBYTE)dcs ) EQ 0 ) /* 7bit alphabet */
     {
     TRACE_FUNCTION("/* 7bit alphabet */");
@@ -1531,7 +1531,7 @@
         utl_cvt7To8((UBYTE *)cnap_name_info->nameString.b_nameString,
                     (UBYTE)cnap_name_info->lengthInCharacters,
                     cnap_name_expanded,
-                    0 );	
+                    0 );
     }
     else
     {
@@ -1542,7 +1542,7 @@
       expanded_len = (UBYTE)cnap_name_info->lengthInCharacters;
     }
 	  cnap_name.len= (UBYTE)expanded_len;
-#ifdef NO_ASCIIZ		
+#ifdef NO_ASCIIZ
 	 memcpy(cnap_name.data,cnap_name_expanded,sizeof(cnap_name.data));
 #else
 	 strcpy(cnap_name.data,cnap_name_expanded);
@@ -1560,7 +1560,7 @@
 +--------------------------------------------------------------------+
 
 
-   PURPOSE :  function to give the name from set_cnap_name to MMI 
+   PURPOSE :  function to give the name from set_cnap_name to MMI
 
 */
 GLOBAL T_MFW_PHB_TEXT * get_cnap_name()
@@ -1682,8 +1682,8 @@
 	  globalSignalUpdate(0);
       prelevel = 0;
     	}
-	else 
-   #endif	
+	else
+   #endif
 	if( prelevel != actlevel )
 	{
 		globalSignalUpdate(actlevel);
@@ -1707,11 +1707,11 @@
 
 GLOBAL void rAT_PercentCPVWI ( UBYTE         flag_set,
                                USHORT        line)
-{ 
+{
 TRACE_FUNCTION("rAT_PercentCPVWI()");
 	//18 May, 2006  DR: OMAPS00070657  x0pleela
 	//Send this event when there is any voice mail
-	sendCPWIEvt(flag_set, line); 
+	sendCPWIEvt(flag_set, line);
 }
 
 /*
@@ -1797,7 +1797,7 @@
            isMessageWaiting = TRUE;
            break;
          case CIND_SMSFULL_INDICATOR_MEMAVAIL:
-           TRACE_FUNCTION("CIND_SMSFULL_INDICATOR_MEMAVAIL");           
+           TRACE_FUNCTION("CIND_SMSFULL_INDICATOR_MEMAVAIL");
            isMessageWaiting = FALSE;
            break;
          case CIND_SMSFULL_INDICATOR_MAX:
@@ -1820,17 +1820,17 @@
 | STATE   : code          ROUTINE : mfw_format_plmn_name    |
 +--------------------------------------------------------------------+
 
-  PURPOSE : Decodes PLMN name to remote source format 
+  PURPOSE : Decodes PLMN name to remote source format
 
 */
 
 void mfw_format_plmn_name(UBYTE dcs,UBYTE *in, UBYTE in_length, UBYTE *out, UBYTE max_out_length)
-{ 
+{
     USHORT size_of_plmn_name;
 	UBYTE dest_len=0;
 	UBYTE buf[33];
-	
-	memset(buf,33,0);	
+
+	memset(buf,33,0);
 	if(dcs ==0) /*GSM default */
 	{
 	  dest_len = utl_cvt7To8(in,in_length,buf,0);
@@ -1840,9 +1840,9 @@
 	else if(dcs ==1) /*UCS2 */
 	{
 	    utl_hexFromGsm(in,in_length,out,max_out_length,&size_of_plmn_name,GSM_ALPHA_Def,CSCS_ALPHA_7_Bit);
-		
+
 	}
-}	
+}
 
 
 
@@ -1859,9 +1859,9 @@
 GLOBAL void rAT_PercentCNIV (T_MMR_INFO_IND *mmr_info_ind)
 {
 	T_MFW_NETWORK_STRUCT plmn_netw_data;
-	SHORT mcc = 0; 
+	SHORT mcc = 0;
        SHORT mnc = 0;
-	
+
 	TRACE_FUNCTION("rAT_PercentCNIV()");
 
       //copy plmn info into plmn_netw_data from mmr_info_ind
@@ -1882,19 +1882,19 @@
 	 else
 	 {
 	   	   sprintf((char*)&plmn_netw_data.network_numeric, "%d%d", mcc, mnc);
-	 }	  
+	 }
 //Apr 13, 2007 DRT:OMAPS00122739 x0066814(Geetha)
 	if (mmr_info_ind->short_name.v_name)  /* short name  */
-  	{ 
+  	{
   		TRACE_FUNCTION(" SHORT NAME ");
     		mfw_format_plmn_name(mmr_info_ind->short_name.dcs,(UBYTE*)mmr_info_ind->short_name.text,
                          mmr_info_ind->short_name.c_text,    (UBYTE *)plmn_netw_data.network_short.data, 33);
  	 }
-  
+
  	if (mmr_info_ind->full_name.v_name) /* full name  */
-  	{ 
+  	{
   		TRACE_FUNCTION(" Long NAME ");
-    		mfw_format_plmn_name(mmr_info_ind->full_name.dcs,(UBYTE*)mmr_info_ind->full_name.text, 
+    		mfw_format_plmn_name(mmr_info_ind->full_name.dcs,(UBYTE*)mmr_info_ind->full_name.text,
 	                     mmr_info_ind->full_name.c_text, (UBYTE *)plmn_netw_data.network_long.data, 33);
   }
 
@@ -1903,14 +1903,14 @@
   nm_get_network_data(&plmn_netw_data);
 }
 
-#else             
+#else
                        /* DMPS MMREG SAP */
 GLOBAL void rAT_PercentCNIV (T_MMREG_INFO_IND *mmr_info_ind)
 {
   T_MFW_NETWORK_STRUCT plmn_netw_data;
-  SHORT mcc = 0; 
+  SHORT mcc = 0;
   SHORT mnc = 0;
-  
+
   TRACE_FUNCTION("rAT_PercentCNIV()");
 
   /* copy plmn info into plmn_netw_data from mmr_info_ind */
@@ -1925,21 +1925,21 @@
   {
       sprintf((char*)&plmn_netw_data.network_numeric, "%d%d",
               mcc, (mnc & 0x0FF0) >> 4);
-	 
+
   }
   else
   {
           sprintf((char*)&plmn_netw_data.network_numeric, "%d%d", mcc, mnc);
-		  
-  }    
+
+  }
 
   if (mmr_info_ind->v_short_net_name AND /* short name only */
       !mmr_info_ind->v_full_net_name)
-  { 
+  {
   TRACE_FUNCTION(" SHORT NAME ");
-#ifdef NO_ASCIIZ  
-    memcpy(plmn_netw_data.network_short.data, 
-           mmr_info_ind->short_net_name.text, 
+#ifdef NO_ASCIIZ
+    memcpy(plmn_netw_data.network_short.data,
+           mmr_info_ind->short_net_name.text,
            mmr_info_ind->short_net_name.c_text);
 #else
     strcpy(plmn_netw_data.network_short, (char*)mmr_info_ind->short_net_name.text);
@@ -1947,31 +1947,31 @@
   }
   else if (!mmr_info_ind->v_short_net_name AND
             mmr_info_ind->v_full_net_name)    /* full name only */
-  {  
+  {
     TRACE_FUNCTION(" LONG NAME ");
-#ifdef NO_ASCIIZ  
-    memcpy( plmn_netw_data.network_long.data, 
-          mmr_info_ind->full_net_name.text,  
+#ifdef NO_ASCIIZ
+    memcpy( plmn_netw_data.network_long.data,
+          mmr_info_ind->full_net_name.text,
           mmr_info_ind->full_net_name.c_text);
 #else
     strcpy( plmn_netw_data.network_long, (char*)mmr_info_ind->full_net_name.text );
-#endif    
+#endif
   }
   else if (mmr_info_ind->v_short_net_name AND
             mmr_info_ind->v_full_net_name)
   {
   TRACE_FUNCTION(" LONG AND SHORT ");
-#ifdef NO_ASCIIZ  
-    memcpy( plmn_netw_data.network_long.data, 
-          mmr_info_ind->full_net_name.text,  
+#ifdef NO_ASCIIZ
+    memcpy( plmn_netw_data.network_long.data,
+          mmr_info_ind->full_net_name.text,
           mmr_info_ind->full_net_name.c_text);
-    memcpy( plmn_netw_data.network_short.data, 
-        mmr_info_ind->short_net_name.text, 
+    memcpy( plmn_netw_data.network_short.data,
+        mmr_info_ind->short_net_name.text,
         mmr_info_ind->short_net_name.c_text);
 #else
     strcpy( plmn_netw_data.network_long, (char*)mmr_info_ind->full_net_name.text );
     strcpy( plmn_netw_data.network_short, (char*)mmr_info_ind->short_net_name.text);
-#endif	  
+#endif
 	  }
   else
   {
@@ -2085,16 +2085,16 @@
 #ifndef NEPTUNE_BOARD
 	T_MFW_NETWORK_STRUCT plmn_eons_data;
 #endif
-  
+
   TRACE_FUNCTION ("rAT_PercentCSTAT ()");
   #ifndef NEPTUNE_BOARD
   memset(&plmn_eons_data, 0, sizeof(T_MFW_NETWORK_STRUCT) );
-  if( (msgType.entityId EQ STATE_MSG_EONS ) AND 
+  if( (msgType.entityId EQ STATE_MSG_EONS ) AND
   	(msgType.entityState EQ ENTITY_STATUS_Ready) )
   {
-    nm_get_COPN(&plmn_eons_data);  
-
-    //send E_NM_OPN event 
+    nm_get_COPN(&plmn_eons_data);
+
+    //send E_NM_OPN event
     nm_get_network_data(&plmn_eons_data);
   }
 #endif
@@ -2165,7 +2165,7 @@
   TRACE_FUNCTION("rAT_PercentCREG()");
 }
 
-#if defined (MFW) || defined (SMI) 
+#if defined (MFW) || defined (SMI)
 #ifdef FF_TIMEZONE
 GLOBAL void rAT_PlusCTZV ( S32 timezone )
 {
@@ -2193,32 +2193,32 @@
 
   PURPOSE :
 */
-#if defined (MFW) || defined (SMI) 
+#if defined (MFW) || defined (SMI)
 GLOBAL void rAT_PercentCTZV (T_MMR_INFO_IND *mmr_info_ind, S32 timezone )
 {
   #ifdef FF_TIMEZONE
   T_MFW_TIME_IND currclock;
-  #endif 
+  #endif
 
   TRACE_FUNCTION("rAT_PercentCTZV()");
 
   #ifdef FF_TIMEZONE
-  // Copy time related data received from network to 'currclock' 
+  // Copy time related data received from network to 'currclock'
   // to be passed to MMI.
 
   currclock.hour = mmr_info_ind->time.hour;
   currclock.minute = mmr_info_ind->time.minute;
   currclock.second = mmr_info_ind->time.second;
 
-  // Copy date related data received from network to 'currclock' 
-  // to be passed to MMI.  
+  // Copy date related data received from network to 'currclock'
+  // to be passed to MMI.
   currclock.day = mmr_info_ind->time.day;
   currclock.month = mmr_info_ind->time.month;
   currclock.year = mmr_info_ind->time.year;
 
   // Pass time and date info to MMI
   nm_set_network_time(&currclock);
-  #endif 
+  #endif
 }
 #endif
 
@@ -2260,7 +2260,7 @@
 {
 }
 #endif
-#else 
+#else
 #ifdef TI_PS_FF_EM
 GLOBAL void rAT_PercentEM ( /*UBYTE srcId,*/ T_EM_VAL *val_tmp )
 {
@@ -2314,7 +2314,7 @@
 #ifndef MFW
 #ifndef FF_MMI_RIV
 /* dummy in case of SMI */
-GLOBAL void rAT_PercentCPVWI ( UBYTE         flag_set, 
+GLOBAL void rAT_PercentCPVWI ( UBYTE         flag_set,
                                USHORT        line)
 { }
 #endif /* FF_MMI_RIV */
@@ -2338,9 +2338,9 @@
 	mfw_mbi.electronic=mbi->mbdn_id_email;
 	mfw_mbi.other=mbi->mbdn_id_other;
 	mfw_mbi.valid=1; /*1 means valid*/
-	
+
 	/*need to send MBI signal to BMI*/
-	sendCPHSSignal(E_CPHS_REL4_GET_MBI, &mfw_mbi);	
+	sendCPHSSignal(E_CPHS_REL4_GET_MBI, &mfw_mbi);
 }
 
 /*
@@ -2368,7 +2368,7 @@
 +--------------------------------------------------------------------+
 
   PURPOSE : handles callback for %MWIS, which queries the message waiting status*/
-  
+
 GLOBAL void rAT_PercentMWIS(T_ACI_MWIS_MWI* mwis)
 {
 	/*send MBDN signal to BMI*/
@@ -2405,7 +2405,7 @@
 	mwis_stat[msp_id - 1].fax = mwis->mwis_count_fax;
 	mwis_stat[msp_id - 1].electronic = mwis->mwis_count_email;
 	mwis_stat[msp_id - 1].other = mwis->mwis_count_other;
-	
+
 	sendCPHSSignal(E_CPHS_GET_VC_STAT,0);
 }
 
@@ -2475,14 +2475,14 @@
 {
   TRACE_FUNCTION ("rAT_PercentCMGR()");
 }
- 
+
 /*
 +--------------------------------------------------------------------+
 | PROJECT : GSM-F&D (8411)        MODULE  : MFW_ACI_DUMMY            |
 | STATE   : code                  ROUTINE : rAT_PercentCMGL          |
 +--------------------------------------------------------------------+
 
-  PURPOSE : 
+  PURPOSE :
 */
 GLOBAL void rAT_PercentCMGL ( T_ACI_CMGL_SM * smLst )
 {
@@ -2535,13 +2535,13 @@
 | PROJECT : GSM-F&D (8411)              MODULE  : ACI_RET            |
 | STATE   : code                        ROUTINE : rAT_PercentCFIS    |
 +--------------------------------------------------------------------+
-  
+
   PURPOSE : handles rAT_PercentCFIS call back
   PARAMETERS : cfis    - Call forward indication status
  */
 #ifdef FF_CPHS_REL4
 GLOBAL void rAT_PercentCFIS ( T_ACI_CFIS_CFU *cfis )
-{	
+{
   T_MFW_CPHS_REL4_DV_STAT divert_status;
   TRACE_FUNCTION("rAT_PercentCFIS()");
 
@@ -2559,13 +2559,13 @@
 	divert_status.data=MFW_CFLAG_SET;
   else
   	divert_status.data=MFW_CFLAG_NOTSet;
-  
+
   memcpy(divert_status.voice_dialling_number,cfis->number,PHB_MAX_LEN);
 
   TRACE_EVENT_P4("voice  %x,  fax  %x,  data  %x,  number  %s",
   	divert_status.voice,divert_status.fax,divert_status.data,
   	divert_status.voice_dialling_number);
-  
+
   sendCPHSSignal(E_CPHS_GET_DV_STAT,&divert_status);
 }
 #endif /* FF_CPHS_REL4 */
@@ -2600,7 +2600,7 @@
   }
 
   return FALSE;
-    
+
 }
 
 /*
@@ -2620,17 +2620,17 @@
 
   U32 ucp=msl_mmi_ind->ucp;
   /*a0393213 compiler warnings removal - removed variable status*/
-  
+
   TRACE_FUNCTION ("Mslil_msl_mmi_ind");
-  
+
 	switch(ucp)
 	{
-#ifdef FF_MMI_CAMERA_APP	
+#ifdef FF_MMI_CAMERA_APP
 	case  MSL_UCP_IMGCAP:/*MSL_UCP_IMGCAP*/
 		mfw_msl_cam_cb(msl_mmi_ind->message, msl_mmi_ind->appData);
 		break;
-#endif		
-#ifdef FF_MMI_FILEMANAGER		
+#endif
+#ifdef FF_MMI_FILEMANAGER
 	case  MSL_UCP_IMGTHMB:/*MSL_UCP_IMGTHMB*/
 		//Call the mmi cb for imagethumbnail.
 		mfw_fm_thmb_mslcb(msl_mmi_ind->message, msl_mmi_ind->appData);
@@ -2639,7 +2639,7 @@
 		//Call the mmi cb for magepreview.
 		mfw_fm_view_mslcb(msl_mmi_ind->message, msl_mmi_ind->appData);
 		break;
-#endif		
+#endif
 	}
 
   PFREE(msl_mmi_ind);
@@ -2657,7 +2657,7 @@
 |			    message - status message
 |
 |  Return       :  void
-|                  
+|
 +------------------------------------------------------------------------------
 */