--- a/src/ui/mfw/mfw_em.c	Tue Jan 19 05:41:26 2021 +0000
+++ b/src/ui/mfw/mfw_em.c	Tue Jan 19 06:10:27 2021 +0000
@@ -60,7 +60,7 @@
 #include "cmh_mm.h"
 #include "cmh_sim.h"
 #include "Mfw_em.h"
-#include "aci_em.h" 
+#include "aci_em.h"
 #include "mfw_win.h"
 
 #ifdef NEPTUNE_BOARD /*EngMode */
@@ -91,7 +91,7 @@
 	MFW_EM_GPRS_Parameter GPRSInfo;
 }
 	T_MFW_EM_PARA;
-#endif    
+#endif
 
 typedef struct
 {
@@ -101,7 +101,7 @@
 #ifndef NEPTUNE_BOARD
     T_MFW_EM_PARA  para;
 #endif
-    
+
 } T_MFW_EM;
 /*
 ********************************Global variables**********************************************
@@ -118,9 +118,9 @@
 **/
 
 #ifndef NEPTUNE_BOARD
-int Mfw_em_sign_exec(T_MFW_HDR * hdr, T_MFW_EVENT event,T_MFW_EM_PARA *para); 
+int Mfw_em_sign_exec(T_MFW_HDR * hdr, T_MFW_EVENT event,T_MFW_EM_PARA *para);
 #else /*if NEPTUNE BOARD*/
-int Mfw_em_sign_exec(T_MFW_HDR * hdr, T_MFW_EVENT event,int* dummy); 
+int Mfw_em_sign_exec(T_MFW_HDR * hdr, T_MFW_EVENT event,int* dummy);
 #endif
 void Mfw_em_signal(MfwEvt event, void *para);
 
@@ -143,8 +143,8 @@
 int Mfw_em_init(void)
 {	TRACE_EVENT("Mfw_em_init()");
 #ifndef NEPTUNE_BOARD
-	em_Init(Mfw_em_cb, NULL); /*init EM driver*/	
-#endif /* NEPTUNE_BOARD */    
+	em_Init(Mfw_em_cb, NULL); /*init EM driver*/
+#endif /* NEPTUNE_BOARD */
 	mfwCommand[MfwTypEm] = (MfwCb) emCommand;
 	return TRUE;
 }
@@ -194,9 +194,9 @@
 #ifndef NEPTUNE_BOARD
 	if (MfwEmData != NULL)
 		mfwFree((void*)MfwEmData, sizeof(MFW_EM_Data));
-	
+
 	em_Exit();
-#endif    
+#endif
 }
 /*
 +--------------------------------------------------------------------+
@@ -219,13 +219,13 @@
 
 #ifndef _EM_MMI_MFW_TEST
 /*If not already allocated, Allocate memory to store data in*/
-if (MfwEmData == NULL)	
+if (MfwEmData == NULL)
 	if ((MfwEmData = (MFW_EM_Data*)mfwAlloc(sizeof(MFW_EM_Data))) == NULL)
 		return FALSE;
 	/*Request appropriate data from Em driver*/
 	switch(type)
 	{
-		case EM_MOBILE_INFO: 
+		case EM_MOBILE_INFO:
 			/*MC SPR 1554, added call to request software version and identity param*/
 			em_Read_Data_Parameter(EM_CLASS_MOBILE_DATA, EM_SUBCLASS_SW_VERSION, 1,Mfw_em_cb);
 			em_Read_Data_Parameter(EM_CLASS_MOBILE_DATA,EM_SUBCLASS_ID, 1, Mfw_em_cb);
@@ -249,13 +249,13 @@
 		break;
 	}
 	return TRUE;
-#endif 
+#endif
+
 
 
-			
 #ifdef _EM_MMI_MFW_TEST
 /*Test harness, just returns made-up data to MMI*/
-if (MfwEmData == NULL)	
+if (MfwEmData == NULL)
 	if ((MfwEmData = (MFW_EM_Data*)mfwAlloc(sizeof(MFW_EM_Data))) == NULL)
 		return FALSE;
 	switch(type)
@@ -269,21 +269,21 @@
 		}
 		break;
 		case EM_SERVING_CELL_PARAMS:
