epoc32/include/mmf/common/mmfipc.inl
branchSymbian3
changeset 4 837f303aceeb
parent 2 2fe1408b6811
     1.1 --- a/epoc32/include/mmf/common/mmfipc.inl	Wed Mar 31 12:27:01 2010 +0100
     1.2 +++ b/epoc32/include/mmf/common/mmfipc.inl	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 @@ -15,38 +15,6 @@
    1.16  // 
    1.17  //
    1.18  
    1.19 -#ifdef __MMF_USE_IPC_V2__
    1.20 -
    1.21 -//
    1.22 -// CMmfIpcSession
    1.23 -//
    1.24 -
    1.25 -inline void CMmfIpcSession::CreateL(const CMmfIpcServer& /*aServer*/)
    1.26 -	{
    1.27 -	// default does nothing
    1.28 -	} 
    1.29 -	
    1.30 -inline void CMmfIpcSession::CreateL() 
    1.31 -	{ 
    1.32 -	const CMmfIpcServer* server = static_cast<const CMmfIpcServer*>(Server());
    1.33 -	CreateL(*server); // simulate CSession::CreateL() call
    1.34 -	}
    1.35 -
    1.36 -//
    1.37 -// CMmfIcpServer
    1.38 -//
    1.39 -
    1.40 -inline CMmfIpcServer::CMmfIpcServer(TInt aPriority,TServerType aType):
    1.41 -	CServer2(aPriority,aType)
    1.42 -	{
    1.43 -	}
    1.44 -
    1.45 -inline CSession2* CMmfIpcServer::NewSessionL(const TVersion& aVersion, const RMessage2& /*aMessage*/) const
    1.46 -	{
    1.47 -	return NewSessionL(aVersion);
    1.48 -	}
    1.49 -
    1.50 -#endif //__MMF_USE_IPC_V2__
    1.51  
    1.52  //
    1.53  // RMmfSessionBase
    1.54 @@ -292,68 +260,6 @@
    1.55  #endif //__MMF_USE_IPC_V2__
    1.56  	}
    1.57  	
    1.58 -//
    1.59 -// MmfMessageUtil
    1.60 -//
    1.61 -
    1.62 -inline void MmfMessageUtil::ReadL(const RMmfIpcMessage& aMessage, TInt aParam, TDes8& aResult)
    1.63 -	{
    1.64 -#ifdef __MMF_USE_IPC_V2__
    1.65 -	User::LeaveIfError(aMessage.Read(aParam, aResult));
    1.66 -#else
    1.67 -	// expect aParam to be a literal - so this code should optimise out
    1.68 -	if (aParam==0)
    1.69 -		aMessage.ReadL(aMessage.Ptr0(), aResult);
    1.70 -	else if (aParam==1)
    1.71 -		aMessage.ReadL(aMessage.Ptr1(), aResult);
    1.72 -	else if (aParam==2)
    1.73 -		aMessage.ReadL(aMessage.Ptr2(), aResult);
    1.74 -	else if (aParam==3)
    1.75 -		aMessage.ReadL(aMessage.Ptr3(), aResult);
    1.76 -	else
    1.77 -		User::Leave(KErrArgument);
    1.78 -#endif //__MMF_USE_IPC_V2__
    1.79 -	}
    1.80 -
    1.81 -inline void MmfMessageUtil::WriteL(const RMmfIpcMessage& aMessage, TInt aParam, const TDesC8& aValue)
    1.82 -	{
    1.83 -#ifdef __MMF_USE_IPC_V2__
    1.84 -	User::LeaveIfError(aMessage.Write(aParam, aValue));
    1.85 -#else
    1.86 -	// expect aParam to be a literal - so this code should optimise out
    1.87 -	if (aParam==0)
    1.88 -		aMessage.WriteL(aMessage.Ptr0(), aValue);
    1.89 -	else if (aParam==1)
    1.90 -		aMessage.WriteL(aMessage.Ptr1(), aValue);
    1.91 -	else if (aParam==2)
    1.92 -		aMessage.WriteL(aMessage.Ptr2(), aValue);
    1.93 -	else if (aParam==3)
    1.94 -		aMessage.WriteL(aMessage.Ptr3(), aValue);
    1.95 -	else
    1.96 -		User::Leave(KErrArgument);
    1.97 -#endif //__MMF_USE_IPC_V2__
    1.98 -	}
    1.99 -
   1.100 -inline TInt MmfMessageUtil::Read(const RMmfIpcMessage& aMessage, TInt aParam, TDes8& aResult)
   1.101 -	{
   1.102 -#ifdef __MMF_USE_IPC_V2__
   1.103 -	return aMessage.Read(aParam, aResult);
   1.104 -#else
   1.105 -	TRAPD(error, ReadL(aMessage, aParam, aResult));
   1.106 -	return error;
   1.107 -#endif //__MMF_USE_IPC_V2__
   1.108 -	}
   1.109 -
   1.110 -inline TInt MmfMessageUtil::Write(const RMmfIpcMessage& aMessage, TInt aParam, const TDesC8& aValue)
   1.111 -	{
   1.112 -#ifdef __MMF_USE_IPC_V2__
   1.113 -	return aMessage.Write(aParam, aValue);
   1.114 -#else
   1.115 -	TRAPD(error, WriteL(aMessage, aParam, aValue));
   1.116 -	return error;
   1.117 -#endif //__MMF_USE_IPC_V2__
   1.118 -}
   1.119 -
   1.120  //TDesC versions
   1.121  
   1.122  inline void RMmfSessionBase::SendReceive(TInt aFunction, const TDesC& aParam0, TRequestStatus& aStatus) const