--- a/contentcontrolsrv/ccsrvapi/inc/ccsrvapi.h	Fri Feb 19 23:07:29 2010 +0200
+++ b/contentcontrolsrv/ccsrvapi/inc/ccsrvapi.h	Fri Mar 12 15:43:54 2010 +0200
@@ -46,7 +46,7 @@
 // - Arg[1]:   Registered provider address (out), TUint32
 // - Arg[2]:   Not used
 // - Arg[2]:   Not used
-    ECcReqisterProvider = ECcIPCFunctionBase,
+    ECcReqisterProvider,
 // ----------------------------------------------------------------------------
 // RegisterObserver
 // ----------------------------------------------------------------------------
@@ -179,7 +179,7 @@
 // ----------------------------------------------------------------------------
 enum TCcSrvMessages
     {
-    ECcMessageBase = 0,
+    ECcMessageBase,
 // ----------------------------------------------------------------------------
 // RegisterObserverNtf
 // ----------------------------------------------------------------------------
@@ -190,7 +190,7 @@
 // - Message id:     EHsCcRegisterObserverNtf
 // - Transaction id: None
 // - Message data:   None
-    ECcRegisterObserverNtf = ECcMessageBase,
+    ECcRegisterObserverNtf,
 // ----------------------------------------------------------------------------
 // UnregisterObserverNtf
 // ----------------------------------------------------------------------------
@@ -258,6 +258,39 @@
     IMPORT_C void SetMessage( RMessage2& aMessage );
 
     /**
+     * Returns IPC function
+     */
+    IMPORT_C TInt Function();
+    
+    /**
+     * Stores IPC function
+     * @param aFunction IPC function
+     */
+    IMPORT_C void SetFunction( TInt aFunction );
+
+    /**
+     * Returns sender of the message
+     */
+    IMPORT_C TUint32 Sender();
+    
+    /**
+     * Stores sender of the message
+     * @param aSender Message sender
+     */
+    IMPORT_C void SetSender( TUint32 );
+
+    /**
+     * Returns receiver of the message
+     */
+    IMPORT_C TUint32 Receiver();
+    
+    /**
+     * Stores receiver of the message
+     * @param aReceiver Message receiver
+     */
+    IMPORT_C void SetReceiver( TUint32 );
+
+    /**
      * Returns message id
      */
     IMPORT_C TUint32 MsgId();
@@ -343,6 +376,21 @@
     RMessage2 iMessage;
 
     /**
+     * IPC function
+     */
+    TInt iFunction;
+    
+    /**
+     * Sender
+     */
+    TUint32 iSender;
+    
+    /**
+     * Receiver
+     */
+    TUint32 iReceiver;
+    
+    /**
      * Message id
      */
     TUint32 iMsgId;