-		{	
+		{
 			MfwEmData->SCInfo.arfcn= 0x44;
 			MfwEmData->SCInfo.RSSI= 86;
 			MfwEmData->SCInfo.RXQ = 67;
 			MfwEmData->SCInfo.RLT = 67;
 			Mfw_em_signal(EM_SERVING_CELL_PARAMS, (void*)&MfwEmData->SCInfo);
 		}
-		break;		
+		break;
 		case EM_NEIGHBOURING_CELL_PARAMS:
 		{	MfwEmData->NCInfo.NUM= 0x05;
 			strcpy((char*)MfwEmData->NCInfo.arfcn, "WERTYUIOPAS");
 			strcpy((char*)MfwEmData->NCInfo.RSSI, "12345");
-			
+
 			Mfw_em_signal(EM_NEIGHBOURING_CELL_PARAMS, (void*)&MfwEmData->NCInfo);
-				
+
 		}
 		break;
 		case EM_LOCATION_PARAMS:
@@ -291,9 +291,9 @@
 			strcpy((char*)MfwEmData->LocInfo.MNC, "456");
 			MfwEmData->LocInfo.LAC = 12345;
 			MfwEmData->LocInfo.CI = 12045;
-			
+
 			Mfw_em_signal(EM_LOCATION_PARAMS, (void*)&MfwEmData->LocInfo);
-				
+
 		}
 		break;
 		case EM_GPRS_PARAMS:
@@ -301,7 +301,7 @@
 			MfwEmData->GPRSInfo.DLS= 0;
 			MfwEmData->GPRSInfo.coding_scheme = 0;
 			Mfw_em_signal(EM_GPRS_PARAMS, (void*)&MfwEmData->GPRSInfo);
-				
+
 		}
 		break;
 		case EM_CIPH_HOP_DTX_PARAMS:
@@ -309,7 +309,7 @@
 			MfwEmData->CHDTXInfo.hopping_channels= 0;
 			MfwEmData->CHDTXInfo.DTX_status = 1;
 			Mfw_em_signal(EM_CIPH_HOP_DTX_PARAMS, (void*)&MfwEmData->CHDTXInfo);
-				
+
 		}
 		break;
 	}
@@ -400,7 +400,7 @@
                         memcpy(&em_data->para.MobileInfo,
                                 para,sizeof(MFW_EM_Mobile_Info));
                         break;
-                   
+
                     case EM_SERVING_CELL_PARAMS:
                         memcpy(&em_data->para.SCInfo,
                                 para,sizeof(MFW_EM_Serving_Cell_Parameters));
@@ -409,7 +409,7 @@
                         memcpy(&em_data->para.NCInfo,
                                 para,sizeof(MFW_EM_Neighbour_Cell_Parameters));
                         break;
-                   
+
                     case EM_LOCATION_PARAMS:
                         memcpy(&em_data->para.LocInfo,
                                 para,sizeof(MFW_EM_Location_Parameters));
@@ -418,7 +418,7 @@
                         memcpy(&em_data->para.CHDTXInfo,
                                 para,sizeof(MFW_EM_Ciph_hop_DTX_Parameters));
                         break;
-                   
+
                     case EM_GPRS_PARAMS:
                         memcpy(&em_data->para.GPRSInfo,
                                 para,sizeof(MFW_EM_GPRS_Parameter));
@@ -426,10 +426,10 @@
                 }
                 if (em_data->handler)
                 {
-                
+
                   // store current mfw elem
                   current_mfw_elem = cur_elem;
-             
+
                   if ((*(em_data->handler))(em_data->event,
                                              (void *) &em_data->para))
                     return TRUE;
@@ -460,7 +460,7 @@
                 {
                   // store current mfw elem
                   current_mfw_elem = cur_elem;
-             
+
                   if ((*(em_data->handler))(em_data->event,
                                              (void *) &dummy))
                     return TRUE;
@@ -494,7 +494,7 @@
     if (mfwFocus)
         if (Mfw_em_sign_exec(mfwFocus,event,para))
 			{
-				dspl_Enable(temp);            
+				dspl_Enable(temp);
 				return;
 			}
     if (mfwRoot)
@@ -528,7 +528,7 @@
          */
         if (Mfw_em_sign_exec (h, event, para))
 			{
-				dspl_Enable(temp);            
+				dspl_Enable(temp);
 				return;
 			}
 
@@ -537,7 +537,7 @@
          */
         if (h == mfwRoot)
 			{
-				dspl_Enable(temp);            
+				dspl_Enable(temp);
 				return;
 			}
 
@@ -549,8 +549,8 @@
 			h = ((MfwWin * )(h->data))->elems;
       }
       Mfw_em_sign_exec (mfwRoot, event, para);
-    }      
-	dspl_Enable(temp);            
+    }
+	dspl_Enable(temp);
 	return;
 
 
