diff -r b183ec05bd8c -r 19bba8228ff0 terminalsecurity/SCP/SCPServer/inc/SCPConfiguration.h --- a/terminalsecurity/SCP/SCPServer/inc/SCPConfiguration.h Tue Aug 31 16:04:06 2010 +0300 +++ b/terminalsecurity/SCP/SCPServer/inc/SCPConfiguration.h Wed Sep 01 12:27:42 2010 +0100 @@ -29,9 +29,8 @@ enum TSCPParamType { EParTypeInt = 0, - EParTypeDesc, - EParTypeBool - }; + EParTypeDesc + }; // LOCAL CONSTANTS @@ -57,11 +56,10 @@ const TInt KParamIDBlockedInOOS = 7; // ID number for the encrypted security code. const TInt KParamIDCryptoCode = 8; -//ID number for the boolean for the configuartion check -const TInt KParamIDConfigChecked = 9; + // Total number of Param IDs -const TInt KTotalParamIDs = 9; +const TInt KTotalParamIDs = 8; //#ifdef __SAP_DEVICE_LOCK_ENHANCEMENTS #define SCP_PARAMETERS_WithFlag { &iConfigFlag, \ @@ -71,9 +69,8 @@ &iFailedAttempts, \ &iBlockedAtTime, \ &iBlockedInOOS, \ - &iCryptoCode, \ - &iConfigChecked \ - }; + &iCryptoCode \ + }; #define SCP_PARAMIDS_WithFlag { KParamIDConfigFlag, \ KParamIDMaxTimeout, \ @@ -82,9 +79,8 @@ KParamIDFailedAttempts, \ KParamIDBlockedAtTime, \ KParamIDBlockedInOOS, \ - KParamIDCryptoCode, \ - KParamIDConfigChecked \ - }; + KParamIDCryptoCode \ + }; #define SCP_PARAMTYPES_WithFlag { EParTypeInt, \ EParTypeInt, \ @@ -93,9 +89,8 @@ EParTypeInt, \ EParTypeDesc, \ EParTypeInt, \ - EParTypeDesc, \ - EParTypeBool \ - }; + EParTypeDesc\ + }; //#else // !__SAP_DEVICE_LOCK_ENHANCEMENTS @@ -189,10 +184,7 @@ /** The name of the main configuration file */ TFileName iConfigFileName; TInt iBlockedInOOS; - - //Flag to check whether Configuration checked already - TBool iConfigChecked; - + /** A ptr to a connected RFs, not owned */ RFs* iFsSession;