1.1 --- a/epoc32/include/mmf/common/mmfipc.h	Wed Mar 31 12:27:01 2010 +0100
     1.2 +++ b/epoc32/include/mmf/common/mmfipc.h	Wed Mar 31 12:33:34 2010 +0100
     1.3 @@ -1,9 +1,9 @@
     1.4  // Copyright (c) 2003-2009 Nokia Corporation and/or its subsidiary(-ies).
     1.5  // All rights reserved.
     1.6  // This component and the accompanying materials are made available
     1.7 -// under the terms of the License "Symbian Foundation License v1.0" to Symbian Foundation members and "Symbian Foundation End User License Agreement v1.0" to non-members
     1.8 +// under the terms of "Eclipse Public License v1.0"
     1.9  // which accompanies this distribution, and is available
    1.10 -// at the URL "http://www.symbianfoundation.org/legal/licencesv10.html".
    1.11 +// at the URL "http://www.eclipse.org/legal/epl-v10.html".
    1.12  //
    1.13  // Initial Contributors:
    1.14  // Nokia Corporation - initial contribution.
    1.15 @@ -27,57 +27,24 @@
    1.16  #endif //__IPC_V2_PRESENT__
    1.17  
    1.18  
    1.19 +#ifdef __MMF_USE_IPC_V2__
    1.20 +typedef RMessage2 RMmfIpcMessage;
    1.21 +#else // __MMF_USE_IPC_V2__
    1.22 +// otherwise always use V1
    1.23 +typedef RMessage RMmfIpcMessage;
    1.24 +#endif // __MMF_USE_IPC_V2__
    1.25 +
    1.26 +#ifndef SYMBIAN_ENABLE_SPLIT_HEADERS
    1.27 +#include <mmf/common/mmfipcserver.h>
    1.28 +#endif
    1.29 +
    1.30 +
    1.31  // The following declarations are used instead of the native ones on the particular system variant:
    1.32  //    RMmfIpcMessage replaces RMessage or RMessage2
    1.33  //    CMmfIpcServer replaces CServer or CServer2
    1.34  //    CMmfIpcSession replaces CSharableSession or CSession2
    1.35  // They are used internally to the MMF component to provide configurability for the particular subsystem
    1.36  
    1.37 -#ifdef __MMF_USE_IPC_V2__
    1.38 -
    1.39 -typedef RMessage2 RMmfIpcMessage;
    1.40 -
    1.41 -class CMmfIpcServer; // forward declaration
    1.42 -
    1.43 -/**
    1.44 - * derive CMmfIpcSession from CSession2 so we can bridge the differences to old CSharableSession
    1.45 - *
    1.46 - * @internalTechnology
    1.47 - */
    1.48 - 
    1.49 -class CMmfIpcSession : public CSession2
    1.50 -	{
    1.51 -protected:
    1.52 -	virtual void CreateL(const CMmfIpcServer& aServer);
    1.53 -	CMmfIpcSession() {}
    1.54 -	// from CSession2
    1.55 -	void CreateL();
    1.56 -	};
    1.57 -
    1.58 -/*
    1.59 - * derive CMmfIpcServer from CServer2 so we can bridge difference to old CServer
    1.60 - *
    1.61 - * @internalTechnology
    1.62 - */
    1.63 - 
    1.64 -class CMmfIpcServer : public CServer2
    1.65 -	{
    1.66 -protected:
    1.67 -	virtual CMmfIpcSession* NewSessionL(const TVersion& aVersion) const=0;
    1.68 -	CMmfIpcServer(TInt aPriority,TServerType aType=EUnsharableSessions);
    1.69 -private:
    1.70 -	// derived from CServer2
    1.71 -	CSession2* NewSessionL(const TVersion& aVersion,const RMessage2& aMessage) const;
    1.72 -	};
    1.73 -
    1.74 -#else // __MMF_USE_IPC_V2__
    1.75 -
    1.76 -// otherwise always use V1
    1.77 -typedef RMessage RMmfIpcMessage;
    1.78 -typedef CServer CMmfIpcServer;
    1.79 -typedef CSharableSession CMmfIpcSession;
    1.80 -
    1.81 -#endif // __MMF_USE_IPC_V2__
    1.82  
    1.83  #if defined(__VC32__)
    1.84  #pragma warning( disable : 4097 )	// typedef-name used as synonym for class-name 
    1.85 @@ -88,7 +55,7 @@
    1.86   * RSessionBase adaptor layer 
    1.87   * Provides typechecking for client-side calls. 
    1.88   *
    1.89 - * @internalTechnology
    1.90 + * @publishedAll
    1.91   */
    1.92  
    1.93  class RMmfSessionBase : public RSessionBase
    1.94 @@ -127,22 +94,6 @@
    1.95  	void SendReceive(TInt aFunction, TInt aParam0, const TDesC8& aParam1, const TDesC8& aParam2, TRequestStatus& aStatus) const;
    1.96  	void SendReceiveResult(TInt aFunction, TInt aParam0, const TDesC8& aParam1, const TDesC8& aParam2, TDes8& aResult, TRequestStatus& aStatus) const;
    1.97  	};
    1.98 -
    1.99 -
   1.100 -/**
   1.101 - * Adapt RMessage calls between IPC variants
   1.102 - *
   1.103 - * @internalTechnology
   1.104 - */
   1.105 -
   1.106 -class MmfMessageUtil 
   1.107 -	{
   1.108 -public:
   1.109 -	static TInt Read(const RMmfIpcMessage& aMessage, TInt aParam, TDes8& aResult);
   1.110 -	static TInt Write(const RMmfIpcMessage& aMessage, TInt aParam, const TDesC8& aValue);
   1.111 -	static void ReadL(const RMmfIpcMessage& aMessage, TInt aParam, TDes8& aResult);
   1.112 -	static void WriteL(const RMmfIpcMessage& aMessage, TInt aParam, const TDesC8& aValue);
   1.113 -	};
   1.114  	
   1.115  #include <mmf/common/mmfipc.inl>
   1.116