--- a/src/ui/mfw/mfw_ss.c	Tue Jan 19 05:41:26 2021 +0000
+++ b/src/ui/mfw/mfw_ss.c	Tue Jan 19 06:10:27 2021 +0000
@@ -14,57 +14,57 @@
    $History:: mfw_ss.c                                              $
 
      	Feb 27, 2007 ER: OMAPS00113891 x0pleela
- 	Description:[ACI] MTC related call forwarded SS notification not differentiable on 
+ 	Description:[ACI] MTC related call forwarded SS notification not differentiable on
  				BAT/ATI level
  	Solution: In function ss_cvtCssuCodes(), new enum CSSU_CODE_IncCallForwarded
- 			from ACI is handled and typecasted to MFW_SS_MT_CALL_FORWARDED 
- 			for MMI to handle this event  
- 				
+ 			from ACI is handled and typecasted to MFW_SS_MT_CALL_FORWARDED
+ 			for MMI to handle this event
+
    	Aug 28, 2006  DR: OMAPS00083503 x0pleela
 	Description: Result of ss_check_ss_string may be ignored
 	Solution:	rat_percentKSIR(): Removed the hardcoded dcs value "MFW_ASCII"
-			and sending ss signal E_SS_USSD_REQ or E_SS_USSD_CNF based on user 
+			and sending ss signal E_SS_USSD_REQ or E_SS_USSD_CNF based on user
 			action required or not
 
 	Jul 04, 2006	REF: OMAPS00079722 	x0023848
-	Description: MS displays garbage instead of appropriate user indication  when network 
+	Description: MS displays garbage instead of appropriate user indication  when network
        release with problem code  "unrecognized operation" or a cause "facility rejected".
 	Solution: Added a NULL Check for the result string of the USSD command that is being received.
-	
+
     Jun 30, 2006     REF : OMAPS00083503    R.Prabakar
     Description : When USSD string is sent, MMI shows requesting screen forever
     Solution     : Some cases in rAT_PlusCUSD weren't handled. They are handled now.
-    
+
 	Dec 16, 2005	REF: OMAPS00053316	x0018858
 	Description: E-Sample 2.58 compiler code crashes when accessing the Voicemail service in the Messages
 	Solution: Added a NULL Check for the USSD pointer that is being received.
-	
+
 	Jul 05, 2005	REF: CRR 22565	a0876501
 	Description: IMEI display on handset through atd*#06# was swapped.
-	Solution: Byte swapping corrected for IMEI decoding. 
+	Solution: Byte swapping corrected for IMEI decoding.
 
 	Mar 30, 2005	REF: CRR 29986	xpradipg
 	Description: Optimisation 1: Removal of unused variables and dynamically
 	allocate/ deallocate mbndata
-	Solution: unused variables are removed 
+	Solution: unused variables are removed
 
 	Apr 06 2005		REF: CRR 29989	xpradipg
 	Description:	Optimisation 3: replace the static global data with dynamic
 					allocation / deallocation
 	Solution:		The static global variables are dynamically allocated and
 					deallocated
-	
+
 	Aug 16, 2004    REF: CRR 24323   Deepa M.D
 	Bug:Clenup of sprintf used for tracing
 	Fix:Replace the char buf[]; sprintf (buf, "...", ...); TRACE_EVENT (buf); statements by TRACE_EVENT_PX
 
 	Jul 15, 2004 REF: CRR 13873 xkundadu
-	Description: Make an incoming call, the end user pressing 0+send will 
-			    pick up the call. Instead, 0+send should reject the incoming 
-			    call. 
+	Description: Make an incoming call, the end user pressing 0+send will
+			    pick up the call. Instead, 0+send should reject the incoming
+			    call.
 	Solution:     Added the handling of 0/1/2 SEND for a waiting call.
-			    Modified the ss_decode() function in the 
-			    mfw_ss.c file to search the sequential table in the case of 
+			    Modified the ss_decode() function in the
+			    mfw_ss.c file to search the sequential table in the case of
 			    waiting call also. Made changes in mfw_cm.c file also
  *
  * *****************  Version 24  *****************
@@ -217,7 +217,7 @@
 
 //	Apr 06 2005		REF: CRR 29989	xpradipg
 //	The below static globals are dynamically allocated in rAT_PercentKSIR where
-//	the data is populated for the supplementary services response and 
+//	the data is populated for the supplementary services response and
 //	deallocated once the ss_signal function is executed where in the contents
 //	are copied onto another variable
 #ifdef FF_MMI_OPTIM
@@ -287,7 +287,7 @@
 
 #ifndef PCM_2_FFS
 
- #ifndef FF_MMI_OPTIM 
+ #ifndef FF_MMI_OPTIM
   EF_MSCAP mscap;
   EF_MSSUP mssup;
   EF_MSSET msset;
@@ -364,7 +364,7 @@
   T_MFW_HDR *hdr;
   T_MFW_SS  *ss_para;
   MfwHdr * insert_status =0;
-  
+
   TRACE_FUNCTION("ss_create()");
 
   hdr      = (T_MFW_HDR *) mfwAlloc(sizeof (T_MFW_HDR));
