--- a/src/ui/bmi/mmiPins.h	Sun Nov 08 05:12:05 2020 +0000
+++ b/src/ui/bmi/mmiPins.h	Sun Nov 08 06:39:16 2020 +0000
@@ -3,36 +3,36 @@
 
 					CONDAT (UK)
 
-********************************************************************************                                                                              
+********************************************************************************
 
  This software product is the property of Condat (UK) Ltd and may not be
- disclosed to any third party without the express permission of the owner.                                 
-                                                                              
+ disclosed to any third party without the express permission of the owner.
+
 ********************************************************************************
 
- $Project name:	Basic MMI                                                      
- $Project code:	BMI (6349)                                                           
+ $Project name:	Basic MMI
+ $Project code:	BMI (6349)
  $Module:		MMI
  $File:		    MmiPins.h
- $Revision:		1.0                                                       
-                                                                              
- $Author:		Condat(UK)                                                         
- $Date:		    25/10/00                                                      
-                                                                               
+ $Revision:		1.0
+
+ $Author:		Condat(UK)
+ $Date:		    25/10/00
+
 ********************************************************************************
-                                                                              
+
  Description:
- 
+
     MMI PIN / PUK entry handling
 
-                        
+
 ********************************************************************************
 
  $History: MmiPins.h
 
  	Apr 03, 2007    ER: OMAPS00122561  x0pleela
 	Description:   [ACI] Phone lock feature has to be supported by ACI
-	Solution: Phone Lock ER implementation 
+	Solution: Phone Lock ER implementation
 
   	Nov 13, 2006 DR: OMAPS00103356  x0pleela
  	Description: SIMP:Master unlock failed through MMI
@@ -42,28 +42,28 @@
    	Sep 26, 2006 DR: OMAPS00095524 x0pleela
  	Description:Implement 2 missing SIM Lock types
  	Solution: Made the following changes
- 			- Added new enum INPUT_PBLOCK_PIN_REQ to send request for entering 
+ 			- Added new enum INPUT_PBLOCK_PIN_REQ to send request for entering
  				Blocked Network Password
 			- Added prototype of functions setLockTypePb(), simlock_check_PBCatLock()
  	xashmic 21 Sep 2006, OMAPS00095831
  	Description: USB enumeration does not happen in PIN/PUK/Insert SIM scenarios
- 	Solution: When booting up without SIM card, or prompting for PIN/PUK/SIMP entry, 
- 	enumerate all the USB ports automatically 
- 
+ 	Solution: When booting up without SIM card, or prompting for PIN/PUK/SIMP entry,
+ 	enumerate all the USB ports automatically
+
  	Sep 08, 2006 DR: OMAPS00091250 x0pleela
  	Description:The phone resets if no MEPD data is presented
- 	Solution: Added new enums NO_MEPD, NO_MEPD_DATA,	TXT_NO_MEPD to display the string 
+ 	Solution: Added new enums NO_MEPD, NO_MEPD_DATA,	TXT_NO_MEPD to display the string
  			MEPD not present
 
 	July 31, 2006 ER: OMAPS00087586, OMAPS00087587 x0pleela
 	Description: 	OMAPS00087586: MasterKey funtion in TCS3.2 SW
-				OMAPS00087587: Time Penaly feature extend handset security 
+				OMAPS00087587: Time Penaly feature extend handset security
 	Solution:Made the following changes
 	1) Added new event  SIM_LOCK_BUSY_UNBLOCK
-	
+
 	July 21, 2006 ER: OMAPS00087586, OMAPS00087587 x0pleela
 	Description: 	OMAPS00087586: MasterKey funtion in TCS3.2 SW
-				OMAPS00087587: Time Penaly feature extend handset security 
+				OMAPS00087587: Time Penaly feature extend handset security
 	Solution:Made the following changes
 		1) Defined new enumerations SMLK_MASTERKEY,INPUT_MASTER_KEY_REQ,
 			SIM_LOCK_REQ_MKPWD,TXT_ENTER_MKPWD,INPUT_SIM_MKPWD,
@@ -71,25 +71,25 @@
 			SIM_LOCK_BUSY,SIM_LOCK_BUSY_BOOTUP,SMLK_SHOW_MK_FAIL,
 			SMLK_SHOW_MK_SUCC
 		2) Added prototypes of the following functions:
-			SIMLock_MasterKeyUnlock(), SIMLock_MasterKeyUnlock_bootup(), simlock_check_masterkey(), 
-			simlock_check_NWCatLock(), simlock_check_NSCatLock(), simlock_check_SPCatLock(), 
-			simlock_check_CPCatLock(), simlock_check_SIMCatLock(), simlock_check_CatBlock(), 
-			SIMLock_unblock_ME(), mmi_simlock_category_menus(), mmi_simlock_master_unlock(), 
+			SIMLock_MasterKeyUnlock(), SIMLock_MasterKeyUnlock_bootup(), simlock_check_masterkey(),
+			simlock_check_NWCatLock(), simlock_check_NSCatLock(), simlock_check_SPCatLock(),
+			simlock_check_CPCatLock(), simlock_check_SIMCatLock(), simlock_check_CatBlock(),
+			SIMLock_unblock_ME(), mmi_simlock_category_menus(), mmi_simlock_master_unlock(),
 			simlock_get_masterkey_status(), simp_unlock_Category()
 
 
 	May 13, 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: Removed new enumerations UNBLOCK_CODE_REQ, UNBLOCK_REQ_ACT_INFO, 
