--- a/phoneengine/engineinfo/inc/cpeengineinfoimpl.h	Fri Jun 04 10:19:18 2010 +0100
+++ b/phoneengine/engineinfo/inc/cpeengineinfoimpl.h	Wed Jun 23 18:12:20 2010 +0300
@@ -76,8 +76,6 @@
     TPEContactFileName iVideoCallRingingTone; // Video call ringingtone name                                    
     TPEDtmfString iDtmfString;              // Dtmf string.                 
     TPEErrorInfo iErrorInfo;                // possible error code                  
-    TPELifeTimeData iLifeTimeData;                  
-    TPEPhoneIdentityParameters iPhoneIdentityParameters; // the phone identity parameters                   
     TPEProfileName iProfileName;            // the name of the profile                  
     TProfileRingingType iRingingType;       // Includes current ringing type                    
     TPEVoiceMailBoxNumberInfo iVMBXNumbers; // Voice mail box numbers
@@ -279,24 +277,12 @@
         const TCCPTone& InbandTone() const;
 
         /**
-        * Gets lifetimer data
-        * @return lifetime data (TDes8&)
-        */
-        const TPELifeTimeData& LifeTimerData() const;
-
-        /**
         * Gets network registration status
         * @return TNWNetworkRegistrationStatus Network registration status
         */
         const TNWNetworkRegistrationStatus& NetworkRegistrationStatus() const;
 
         /**
-        * Gets phone identity parameters from TPEBasicInfo-structure
-        * @param aPhoneIdentityParameters is the phone identity parameters. 
-        */
-        const TPEPhoneIdentityParameters& PhoneIdentityParameters() const;
-
-        /**
         * Gets phone number
         * @return Reference to TPEPhoneNumber, containing the phone number of the remote party.
         */
@@ -621,6 +607,13 @@
          * @param aCallState state to be checked.
          */
           TBool CheckIfCallStateExists( const TPEState& aCallState );
+          
+          /**
+          * Sets the protocol spesific error code
+          * @param aError is the error code from protocol.
+          * @return None.
+          */
+           void SetProtocolError( TInt aError ); 
 
     // Functions from MPEDataStore (reading values)
     public:
@@ -1167,12 +1160,6 @@
         void SetKeypadVolume( const TInt aKeypadVolume );
 
         /**
-        * Sets lifetimer data of the phone to TPEBasicInfo-structure
-        * @param aLifeTimerData lifetime data (TDesc8&).
-        */
-        void SetLifeTimerData( TCCPLifeTimeDataPckg& aPckg );
-
-        /**
         * Sets a logging indicator to TPECallInfo-tructure
         * @param aLoggingIndicator, Continuous logging indicator.
         * @param aCallId, the call identification number.
@@ -1209,13 +1196,6 @@
         * @param aPersonalTone is personal tone status (EFalse/ETrue).
         */
         void SetPersonalToneStatus( const TInt& aPersonalToneStatus );
-
-        /**
-        * Sets phone number to TPECallCommandInfo-structure
-        * @param aPhoneIdentityParameters is the phone identity parameters
-        */
-        void SetPhoneIdentityParameters( 
-            const TPEPhoneIdentityParameters& aPhoneIdentityParameters );
         
         /**
         * Sets phone number parsing result
@@ -1258,7 +1238,7 @@
         * @param aCallId, is the call identification number.
         */
         void SetRemoteColpNumber(
-            TPEPhoneNumber& aColpNumber, 
+            const TPEPhoneNumber& aColpNumber, 
             const TInt aCallId );
 
         /**