@@ -373,16 +373,16 @@
   if (!hdr OR !ss_para)
   	{
     	TRACE_ERROR("ERROR: ss_create() Mem Alloc Failed.");
-			
+
 	   	if(hdr)
    			mfwFree((U8*)hdr,sizeof(MfwHdr));
 
    		if(ss_para)
    			mfwFree((U8*)ss_para,sizeof(T_MFW_SS));
-   		
+
 	   	return FALSE;
     }
-  
+
   /*
    * initialisation of the handler
    */
@@ -396,12 +396,12 @@
    * installation of the handler
    */
   insert_status = mfwInsert((T_MFW_HDR *)hWin, hdr);
-  
+
   if(!insert_status)
   	{
   		TRACE_ERROR("ERROR: ss_create() Failed to Install Handler. ");
    		mfwFree((U8*)hdr,sizeof(MfwHdr));
-   		mfwFree((U8*)ss_para,sizeof(T_MFW_SS)); 	
+   		mfwFree((U8*)ss_para,sizeof(T_MFW_SS));
 		return 0;
   	}
     return insert_status;
@@ -547,7 +547,7 @@
 {
 	UBYTE temp;
   TRACE_FUNCTION ("ss_signal()");
-	
+
 temp = dspl_Enable(0);
 if (mfwSignallingMethod EQ 0)
   {
@@ -656,7 +656,7 @@
   if ((cm_search_callId(CAL_STAT_Held, &id) == CM_OK)
       OR (cm_search_callId(CAL_STAT_Active, &id) == CM_OK))
    {
-     call_active = TRUE;   
+     call_active = TRUE;
     ksd_decode((CHAR *)string, TRUE, &grp, &rest, &para);
    }
   else
@@ -675,11 +675,11 @@
     if (string_length<=MFW_MAX_DIAL_SHORT_STRING_LEN)
     {
     /* If the call is active, the short string will be USSD in all the cases not described in ETSI 2.30*/
-      if (call_active)                
+      if (call_active)
         grp = SEQGRP_USSD;
         /* If the call is not active, the short strings 1x will be DIAL, the rest USSD*/
       else if ((string_length EQ 1)||(*(string) NEQ '1'))
-        grp = SEQGRP_USSD;	
+        grp = SEQGRP_USSD;
     }
   break;
   case (SEQGRP_SUP_CLIR):   /* JGG/JVJ - CQ 6537 */
@@ -692,8 +692,8 @@
       rest_ss_group = ss_check_ss_string((UBYTE*)rest);
       if (rest_ss_group EQ MFW_SS_DIAL) /*If rest is a dial string, then the whole string is dial */
         ss_group = MFW_SS_DIAL;
-      else 
-        ss_group = MFW_SS_UNKNOWN;   
+      else
+        ss_group = MFW_SS_UNKNOWN;
 
       TRACE_EVENT_P2("ss_check_ss_string(""%s"") returns -> %d",(char*)string,ss_group);
       return ss_group;
@@ -733,13 +733,13 @@
   TRACE_FUNCTION("ss_decode()");
 
 // Added the checking of wait call to solve the bug MMI-SPR 13873.
-// If the call is a waiting also pass TRUE as the second parameter to the 
-// function ksd_decode() to decode the entered number. In ksd_decode only if   
-// the second parameter is TRUE the sequential table is searched to find out 
+// If the call is a waiting also pass TRUE as the second parameter to the
+// function ksd_decode() to decode the entered number. In ksd_decode only if
+// the second parameter is TRUE the sequential table is searched to find out
 // the group where the user entered string belongs to.
   if ((cm_search_callId(CAL_STAT_Held, &id) == CM_OK)
       OR (cm_search_callId(CAL_STAT_Active, &id) == CM_OK)
-        OR (cm_search_callId(CAL_STAT_Wait, &id) == CM_OK)) 
+        OR (cm_search_callId(CAL_STAT_Wait, &id) == CM_OK))
   {
     	bRetVal = ksd_decode((CHAR *)string, TRUE, &grp, &rest, &para);
     	if (!bRetVal)
@@ -780,7 +780,7 @@
 T_MFW_SS_RETURN ss_check_group(T_KSD_SEQGRP grp, T_KSD_SEQPARAM   para)
 {
 	TRACE_EVENT_P1("ss_check_group: grp=%d", grp);
-	
+
   switch (grp)
   {
     case SEQGRP_DIAL:
@@ -800,7 +800,7 @@
 
     case SEQGRP_USSD:
     /*MC, SPR 1111 check for LANGUAGE reset code*/
-    
+
     if (!strncmp((char*)para.ussd.ussd, LANG_RESET, strlen(LANG_RESET)) && para.ussd.ussd[6]=='#')
     	return MFW_SS_LANG_RESET;
    /*MC end*/
@@ -867,7 +867,7 @@
 
 		/*NM 190602*/
 		case KSD_SS_ALL_SERV:
-		
+
 		  return MFW_SS_REG_PW;
 
 		case KSD_SS_PIN1:
@@ -959,8 +959,8 @@
 		case CSSU_CODE_ECTConnect:     return MFW_SS_NOTIFY_ectCONNECT;
 		case CSSU_CODE_DeflectedCall:  return MFW_SS_MT_DEFLECTED;
 		//x0pleela 22 Feb, 2007 ER: OMAPS00113891
-		/* 	Adding the following new enum to differentiate the indications b/n the 
-			subscriber who forwarded the call (CSSU_CODE_IncCallForwarded) and 
+		/* 	Adding the following new enum to differentiate the indications b/n the
+			subscriber who forwarded the call (CSSU_CODE_IncCallForwarded) and
 			to whom the call was forwarded(CSSU_CODE_ForwardedCall) */
 		case CSSU_CODE_IncCallForwarded: return MFW_SS_MT_CALL_FORWARDED;
 		default:					   return MFW_SS_NOTIFY_UNKNOWN;
@@ -1029,11 +1029,11 @@
 		strcpy((char *)notify.subaddr, (char *)subaddr);
 
 	//PATCH TB 1309: Wrong codes tested
-	if ((code == MFW_SS_MO_CUG_CALL) OR 
+	if ((code == MFW_SS_MO_CUG_CALL) OR
 		(code == MFW_SS_MT_CUG_CALL))
 		notify.index = (UBYTE)index;
 	/* END PATCH TB	*/
-		
+
     {
 		/***************************Go-lite Optimization changes Start***********************/
 		//Aug 16, 2004    REF: CRR 24323   Deepa M.D
@@ -1082,7 +1082,7 @@
 
 */
 
-T_MFW ss_cvtSCode(T_ACI_KSD_SS code) 
+T_MFW ss_cvtSCode(T_ACI_KSD_SS code)
 {
 	switch (code)
 	{
@@ -1249,9 +1249,9 @@
     imei_info.imei_number[1] = ( ksStat->ir.rKSIMEI.tac1 & 0xF0 )   >> 4 | 0x30;
     imei_info.imei_number[2] = ( ksStat->ir.rKSIMEI.tac2 )   & 0x0F | 0x30;
     imei_info.imei_number[3] = ( ksStat->ir.rKSIMEI.tac2 & 0xF0 )   >> 4 | 0x30;
-    imei_info.imei_number[4] = ( ksStat->ir.rKSIMEI.tac3 )   & 0x0F | 0x30;	
+    imei_info.imei_number[4] = ( ksStat->ir.rKSIMEI.tac3 )   & 0x0F | 0x30;
     imei_info.imei_number[5] = ( ksStat->ir.rKSIMEI.tac3 & 0xF0 )   >> 4 | 0x30;
-    imei_info.imei_number[6] = ( ksStat->ir.rKSIMEI.fac  )    & 0x0F | 0x30;    
+    imei_info.imei_number[6] = ( ksStat->ir.rKSIMEI.fac  )    & 0x0F | 0x30;
     imei_info.imei_number[7] = ( ksStat->ir.rKSIMEI.fac  & 0xF0 )   >> 4 | 0x30;
     imei_info.imei_number[8] = ( ksStat->ir.rKSIMEI.snr1 )   & 0x0F | 0x30;
     imei_info.imei_number[9] = ( ksStat->ir.rKSIMEI.snr1 & 0xF0 )   >> 4 | 0x30;
@@ -1263,7 +1263,7 @@
     imei_info.imei_number[15] = ( ksStat->ir.rKSIMEI.svn )  & 0x0F | 0x30;
     imei_info.imei_number[16] = ( ksStat->ir.rKSIMEI.svn  & 0xF0 ) >> 4 | 0x30;
     imei_info.imei_number[17] = '\0';
-	
+
 #else
     imei_info->imei_number[0] = ( ksStat->ir.rKSIMEI.tac1 & 0xF0 )   >> 4 | 0x30;
     imei_info->imei_number[1] = ( ksStat->ir.rKSIMEI.tac1 )   & 0x0F | 0x30;
@@ -1293,9 +1293,9 @@
     imei_info.imei_number[1] = ( ksStat->ir.rKSIMEI.tac1 & 0xF0 )   >> 4 | 0x30;
     imei_info.imei_number[2] = ( ksStat->ir.rKSIMEI.tac2 )   & 0x0F | 0x30;
     imei_info.imei_number[3] = ( ksStat->ir.rKSIMEI.tac2 & 0xF0 )   >> 4 | 0x30;
-    imei_info.imei_number[4] = ( ksStat->ir.rKSIMEI.tac3 )   & 0x0F | 0x30;	
+    imei_info.imei_number[4] = ( ksStat->ir.rKSIMEI.tac3 )   & 0x0F | 0x30;
     imei_info.imei_number[5] = ( ksStat->ir.rKSIMEI.tac3 & 0xF0 )   >> 4 | 0x30;
-    imei_info.imei_number[6] = ( ksStat->ir.rKSIMEI.fac  )    & 0x0F | 0x30;    
+    imei_info.imei_number[6] = ( ksStat->ir.rKSIMEI.fac  )    & 0x0F | 0x30;
     imei_info.imei_number[7] = ( ksStat->ir.rKSIMEI.fac  & 0xF0 )   >> 4 | 0x30;
     imei_info.imei_number[8] = ( ksStat->ir.rKSIMEI.snr1 )   & 0x0F | 0x30;
     imei_info.imei_number[9] = ( ksStat->ir.rKSIMEI.snr1 & 0xF0 )   >> 4 | 0x30;
@@ -1307,7 +1307,7 @@
     imei_info.imei_number[15] = ( ksStat->ir.rKSIMEI.svn )  & 0x0F | 0x30;
     imei_info.imei_number[16] = ( ksStat->ir.rKSIMEI.svn  & 0xF0 ) >> 4 | 0x30;
     imei_info.imei_number[17] = '\0';
-	
+
    #else
 //	Jul 05 2005		REF: CRR 22565	a0876501
 //	Fixed the issue of byte swapping.
@@ -1339,10 +1339,10 @@
   TRACE_EVENT_P6("ss_decode_imei IMEI: SNR %1c%1c%1c%1c%1c%1c",
                   imei_info.imei_number[8],  imei_info.imei_number[9], imei_info.imei_number[10], imei_info.imei_number[11],
                   imei_info.imei_number[12], imei_info.imei_number[13]);
-  TRACE_EVENT_P4("ss_decode_imei IMEI: SV CD %1c%1c%1c%1c", 
+  TRACE_EVENT_P4("ss_decode_imei IMEI: SV CD %1c%1c%1c%1c",
 				  imei_info.imei_number[14], imei_info.imei_number[15], imei_info.imei_number[16],imei_info.imei_number[17]);
 
-#endif	
+#endif
 }
 
 #ifdef NEPTUNE_BOARD
@@ -1382,7 +1382,7 @@
 | PROJECT: MMI-Framework (8417)         MODULE  : MFW_SS             |
 | STATE  : code                         ROUTINE : mfw_getCdByteFromImei  |
 +--------------------------------------------------------------------+
-   PURPOSE :  Get CD byte from IMEI.  
+   PURPOSE :  Get CD byte from IMEI.
 */
 UBYTE getCdByteFromImei(UBYTE *imei)
 {
@@ -1407,7 +1407,7 @@
   return(cmhSS_getCdFromImei(&aci_imei));
 
 #else
-  
+
   /* OMAPS00059546 : Calculating the CD bytes for IMEI  */
   iSum += mfw_getSumOf2Digits ( aci_imei.tac1 );
   iSum += mfw_getSumOf2Digits ( aci_imei.tac2 );
@@ -1416,7 +1416,7 @@
   iSum += mfw_getSumOf2Digits ( aci_imei.snr1 );
   iSum += mfw_getSumOf2Digits ( aci_imei.snr2 );
   iSum += mfw_getSumOf2Digits ( aci_imei.snr3 );
-  
+
   iCd = 10 - ( iSum % 10 );
   iCd = ( iCd EQ 10 ? 0 : iCd );
   return ( iCd );
@@ -1482,7 +1482,7 @@
           cb_cnf.ss_category = (T_MFW_SS_CATEGORY)ss_cvtOCode((T_ACI_KSD_OP)ksStat->ir.rKSCB.opCd);
           cb_cnf.ss_error    = (T_MFW_SS_ERROR)ss_cvtErrCode((T_ACI_KSD_ERR)ksStat->ir.rKSCB.ssErr);
           cb_cnf.ss_telecom_list = p_tele;
-#endif          
+#endif
 
           for( idx = 0;
                idx < ksStat->ir.rKSCB.c_cbInfoLst AND
@@ -1496,13 +1496,13 @@
             p_tele->ss_status = ksStat->ir.rKSCB.
                                             cbInfoLst[idx].ssSt;
           }
-//	Apr 06 2005		REF: CRR 29989	xpradipg          
+//	Apr 06 2005		REF: CRR 29989	xpradipg
 #ifdef FF_MMI_OPTIM
-		if(NULL != cb_cnf)	
+		if(NULL != cb_cnf)
           cb_cnf->ss_telecom_count = idx;
 #else
           cb_cnf.ss_telecom_count = idx;
-#endif          
+#endif
           break;
 
         case KSD_CMD_CF:
@@ -1546,7 +1546,7 @@
           cf_cnf.ss_error    = (T_MFW_SS_ERROR)ss_cvtErrCode((T_ACI_KSD_ERR)ksStat->ir.rKSCF.ssErr);
 
           cf_cnf.ss_feature_list = p_feat;
-#endif	
+#endif
           for( idx = 0;
                idx < ksStat->ir.rKSCF.c_cfFeatLst AND
                idx < MFW_MAX_FEAT_NR;
@@ -1570,21 +1570,21 @@
             p_feat->ss_no_reply_condition_time = ksStat->ir.rKSCF.
                                                               cfFeatLst[idx].time;
           }
-//	Apr 06 2005		REF: CRR 29989	xpradipg          
+//	Apr 06 2005		REF: CRR 29989	xpradipg
 #ifdef FF_MMI_OPTIM
 		if(NULL != cf_cnf)
           cf_cnf->ss_feature_count = idx;
 #else
           cf_cnf.ss_feature_count = idx;
-#endif          
+#endif
 	TRACE_EVENT("rat_percentksir->KSD_CMD_CF");
           if (ksStat->srcId != CMD_SRC_LCL)
-//	Apr 06 2005		REF: CRR 29989	xpradipg          
+//	Apr 06 2005		REF: CRR 29989	xpradipg
 #ifdef FF_MMI_OPTIM
-			{	
-				
+			{
+
 				ss_signal(E_SS_CF_ICN_UPD,cf_cnf);
-			}				
+			}
 #else
  	            ss_signal(E_SS_CF_ICN_UPD, &cf_cnf);
 #endif
@@ -1600,7 +1600,7 @@
           TRACE_EVENT_P1("ksStat->ir.rKSCL.mode %d", ksStat->ir.rKSCL.mode);
           TRACE_EVENT_P1("ksStat->ir.rKSCL.clirOpt %d", ksStat->ir.rKSCL.clirOpt);
           TRACE_EVENT_P1("ksStat->ir.rKSCL.ovrdCtg %d", ksStat->ir.rKSCL.ovrdCtg);
-//	Apr 06 2005		REF: CRR 29989	xpradipg          
+//	Apr 06 2005		REF: CRR 29989	xpradipg
 #ifdef FF_MMI_OPTIM
 		  cli_cnf = (T_MFW_SS_CLI_CNF*)mfwAlloc(sizeof(T_MFW_SS_CLI_CNF));
 		  if(NULL != cli_cnf)
@@ -1620,7 +1620,7 @@
           cli_cnf.ss_status      = ksStat->ir.rKSCL.ssSt;
           cli_cnf.ss_clir_option = (T_MFW_CL_STATUS)ss_cvtCLStatus((T_ACI_KSD_CLIR_OP)ksStat->ir.rKSCL.clirOpt);/*a0393213 compiler warning removal - explicit typecasting done*/
           cli_cnf.ss_ovrd_ctgry  = (T_MFW_OV_CTGRY)ss_cvtCLOvrd((T_ACI_KSD_OVRD_CTG)ksStat->ir.rKSCL.ovrdCtg);
-#endif          
+#endif
           break;
 
         case KSD_CMD_CW:
@@ -1640,7 +1640,7 @@
             }
           }
           p_srv = (T_MFW_SRV_GROUP *) ssLstBuf;
-//		Apr 06 2005		REF: CRR 29989	xpradipg          
+//		Apr 06 2005		REF: CRR 29989	xpradipg
 #ifdef FF_MMI_OPTIM
 		  cw_cnf = (T_MFW_SS_CW_CNF*)mfwAlloc(sizeof(T_MFW_SS_CW_CNF));
 		  if(cw_cnf != NULL)
@@ -1651,8 +1651,8 @@
     	    cw_cnf->ss_status   = ksStat->ir.rKSCW.ssSt;
             cw_cnf->ss_service_list = p_srv;
           }
-        
-#else	
+
+#else
 	      cw_cnf.ss_code = (T_MFW_SS_CODES)ss_cvtSCode((T_ACI_KSD_SS)ksStat->ir.rKSCW.ssCd);
           cw_cnf.ss_category = (T_MFW_SS_CATEGORY)ss_cvtOCode((T_ACI_KSD_OP)ksStat->ir.rKSCW.opCd);
           cw_cnf.ss_error    = (T_MFW_SS_ERROR)ss_cvtErrCode((T_ACI_KSD_ERR)ksStat->ir.rKSCW.ssErr);
@@ -1670,13 +1670,13 @@
             p_srv->ss_telecom_service = ksStat->ir.rKSCW.
                                                        cwBSGLst[idx].bsCd;
           }
-//	Apr 06 2005		REF: CRR 29989	xpradipg          
+//	Apr 06 2005		REF: CRR 29989	xpradipg
 #ifdef FF_MMI_OPTIM
 		if(NULL != cw_cnf)
 		  cw_cnf->ss_service_count = idx;
 #else
           cw_cnf.ss_service_count = idx;
-#endif          
+#endif
           break;
 
       case KSD_CMD_PWD:
@@ -1685,10 +1685,10 @@
           TRACE_EVENT_P1("ksStat->ir.rKSPW.opCd %d", ksStat->ir.rKSPW.opCd);
           TRACE_EVENT_P1("ksStat->ir.rKSPW.ssErr %d", ksStat->ir.rKSPW.ssErr);
           TRACE_EVENT_P1("ksStat->ir.rKSPW.newPwd %s", ksStat->ir.rKSPW.newPwd);
-//		Apr 06 2005		REF: CRR 29989	xpradipg          
+//		Apr 06 2005		REF: CRR 29989	xpradipg
 #ifdef FF_MMI_OPTIM
 		  pw_cnf = (T_MFW_SS_PW_CNF*)mfwAlloc(sizeof(T_MFW_SS_PW_CNF));
-		  if( NULL != pw_cnf)		
+		  if( NULL != pw_cnf)
 		  {
             pw_cnf->ss_code      = (T_MFW_SS_CODES)ss_cvtSCode((T_ACI_KSD_SS)ksStat->ir.rKSPW.ssCd);/*a0393213 compiler warning removal - explicit typecasting done*/
           	pw_cnf->ss_category  = (T_MFW_SS_CATEGORY)ss_cvtOCode((T_ACI_KSD_OP)ksStat->ir.rKSPW.opCd);/*a0393213 compiler warning removal - explicit typecasting done*/
@@ -1696,7 +1696,7 @@
 
           	strncpy( (char *)pw_cnf->ss_new_pwd, (char *)ksStat->ir.rKSPW.newPwd,
                    MFW_SS_PWD_LEN);
-		  }	                   
+		  }
 #else
           pw_cnf.ss_code      = (T_MFW_SS_CODES)ss_cvtSCode((T_ACI_KSD_SS)ksStat->ir.rKSPW.ssCd);
           pw_cnf.ss_category  = (T_MFW_SS_CATEGORY)ss_cvtOCode((T_ACI_KSD_OP)ksStat->ir.rKSPW.opCd);
@@ -1704,7 +1704,7 @@
 
           strncpy( (char *)pw_cnf.ss_new_pwd, (char *)ksStat->ir.rKSPW.newPwd,
                    MFW_SS_PWD_LEN);
-#endif                   
+#endif
           break;
 
 	  case KSD_CMD_IMEI:
@@ -1718,19 +1718,19 @@
           TRACE_EVENT_P1("ksStat->ir.rKSIMEI.snr3 %d", ksStat->ir.rKSIMEI.snr3);
           TRACE_EVENT_P1("ksStat->ir.rKSIMEI.svn %d", ksStat->ir.rKSIMEI.svn);
           TRACE_EVENT_P1("ksStat->ir.rKSIMEI.cd %d", ksStat->ir.rKSIMEI.cd);
-//	Apr 06 2005		REF: CRR 29989	xpradipg          
+//	Apr 06 2005		REF: CRR 29989	xpradipg
 #ifdef FF_MMI_OPTIM
 		  imei_info = (T_MFW_IMEI*)mfwAlloc(sizeof(T_MFW_IMEI));
 		  if( NULL != imei_info)
 		  {
 #endif
           ss_decode_imei(ksStat);
-//	Apr 06 2005		REF: CRR 29989	xpradipg          
+//	Apr 06 2005		REF: CRR 29989	xpradipg
 #ifdef FF_MMI_OPTIM
 		  imei_info->error = MFW_SS_NO_ERROR;
 		  ss_signal(E_SS_IMEI, imei_info);
 		  }
-#else		  
+#else
           imei_info.error = MFW_SS_NO_ERROR;
 			    ss_signal(E_SS_IMEI, &imei_info);
 #endif
@@ -1759,10 +1759,10 @@
 		//sending ss signal E_SS_USSD_REQ or E_SS_USSD_CNF based on user action required or not
 		if (ksStat->ir.rKSUS.mode == CUSD_MOD_YesActReq)
 			 ss_signal(E_SS_USSD_REQ, &ussd_info);
-		if (ksStat->ir.rKSUS.mode == CUSD_MOD_NoActReq || ksStat->ir.rKSUS.mode==CUSD_MOD_TerminatedByNetwork  || 
+		if (ksStat->ir.rKSUS.mode == CUSD_MOD_NoActReq || ksStat->ir.rKSUS.mode==CUSD_MOD_TerminatedByNetwork  ||
 				  ksStat->ir.rKSUS.mode == CUSD_MOD_OperationNotSupported || ksStat->ir.rKSUS.mode ==CUSD_MOD_NetworkTimeout)
 		        ss_signal(E_SS_USSD_CNF, &ussd_info);
-	
+
           break;
 
         default:
@@ -1788,7 +1788,7 @@
 //	the variable is made local since the scope lies within this function
 #ifdef FF_MMI_OPTIM
 	    T_MFW_SS_RES       ss_res;
-#endif	    
+#endif
     TRACE_FUNCTION("ss_command_info()");
 
     if (cmd->cmdPrm.sCFUN.srcId != CMD_SRC_LCL)
@@ -1847,7 +1847,7 @@
 						/*NM 190602*/
 						case KSD_SS_ALL_SERV :
 
-						
+
 					          ss_res.type = ss_cvtSCode((T_ACI_KSD_SS)cmd->cmdPrm.sKSPW.ssCd);
 					          ss_res.category = SS_REGISTRATION;
                     if( cmd->cmdPrm.sKSPW.oldPwd )
@@ -1968,12 +1968,12 @@
 				ss_signal(E_SS_CB_CNF, cb_cnf);
 				mfwFree((U8*)cb_cnf, sizeof(T_MFW_SS_CB_CNF));
 			}
-#else        
+#else
             ss_signal(E_SS_CB_CNF, &cb_cnf);
-#endif         
+#endif
             break;
         case KSD_CMD_CF:
-//	Apr 06 2005		REF: CRR 29989	xpradipg        
+//	Apr 06 2005		REF: CRR 29989	xpradipg
 #ifdef FF_MMI_OPTIM
 			TRACE_EVENT("KSD_CMD_CF");
 			if(cf_cnf)
@@ -1981,13 +1981,13 @@
 				ss_signal(E_SS_CF_CNF, cf_cnf);
 				mfwFree((U8*)cf_cnf, sizeof(T_MFW_SS_CF_CNF));
 			}
-#else        
+#else
             ss_signal(E_SS_CF_CNF, &cf_cnf);
-#endif            
-            
+#endif
+
             break;
         case KSD_CMD_CW:
-//	Apr 06 2005		REF: CRR 29989	xpradipg        
+//	Apr 06 2005		REF: CRR 29989	xpradipg
 #ifdef FF_MMI_OPTIM
 			TRACE_EVENT("KSD_CMD_CW");
 			if(cw_cnf)
@@ -1995,12 +1995,12 @@
 				ss_signal(E_SS_CW_CNF, cw_cnf);
 				mfwFree((U8*)cw_cnf, sizeof(T_MFW_SS_CW_CNF));
 			}
-#else        
+#else
             ss_signal(E_SS_CW_CNF, &cw_cnf);
-#endif           
+#endif
             break;
         case KSD_CMD_PWD:
-//	Apr 06 2005		REF: CRR 29989	xpradipg        
+//	Apr 06 2005		REF: CRR 29989	xpradipg
 #ifdef FF_MMI_OPTIM
 			TRACE_EVENT("KSD_CMD_PW");
 			if(pw_cnf)
@@ -2009,11 +2009,11 @@
 					ss_signal(E_SS_GET_PW, pw_cnf);
 				mfwFree((U8*)pw_cnf,sizeof(T_MFW_SS_PW_CNF));
 			}
-#else        
+#else
             if (!pwd_flag)
 				ss_signal(E_SS_GET_PW, &pw_cnf);
-#endif           
-			
+#endif
+
 			if (pwd_flag == 1)
 			{
 				pwd_flag = 0;
@@ -2024,7 +2024,7 @@
             sim_ss_unblock(SIM_UBLK_OK, CME_ERR_NotPresent);
             break;
         case KSD_CMD_CL:
-//	Apr 06 2005		REF: CRR 29989	xpradipg        
+//	Apr 06 2005		REF: CRR 29989	xpradipg
 #ifdef FF_MMI_OPTIM
 			TRACE_EVENT("KSD_CMD_CLI");
 			if(cli_cnf)
@@ -2034,10 +2034,10 @@
 			}
 #else
 			ss_signal(E_SS_CLI_CNF,&cli_cnf);
-#endif			
+#endif
             break;
 		case KSD_CMD_IMEI:
-//	Apr 06 2005		REF: CRR 29989	xpradipg		
+//	Apr 06 2005		REF: CRR 29989	xpradipg
 #ifdef FF_MMI_OPTIM
 			if( imei_info)
 			{
@@ -2048,7 +2048,7 @@
 #else
 			imei_info.error = MFW_SS_NO_ERROR;
 			ss_signal(E_SS_IMEI, &imei_info);
-#endif			
+#endif
 			break;
         default:
             break;
@@ -2084,12 +2084,12 @@
 				ss_signal(E_SS_CB_CNF, cb_cnf);
 				mfwFree((U8*)cb_cnf,sizeof(T_MFW_SS_CB_CNF));
 			}
-#else        
+#else
             ss_signal(E_SS_CB_CNF, &cb_cnf);
-#endif         
+#endif
             break;
         case KSD_CMD_CF:
-//	Apr 06 2005		REF: CRR 29989	xpradipg        
+//	Apr 06 2005		REF: CRR 29989	xpradipg
 #ifdef FF_MMI_OPTIM
 			TRACE_EVENT("KSD_CMD_CF");
 			if(cf_cnf)
@@ -2098,26 +2098,26 @@
 				mfwFree((U8*)cf_cnf,sizeof(T_MFW_SS_CF_CNF));
 				TRACE_FUNCTION("memory freed for cf_cnf");
 			}