+	Solution: Removed new enumerations UNBLOCK_CODE_REQ, UNBLOCK_REQ_ACT_INFO,
 			TXT_UNBLOCK_CODE, UNBLOCK_CODE to handle unblock code for SIMP feature
-	
+
 	Apr 19, 2006 DR:OMAPs00067912 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: Defined new enumerations UNBLOCK_CODE_REQ, UNBLOCK_REQ_ACT_INFO, 
+	Solution: Defined new enumerations UNBLOCK_CODE_REQ, UNBLOCK_REQ_ACT_INFO,
 			TXT_UNBLOCK_CODE, UNBLOCK_CODE to handle unblock code for SIMP feature
-	
+
 	Nov 24, 2005 DR: OMAPS00045909 - Shashi Shekar B.S.
 	Description: Improve IMEI control mechanism
 	Solution : When MMI calls sAT_PLUSCFUN, if an IMEI invalid error is returned,
@@ -97,18 +97,18 @@
 		since the PS will not be booted at all!!!
 
 	July 19, 2005 REF: CRR LOCOSTO-ENH-28173 xpradipg
-  	Description: To provide MMI Support to enable/disable/change password and 
+  	Description: To provide MMI Support to enable/disable/change password and
   				query all the Personalization locks
-  	Solution: Integration of the changes for the same provided by the soldel 
+  	Solution: Integration of the changes for the same provided by the soldel
   			  team
-  			  
+
   	June 16, 2005  REF: CRR 31267  x0021334
 	Description: Handset ignore the initializtion of the PIN1/PIN2
 	Fix:	Cheking is done to ascertain if PIN1/PIN2 are initialised. If not, appropriate
 	       message is displayed to the user.
 
-	25/10/00			Original Condat(UK) BMI version.	
-	   
+	25/10/00			Original Condat(UK) BMI version.
+
  $End
 
 *******************************************************************************/
@@ -145,14 +145,14 @@
 	INPUT_NEW_PIN,
 	INPUT_NEW_PIN_AGAIN,
 	INPUT_NEW_PIN2,
-	INPUT_NEW_PIN2_AGAIN,	
+	INPUT_NEW_PIN2_AGAIN,
 #ifdef SIM_PERS
 	INPUT_SIM_PLOCK,
 	TXT_ENTER_PLOCK,
 	SIM_LOCK_STATUS_END,
        SIM_PLOCK_END,
 	SIM_LOCK_ENDSUCC,
-       SIM_LOCK_ENDIS_FAIL,   
+       SIM_LOCK_ENDIS_FAIL,
        SIM_LOCK_REQ_OLD,
        SIM_LOCK_STATUS,
        SIM_LOCK_REQ_NEW,
@@ -207,14 +207,14 @@
 	PIN_OK,
 	PIN2_OK,
 	PIN1_OK,
-	PIN1_STATUS,	
-	PIN1_STATUS_END,	
+	PIN1_STATUS,
+	PIN1_STATUS_END,
 	PIN2_ABORT,
 	PIN1_ABORT,
 	PIN1_REQ,
 	PIN2_REQ,
-	PIN1_REQ_ATT,         
-	PUK1_REQ_ACT_INFO,    
+	PIN1_REQ_ATT,
+	PUK1_REQ_ACT_INFO,
 	PUK1_REQ,
 #ifdef SIM_PERS
 	PERM_BLK,
@@ -222,23 +222,23 @@
 #endif
 	PUK1_OK_END,
     PIN1_REQ_OLD,
-    PIN2_REQ_OLD,	
-	GSM_FAIL,             
+    PIN2_REQ_OLD,
+	GSM_FAIL,
 	NEW_PIN_FAIL,
 	NEW_PIN2_FAIL,
-	PUK1_REQ_VER_INFO,    	
-	PUK1_UNBL_FAIL_INFO,  	
-	PUK1_UNBL_FATAL_ERROR,	
-    INVALID_CARD,	
-	NO_SIM_CARD,          			
-	SIM_UNLOCK_OK,        	
+	PUK1_REQ_VER_INFO,
+	PUK1_UNBL_FAIL_INFO,
+	PUK1_UNBL_FATAL_ERROR,
+    INVALID_CARD,
+	NO_SIM_CARD,
+	SIM_UNLOCK_OK,
 	SIM_LOCK_ERR,
 	SIM_PLOCK_REQ,
