FreeCalypso > hg > fc-tourmaline
diff src/ui/mfw/mfw_sim.c @ 188:92abb46dc1ba
src/ui/mfw/*.[ch]: rm trailing white space
| author | Mychaela Falconia <falcon@freecalypso.org> |
|---|---|
| date | Tue, 19 Jan 2021 06:10:27 +0000 |
| parents | 67bfe9f274f6 |
| children |
line wrap: on
line diff
--- a/src/ui/mfw/mfw_sim.c Tue Jan 19 05:41:26 2021 +0000 +++ b/src/ui/mfw/mfw_sim.c Tue Jan 19 06:10:27 2021 +0000 @@ -12,40 +12,40 @@ $History:: mfw_sim.c - + May 30, 2007 DR: OMAPS00132483 x0pleela Description: MM: While playing an AAC, unplug USB freezes the audio - Solution: Defined new functions mfw_get_Phlock_status(), mfw_set_Phlock_status( ), - mfw_get_Auto_Phlock_status(), mfw_set_Auto_Phlock_status() to set and + Solution: Defined new functions mfw_get_Phlock_status(), mfw_set_Phlock_status( ), + mfw_get_Auto_Phlock_status(), mfw_set_Auto_Phlock_status() to set and get the phone lock and automatic phone lock status - + Apr 03, 2007 ER: OMAPS00122561 x0pleela Description: [ACI] Phone lock feature has to be supported by ACI Solution: Phone Lock ER implementation - + Feb 19, 2006 ER:OMAPS00115179 a0393213 Description : support SIM insertion without powering down Solution : New case is handled in rAT_PercentSIMINS - + Dec 13, 2006 DR: OMAPS00105640 x0039928 Description: SIMP: The board reboots when removing SIM card. Solution: Sim status is updated. - + Nov 13, 2006 DR: OMAPS00103356 x0pleela Description: SIMP:Master unlock failed through MMI - Solution: In function mfw_simlock_master_unlock() a check is added if the master unlock - password is wrong. If wrong, displays Wrong password. - Also a check is added if the error code for any of the categories (non-dependent) - being locked/blocked. If yes, return OK as the dependent categories are unblocked + Solution: In function mfw_simlock_master_unlock() a check is added if the master unlock + password is wrong. If wrong, displays Wrong password. + Also a check is added if the error code for any of the categories (non-dependent) + being locked/blocked. If yes, return OK as the dependent categories are unblocked using Master unblock password - + Sep 26, 2006 DR: OMAPS00095524 x0pleela Description:Implement 2 missing SIM Lock types Solution: Made the following changes 1) sim_error_cfun(), sim_error_cpin() - - Setting the aciErrdesc separately for all the CME errors related to + - Setting the aciErrdesc separately for all the CME errors related to SIMP categories - - Handling the extension error of request for Blocked network password + - Handling the extension error of request for Blocked network password (both PIN and PUK) 2) mfw_simlock_check_lock_bootup() - Updating aciErrDesc with Blocked Network (PIN or PUK) password request @@ -54,15 +54,15 @@ 4) sim_simlock_cpin_code() - Set the reqduired parameters for Blocked Network Password and Unblock code request - + Sep 26, 2006 DR: OMAPS00096565 x0pleela - Description: After blocking PIN, when ISAMPLE is reset, instead of prompting for PUK, master + Description: After blocking PIN, when ISAMPLE is reset, instead of prompting for PUK, master unlock key is asked Solution: Reset C_KEY_REQ to 0 in functions sim_error_cfun() and sim_error_cpin() - + Sep 11, 2006 DR: OMAPS00094215 x0pleela Description: MMI compilation failed as CME_ErrBusy undefined - Solution: Handling new Ext_ERR_Busy sent by ACI + Solution: Handling new Ext_ERR_Busy sent by ACI xashmic 9 Sep 2006, OMAPS00092732 USBMS ER @@ -79,36 +79,36 @@ 1) Defined new static variable "Simp_Busy_State" which will be set to either TRUE or FALSE based on the ACI's busy error 2) sim_error_cfun(): Update global aciErrDesc with the current CME error code 3) mfw_simlock_check_lock_bootup(): Check for the CME busy error and update "Simp_Busy_State" accordingly - 4) mfw_simlock_return_lock_type(): Return coresponding lock type for master unlock + 4) mfw_simlock_return_lock_type(): Return coresponding lock type for master unlock 5) Added following new functions: mfw_simlock_master_unlock: This function unlocks(dependent categories) or unblocks ME - mfw_simlock_check_masterkey: This function checks from ACI whether Master Unlock feature is enabled or not. If - enabled, displays a menu item for the user toy select master unlocking option. If not enabled, doesn't + mfw_simlock_check_masterkey: This function checks from ACI whether Master Unlock feature is enabled or not. If + enabled, displays a menu item for the user toy select master unlocking option. If not enabled, doesn't display master unlocking option in the menu mfw_simlock_set_busy_state: This function sets Simp_Busy_State to either TRUE or FALSE based on ACI's CME error mfw_simlock_get_busy_state: This function returns the current value of Simp_Busy_State - + 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 check for services 51 and 52 from function rat_pluscfunp - + xrashmic 6 Jul, 2006 OMAPS00080708 For error return value in sAT_PercentPVRF, bmi has to be informed - + xrashmic 1 Jul, 2006 OMAPS00075784 Hanlding of SIMP events during bootup - + 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 global variables (simp_cpin_code, simp_cpin_flag) to store the code result of qAT_PlusCPIN() result 2. Using new enum type T_MFW_SIMP_CLCK_FLAG sim_unlock_in_prog instead of U8 3. Added code in sim_error_cpin() to set the sim_status field to request for Unblocking code 4. Modified the code to check SIMP during bootup sequence - 5. Added new function sim_simlock_cpin_code() which checks for the code and take action for SIMP category unlocking - + 5. Added new function sim_simlock_cpin_code() which checks for the code and take action for SIMP category unlocking + Feb 15, 2006 ER: OMAPS00065203 x0pleela Description: Cingular Operator Name Prioritization implementation required Solution: Incorporated review comments @@ -116,9 +116,9 @@ Feb 09, 2006 ER: OMAPS00065203 x0pleela Description: Cingular Operator Name Prioritization implementation required - Solution: Check for services 51 - OPL and 52 - PNN in function rAT_PlusCFUNP and + Solution: Check for services 51 - OPL and 52 - PNN in function rAT_PlusCFUNP and gEons_alloc_active is updated accordingly - + 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, @@ -130,29 +130,29 @@ Solution: Included the compilation FLAG "NEPTUNE_BOARD" for un wanted code for Neptune build 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 - a please wait screen is displayed until the response is recieved + Solution : The return value of sAT_PlusCLCK of AT_EXCT is handled and + a please wait screen is displayed until the response is recieved Nov 03, 2005 DR: OMAPS00050595 - xpradipg - Description: SIMP: If the SIM is blocked (by entering invalid PIN1), the user is + Description: SIMP: If the SIM is blocked (by entering invalid PIN1), the user is not able to unblock it even after entering the valid PUK1 Solution : The global flag for SIM Personlaization PUK request was set even for the SIM PUK request. This setting is removed. Also the condition check has been done first for the global flag and then the rest of the checks. - + Sept 24, 2005 REF: LOCOSTO-ENH-34438, xpradipg Description: Integration changes required with new aci labe - Solution: changes to adopt to the new ACI label + Solution: changes to adopt to the new ACI label 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 - + 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 $ @@ -165,7 +165,7 @@ * Updated in $/BMI/Condat/MS/SRC/MFW * Changed simlock functions into wrappers for aci_slock functions, and * removed variables definitions and helper functions rendered obsolete. - * + * * ***************** Version 43 ***************** * User: Vo Date: 22.03.00 Time: 17:29 * Updated in $/GSM/Condat/MS/SRC/MFW @@ -416,7 +416,7 @@ #include "mfw_ssi.h" #include "aci_ext_pers.h" /*MC, SPR 1351 include ACI simlock files*/ -#include "aci_slock.h" +#include "aci_slock.h" #ifdef SIM_TOOLKIT #include "mfw_sat.h" @@ -442,7 +442,7 @@ //x0pleela 25 Apr, 2006 DR: OMAPS00067919 //Global variable to store the code result of qAT_PlusCPIN() result -GLOBAL T_ACI_CPIN_RSLT simp_cpin_code; +GLOBAL T_ACI_CPIN_RSLT simp_cpin_code; GLOBAL UBYTE simp_cpin_flag; //Global to indicate whether Category pwds are asked after qAT_PlusCPIN() #endif @@ -470,7 +470,7 @@ /* * Only for windows to check several SIM lock combinations */ -UBYTE sim_lock_mode = 0; +UBYTE sim_lock_mode = 0; #endif UBYTE sim_lock_field = NOT_PRESENT_8BIT; /* type of sim lock field */ @@ -519,8 +519,8 @@ pin_flag = -1; pin_ident = MFW_SIM_UNKNOWN; - /* - * install prim handler + /* + * install prim handler */ pSlot = aci_create(sima_response_cb,NULL); mfwCommand[MfwTypSim] = (MfwCb) simCommand; @@ -558,8 +558,8 @@ { TRACE_FUNCTION("sim_exit()"); - /* - * remove prim handler + /* + * remove prim handler */ aci_delete(pSlot); sim_stat = SIM_NOT_ACTIVE; @@ -590,13 +590,13 @@ if (!hdr || !sim_para) { TRACE_ERROR("ERROR: sim_create() Mem Alloc Failed."); - + if(hdr) mfwFree((U8*)hdr,sizeof(MfwHdr)); if(sim_para) mfwFree((U8*)sim_para,sizeof(T_MFW_SIM)); - + return 0; } sim_para->emask = event; @@ -604,14 +604,14 @@ hdr->data = sim_para; hdr->type = MfwTypSim; - + insert_status = mfwInsert((MfwHdr *) hWin,hdr); - + if(!insert_status) { TRACE_ERROR("ERROR: sim_create() Failed to Install Handler. "); mfwFree((U8*)hdr,sizeof(MfwHdr)); - mfwFree((U8*)sim_para,sizeof(T_MFW_SIM)); + mfwFree((U8*)sim_para,sizeof(T_MFW_SIM)); return 0; } return insert_status; @@ -666,7 +666,7 @@ if (mfwFocus) if (sim_sign_exec(mfwFocus,event,para)) { - dspl_Enable(temp); + dspl_Enable(temp); return; } if (mfwRoot) @@ -700,7 +700,7 @@ */ if (sim_sign_exec (h, event, para)) { - dspl_Enable(temp); + dspl_Enable(temp); return; } @@ -709,7 +709,7 @@ */ if (h == mfwRoot) { - dspl_Enable(temp); + dspl_Enable(temp); return; } @@ -721,8 +721,8 @@ h = ((MfwWin * )(h->data))->elems; } sim_sign_exec (mfwRoot, event, para); - } - dspl_Enable(temp); + } + dspl_Enable(temp); return; } @@ -808,8 +808,8 @@ TRACE_FUNCTION("sim_activate()"); - /* - * Full functionality is used donīt reset the ME + /* + * Full functionality is used donīt reset the ME */ // Nov 24, 2005, a0876501, DR: OMAPS00045909 @@ -920,8 +920,8 @@ */ /* 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 ) */ void sim_error_cfun (T_ACI_CME_ERR result) @@ -945,13 +945,13 @@ sim_status.sim_status_type = MFW_SIM_PIN2; sim_stat = SIM_ACTIVE; break; - + #ifdef SIM_PERS case CME_ERR_PhoneFail: case CME_ERR_NetworkPersPukReq: case CME_ERR_NetworkSubsetPersPukReq: case CME_ERR_ProviderPersPukReq: - case CME_ERR_CorporatePersPukReq: + case CME_ERR_CorporatePersPukReq: //x0pleela 25 Sep, 2006 ER: OMAPS00095524 //Update global aciErrDesc with the current CME error code ACI_ERR_DESC( ACI_ERR_CLASS_Cme, result ); @@ -961,12 +961,12 @@ sim_status.sim_status_type = MFW_SIM_PUK1; sim_stat = SIM_ACTIVE; break; - -#endif + +#endif // Nov 03, 2005 DR: OMAPS00050595 - xpradipg // the setting of C_KEY_REQ is done only for SIM Personalization PUK request - case CME_ERR_SimPukReq: /* PUK 1 must be entered */ -#ifdef SIM_PERS + case CME_ERR_SimPukReq: /* PUK 1 must be entered */ +#ifdef SIM_PERS C_KEY_REQ = 0; #endif sim_status.sim_status = MFW_SIM_PUK_REQ; @@ -980,7 +980,7 @@ sim_status.sim_status_type = MFW_SIM_PUK2; sim_stat = SIM_ACTIVE; break; - case CME_ERR_NotPresent: /* JVJ -#1580. Unexpected error should be treated as INVALID CARD for FTA*/ + case CME_ERR_NotPresent: /* JVJ -#1580. Unexpected error should be treated as INVALID CARD for FTA*/ case CME_ERR_SimFail: /* SIM card is invalid */ case CME_ERR_SimWrong: sim_status.sim_status = MFW_SIM_INVALID_CARD; @@ -994,7 +994,7 @@ sim_status.sim_status_type = MFW_SIM_UNKNOWN; sim_stat = SIM_NOT_ACTIVE; break; -#ifdef SIM_PERS +#ifdef SIM_PERS //The events are handled that are posted by rAT_PlusCME() //for all the five SIM Locks. case CME_ERR_PhSimPinReq: @@ -1009,7 +1009,7 @@ case CME_ERR_NetworkPersPinReq: //x0pleela 25 Sep, 2006 ER: OMAPS00095524 //Update global aciErrDesc with the current CME error code - ACI_ERR_DESC( ACI_ERR_CLASS_Cme, result ); + ACI_ERR_DESC( ACI_ERR_CLASS_Cme, result ); sim_status.sim_status = MFW_SIM_NLOCK_REQ; sim_status.sim_pin_retries = 0; sim_status.sim_status_type = MFW_SIM_LOCKED; @@ -1037,13 +1037,13 @@ case CME_ERR_CorporatePersPinReq: //x0pleela 25 Sep, 2006 ER: OMAPS00095524 //Update global aciErrDesc with the current CME error code - ACI_ERR_DESC( ACI_ERR_CLASS_Cme, result ); + ACI_ERR_DESC( ACI_ERR_CLASS_Cme, result ); sim_status.sim_status = MFW_SIM_CLOCK_REQ; sim_status.sim_pin_retries = 0; sim_status.sim_status_type = MFW_SIM_LOCKED; sim_stat = SIM_ACTIVE; break; - + //x0pleela 27 Apr, 2006 DR: OMAPS00067919 case CME_ERR_WrongPasswd: { @@ -1054,7 +1054,7 @@ case CME_ERR_NetworkPersPukReq: case CME_ERR_NetworkSubsetPersPukReq: case CME_ERR_ProviderPersPukReq: - case CME_ERR_CorporatePersPukReq: + case CME_ERR_CorporatePersPukReq: C_KEY_REQ = 1; sim_status.sim_status = MFW_SIM_PUK_REQ; sim_status.sim_pin_retries = sim_pin_count(MFW_SIM_PUK1); @@ -1068,11 +1068,11 @@ } } break; - + //x0pleela 23 Aug, 2006 DR: OMAPS00091250 case CME_ERR_Unknown: { - if( ((aciErrDesc & 0xFFFF0000) >> 16) EQ ACI_ERR_CLASS_Ext) + if( ((aciErrDesc & 0xFFFF0000) >> 16) EQ ACI_ERR_CLASS_Ext) { switch(aciErrDesc & 0x0000FFFF) { @@ -1150,8 +1150,8 @@ //x0pleela 26 Sep, 2006 DR: OMAPS00096565 //Reset C_KEY_REQ to 0 -#ifdef SIM_PERS - C_KEY_REQ = 0; +#ifdef SIM_PERS + C_KEY_REQ = 0; #endif switch (reason) @@ -1164,16 +1164,16 @@ return; } break; -#ifdef SIM_PERS +#ifdef SIM_PERS case CME_ERR_SimPinReq: /* PIN 1 must be entered */ sim_status.sim_status = MFW_SIM_PIN_REQ; sim_status.sim_pin_retries = sim_pin_count(MFW_SIM_PIN1); sim_status.sim_status_type = MFW_SIM_PIN1; sim_status.sim_procedure = MFW_SIM_ACTIVATION; - sim_stat = SIM_ACTIVE; + sim_stat = SIM_ACTIVE; sim_signal(E_SIM_STATUS,&sim_status); return; - + case CME_ERR_SimPin2Req: /* PIN 2 must be entered */ sim_status.sim_status = MFW_SIM_PIN2_REQ; sim_status.sim_pin_retries = sim_pin_count(MFW_SIM_PIN2); @@ -1182,12 +1182,12 @@ sim_stat = SIM_ACTIVE; sim_signal(E_SIM_STATUS,&sim_status); return; - + case CME_ERR_PhoneFail: case CME_ERR_NetworkPersPukReq: case CME_ERR_NetworkSubsetPersPukReq: case CME_ERR_ProviderPersPukReq: - case CME_ERR_CorporatePersPukReq: + case CME_ERR_CorporatePersPukReq: //x0pleela 25 Sep, 2006 ER: OMAPS00095524 //Update global aciErrDesc with the current CME error code ACI_ERR_DESC( ACI_ERR_CLASS_Cme, reason ); @@ -1200,7 +1200,7 @@ sim_signal(E_SIM_STATUS,&sim_status); return; -// Nov 03, 2005 DR: OMAPS00050595 - xpradipg +// Nov 03, 2005 DR: OMAPS00050595 - xpradipg case CME_ERR_SimPukReq: /* PUK 1 must be entered */ C_KEY_REQ = 0; sim_status.sim_status = MFW_SIM_PUK_REQ; @@ -1218,9 +1218,9 @@ sim_stat = SIM_ACTIVE; sim_signal(E_SIM_STATUS,&sim_status); return; - case CME_ERR_NotPresent: /* JVJ -#1580. Unexpected error should be treated as INVALID CARD for FTA*/ + case CME_ERR_NotPresent: /* JVJ -#1580. Unexpected error should be treated as INVALID CARD for FTA*/ case CME_ERR_SimFail: /* SIM card is invalid */ -#endif +#endif case CME_ERR_SimWrong: sim_status.sim_status = MFW_SIM_INVALID_CARD; #ifdef SIM_PERS @@ -1234,7 +1234,7 @@ #endif return; - + case CME_ERR_SimNotIns: /* no SIM card inserted */ sim_status.sim_status = MFW_SIM_NO_SIM_CARD; sim_status.sim_pin_retries = 0; @@ -1244,13 +1244,13 @@ sim_signal(E_SIM_STATUS,&sim_status); return; -#ifdef SIM_PERS +#ifdef SIM_PERS //The events are handled that are posted by rAT_PlusCME() //for all the five SIM Locks. case CME_ERR_PhSimPinReq: //x0pleela 25 Sep, 2006 ER: OMAPS00095524 //Update global aciErrDesc with the current CME error code - ACI_ERR_DESC( ACI_ERR_CLASS_Cme, reason ); + ACI_ERR_DESC( ACI_ERR_CLASS_Cme, reason ); sim_status.sim_status = MFW_SIM_PLOCK_REQ; sim_status.sim_pin_retries = 0; sim_status.sim_status_type = MFW_SIM_LOCKED ; @@ -1261,7 +1261,7 @@ case CME_ERR_NetworkPersPinReq: //x0pleela 25 Sep, 2006 ER: OMAPS00095524 //Update global aciErrDesc with the current CME error code - ACI_ERR_DESC( ACI_ERR_CLASS_Cme, reason ); + ACI_ERR_DESC( ACI_ERR_CLASS_Cme, reason ); sim_status.sim_status = MFW_SIM_NLOCK_REQ; sim_status.sim_pin_retries = 0; sim_status.sim_status_type = MFW_SIM_LOCKED; @@ -1273,7 +1273,7 @@ case CME_ERR_NetworkSubsetPersPinReq: //x0pleela 25 Sep, 2006 ER: OMAPS00095524 //Update global aciErrDesc with the current CME error code - ACI_ERR_DESC( ACI_ERR_CLASS_Cme, reason ); + ACI_ERR_DESC( ACI_ERR_CLASS_Cme, reason ); sim_status.sim_status = MFW_SIM_NSLOCK_REQ; sim_status.sim_pin_retries = 0; sim_status.sim_status_type = MFW_SIM_LOCKED; @@ -1284,7 +1284,7 @@ case CME_ERR_ProviderPersPinReq: //x0pleela 25 Sep, 2006 ER: OMAPS00095524 //Update global aciErrDesc with the current CME error code - ACI_ERR_DESC( ACI_ERR_CLASS_Cme, reason ); + ACI_ERR_DESC( ACI_ERR_CLASS_Cme, reason ); sim_status.sim_status = MFW_SIM_SPLOCK_REQ; sim_status.sim_pin_retries = 0; sim_status.sim_status_type = MFW_SIM_LOCKED; @@ -1295,7 +1295,7 @@ case CME_ERR_CorporatePersPinReq: //x0pleela 25 Sep, 2006 ER: OMAPS00095524 //Update global aciErrDesc with the current CME error code - ACI_ERR_DESC( ACI_ERR_CLASS_Cme, reason ); + ACI_ERR_DESC( ACI_ERR_CLASS_Cme, reason ); sim_status.sim_status = MFW_SIM_CLOCK_REQ; sim_status.sim_pin_retries = 0; sim_status.sim_status_type = MFW_SIM_LOCKED; @@ -1307,7 +1307,7 @@ case CME_ERR_Unknown: { //Check for No MEPD Error - if( ((aciErrDesc & 0xFFFF0000) >> 16) EQ ACI_ERR_CLASS_Ext) + if( ((aciErrDesc & 0xFFFF0000) >> 16) EQ ACI_ERR_CLASS_Ext) { switch(aciErrDesc & 0x0000FFFF) { @@ -1319,7 +1319,7 @@ sim_stat = SIM_ACTIVE; sim_signal(E_SIM_STATUS,&sim_status); return; - + //x0pleela 25 Sep, 2006 ER: OMAPS00095524 //Set the reqd. parameters for Blocked Network Password request case EXT_ERR_BlockedNetworkPersPinReq: @@ -1330,7 +1330,7 @@ sim_stat = SIM_ACTIVE; sim_signal(E_SIM_STATUS,&sim_status); return; - + //x0pleela 25 Sep, 2006 ER: OMAPS00095524 //Set the reqd. parameters for Blocked Network Unblock code request case EXT_ERR_BlockedNetworkPersPukReq: @@ -1342,14 +1342,14 @@ sim_stat = SIM_ACTIVE; sim_signal(E_SIM_STATUS,&sim_status); return; - + default: break; } } } break; -#endif +#endif default: TRACE_ERROR("sim_error_cpin():Ill reason"); @@ -1364,7 +1364,7 @@ sim_status.sim_pin_retries = sim_pin_count(MFW_SIM_PIN1); break; case CPIN_RSLT_SimPukReq: -#ifdef SIM_PERS +#ifdef SIM_PERS C_KEY_REQ = 0; #endif sim_status.sim_status = MFW_SIM_PUK_REQ; @@ -1420,10 +1420,10 @@ sim_status.sim_status_type = pin_ident; //TISH due to 11.11, if pin is unblock successfully, it should set pin Enabled. //#ifdef SIM_PERS - pin1_set = MFW_SIM_ENABLE; + pin1_set = MFW_SIM_ENABLE; //#endif break; - //xrashmic 1 Jul, 2006 OMAPS00075784 + //xrashmic 1 Jul, 2006 OMAPS00075784 //To handle the simp lock disable events during bootup case MFW_SIM_ACTIVATION: sim_status.sim_procedure = MFW_SIM_ACTIVATION; @@ -1462,7 +1462,7 @@ void sim_ss_unblock(UBYTE result, T_ACI_CME_ERR reason) { TRACE_FUNCTION("sim_ss_unblock()"); - + pin_flag = MFW_SIM_UNBLOCK; if (result == SIM_UBLK_ERROR) @@ -1571,7 +1571,7 @@ { case MFW_SIM_PIN1: /*a0393213 warnings removal - CPWD_FAC_Sc changed to FAC_Sc as a result of ACI enum change*/ - sAT_PlusCPWD(CMD_SRC_LCL, FAC_Sc, + sAT_PlusCPWD(CMD_SRC_LCL, FAC_Sc, (char *)old_pin, (char *)new_pin); break; case MFW_SIM_PIN2: @@ -1703,7 +1703,7 @@ sim_signal(E_SIM_STATUS,&sim_status); } -/* +/* +--------------------------------------------------------------------+ | PROJECT : MMI-Framework (8417) MODULE : MFW_SIM | | STATE : code ROUTINE : sim_disable | @@ -1718,8 +1718,8 @@ T_ACI_RETURN cfun; TRACE_FUNCTION("sim_disable()"); - /* - * Full functionality is used donīt reset the ME + /* + * Full functionality is used donīt reset the ME */ cfun = sAT_PlusCFUN(CMD_SRC_LCL,CFUN_FUN_Minimum,CFUN_RST_NotPresent); @@ -1775,7 +1775,7 @@ $Description: for displaying the sAT_PlusCLCK result $Returns: None $Arguments: state if passed / failed - + *******************************************************************************/ void mfw_simlock_continue(U8 state) { @@ -1785,18 +1785,18 @@ /******************************************************************************* $Function: mfw_simlock_unblockME $Description: for unblocking ME - $Returns: SUCCESS or FAILURE + $Returns: SUCCESS or FAILURE $Arguments: PUK - + *******************************************************************************/ int mfw_simlock_unblockME(char *puk) -{ +{ TRACE_FUNCTION("mfw_simlock_unblockME"); /*a0393213 warnings removal - CLCK_FAC_Sc, changed to FAC_Sc as a result of ACI enum change*/ if( sAT_PlusCLCK(CMD_SRC_LCL,FAC_Fc,CLCK_MOD_Unlock,(char*)puk,CLASS_NotPresent)==AT_CMPL)/*a0393213 compiler warnings removal - -1 changed to CLASS_NotPresent*/ //return UNBLOCK_SUCESS; return MFW_SS_OK; - else + else //return UNBLOCK_FAILURE; return MFW_SS_FAIL; } @@ -1804,27 +1804,27 @@ /******************************************************************************* $Function: mfw_simlock_check_lock_bootup $Description: checking PIN during bootup - $Returns: SUCCESS or FAILURE + $Returns: SUCCESS or FAILURE $Arguments: PIN - + *******************************************************************************/ int mfw_simlock_check_lock_bootup(char *pin, S16 lcktype) -{ - +{ + /* if( sAT_PlusCPIN(CMD_SRC_LCL, pin, NULL)==AT_CMPL) return BOOTUP_LOCK_SUCCESS; - else + else return BOOTUP_LOCK_FAILURE;*/ //Leela for CPIN to CLCK change T_ACI_FAC lckFac;/*a0393213 warnings removal - T_ACI_CLCK_FAC changed to T_ACI_FAC as a result of ACI enum changed*/ /*a0393213 compiler warnings removal- removed variables clsStat,slock_status,status*/ - + int maxval, curval; T_ACI_RETURN ret; //x0pleela 21 Apr, 2006 DR: OMAPS00067919 T_ACI_CPIN_RSLT code; //x0pleela 21 Apr, 2006 DR: OMAPS00067919 - + TRACE_FUNCTION("mfw_simlock_check_lock_bootup"); - + lckFac= mfw_simlock_return_lock_type(lcktype); //x0pleela 27 Apr, 2006 DR: OMAPS00067919 @@ -1836,14 +1836,14 @@ if(sAT_PlusCLCK(CMD_SRC_LCL,lckFac,CLCK_MOD_Unlock,(char*)pin,CLASS_NotPresent)== AT_FAIL)/*a0393213 compiler warnings removal - -1 changed to CLASS_NotPresent*/ { //x0pleela 11 Sep, 2006 DR: OMASP00094215 - //checking for Class type and the ext busy error and update Simp_Busy_State accordingly + //checking for Class type and the ext busy error and update Simp_Busy_State accordingly //x0pleela 06 Sep, 2006 SIMP: fix for ACI if( ( ((aciErrDesc & 0xFFFF0000) >> 16) EQ ACI_ERR_CLASS_Ext) AND (aciErrDesc & 0x0000FFFF) EQ EXT_ERR_Busy) mfw_simlock_set_busy_state(TRUE); else mfw_simlock_set_busy_state(FALSE); - + mfw_simlock_check_status(lcktype,&maxval,&curval); //set the error descriptor switch( lcktype) @@ -1853,56 +1853,56 @@ { ACI_ERR_DESC( ACI_ERR_CLASS_Cme, CME_ERR_NetworkPersPinReq ); } - else + else { - ACI_ERR_DESC( ACI_ERR_CLASS_Cme, CME_ERR_NetworkPersPukReq); + ACI_ERR_DESC( ACI_ERR_CLASS_Cme, CME_ERR_NetworkPersPukReq); } break; - + case MFW_SIM_NSLOCK: if(curval !=0) { ACI_ERR_DESC( ACI_ERR_CLASS_Cme, CME_ERR_NetworkSubsetPersPinReq ); } - else + else { - ACI_ERR_DESC( ACI_ERR_CLASS_Cme, CME_ERR_NetworkSubsetPersPukReq); + ACI_ERR_DESC( ACI_ERR_CLASS_Cme, CME_ERR_NetworkSubsetPersPukReq); } break; - + case MFW_SIM_SPLOCK: - - if(curval !=0) + + if(curval !=0) { - ACI_ERR_DESC( ACI_ERR_CLASS_Cme, CME_ERR_ProviderPersPinReq); + ACI_ERR_DESC( ACI_ERR_CLASS_Cme, CME_ERR_ProviderPersPinReq); } - else + else { - ACI_ERR_DESC( ACI_ERR_CLASS_Cme, CME_ERR_ProviderPersPukReq ); + ACI_ERR_DESC( ACI_ERR_CLASS_Cme, CME_ERR_ProviderPersPukReq ); } break; - + case MFW_SIM_CLOCK: - - if(curval !=0) + + if(curval !=0) { - ACI_ERR_DESC( ACI_ERR_CLASS_Cme, CME_ERR_CorporatePersPinReq); + ACI_ERR_DESC( ACI_ERR_CLASS_Cme, CME_ERR_CorporatePersPinReq); } - else + else { - ACI_ERR_DESC( ACI_ERR_CLASS_Cme, CME_ERR_CorporatePersPukReq ); + ACI_ERR_DESC( ACI_ERR_CLASS_Cme, CME_ERR_CorporatePersPukReq ); } break; - + case MFW_SIM_PLOCK: - - if(curval !=0) + + if(curval !=0) { - ACI_ERR_DESC( ACI_ERR_CLASS_Cme, CME_ERR_PhSimPinReq ); + ACI_ERR_DESC( ACI_ERR_CLASS_Cme, CME_ERR_PhSimPinReq ); } else { - ACI_ERR_DESC( ACI_ERR_CLASS_Cme, CME_ERR_PhoneFail); + ACI_ERR_DESC( ACI_ERR_CLASS_Cme, CME_ERR_PhoneFail); } break; @@ -1912,14 +1912,14 @@ { ACI_ERR_DESC( ACI_ERR_CLASS_Ext, EXT_ERR_BlockedNetworkPersPinReq ); } - else + else { - ACI_ERR_DESC( ACI_ERR_CLASS_Ext, EXT_ERR_BlockedNetworkPersPukReq); + ACI_ERR_DESC( ACI_ERR_CLASS_Ext, EXT_ERR_BlockedNetworkPersPukReq); } break; - // default: - // ACI_ERR_DESC( ACI_ERR_CLASS_Cme, CME_ERR_WrongPasswd ); + // default: + // ACI_ERR_DESC( ACI_ERR_CLASS_Cme, CME_ERR_WrongPasswd ); // break; } @@ -1928,7 +1928,7 @@ //x0pleela 21 Apr, 2006 DR: OMAPS00067919 //Calling qat_plusCPIN for next category check by ACI else - { + { ret = qAT_PlusCPIN( CMD_SRC_LCL, &code ); if( code EQ CPIN_RSLT_SimReady ) @@ -1944,15 +1944,15 @@ case AT_FAIL: TRACE_EVENT("qAT_PlusCPIN error"); return BOOTUP_LOCK_FAILURE; - + case AT_CMPL: // case AT_EXCT: - TRACE_EVENT("BOOTUP_OK"); + TRACE_EVENT("BOOTUP_OK"); return BOOTUP_OK; - + default: break; - } + } } return BOOTUP_LOCK_FAILURE; /*a0393213 lint warnings removal - return statement added*/ } @@ -1962,7 +1962,7 @@ $Description: for getting the fc value $Returns: value of the req fc type $Arguments: fc type - + *******************************************************************************/ int mfw_simlock_get_sup_info(int flag) { @@ -1982,7 +1982,7 @@ $Description: The lock type is converted to the ACI enum type $Returns: corresponding ACi lock type $Arguments: MMI lock type - (SIM Locks Only) - + *******************************************************************************/ /*a0393213 warnings removal - return type changed from T_ACI_CLCK_FAC as a result of ACI enum change*/ T_ACI_FAC mfw_simlock_return_lock_type(S16 lck) @@ -1992,41 +1992,41 @@ //case 0: case MFW_SIM_NLOCK: return FAC_Pn; - //case 1: + //case 1: case MFW_SIM_SPLOCK: return FAC_Pp; - //case 2: + //case 2: case MFW_SIM_NSLOCK: return FAC_Pu; - //case 3: + //case 3: case MFW_SIM_CLOCK: return FAC_Pc; - //case 4: + //case 4: case MFW_SIM_PLOCK: return FAC_Ps; case MFW_SIM_FC: return FAC_Fc; - + case MFW_SIM_FCM: return FAC_Fcm; //x0pleela 20 July, 2006 - //Return coresponding lock type for master unlock + //Return coresponding lock type for master unlock case MFW_SIM_MKEY: return FAC_Mu; case MFW_SIM_MKEYM: return FAC_Mum; //x0pleela 25 Sep, 2006 ER: OMAPS00095524 - //Return coresponding ACI lock type for Blocked network + //Return coresponding ACI lock type for Blocked network case MFW_SIM_PBLOCK: return FAC_Bl; - + default: return FAC_NotPresent; /*a0393213 compiler warnings removal - -1 changed to CLCK_FAC_NotPresent*/ } - + } @@ -2043,7 +2043,7 @@ T_SUP_INFO_TYPE FLAG; int curr_fc, max_fc,FC_Reset_Fail_Max,FC_Reset_Fail_Current,FC_Reset_Success_Max,FC_Reset_Success_Current ; //T_DISPLAY_DATA display_info; - + // T_MFW_HND win = mfwParent(mfw_header()); // Sept 24, 2005 REF: LOCOSTO-ENH-34438, xpradipg // used new enum value @@ -2058,7 +2058,7 @@ FLAG = FCRESETFAILMAX; FC_Reset_Fail_Max=mfw_simlock_get_sup_info(FLAG); // Sept 24, 2005 REF: LOCOSTO-ENH-34438, xpradipg -// used new enum value +// used new enum value FLAG =FCRESETFAILATTEMPTSLEFT; FC_Reset_Fail_Current=mfw_simlock_get_sup_info(FLAG); // Sept 24, 2005 REF: LOCOSTO-ENH-34438, xpradipg @@ -2066,7 +2066,7 @@ FLAG =FCRESETSUCCESSMAX; FC_Reset_Success_Max=mfw_simlock_get_sup_info(FLAG); // Sept 24, 2005 REF: LOCOSTO-ENH-34438, xpradipg -// used new enum value +// used new enum value FLAG =FCRESETSUCCESSATTEMPTSLEFT; FC_Reset_Success_Current=mfw_simlock_get_sup_info(FLAG); @@ -2081,7 +2081,7 @@ *curr = FC_Reset_Success_Current; } - TRACE_FUNCTION_P4(" FC_Reset_Fail_Max %d FC_Reset_Fail_Current %d FC_Reset_Success_Max %d FC_Reset_Success_Current %d",FC_Reset_Fail_Max,FC_Reset_Fail_Current,FC_Reset_Success_Max,FC_Reset_Success_Current); + TRACE_FUNCTION_P4(" FC_Reset_Fail_Max %d FC_Reset_Fail_Current %d FC_Reset_Success_Max %d FC_Reset_Success_Current %d",FC_Reset_Fail_Max,FC_Reset_Fail_Current,FC_Reset_Success_Max,FC_Reset_Success_Current); /* if( lcktyp == 0 ) */ if (curr_fc == 0) @@ -2091,15 +2091,15 @@ //temporarily blocked TRACE_FUNCTION("chk_status:MFW_SIM_BLOCKED"); return MFW_SIM_BLOCKED; - + } else { //permanently blocked TRACE_FUNCTION("check_staus: MFW_SIM_PERM_BLOCKED"); return MFW_SIM_PERM_BLOCKED; - } - + } + } else { @@ -2115,7 +2115,7 @@ $Description: returns the status of the lock - enabled / disabled $Returns: lock status $Arguments: lock type - + *******************************************************************************/ int mfw_simlock_get_lock_status(S16 lcktyp) { @@ -2131,7 +2131,7 @@ return MFW_SIM_BLOCKED; if(status == MFW_SIM_PERM_BLOCKED) return MFW_SIM_PERM_BLOCKED; - + lckfac= mfw_simlock_return_lock_type(lcktyp); if (qAT_PlusCLCK(CMD_SRC_LCL, lckfac, CLASS_NotPresent, &clsStat) EQ AT_CMPL) @@ -2148,7 +2148,7 @@ } } return MFW_SIM_FAILURE; - + } @@ -2156,18 +2156,18 @@ /******************************************************************************* $Function: mfw_simlock_enable_lock - $Description: Changes the oldpassword with the new one for the given + $Description: Changes the oldpassword with the new one for the given lock type $Returns: success or failure $Arguments: type of lock and old and new password - + *******************************************************************************/ T_MFW_SS_RETURN mfw_simlock_enable_lock(U8 *pin, S16 lcktyp) { T_ACI_FAC lckFac;/*a0393213 warnings removal - T_ACI_CLCK_FAC changed to T_ACI_FAC as a result of ACI enum change*/ -// Nov 03, 2005 DR: OMAPS00052032 - xpradipg +// Nov 03, 2005 DR: OMAPS00052032 - xpradipg T_ACI_RETURN ret; TRACE_FUNCTION("mfw_simlock_enable_lock()"); @@ -2176,7 +2176,7 @@ lckFac= mfw_simlock_return_lock_type(lcktyp); ret = sAT_PlusCLCK(CMD_SRC_LCL,lckFac,CLCK_MOD_Lock,(char*)pin,CLASS_NotPresent); /*a0393213 compiler warnings removal - -1 changed to CLASS_NotPresent*/ // Nov 03, 2005 DR: OMAPS00052032 - xpradipg -// handle the AT_EXCT case and set the global to true +// handle the AT_EXCT case and set the global to true switch(ret) { case AT_CMPL: @@ -2195,7 +2195,7 @@ $Description: disables the lock with the given password for the given lock $Returns: success or failure $Arguments: type of lock and password - + *******************************************************************************/ T_MFW_SS_RETURN mfw_simlock_disable_lock(U8 *pin, S16 lcktyp) { @@ -2219,7 +2219,7 @@ T_ACI_FAC lckFac;/*a0393213 warnings removal - T_ACI_CLCK_FAC changed to T_ACI_FAC as a result of ACI enum change*/ T_ACI_RETURN stat; TRACE_FUNCTION("mfw_simlock_reset_fc_value()"); - TRACE_EVENT_P1("SimLock_MFW FC Password=%s",pin); + TRACE_EVENT_P1("SimLock_MFW FC Password=%s",pin); lckFac= mfw_simlock_return_lock_type(fc_flag); stat = sAT_PlusCLCK(CMD_SRC_LCL,lckFac,CLCK_MOD_Unlock,(char*)pin,CLASS_NotPresent) ;/*a0393213 compiler warnings removal - -1 changed to CLASS_NotPresent*/ if( stat != AT_CMPL) @@ -2238,7 +2238,7 @@ $Function: mfw_simlock_master_unlock $Description: This function unlocks(dependent categories) or unblocks ME $Returns: success or failure - $Arguments: + $Arguments: *******************************************************************************/ //x0pleela 20 July, 2006 ER: OMAPS00087586, OMAPS00087587 T_MFW mfw_simlock_master_unlock(U8 *pin, S16 MK_Unblock_flag) @@ -2294,7 +2294,7 @@ $Description: This function checks from ACI whether Master Unlock feature is enabled or not If enabled, displays a menu item for the user to select master unlocking option If not enabled, doesn't display master unlocking option in the menu - $Arguments: + $Arguments: *******************************************************************************/ //x0pleela 20 July, 2006 ER: OMAPS00087586, OMAPS00087587 @@ -2304,7 +2304,7 @@ T_ACI_FAC lckfac;/*a0393213 warnings removal - T_ACI_CLCK_FAC changed to T_ACI_FAC as a result of ACI enum change*/ TRACE_FUNCTION("mfw_simlock_check_masterkey()"); - + //get the lock type lckfac= mfw_simlock_return_lock_type(MK_unlock_type); @@ -2324,9 +2324,9 @@ /******************************************************************************* $Function: mfw_simlock_set_busy_state - $Description: This function sets Simp_Busy_State to either TRUE or FALSE based on ACI's + $Description: This function sets Simp_Busy_State to either TRUE or FALSE based on ACI's CME error - $Arguments: + $Arguments: *******************************************************************************/ //x0pleela 20 July, 2006 ER: OMAPS00087586, OMAPS00087587 void mfw_simlock_set_busy_state( UBYTE state ) @@ -2337,8 +2337,8 @@ /******************************************************************************* $Function: mfw_simlock_get_busy_state - $Description: This function returns the current value of Simp_Busy_State - $Arguments: + $Description: This function returns the current value of Simp_Busy_State + $Arguments: *******************************************************************************/ //x0pleela 20 July, 2006 ER: OMAPS00087586, OMAPS00087587 UBYTE mfw_simlock_get_busy_state( void ) @@ -2354,11 +2354,11 @@ #if 0 /******************************************************************************* $Function: mfw_simlock_verify_lock - $Description: If locked, it performs unlock + lock, if unlocks, it performs + $Description: If locked, it performs unlock + lock, if unlocks, it performs lock + unlock, thus validating if the password provided is correct $Returns: success or failure $Arguments: type of lock and password - + *******************************************************************************/ int mfw_simlock_verify_lock(char* pwd,S16 lock) @@ -2367,7 +2367,7 @@ T_ACI_FAC lckfac; TRACE_FUNCTION("mfw_simlock_verify_lock()"); - TRACE_EVENT_P1("Vidya: SimLock_MFW Password=%s",pwd); + TRACE_EVENT_P1("Vidya: SimLock_MFW Password=%s",pwd); // status = mfw_simlock_get_lock_status(lock); lckfac=mfw_simlock_return_lock_type(lock); @@ -2394,7 +2394,7 @@ else return MFW_SS_OK; } - + } else if(status==MFW_SIM_DISABLE) { @@ -2413,8 +2413,8 @@ else return MFW_SS_OK; } - - + + } */ /* if(aci_ext_personalisation_MMI_verify_password(pwd) != MMILOCK_VERIFIED) @@ -2426,11 +2426,11 @@ #endif /******************************************************************************* $Function: mfw_simlock_change_lock_code - $Description: Changes the oldpassword with the new one for the given + $Description: Changes the oldpassword with the new one for the given lock type $Returns: success or failure $Arguments: type of lock and old and new password - + *******************************************************************************/ T_MFW mfw_simlock_change_lock_code(int type,char*oldpswd,char* newpswd) { @@ -2587,8 +2587,8 @@ /* Apr 13, 2004 REF: CRR 16303 JuanVi Jativa-Villoldo */ - /* SPN must always be read, not only when nm_registration is called */ - sim_spn_req(); + /* SPN must always be read, not only when nm_registration is called */ + sim_spn_req(); if (sim_check_service(15,sim_service_table) == ALLOCATED_AND_ACTIVATED) @@ -2737,7 +2737,7 @@ /* Dec 13, 2006 DR: OMAPS00105640 x0039928 Fix: sim_stat is updated */ - sim_stat = SIM_NOT_ACTIVE; + sim_stat = SIM_NOT_ACTIVE; if ( srType EQ SIMREM_FAILURE ) { sim_status.sim_procedure = MFW_SIM_REMOVED; @@ -2750,7 +2750,7 @@ else if ( srType EQ SIMREM_RESET ) { #ifdef SIM_TOOLKIT - sim_signal(E_SIM_RESET, 0); + sim_signal(E_SIM_RESET, 0); #endif } } @@ -2793,11 +2793,11 @@ { T_ACI_RETURN cfun; /*This event is not passed to BMI as there is no need currently*/ - cfun = sAT_PlusCFUN(CMD_SRC_LCL,CFUN_FUN_Full,CFUN_RST_NotPresent); + cfun = sAT_PlusCFUN(CMD_SRC_LCL,CFUN_FUN_Full,CFUN_RST_NotPresent); if (cfun NEQ AT_EXCT) { TRACE_ERROR("rAT_PercentSIMINS() : sAT_PlusCFUN error"); - } + } break; } @@ -2819,7 +2819,7 @@ UBYTE sim_cvt_access_status(UBYTE acs) { TRACE_FUNCTION("sim_cvt_access_status()"); - + switch(acs) { #ifdef FF_2TO1_PS @@ -2861,7 +2861,7 @@ *phase = sim_config.phase; if ((serv != NULL) && (slen != NULL)) - { + { l = sizeof(sim_service_table); if (l < *slen) *slen = l; @@ -2926,7 +2926,7 @@ SHORT pk2Cnt; T_ACI_PVRF_STAT ps1; T_ACI_PVRF_STAT ps2; - + TRACE_FUNCTION("sim_pin_count()"); @@ -2952,7 +2952,7 @@ SHORT pk2Cnt; T_ACI_PVRF_STAT ps1; T_ACI_PVRF_STAT ps2; - + TRACE_FUNCTION("sim_pin_count()"); @@ -2965,13 +2965,13 @@ /***************************Go-lite Optimization changes end***********************/ switch (pin_id) { - case MFW_SIM_PIN1: + case MFW_SIM_PIN1: { if (ps1 ==PVRF_STAT_NotPresent) return 0; else return 1; } // break; // RAVI - case MFW_SIM_PIN2: + case MFW_SIM_PIN2: { if (ps2 ==PVRF_STAT_NotPresent) return 0; else @@ -2988,7 +2988,7 @@ | STATE : code ROUTINE : sim_convert_simlock_status| +---------------------------------------------------------------------+ - PURPOSE : Conversion of ACI simlock status to MFW simlock status codes for + PURPOSE : Conversion of ACI simlock status to MFW simlock status codes for compatibility with existing MMI layer. */ @@ -3001,7 +3001,7 @@ case(SIMLOCK_BLOCKED): return MFW_SIM_BLOCKED; // break; // RAVI case(SIMLOCK_LOCKED): return MFW_SIM_LOCKED; //break; // RAVI case (SIMLOCK_FAIL): return MFW_SIM_FAILURE; // break; // RAVI - default: return MFW_SIM_FAILURE; + default: return MFW_SIM_FAILURE; } } @@ -3018,11 +3018,11 @@ /*MC SPR1351, replaced previous implemnetation with wrapper for aci implementation*/ T_MFW sim_unlock_sim_lock(UBYTE type, UBYTE *passwd) { - + T_SIMLOCK_STATUS simlock_status=SIMLOCK_DISABLED;/*status from ACI */ - /*for CQ-34324 -- While Integrating of VLE5 ME personalization code aci_slock_unlock - function is moved under SIM_PERS flag and this function is never called . So variable - simlock_status is hardcoded to default value */ + /*for CQ-34324 -- While Integrating of VLE5 ME personalization code aci_slock_unlock + function is moved under SIM_PERS flag and this function is never called . So variable + simlock_status is hardcoded to default value */ UBYTE mfw_simlock_status;/*status converted to MFW encoding*/ TRACE_EVENT_P1("sim_unlock_sim_lock(): %d", type); @@ -3062,7 +3062,7 @@ default: return MFW_SIM_UNLOCK_ERR; } // break; // RAVI - + /* * NS-Lock */ @@ -3113,7 +3113,7 @@ default:return MFW_SIM_UNLOCK_ERR; } // break; // RAVI - + } return MFW_SIM_UNLOCK_ERR; @@ -3130,10 +3130,10 @@ */ /*MC SPR1351, replaced previous implemnetation with wrapper for aci implementation*/ int sim_check_sim_Plock (void) -{ T_SIMLOCK_STATUS simlock_status = SIMLOCK_DISABLED; +{ T_SIMLOCK_STATUS simlock_status = SIMLOCK_DISABLED; /*ACI set default value for CQ-34324--While Integrating of VLE5 ME personalization code - aci_slock_checklock function is removed and this function is never called. So variable - simlock_status is hardcoded to default value + aci_slock_checklock function is removed and this function is never called. So variable + simlock_status is hardcoded to default value */ TRACE_EVENT ("sim_check_sim_Plock"); @@ -3141,7 +3141,7 @@ simlock_status =aci_slock_checklock(SIMLOCK_SIM); #endif TRACE_EVENT_P1("PLock: %d", simlock_status); - /*convert status from ACI to MFW encoding*/ + /*convert status from ACI to MFW encoding*/ return sim_convert_simlock_status(simlock_status); } @@ -3158,17 +3158,17 @@ */ /*MC SPR1351, replaced previous implemnetation with wrapper for aci implementation*/ int sim_check_sim_Nlock (void) -{ T_SIMLOCK_STATUS simlock_status = SIMLOCK_DISABLED; +{ T_SIMLOCK_STATUS simlock_status = SIMLOCK_DISABLED; /*ACI set default value for CQ-34324--While Integrating of VLE5 ME personalization code - aci_slock_checklock function is removed and this function is never called. So variable - simlock_status is hardcoded to default value + aci_slock_checklock function is removed and this function is never called. So variable + simlock_status is hardcoded to default value */ TRACE_EVENT ("sim_check_sim_Nlock()"); #ifdef MMI_34324 simlock_status =aci_slock_checklock(SIMLOCK_NETWORK); #endif TRACE_EVENT_P1("NLock: %d", simlock_status); - /*convert status from ACI to MFW encoding*/ + /*convert status from ACI to MFW encoding*/ return sim_convert_simlock_status(simlock_status); @@ -3189,17 +3189,17 @@ int sim_check_sim_SPlock (void) { T_SIMLOCK_STATUS simlock_status = SIMLOCK_DISABLED; /*ACI set default value for CQ-34324--While Integrating of VLE5 ME personalization code - aci_slock_checklock function is removed and this function is never called. So variable - simlock_status is hardcoded to default value + aci_slock_checklock function is removed and this function is never called. So variable + simlock_status is hardcoded to default value */ TRACE_EVENT ("sim_check_sim_SPlock()"); - + #ifdef MMI_34324 simlock_status =aci_slock_checklock(SIMLOCK_SERVICE_PROVIDER); #endif - + TRACE_EVENT_P1("NLock: %d", simlock_status); - /*convert status from ACI to MFW encoding*/ + /*convert status from ACI to MFW encoding*/ return sim_convert_simlock_status(simlock_status); } @@ -3216,19 +3216,19 @@ */ /*MC SPR1351, replaced previous implementation with wrapper for aci implementation*/ int sim_check_sim_NSlock (void) -{ T_SIMLOCK_STATUS simlock_status = SIMLOCK_DISABLED; +{ T_SIMLOCK_STATUS simlock_status = SIMLOCK_DISABLED; /*ACI set default value for CQ-34324--While Integrating of VLE5 ME personalization code - aci_slock_checklock function is removed and this function is never called. So variable - simlock_status is hardcoded to default value + aci_slock_checklock function is removed and this function is never called. So variable + simlock_status is hardcoded to default value */ TRACE_EVENT ("sim_check_sim_NSlock()"); - + #ifdef MMI_34324 simlock_status =aci_slock_checklock(SIMLOCK_NETWORK_SUBSET); #endif TRACE_EVENT_P1("NSLock: %d", simlock_status); - /*convert status from ACI to MFW encoding*/ + /*convert status from ACI to MFW encoding*/ return sim_convert_simlock_status(simlock_status); } @@ -3244,17 +3244,17 @@ */ /*MC SPR1351, replaced previous implemnetation with wrapper for aci implementation*/ int sim_check_sim_Clock (void) -{ T_SIMLOCK_STATUS simlock_status = SIMLOCK_DISABLED; +{ T_SIMLOCK_STATUS simlock_status = SIMLOCK_DISABLED; /*ACI set default value for CQ-34324--While Integrating of VLE5 ME personalization code - aci_slock_checklock function is removed and this function is never called. So variable - simlock_status is hardcoded to default value + aci_slock_checklock function is removed and this function is never called. So variable + simlock_status is hardcoded to default value */ TRACE_EVENT ("sim_check_sim_Clock()"); #ifdef MMI_34324 simlock_status =aci_slock_checklock(SIMLOCK_CORPORATE); #endif TRACE_EVENT_P1("CLock: %d", simlock_status); - /*convert status from ACI to MFW encoding*/ + /*convert status from ACI to MFW encoding*/ return sim_convert_simlock_status(simlock_status); } @@ -3283,8 +3283,8 @@ status->stat = MFW_SIM_UNKNOWN; status->set = MFW_SIM_UNKNOWN; - - if (qAT_PercentPVRF(CMD_SRC_LCL, &pn1Cnt, + + if (qAT_PercentPVRF(CMD_SRC_LCL, &pn1Cnt, &pn2Cnt, &pk1Cnt, &pk2Cnt, &ps1, &ps2) == AT_CMPL) { switch (status->type) @@ -3326,15 +3326,15 @@ switch (ps) { - case PVRF_STAT_NotRequired: + case PVRF_STAT_NotRequired: return MFW_SIM_NO_PIN; case PVRF_STAT_Required: - if (type EQ MFW_SIM_PIN1) + if (type EQ MFW_SIM_PIN1) return MFW_SIM_PIN_REQ; - if (type EQ MFW_SIM_PIN2) + if (type EQ MFW_SIM_PIN2) return MFW_SIM_PIN2_REQ; return MFW_SIM_UNKNOWN; - default: + default: return MFW_SIM_UNKNOWN; } } @@ -3350,8 +3350,8 @@ */ -void simDecodeIMSI (UBYTE * imsi_field, - UBYTE imsi_c_field, +void simDecodeIMSI (UBYTE * imsi_field, + UBYTE imsi_c_field, UBYTE * imsi_extracted) { UBYTE length; @@ -3456,16 +3456,16 @@ PURPOSE : The function checks all simlocks and returns SIMLOCK_DISABLED if none are set. - + */ /*spr 1351, replaced previous implemntation with a wrapper for aci implentation*/ UBYTE sim_simlock_ok (void) -{ - T_SIMLOCK_STATUS simlock_status = SIMLOCK_ENABLED; - /*ACI set default value for CQ-34324 -- While Integrating of VLE5 ME personalization code - aci_slock_checkpersonalisation function is moved under SIM_PERS flag and this function is +{ + T_SIMLOCK_STATUS simlock_status = SIMLOCK_ENABLED; + /*ACI set default value for CQ-34324 -- While Integrating of VLE5 ME personalization code + aci_slock_checkpersonalisation function is moved under SIM_PERS flag and this function is never called . So variable simlock_status is hardcoded to default value */ - #ifdef MMI_34324 + #ifdef MMI_34324 simlock_status = aci_slock_checkpersonalisation(); #endif return sim_convert_simlock_status(simlock_status); @@ -3540,7 +3540,7 @@ case SIM_LP: { T_ACI_LAN_SUP lngCde; - CHAR lang_buffer[3]; + CHAR lang_buffer[3]; memset(lang_buffer, 0, sizeof(lang_buffer)); lngCde.str = lang_buffer; @@ -3609,7 +3609,7 @@ | STATE : code ROUTINE : sim_init_CPRS | +--------------------------------------------------------------------+ - PURPOSE : initialize the ciphering indication + PURPOSE : initialize the ciphering indication */ @@ -3619,7 +3619,7 @@ //UBYTE getCPRImode; // RAVI TRACE_FUNCTION("sim_init_CPRS()"); - + //keep the callback function from MMI if (func != NULL) mmi_cprs_cb = func; @@ -3639,8 +3639,8 @@ | STATE : code ROUTINE : rAT_PercentCPRI | +--------------------------------------------------------------------+ - PURPOSE : is called to inform the application about a received ciphering indication. - gsm_ciph and gprs_ciph are used to inform the application about a change in ciphering + PURPOSE : is called to inform the application about a received ciphering indication. + gsm_ciph and gprs_ciph are used to inform the application about a change in ciphering mode in GSM or GPRS. */ @@ -3659,9 +3659,9 @@ | STATE : code ROUTINE : sim_read_lp_cnf | +---------------------------------------------------------------------+ - PURPOSE : - -*/ + PURPOSE : + +*/ void sim_read_lp_cnf (USHORT error, T_ACI_LAN_SUP *CLang) { @@ -3691,8 +3691,8 @@ | STATE : code ROUTINE : sim_simlock_cpin_code | +---------------------------------------------------------------------+ - PURPOSE : This function checks for the code and take action for SIMP category unlocking -*/ + PURPOSE : This function checks for the code and take action for SIMP category unlocking +*/ #ifdef SIM_PERS void sim_simlock_cpin_code (T_ACI_CPIN_RSLT code) { @@ -3704,7 +3704,7 @@ sim_stat = SIM_ACTIVE; pin_flag = -1; pin_ident = MFW_SIM_UNKNOWN; - + if( code EQ CPIN_RSLT_SimReady ) { TRACE_EVENT("CPIN_RSLT_SimReady"); @@ -3717,7 +3717,7 @@ } switch ( code ) { - case CPIN_RSLT_PhSimPinReq: + case CPIN_RSLT_PhSimPinReq: sim_status.sim_status = MFW_SIM_PLOCK_REQ; sim_status.sim_status_type = MFW_SIM_LOCKED ; sim_signal(E_SIM_STATUS,&sim_status); @@ -3752,7 +3752,7 @@ case CPIN_RSLT_PhSPPukReq: case CPIN_RSLT_PhCorpPukReq: case CPIN_RSLT_PhSimFail: - C_KEY_REQ = 1; + C_KEY_REQ = 1; sim_status.sim_status = MFW_SIM_PUK_REQ; sim_status.sim_pin_retries = sim_pin_count(MFW_SIM_PUK1); sim_status.sim_status_type = MFW_SIM_PUK1; @@ -3767,11 +3767,11 @@ sim_status.sim_status_type = MFW_SIM_LOCKED; sim_signal(E_SIM_STATUS,&sim_status); break; - + //x0pleela 25 Sep, 2006 ER: OMAPS00095524 //Set the reqd. parameters for Blocked Network Unblock code request case CPIN_RSLT_PhBlockedNetPukReq: - C_KEY_REQ = 1; + C_KEY_REQ = 1; sim_status.sim_status = MFW_SIM_PUK_REQ; sim_status.sim_pin_retries = sim_pin_count(MFW_SIM_PUK1); sim_status.sim_status_type = MFW_SIM_PUK1; @@ -3782,7 +3782,7 @@ default: TRACE_ERROR("sim_simlock_cpin_code (): result"); break; - } + } return ; } #endif @@ -3795,7 +3795,7 @@ $Description: returns the status of the lock - enabled / disabled $Returns: lock status $Arguments: lock type - + *******************************************************************************/ int mfw_phlock_get_lock_status(S16 lcktyp) { @@ -3803,7 +3803,7 @@ T_ACI_FAC lckfac; TRACE_FUNCTION("mfw_phlock_get_lock_status()"); - + lckfac = FAC_Pl; if (qAT_PlusCLCK(CMD_SRC_LCL, lckfac, @@ -3831,7 +3831,7 @@ } } return MFW_PH_LOCK_FAILURE; - + } /******************************************************************************* @@ -3839,7 +3839,7 @@ $Description: returns the status of the lock - enabled / disabled $Returns: lock status $Arguments: lock type - + *******************************************************************************/ int mfw_phlock_get_autolock_status(S16 lcktyp) { @@ -3859,10 +3859,10 @@ { case STATUS_NotActive: TRACE_FUNCTION("MFW_PH_LOCK_DISABLE "); - + //x0pleela 29 May, 2007 DR: OMAPS00132483 //set the auto phone lock status to FALSE - mfw_set_Auto_Phlock_status(FALSE); + mfw_set_Auto_Phlock_status(FALSE); return MFW_PH_LOCK_DISABLE; case STATUS_Active: @@ -3870,19 +3870,19 @@ //x0pleela 29 May, 2007 DR: OMAPS00132483 //set the auto phone lock status to TRUE - mfw_set_Auto_Phlock_status(TRUE); + mfw_set_Auto_Phlock_status(TRUE); return MFW_PH_LOCK_ENABLE; } } return MFW_PH_LOCK_FAILURE; - + } /******************************************************************************* $Function: mfw_phlock_enable_lock $Description: disables the lock with the given password for the given lock $Returns: success or failure $Arguments: type of lock and password - + *******************************************************************************/ T_MFW_SS_RETURN mfw_phlock_enable_lock(U8 *pin, S16 lcktyp) { @@ -3894,7 +3894,7 @@ else if ( lcktyp == MFW_PH_LOCK ) lckFac = FAC_Pl; - ret = sAT_PlusCLCK(CMD_SRC_LCL,lckFac,CLCK_MOD_Lock,(char*)pin,CLASS_NotPresent); + ret = sAT_PlusCLCK(CMD_SRC_LCL,lckFac,CLCK_MOD_Lock,(char*)pin,CLASS_NotPresent); switch(ret) { case AT_CMPL: @@ -3902,7 +3902,7 @@ case AT_FAIL: return MFW_SS_FAIL; } - return MFW_SS_FAIL; + return MFW_SS_FAIL; } /******************************************************************************* @@ -3910,7 +3910,7 @@ $Description: disables the lock with the given password for the given lock $Returns: success or failure $Arguments: type of lock and password - + *******************************************************************************/ T_MFW_SS_RETURN mfw_phlock_disable_lock(U8 *pin, S16 lcktyp) { @@ -3921,7 +3921,7 @@ if( lcktyp == MFW_PH_LOCK ) lckFac = FAC_Pl; - ret = sAT_PlusCLCK(CMD_SRC_LCL,lckFac,CLCK_MOD_Unlock,(char*)pin,CLASS_NotPresent) ; + ret = sAT_PlusCLCK(CMD_SRC_LCL,lckFac,CLCK_MOD_Unlock,(char*)pin,CLASS_NotPresent) ; if(ret != AT_CMPL) return MFW_SS_FAIL; else @@ -3933,7 +3933,7 @@ $Description: disables the auto lock when user selects Autolock Off option from menu $Returns: success or failure $Arguments: type of lock and password - + *******************************************************************************/ T_MFW_SS_RETURN mfw_phlock_disable_autoLock( S16 lcktyp) { @@ -3944,8 +3944,8 @@ if( lcktyp == MFW_AUTO_PH_LOCK ) lckFac = FAC_Apl; - if( mfw_phlock_get_autolock_status(MFW_AUTO_PH_LOCK) == MFW_PH_LOCK_ENABLE ) - { + if( mfw_phlock_get_autolock_status(MFW_AUTO_PH_LOCK) == MFW_PH_LOCK_ENABLE ) + { ret = sAT_PlusCLCK(CMD_SRC_LCL,lckFac,CLCK_MOD_Unlock,NULL,CLASS_NotPresent) ; if(ret != AT_CMPL) @@ -3961,11 +3961,11 @@ /******************************************************************************* $Function: mfw_phlock_change_lock_code - $Description: Changes the oldpassword with the new one for the given + $Description: Changes the oldpassword with the new one for the given lock type $Returns: success or failure $Arguments: type of lock and old and new password - + *******************************************************************************/ T_MFW mfw_phlock_change_lock_code(int type,char*oldpswd,char* newpswd) { @@ -3994,7 +3994,7 @@ $Function: mfw_set_Auto_Phlock_status - $Description: set /resets the AutoPhlockStatus bit in Phlock_flag + $Description: set /resets the AutoPhlockStatus bit in Phlock_flag $Returns: none. @@ -4016,7 +4016,7 @@ $Function: mfw_get_Auto_Phlock_status - $Description: returns the AutoPhlockStatus status from Phlock_flag + $Description: returns the AutoPhlockStatus status from Phlock_flag $Returns: none. @@ -4038,7 +4038,7 @@ $Function: mfw_set_Phlock_status - $Description: set /resets the PhlockStatus bit in Phlock_flag + $Description: set /resets the PhlockStatus bit in Phlock_flag $Returns: none. @@ -4060,7 +4060,7 @@ $Function: mfw_get_Phlock_status - $Description: returns the PhlockStatus status from Phlock_flag + $Description: returns the PhlockStatus status from Phlock_flag $Returns: none.