diff -r 510c70acdbf6 -r 8ccc39f9d787 adaptationlayer/tsy/nokiatsy_dll/inc/cmmcallmesshandler.h
--- a/adaptationlayer/tsy/nokiatsy_dll/inc/cmmcallmesshandler.h	Mon Nov 09 10:36:19 2009 +0000
+++ b/adaptationlayer/tsy/nokiatsy_dll/inc/cmmcallmesshandler.h	Thu Jan 14 10:44:58 2010 +0200
@@ -11,7 +11,7 @@
 *
 * Contributors:
 *
-* Description: 
+* Description:
 *
 */
 
@@ -61,6 +61,10 @@
 const TUint8 KMaskBits1to7 = 0x7F;
 const TUint8 KMaskBit8 = 0x80;
 
+// These OBJ ID is used in pipe direction.
+// Pipe-End-Point, Circuit Switched Data server
+#define PN_OBJ_CSD_SRV       0x31
+
 // MACROS
 //  None
 
@@ -561,7 +565,7 @@
         void CsdMultimediaDataRateInd( const TIsiReceiveC &aIsiMessage );
 
         /**
-        * Creates subblocks for CSD_CALL_CONTROL_REQ 
+        * Creates subblocks for CSD_CALL_CONTROL_REQ
         * @param aTelNumber Phone number to be called
         * @param aIdRestrict Caller id restriction
         * @param aCsdIsiMsg CSD IsiMsg
@@ -631,65 +635,25 @@
         TInt PnsPipeCreateReq( const TUint8 aPipeStateAfter ) const;
 
         /**
-        * Creates PnsPipeEnableReq ISI message and sends it to Phonet.
-		* @return error value: Symbian error code
-        */
-        TInt PnsPipeEnableReq() const;
-
-        /**
-        * Creates PnsPipeResetReq ISI message and sends it to Phonet.
-        * @param aStateAfterReset: pipe state after reset
-		* @return error value: Symbian error code
-        */
-        TInt PnsPipeResetReq( const TUint8 aStateAfterReset );
-
-        /**
         * Creates PnsPipeRemoveReq ISI message and sends it to Phonet.
 		* @return error value: Symbian error code
         */
         TInt PnsPipeRemoveReq();
 
         /**
-        * Creates PnsPipeRedirectReq ISI message and sends it to Phonet.
-		* @return error value: Symbian error code
-        */
-        TInt PnsPipeRedirectReq();
-
-        /**
-        * PnsPipeCreate response. 
+        * PnsPipeCreate response.
         * @param aIsiMessage, reference to the received message.
         * @return void
         */
         void PnsPipeCreateResp( const TIsiReceiveC &aIsiMessage );
 
         /**
-        * PnsPipeEnable response.
-        * @param aIsiMessage, reference to the received message.
-        * @return void
-        */
-        void PnsPipeEnableResp( const TIsiReceiveC& aIsiMessage );
-
-        /**
-        * PnsPipeReset response. 
-        * @param aIsiMessage, reference to the received message.
-        * @return void
-        */
-        void PnsPipeResetResp( const TIsiReceiveC& aIsiMessage );
-
-        /**
-        * PnsPipeRemove response. 
+        * PnsPipeRemove response.
         * @param aIsiMessage, reference to the received message.
         * @return void
         */
         void PnsPipeRemoveResp( const TIsiReceiveC& aIsiMessage );
 
-        /**
-        * PnsPipeRedirect response. 
-        * @param aIsiMessage, reference to the received message.
-        * @return void
-        */
-        void PnsPipeRedirectResp( const TIsiReceiveC& aIsiMessage );
-
     public:     // Data
         // None
 
@@ -798,16 +762,16 @@
 
 		// Video call connected or disconnected
         TUint8 iVideoCallStatus;
-        
+
 		// bearer rate for multimedia call
         TUint8 iDataRateCode;
-        
+
         // Call direction
         RMobileCall:: TMobileCallDirection iCallDirection;
 
         // Mobile call info
         RMobileCall::TMobileCallInfoV1 iMobileCallInfo;
-        
+
         // Is call multimedia/video call
         TBool iIsMultimedia;
 
@@ -817,14 +781,17 @@
         // Pipe handle for video/multimediacall
         TUint8 iPipeHandle;
 
-        TUint8 iSecondPepDeviceId; 
-        TUint8 iSecondPepObjectId;
-        
         // Call Operation ID
         TUint8 iCallOperationID;
 
-        // Video call mt released
-        TBool iVideoCallMtReleased;
+        // Video call mo/mt released
+        TBool iVideoCallReleased;
+
+        // CALL_ID of the call controlled request
+        TUint8 iCallControlCallId;
+
+        // call control result
+        TUint8 iCcResult;
 
     public:     // Friend classes
         // None