-#else        
+#else
             ss_signal(E_SS_CF_CNF, &cf_cnf);
-#endif            
+#endif
             break;
         case KSD_CMD_CW:
-//	Apr 06 2005		REF: CRR 29989	xpradipg        
-#ifdef FF_MMI_OPTIM       
+//	Apr 06 2005		REF: CRR 29989	xpradipg
+#ifdef FF_MMI_OPTIM
 			TRACE_EVENT("KSD_CMD_CW");
 			if(cw_cnf)
 			{
             	ss_signal(E_SS_CW_CNF, cw_cnf);
                	mfwFree((U8*)E_SS_CW_CNF,sizeof(T_MFW_SS_CW_CNF));
             }
-#else            
+#else
             ss_signal(E_SS_CW_CNF, &cw_cnf);
-#endif            
+#endif
             break;
        case KSD_CMD_PWD:
-//	Apr 06 2005		REF: CRR 29989	xpradipg       
-#ifdef FF_MMI_OPTIM       
+//	Apr 06 2005		REF: CRR 29989	xpradipg
+#ifdef FF_MMI_OPTIM
 			TRACE_EVENT("KSD_CMD_PW");
 			if(pw_cnf)
 			{
@@ -2128,7 +2128,7 @@
 #else
 		    if (!pwd_flag)
 				ss_signal(E_SS_GET_PW, &pw_cnf);
-#endif				
+#endif
 			if (pwd_flag == 1)
 			{
 				pwd_flag = 0;
@@ -2139,7 +2139,7 @@
             sim_ss_unblock(SIM_UBLK_ERROR, reason);
             break;
         case KSD_CMD_CL:
-//	Apr 06 2005		REF: CRR 29989	xpradipg        
+//	Apr 06 2005		REF: CRR 29989	xpradipg
 #ifdef FF_MMI_OPTIM
 			TRACE_EVENT("KSD_CMD_CLI");
 			if(cli_cnf)
@@ -2149,9 +2149,9 @@
 			}
 #else
 			ss_signal(E_SS_CLI_CNF,&cli_cnf);
-#endif	
+#endif
 		case KSD_CMD_IMEI:
-//	Apr 06 2005		REF: CRR 29989	xpradipg		
+//	Apr 06 2005		REF: CRR 29989	xpradipg
 #ifdef FF_MMI_OPTIM
 			if( imei_info)
 			{
@@ -2162,7 +2162,7 @@
 #else
 			imei_info.error = MFW_SS_ERROR;
 			ss_signal(E_SS_IMEI, &imei_info);
-#endif				
+#endif
               break;
         default:
             break;
@@ -2181,7 +2181,7 @@
 
 */
 /*a0393213 warnings removal - T_ACI_CLCK_FAC changed to T_ACI_FAC as a result of ACI enum change*/
-T_MFW ss_set_clck(T_ACI_FAC fac,			
+T_MFW ss_set_clck(T_ACI_FAC fac,
                   T_ACI_CLCK_MOD mode,
                   CHAR *passwd,
                   T_ACI_CLASS class_type,
@@ -2314,27 +2314,27 @@
 
 void rAT_PlusCUSD(T_ACI_CUSD_MOD m, T_ACI_USSD_DATA *ussd, SHORT dcs)
 {
-	
+
     TRACE_FUNCTION("rAT_PlusCUSD()");
 
 //Dec 16, 2005 OMAPS00053316	x0018858
 //Added the NullCheck to ensure that we dont access the elements when the pointer is NULL.
 //Begin OMAPS00053316
-	
+
 if(ussd != NULL)
 {
     ussd_info.len = ussd->len;
-    memcpy(ussd_info.ussd, ussd->data, sizeof(ussd_info.ussd));	
+    memcpy(ussd_info.ussd, ussd->data, sizeof(ussd_info.ussd));
 }
 else
 {
     ussd_info.len = 0;
-    memset(ussd_info.ussd, 0x00, sizeof(ussd_info.ussd));	
+    memset(ussd_info.ussd, 0x00, sizeof(ussd_info.ussd));
 }
 //End OMAPS00053316
     ussd_info.dcs = (T_MFW_DCS)dcs;
 
-	if (m==CUSD_MOD_TerminatedByNetwork  || 
+	if (m==CUSD_MOD_TerminatedByNetwork  ||
 	    m== CUSD_MOD_OperationNotSupported ||
 	    m==CUSD_MOD_NetworkTimeout)
 	      ussd_info.error = MFW_SS_ERROR;
@@ -2407,7 +2407,7 @@
 T_MFW ss_abort_transaction(void)
 {
   TRACE_FUNCTION("ss_abort_transaction()");
-  
+
   if (sAT_Abort(CMD_SRC_LCL, AT_CMD_CUSD) EQ AT_CMPL)
     return TRUE;
   else
@@ -2440,7 +2440,7 @@
 /* check cug mode  */
 	switch(cug_param->mode)
 	{
-		case MFW_SS_CUG_TMP_DISABLE: 
+		case MFW_SS_CUG_TMP_DISABLE:
 			cug_mode = CCUG_MOD_DisableTmp;
 			break;
 		case MFW_SS_CUG_TMP_ENABLE:
@@ -2479,7 +2479,7 @@
 		case MFW_SS_CUG_INDEX8:
 			cug_index = CCUG_IDX_8;
 			break;
-		case MFW_SS_CUG_INDEX9:		
+		case MFW_SS_CUG_INDEX9:
 			cug_index = CCUG_IDX_9;
 			break;
 		case MFW_SS_CUG_NO_INDEX:
@@ -2528,7 +2528,7 @@
 {
 	T_ACI_CCUG_MOD  cug_mode;
     T_ACI_CCUG_IDX  cug_index;
-    T_ACI_CCUG_INFO cug_info; 
+    T_ACI_CCUG_INFO cug_info;
 
 	cug_param->mode =  MFW_SS_CUG_MODE_Not_Present;
 	cug_param->index = MFW_SS_CUG_INDEX_Not_Present;