API_REF/Public_API: comparison epoc32/include/e32base.h

equal deleted inserted replaced

-:e1b950c65cb4
+:837f303aceeb
 // Copyright (c) 1994-2009 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
-// 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
+// under the terms of the License "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available
-// at the URL "http://www.symbianfoundation.org/legal/licencesv10.html".
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
 //
 // Initial Contributors:
 // Nokia Corporation - initial contribution.
 //
 // Contributors:
 	friend class CObjectCon;
 	friend class CObjectIx;
 	__DECLARE_TEST;
 	};
+//Forward declaration of SObjectIxRec
+struct SObjectIxRec;
-/**
-@internalComponent
-*/
-		struct	TObjectDataStr	//In use if this slot contains pointer to object.
-			{
-			TInt16 instance;
-			TUint16 uniqueID;
-			};
-/**
-@internalComponent
-*/
-struct SObjectIxRec
-	{
-	union
-	{
-		TObjectDataStr str;	//This is in use if the slot contains pointer to CObject.
-		TInt nextEmpty;		//This is in use if the slot is empty. Points to the next empty slot ...
-							//... in the list. 16 bits would be enough but ARM prefers 32 bytes.
-	};
-	CObject* obj;
-	};
 class CObjectIx : public CBase
 /**
 @publishedAll
 @released
 @see CObject
 @see CObjectConIx
 */
 	{
-protected:
-/**
-@internalComponent
-*/
-	enum {ENotOwnerID};
 public:
 	IMPORT_C static CObjectCon* NewL();
 	IMPORT_C ~CObjectCon();
 	IMPORT_C void Remove(CObject* anObj);
 	IMPORT_C void AddL(CObject* anObj);
 @see CObjectCon
 @see CObject
 */
 	{
+#ifndef	SYMBIAN_ENABLE_SPLIT_HEADERS
+protected:
+/**
+@internalComponent
+*/
+	enum {ENotOwnerID};
+#endif
 public:
 	IMPORT_C static CObjectConIx* NewL();
 	IMPORT_C ~CObjectConIx();
 	IMPORT_C CObjectCon* Lookup(TInt aFindHandle) const;
 	IMPORT_C CObjectCon* CreateL();
 	CObjectCon** iContainers;
 	TAny* iSpare1;
 	TAny* iSpare2;
 	};
-/**
-@internalTechnology
-@deprecated
-*/
-class CBitMapAllocator : public CBase
-	{
-public:
-	IMPORT_C static CBitMapAllocator* New(TInt aSize);
-	IMPORT_C static CBitMapAllocator* NewL(TInt aSize);
-	IMPORT_C ~CBitMapAllocator();
-	IMPORT_C TInt Alloc();
-	IMPORT_C TInt AllocFrom(TInt aPos);
-	IMPORT_C TInt Alloc(TInt aCount, TInt& aConsecutive);
-	IMPORT_C TInt AllocAligned(TInt anAlignment);
-	IMPORT_C TInt AllocAlignedBlock(TInt anAlignment);
-	IMPORT_C TInt AllocFromTop();
-	IMPORT_C TInt AllocFromTopFrom(TInt aPos);
-	IMPORT_C void AllocAt(TInt aPos);
-	IMPORT_C void AllocAt(TInt aPos, TInt aCount);
-	IMPORT_C TBool IsFree(TInt aPos);
-	IMPORT_C TBool IsFree(TInt aPos, TInt aCount);
-	IMPORT_C void Free(TInt aPos);
-	IMPORT_C void Free(TInt aPos, TInt aCount);
-	IMPORT_C TInt Avail();
-	IMPORT_C TInt Size();
-	IMPORT_C TInt ExtractRamPages(TInt aConsecutive,TInt& aPageNo);
-protected:
-	IMPORT_C CBitMapAllocator(TInt aSize,TInt aLength);
-protected:
-	TInt iAvail;
-	TInt iSize;
-	TInt iLength;
-	TUint iMap[1];
-	};
 // Forward Declaration of TCleanupStackItem
 class TCleanupStackItem;
 class CCirBuffer : public CCirBuf<TUint8>
 /**
 @publishedAll
 @released
-Circular buffer of unsigned integers.
+Circular buffer of unsigned 8-bit integers.
-The integer values range from -128 to +127.
+The integer values range from 0 to 255.
 */
 	{
 public:
 	IMPORT_C CCirBuffer();
 	IMPORT_C ~CCirBuffer();
 @see CDeltaTimer
 */
 	{
 	friend class CDeltaTimer;
 public:
-	inline TDeltaTimerEntry(TCallBack& aCallback);
+	inline TDeltaTimerEntry(const TCallBack& aCallback);
 	inline TDeltaTimerEntry();
 	inline void Set(TCallBack& aCallback);
 private:
 	TCallBack iCallBack;
 	TTickCountQueLink iLink;
 protected:
 	IMPORT_C CSession2();
 	IMPORT_C virtual void Disconnect(const RMessage2& aMessage);
 	IMPORT_C virtual TInt Extension_(TUint aExtensionId, TAny*& a0, TAny* a1);
 public:
+	IMPORT_C void SetServer(const CServer2* aServer);
 /**
 @internalComponent
 */
 	enum TPanicNo {ESesCountResourcesNotImplemented=1,ESesFoundResCountHeaven};
 private:
 	TInt iResourceCountMark;
 	TDblQueLink iLink;
 	const CServer2* iServer;
 	TAny* iSpare;
 (Note that this class should be used instead of CServer)
 */
 class CServer2 : public CActive
 	{
 public:
-/**
-Defines the set of session types that the server can create.
+	/**
+	This enumeration defines the maximum sharability of sessions opened
-A specific session type is specified when the CServer2 object is created.
+	with this server; for backwards compatibilty, these should be have
-*/
+	the same values as the corresponding EIpcSessionType enumeration
+	*/
 	enum TServerType
 		{
-		/**
+		EUnsharableSessions					= EIpcSession_Unsharable,
-		The session is not sharable with other threads.
+		ESharableSessions					= EIpcSession_Sharable,
-		*/
+		EGlobalSharableSessions				= EIpcSession_GlobalSharable,
-		EUnsharableSessions = EIpcSession_Unsharable,
-		/**
-		The session is sharable with other threads in the same process.
-		*/
-		ESharableSessions = EIpcSession_Sharable,
-		/**
-		The session is sharable with all other threads in the system.
-		*/
-		EGlobalSharableSessions = EIpcSession_GlobalSharable,
 		};
 public:
 	IMPORT_C virtual ~CServer2() =0;
 	IMPORT_C TInt Start(const TDesC& aName);
 	IMPORT_C void StartL(const TDesC& aName);
 	IMPORT_C void ReStart();
+	IMPORT_C void SetPinClientDescriptors(TBool aPin);
 	/**
 	Gets a handle to the server.
 	Note that the RServer2 object is classified as Symbian internal, and its
 */
 	IMPORT_C virtual CSession2* NewSessionL(const TVersion& aVersion,const RMessage2& aMessage) const =0;
 	void Connect(const RMessage2& aMessage);
 	void DoConnectL(const RMessage2& aMessage,CSession2* volatile& aSession);
 public:
+	IMPORT_C void SetMaster(const CServer2* aServer);
 	/**
 @internalComponent
 */
 	enum TPanic
 		{
 		EBadMessageNumber,
 		ESessionNotConnected,
 		ESessionAlreadyConnected,
 		EClientDoesntHaveRequiredCaps,
 		};
-private:
-	TInt iSessionType;
+private:
+	TUint8 iSessionType;
+	TUint8 iServerRole;
+	TUint16 iServerOpts;
 	RServer2 iServer;
 	RMessage2 iMessage;
 	TAny* iSpare;
 	TDblQue<CSession2> iSessionQ;
 protected:
 	TDblQueIter<CSession2> iSessionIter;
 private:
 	void Disconnect(const RMessage2& aMessage);
 	static void BadMessage(const RMessage2& aMessage);
 	IMPORT_C static CConsoleBase* NewL(const TDesC& aTitle,TSize aSize);
 	};
 #include <e32base.inl>
+#ifndef SYMBIAN_ENABLE_SPLIT_HEADERS
+#include <e32base_private.h>
+#endif
 #endif //__E32BASE_H__

branch	Symbian3
changeset 4	837f303aceeb
parent 2	2fe1408b6811