@@ -569,14 +569,14 @@
 void Mfw_em_cb(T_DRV_SIGNAL_EM* signal)
 {
 	TRACE_EVENT_P1("Mfw_em_cb, signalType: %d", signal->SignalType);
-	
+
 	switch(signal->SignalType)
 	{
 		case EM_SUBCLASS_SC:
 		{	/*copy Serving Cell Information to appropriate data structure*/
 
             T_EM_SC_INFO_CNF *serv_cell = (T_EM_SC_INFO_CNF*)&signal->UserData.sc;
-               
+
 			MfwEmData->SCInfo.arfcn = serv_cell->arfcn;
 			MfwEmData->SCInfo.RSSI = serv_cell->rxlev;
 			MfwEmData->SCInfo.RXQ = serv_cell->rxqual_f;
@@ -586,7 +586,7 @@
       MfwEmData->SCInfo.BSIC  = serv_cell->bsic;
       MfwEmData->SCInfo.TAV  = serv_cell->tav;
       MfwEmData->SCInfo.LAC  = serv_cell->lac;
-      
+
       MfwEmData->NCInfo.arfcn[6] = MfwEmData->SCInfo.arfcn;
       MfwEmData->NCInfo.RSSI[6] = MfwEmData->SCInfo.RSSI;
       MfwEmData->NCInfo.C2[6] = MfwEmData->SCInfo.C2;
@@ -598,8 +598,8 @@
 
       			/*send event to MMI*/
 			Mfw_em_signal(EM_SERVING_CELL_PARAMS, (void*)&MfwEmData->SCInfo);
-		}		
-		break;	
+		}
+		break;
 		case EM_SUBCLASS_SC_GPRS:
 		{	/*MC, SPR 1554 added code to copy NMOinto GPRS data structure*/
 
@@ -645,7 +645,7 @@
 		}
 		case EM_SUBCLASS_ID:
 		{	/*MC, SPR 1554 added conversion of IMEI and IMSI from numbers to ASCII*/
-			
+
 			int i;
 			/*convert to ASCII digits*/
 			for (i=0; i < 15; i++)
@@ -654,14 +654,14 @@
 				MfwEmData->MobileInfo.IMSI[i]=signal->UserData.id.em_imsi.ident_dig[i] +ASCII_OFFSET;
 			}
 			MfwEmData->MobileInfo.IMEI[15] = NULL;
-			MfwEmData->MobileInfo.IMSI[15] = NULL;	
-	
+			MfwEmData->MobileInfo.IMSI[15] = NULL;
+
 			MfwEmData->MobileInfo.TMSI = signal->UserData.id.tmsi;
-			
+
 			Mfw_em_signal(EM_MOBILE_INFO, (void*)&MfwEmData->MobileInfo);
 		}
 		case EM_SUBCLASS_SW_VERSION:
-		{	
+		{
 			T_EM_SW_VER* sw_ver = &signal->UserData.version;
 			memcpy(MfwEmData->MobileInfo.SIM_version, sw_ver->sim, MAX_VER*sizeof(char));
 			memcpy(MfwEmData->MobileInfo.CC_version , sw_ver->cc, MAX_VER*sizeof(char));
@@ -691,14 +691,14 @@
   PURPOSE : sends event to MMi via Mfw_em_sign_exec()
 
 */
-void Mfw_em_response_EINFO(T_ENG_INFO_REQ *emode_data, 
+void Mfw_em_response_EINFO(T_ENG_INFO_REQ *emode_data,
             T_ENG_INFO_STATIC_REQ *emode_static_data)
 {
     int* dummy;
     TRACE_FUNCTION("Mfw_em_response_EINFO()");
     Eng_Info_Req = emode_data;
     Mfw_em_signal(EmType, (void*)&dummy);
-    
+
 }
 
 void Mfw_em_response_ESINFO(T_ENG_INFO_STATIC_REQ *emode_static_data)