-	SIM_NLOCK_REQ,						
-	SIM_NSLOCK_REQ,						
-	SIM_SPLOCK_REQ,						
-	SIM_CLOCK_REQ,						
-	SIM_PLOCK,						
+	SIM_NLOCK_REQ,
+	SIM_NSLOCK_REQ,
+	SIM_SPLOCK_REQ,
+	SIM_CLOCK_REQ,
+	SIM_PLOCK,
 	SIM_NLOCK,
 	SIM_NSLOCK,
 	SIM_SPLOCK,
@@ -300,11 +300,11 @@
 	TXT_INVALID_IMEI // Nov 24, 2005, a0876501, DR: OMAPS00045909
 //x0pleela 18 Oct, 2006 DR: OMAPS00099660
 //Flagging the following enums
-#ifdef SIM_PERS	
+#ifdef SIM_PERS
 	//x0pleela 30 Aug, 2006 DR: OMAPS00091250
 	, NO_MEPD,
 	NO_MEPD_DATA,
-	TXT_NO_MEPD	
+	TXT_NO_MEPD
 #endif
 //x0pleela 05 Mar, 2007  ER: OMAPS00122561
 #ifdef FF_PHONE_LOCK
@@ -334,7 +334,7 @@
 	PH_LOCK_SUCC,
 	PH_LOCK_AUTO_SUCC,
 	PH_LOCK_SETT_ABORT
-#endif /*FF_PHONE_LOCK*/	 
+#endif /*FF_PHONE_LOCK*/
 
 } PIN_CASE;
 //xashmic 21 Sep 2006, OMAPS00095831
@@ -342,7 +342,7 @@
 {
 	BOOTUP_STATE_NONE = -1,
 	BOOTUP_STATE_INPROGRESS,
-	BOOTUP_STATE_COMPLETED	
+	BOOTUP_STATE_COMPLETED
 }T_BOOTUP_STATE;
 typedef enum
 {
@@ -428,31 +428,31 @@
 //x0pleela 25 Sep, 2006 ER: OMAPS00095524
 int setLockTypePb (struct MfwMnuTag * m, struct MfwMnuItemTag * i);
 
-USHORT	simlock_check_masterkey(struct MfwMnuTag *m, 
-									   struct MfwMnuAttrTag *ma, 
+USHORT	simlock_check_masterkey(struct MfwMnuTag *m,
+									   struct MfwMnuAttrTag *ma,
 									   struct MfwMnuItemTag *mi);
-USHORT	simlock_check_NWCatLock(struct MfwMnuTag *m, 
-									   struct MfwMnuAttrTag *ma, 
+USHORT	simlock_check_NWCatLock(struct MfwMnuTag *m,
+									   struct MfwMnuAttrTag *ma,
 									   struct MfwMnuItemTag *mi);
-USHORT	simlock_check_NSCatLock(struct MfwMnuTag *m, 
-									   struct MfwMnuAttrTag *ma, 
+USHORT	simlock_check_NSCatLock(struct MfwMnuTag *m,
+									   struct MfwMnuAttrTag *ma,
 									   struct MfwMnuItemTag *mi);
-USHORT	simlock_check_SPCatLock(struct MfwMnuTag *m, 
-									   struct MfwMnuAttrTag *ma, 
+USHORT	simlock_check_SPCatLock(struct MfwMnuTag *m,
+									   struct MfwMnuAttrTag *ma,
 									   struct MfwMnuItemTag *mi);
-USHORT	simlock_check_CPCatLock(struct MfwMnuTag *m, 
-									   struct MfwMnuAttrTag *ma, 
+USHORT	simlock_check_CPCatLock(struct MfwMnuTag *m,
+									   struct MfwMnuAttrTag *ma,
 									   struct MfwMnuItemTag *mi);
-USHORT	simlock_check_SIMCatLock(struct MfwMnuTag *m, 
-									   struct MfwMnuAttrTag *ma, 
-									   struct MfwMnuItemTag *mi);				
-USHORT	simlock_check_CatBlock(struct MfwMnuTag *m, 
-									   struct MfwMnuAttrTag *ma, 
+USHORT	simlock_check_SIMCatLock(struct MfwMnuTag *m,
+									   struct MfwMnuAttrTag *ma,
+									   struct MfwMnuItemTag *mi);
+USHORT	simlock_check_CatBlock(struct MfwMnuTag *m,
+									   struct MfwMnuAttrTag *ma,
 									   struct MfwMnuItemTag *mi);
 
 //x0pleela 25 Sep, 2006 ER: OMAPS00095524
-USHORT	simlock_check_PBCatLock(struct MfwMnuTag *m, 
-									   struct MfwMnuAttrTag *ma, 
+USHORT	simlock_check_PBCatLock(struct MfwMnuTag *m,
+									   struct MfwMnuAttrTag *ma,
 									   struct MfwMnuItemTag *mi);
 int SIMLock_unblock_ME(struct MfwMnuTag * m, struct MfwMnuItemTag * i);
 T_MFW_HND mmi_simlock_category_menus(T_MFW_HND parent);