FCL/sf/os/kernelhwsrv: comparison kernel/eka/include/e32btrace.h

equal deleted inserted replaced

-:c1f20ce4abcf
+:3e88ff8f41d5
 -#	Timestamp.		A timestamp value indicating when the trace was generated.
 					The format and resolution of this value are platform-dependent, but
 					typically will contain the same values as would be returned by
 					User::FastCounter() or NKern::FastCounter().
 					This value is only present if the ETimestampPresent flag is set.
--#	Timestamp2. 	Additional timestamp information. E.g. the most significant
+-#	Timestamp2.		Additional timestamp information. E.g. the most significant
 					half of a 64bit timestamp value. Note, it is valid for a Timestamp2 value
 					to be present even if the previous Timestamp is absent.
 					This value is only present if the ETimestamp2Present flag is set.
--#	Context ID. 	This value indicates the context in which the trace was generated.
+-#	Context ID.		This value indicates the context in which the trace was generated.
 					The meaning of the id is dependent on the contents of the two
 					least significant bits:
 					-	00	indicates the value is the address of the NThread object for
 							the currently executing thread.
 					-	01	indicates Fast Interrupt (FIQ) context.
 	enum TFlags
 		{
 		/**
 		Header2 is present in the trace record.
 		*/
-		EHeader2Present 	= 1<<0,
+		EHeader2Present		= 1<<0,
 		/**
 		A timestamp value is present in the trace record.
 		*/
 		ETimestampPresent	= 1<<1,
 		EMultipartFlagMask		= 3<<0,
 		/**
 		Masks out the bits for the CPU ID for SMP systems (zero if present on non SMP systems)
 		*/
-		ECpuIdMask			= 0xfffU<<20,
+		ECpuIdMask			= 0xfff<<20,
 		};
 	/**
 	Values for multipart trace indicator. These values are stored in Flags2 an
 	are obtained by ANDing with the value EMultipartFlagMask.
 	enum TMultiPart
 		{
 		/**
 		Indicates that this trace is the first part of a multipart trace.
 		*/
-		EMultipartFirst 		= 1,
+		EMultipartFirst			= 1,
 		/**
 		Indicates that this trace is a middle part of a multipart trace.
 		I.e. it is not the first or last part.
 		*/
 		@see enum TCpuUsage
 		*/
 		ECpuUsage = 4,
-		/**
+/**
-		Category used for profiling device drivers, kernel extensions etc.
+Category used for profiling device drivers, kernel extensions etc.
-		Used by PERF_LOG macro.
+Used by PERF_LOG macro.
-		@prototype 9.3
+@prototype 9.3
-		*/
+*/
-		EKernPerfLog = 5,
+EKernPerfLog = 5,
-		/**
+/**
 		Trace generated when client-server activity takes place such as server creation,
 		session management, message handling, etc.
 		If #Prime is called with this category, traces will be generated for all
 		servers currently running and their sessions.
-		*/
+*/
-		EClientServer = 6,
+EClientServer = 6,
-		/**
+/**
 		Trace generated on thread request completion.
-		*/
+*/
-		ERequests = 7,
+ERequests = 7,
-		/**
+/**
 		Trace generated when chunks are created and destroyed, and when memory
 		is committed and decommitted to and from chunks.
 		If #Prime is called with this category, traces will be generated for all
 		chunks currently extant.
 		@see TChunks
-		*/
+*/
-		EChunks = 8,
+EChunks = 8,
-		/**
+/**
 		Trace generated when code segments are created and destroyed, mapped
 		into out of processes, and when memory is committed and decommitted to
 		and from them.
 		If #Prime is called with this category, traces will be generated for all
 		code segments currently extant.
 		@see TCodeSegs
-		*/
+*/
-		ECodeSegs = 9,
+ECodeSegs = 9,
 		/**
 		Trace generated by Demand Paging.
 		@prototype 9.3
 		*/
 		If #Prime is called with this category, traces will be generated for all
 		threads currently extant.
 		@see enum TThreadPriority
 		@internalTechnology
-		@prototype 9.3
+@prototype 9.3
 		*/
 		EThreadPriority = 11,
 		/**
 		Trace generated by processing Paging requests in the Media subsystem and Media drivers.
 		@see enum TProfiling
 		*/
 		EProfiling = 18,
 		/**
-		Trace generated by Power Resource Manager.
+Trace generated by Power Resource Manager.
-		@prototype 9.5
+@prototype 9.5
-		*/
+*/
-		EResourceManager = 19,
+EResourceManager = 19,
-		/**
+/**
-		Trace generated by Power Resource Manager User-Side API.
+Trace generated by Power Resource Manager User-Side API.
-		@prototype 9.5
+@prototype 9.5
-		*/
+*/
-		EResourceManagerUs = 20,
+EResourceManagerUs = 20,
 		/**
 		Trace generated by Raw Event subsystem APIs
 		@see enum TRawEventTrace
 		@prototype 9.5
 		/**
 		Trace generated by USB communications (Client, Host and OTG) where use
 		of standard logging (conditional Kern::Printf() calls) is sufficiently
 		time-consuming that the required device timings mandated by the core
 		USB standards cannot be achieved
-		@prototype 9.5
+@prototype 9.5
 		*/
 		EUsb = 22,
 		/**
 		Trace generated by Symbian OS kernel synchronization objects.
-		@prototype 9.5
+@prototype 9.5
 		*/
 		ESymbianKernelSync = 23,
 		/**
 		Trace generated by the flexible memory model.
 		*/
 		EFlexibleMemModel = 24,
 		/**
-		Trace generated by IIC bus.
+Trace generated by IIC bus.
-		@prototype 9.6
+@prototype 9.6
-		*/
+*/
-		EIic = 25,
+EIic = 25,
-		/**
-		Trace generated by load balancing or higher-level scheduling
-		@prototype 9.6
-		*/
-		EHSched = 26,
-		/**
-		Trace generated by the nanokernel
-		@prototype 9.6
-		*/
-		ENKern = 27,
 		/**
 		First category value in the range reserved for platform specific use;
 		the end of this range is #EPlatformSpecificLast.
 		Symbian's code will not generate any traces with categories in this range.
 		The context id (NThread*) in this trace is that of the thread being scheduled.
 		*/
 		ENewThreadContext
 		};
-	/**
+/**
 	@internalTechnology
-	@prototype 9.3
+@prototype 9.3
-	*/
+*/
 	enum TClientServer
 		{
 		/**
 		Trace generated whenever a server is created and during prime.
 		Trace generated whenever a message is completed using RMessagePtr2::Complete.
 		Trace data format:
 		- 4 bytes containing the message handle.
 		- 4 bytes containing the completion reason, or object handle, value.
-			(The object handle value is that which is delivered to the sender of the
+		    (The object handle value is that which is delivered to the sender of the
 			message, not that supplied by the server actually completing the request.)
 		The context id (NThread*) in this trace is that of the thread which completed the message.
 		*/
 		EMessageComplete
 		};
-	/**
+/**
 	@internalTechnology
-	@prototype 9.3
+@prototype 9.3
-	*/
+*/
 	enum TRequests
 		{
 		/**
 		Trace generated whenever a request status is completed.
 		*/
 		EPagingPageTableAlloc,
 		};
 /**
-Enumeration of sub-category values for trace category EResourceManager.
+	Enumeration of sub-category values for trace category EResourceManager.
-@see EResourceManager
+	@see EResourceManager
 @prototype 9.5
-*/
+	*/
-enum TResourceManager
+	enum TResourceManager
-{
+		{
-/**
+		/**
-Trace output for resource registration.
+		Trace output for resource registration.
-Trace data format:
+		Trace data format:
-- 4 bytes containing the Resource Id.
+		- 4 bytes containing the Resource Id.
-- 4 bytes containing the Resource address.
+		- 4 bytes containing the Resource address.
-- 4 bytes containing the Resource Minimum Level
+		- N bytes containing the Resource name, where 0 < N < 32
-- 4 bytes containing the Resource Maximum Level
+		- 4 bytes containing the Resource Minimum Level
-- 4 bytes containing the Resource Default Level
+		- 4 bytes containing the Resource Maximum Level
-- 4 bytes containing the length of resource name
+		- 4 bytes containing the Resource Default Level
-- N bytes containing the Resource name, where 0 < N < 32
+		*/
-*/
+		ERegisterResource = 0,
-ERegisterResource = 0,
+		/**
-/**
+		Trace output for client registration
-Trace output for client registration
+		Trace data format:
-Trace data format:
+		- 4 bytes containing clientId
-- 4 bytes containing clientId
+		- 4 bytes containing client address
-- 4 bytes containing client address
+		- N bytes containing client name, where 0 < N < 32
-- 4 bytes containing the length of client name
+		*/
-- N bytes containing client name, where 0 < N < 32
+		ERegisterClient,
-*/
-ERegisterClient,
+		/**
+		Trace output for client deregistration
-/**
-Trace output for client deregistration
+		Trace data format:
+		- 4 bytes containing clientId
-Trace data format:
+		- 4 bytes containing client address
-- 4 bytes containing clientId
+		- N bytes containing client name, where 0 < N < 32
-- 4 bytes containing client address
+		*/
-- 4 bytes containing the length of client name
+		EDeRegisterClient,
-- N bytes containing client name, where 0 < N < 32
-*/
+		/**
-EDeRegisterClient,
+		Trace output for resource state change start operation
-/**
+		Trace data format:
-Trace output for resource state change start operation
+		- 4 bytes containing clientId
+		- 4 bytes containing the Resource Id.
-Trace data format:
+		- N bytes containing client name, where 0 < N < 32
-- 4 bytes containing clientId
+		- N bytes containing the Resource name, where 0 < N < 32
-- 4 bytes containing the Resource Id.
+		- 4 bytes containing the Resource state
-- 4 bytes containing the Resource state
+		*/
-- 4 bytes containing the length of client name
+		ESetResourceStateStart,
-- N bytes containing client name, where 0 < N < 32
-- 4 bytes containing the length of resource name
+		/**
-- N bytes containing the Resource name, where 0 < N < 32
+		Trace output for resource state change end operation
-*/
-ESetResourceStateStart,
+		Trace data format:
+		- 4 bytes containing clientId
-/**
+		- 4 bytes containing the Resource Id.
-Trace output for resource state change end operation
+		- N bytes containing client name, where 0 < N < 32
+		- N bytes containing the Resource name, where 0 < N < 32
-Trace data format:
+		- 4 bytes containing return value.
-- 4 bytes containing clientId
+		- 4 bytes containing the Resource state.
-- 4 bytes containing the Resource Id.
+		*/
-- 4 bytes containing return value.
+		ESetResourceStateEnd,
-- 4 bytes containing the Resource state.
-- 4 bytes containing the length of client name
+		/**
-- N bytes containing client name, where 0 < N < 32
+		Trace output for registration for post notification
-- 4 bytes containing the length of resource name
-- N bytes containing the Resource name, where 0 < N < 32
+		Trace data format:
-*/
+		- 4 bytes containing clientId
-ESetResourceStateEnd,
+		- 4 bytes containing the Resource Id.
+		- 4 bytest containing the callback address
-/**
+		- 4 bytes containing return value.
-Trace output for registration for post notification
+		*/
+		EPostNotificationRegister,
-Trace data format:
-- 4 bytes containing clientId
+		/**
-- 4 bytes containing the Resource Id.
+		Trace output for deregistration for post notification
-- 4 bytest containing the callback address
-- 4 bytes containing return value.
+		Trace data format:
-*/
+		- 4 bytes containing clientId
-EPostNotificationRegister,
+		- 4 bytes containing the Resource Id.
+		- 4 bytes containing the callback address
-/**
+		- 4 bytes containing the return value.
-Trace output for deregistration for post notification
+		*/
+		EPostNotificationDeRegister,
-Trace data format:
-- 4 bytes containing clientId
+		/**
-- 4 bytes containing the Resource Id.
+		Trace output for post notification sent.
-- 4 bytes containing the callback address
-- 4 bytes containing the return value.
+		Trace data format:
-*/
+		- 4 bytes containing clientId
-EPostNotificationDeRegister,
+		- 4 bytes containing the Resource Id.
+		*/
-/**
+		EPostNotificationSent,
-Trace output for post notification sent.
+		/**
-Trace data format:
+		Trace output for Callback complete
-- 4 bytes containing clientId
-- 4 bytes containing the Resource Id.
+		Trace data format:
-*/
+		- 4 bytes containing clientId
-EPostNotificationSent,
+		- 4 bytes containing the Resource Id.
+		*/
-/**
+		ECallbackComplete,
-Trace output for Callback complete
+		/**
-Trace data format:
+		Trace output for resource manager memory usage
-- 4 bytes containing clientId
-- 4 bytes containing the Resource Id.
+		Trace data format:
-*/
+		- 4 bytes containing memory allocated in bytes.
-ECallbackComplete,
+		*/
+		EMemoryUsage,
-/**
-Trace output for resource manager memory usage
+		/**
+		Trace output for get resource state start operation
-Trace data format:
-- 4 bytes containing memory allocated in bytes.
+		Trace data format:
-*/
+		- 4 bytes containing clientId
-EMemoryUsage,
+		- 4 bytes containing the Resource Id.
+		- N bytes containing client name, where 0 < N < 32
-/**
+		- N bytes containing the Resource name, where 0 < N < 32
-Trace output for get resource state start operation
+		*/
+		EGetResourceStateStart,
-Trace data format:
-- 4 bytes containing clientId
+		/**
-- 4 bytes containing the Resource Id.
+		Trace output for get resource state end operation
-- 4 bytes containing the length of client name.
-- N bytes containing client name, where 0 < N < 32
+		Trace data format:
-- 4 bytes containing the length of resource name.
+		- 4 bytes containing clientId
-- N bytes containing the Resource name, where 0 < N < 32
+		- 4 bytes containing the Resource Id.
-*/
+		- N bytes containing client name, where 0 < N < 32
-EGetResourceStateStart,
+		- N bytes containing the Resource name, where 0 < N < 32
+		- 4 bytes containing the Resource state
-/**
+		- 4 bytes containing return value.
-Trace output for get resource state end operation
+		*/
+		EGetResourceStateEnd,
-Trace data format:
-- 4 bytes containing clientId
+		/**
-- 4 bytes containing the Resource Id.
+		Trace output for cancellation of long latency operation
-- 4 bytes containing the Resource state
-- 4 bytes containing return value.
+		Trace data format:
-- 4 bytes containing the length of client name.
+		- 4 bytes containing clientId
-- N bytes containing client name, where 0 < N < 32
+		- 4 bytes containing the Resource Id.
-- 4 bytes containing the length of resource name.
+		- N bytes containing client name, where 0 < N < 32
-- N bytes containing the Resource name, where 0 < N < 32
+		- N bytes containing the Resource name, where 0 < N < 32
-*/
+		- 4 bytes containing return value
-EGetResourceStateEnd,
+		*/
+		ECancelLongLatencyOperation,
-/**
-Trace output for cancellation of long latency operation
+		/**
+		Trace output for booting of resource manager
-Trace data format:
-- 4 bytes containing clientId
+		Trace data format:
-- 4 bytes containing the Resource Id.
+		- 4 bytes containing entry point
-- 4 bytes containing return value
+		*/
-- 4 bytes containing the length of client name.
+		EBooting,
-- N bytes containing client name, where 0 < N < 32
-- 4 bytes containing the length of resource name.
+		/**
-- N bytes containing the Resource name, where 0 < N < 32
+		Trace output for PSL resource state change operation
-*/
-ECancelLongLatencyOperation,
+		Trace data format:
+		- 4 bytes containing clientId
-/**
+		- 4 bytes containing the Resource Id.
-Trace output for booting of resource manager
+		- N bytes containing the Resource name, where 0 < N < 32
+		- 4 bytes containing the Resource current state
-Trace data format:
+		- 4 bytes containing the resource requested state
-- 4 bytes containing entry point
+		*/
-*/
+		EPslChangeResourceStateStart,
-EBooting,
+		/**
-/**
+		Trace output for PSL resource state change operation
-Trace output for PSL resource state change operation
+		Trace data format:
-Trace data format:
+		- 4 bytes containing clientId
-- 4 bytes containing clientId
+		- 4 bytes containing the Resource Id.
-- 4 bytes containing the Resource Id.
+		- N bytes containing the Resource name, where 0 < N < 32
-- 4 bytes containing the Resource current state
+		- 4 bytes containing the Resource current state
-- 4 bytes containing the resource requested state
+		- 4 bytes containing the resource requested state
-- 4 bytes containing the length of resource name.
+		- 4 bytes containing return value
-- N bytes containing the Resource name, where 0 < N < 32
+		*/
-*/
+		EPslChangeResourceStateEnd,
-EPslChangeResourceStateStart,
+		/**
-/**
+		Trace output for get resource state start operation in PSL
-Trace output for PSL resource state change operation
+		Trace data format:
-Trace data format:
+		- 4 bytes containing clientId
-- 4 bytes containing clientId
+		- 4 bytes containing the Resource Id.
-- 4 bytes containing the Resource Id.
+		- N bytes containing the Resource name, where 0 < N < 32
-- 4 bytes containing the Resource current state
+		*/
-- 4 bytes containing the resource requested state
+		EPslGetResourceStateStart,
-- 4 bytes containing return value
-- 4 bytes containing the length of resource name.
+		/**
-- N bytes containing the Resource name, where 0 < N < 32
+		Trace output for get resource state end operation in PSL
-*/
-EPslChangeResourceStateEnd,
+		Trace data format:
+		- 4 bytes containing clientId
-/**
+		- 4 bytes containing the Resource Id.
-Trace output for get resource state start operation in PSL
+		- N bytes containing the Resource name, where 0 < N < 32
+		- 4 bytes containing the Resource state
-Trace data format:
+		- 4 bytes containing return value.
-- 4 bytes containing clientId
+		*/
-- 4 bytes containing the Resource Id.
+		EPslGetResourceStateEnd,
-- 4 bytes containing the length of resource name.
-- N bytes containing the Resource name, where 0 < N < 32
+		/**
-*/
+		Trace output for resource creation
-EPslGetResourceStateStart,
+		Trace data format:
-/**
+		- 4 bytes containing minimum value of resource
-Trace output for get resource state end operation in PSL
+		- 4 bytes containing maximum value of resource
+		- 4 bytes containing the default value of resource
-Trace data format:
+		- 4 bytes containing the properties of the resource
-- 4 bytes containing clientId
+		- N bytes containing the Resource name, where 0 < N < 32
-- 4 bytes containing the Resource Id.
+		*/
-- 4 bytes containing the Resource state
+		EPslResourceCreate,
-- 4 bytes containing return value.
-- 4 bytes containing the length of resource name.
+		/**
-- N bytes containing the Resource name, where 0 < N < 32
+		Trace output for static resource with dependency registration
-*/
-EPslGetResourceStateEnd,
+		Trace data format:
+		- 4 bytes containing the Resource Id
-/**
+		- 4 bytes containing the Resource address
-Trace output for resource creation
+		- N bytes containing the Resource name, where 0 < N < 32
+		- 4 bytes containing the minimum value of resource
-Trace data format:
+		- 4 bytes containing the maximum value of resource
-- 4 bytes containing minimum value of resource
+		- 4 bytes containing the default value of resource
-- 4 bytes containing maximum value of resource
+		*/
-- 4 bytes containing the default value of resource
+		ERegisterStaticResourceWithDependency,
-- 4 bytes containing the properties of the resource
-- 4 bytes containing the length of resource name.
+		/**
-- N bytes containing the Resource name, where 0 < N < 32
+		Trace output for dynamic resource registration
-*/
-EPslResourceCreate,
+		Trace data format:
+		- 4 bytes containing clientId
-/**
+		- 4 bytes containing the Resource Id
-Trace output for static resource with dependency registration
+		- N bytes containing the client name, where 0 < N < 32
+		- N bytes containing the resource name, where 0 < N < 32
-Trace data format:
+		- 4 bytes containing the resouce address
-- 4 bytes containing the Resource Id
+		*/
-- 4 bytes containing the Resource address
+		ERegisterDynamicResource,
-- 4 bytes containing the minimum value of resource
-- 4 bytes containing the maximum value of resource
+		/**
-- 4 bytes containing the default value of resource
+		Trace output for dynamic resource deregistration
-- 4 bytes containing the length of resource name
-- N bytes containing the Resource name, where 0 < N < 32
+		Trace data format:
-*/
+		- 4 bytes containing clientId
-ERegisterStaticResourceWithDependency,
+		- 4 bytes containing the Resource Id
+		- N bytes containing the client name, where 0 < N < 32
-/**
+		- N bytes containing the resource name, where 0 < N < 32
-Trace output for dynamic resource registration
+		- 4 bytes containing the resource address
+		- 4 bytes containing the resource level.
-Trace data format:
+		*/
-- 4 bytes containing clientId
+		EDeRegisterDynamicResource,
-- 4 bytes containing the Resource Id
-- 4 bytes containing the resouce address
+		/**
-- 4 bytes containing the length of client name
+		Trace output for resource dependency registration
-- N bytes containing the client name, where 0 < N < 32
-- 4 bytes containing the length of resource name
+		Trace data format:
-- N bytes containing the resource name, where 0 < N < 32
+		- 4 bytes containing clientId
-*/
+		- 4 bytes containing the Resource Id of first dependent resource
-ERegisterDynamicResource,
+		- N bytes containing the client name, where 0 < N < 32
+		- N bytes containing the resource name of first dependent resource, where 0 < N < 32
-/**
+		- 4 bytes containing the Resource Id of second dependent resource
-Trace output for dynamic resource deregistration
+		- N bytes containing the resource name of second dependent resource, where 0 < N < 32
+		- 4 bytes containing the address of first dependent resource
-Trace data format:
+		- 4 bytes containing the address of second dependent resource
-- 4 bytes containing clientId
+		*/
-- 4 bytes containing the Resource Id
+		ERegisterResourceDependency,
-- 4 bytes containing the resource address
-- 4 bytes containing the resource level.
+		/**
-- 4 bytes containing the length of client name
+		Trace output for resource dependency deregistration
-- N bytes containing the client name, where 0 < N < 32
-- 4 bytes containing the length of resource name
+		Trace data format:
-- N bytes containing the resource name, where 0 < N < 32
+		- 4 bytes containing clientId
-*/
+		- 4 bytes containing the Resource Id of first dependent resource
-EDeRegisterDynamicResource,
+		- N bytes containing the client name, where 0 < N < 32
+		- N bytes containing the resource name of first dependent resource, where 0 < N < 32
-/**
+		- 4 bytes containing the resource id of second dependent resource
-Trace output for resource dependency registration
+		- N bytes containing the resource name of second dependent resource, where 0 < N < 32
+		- 4 bytes containing the address of first dependent resource
-Trace data format:
+		- 4 bytes containing the address of second dependent resource
-- 4 bytes containing clientId
+		*/
-- 4 bytes containing the Resource Id of first dependent resource
+		EDeRegisterResourceDependency
-- 4 bytes containing the Resource Id of second dependent resource
+		};
-- 4 bytes containing the address of first dependent resource
-- 4 bytes containing the address of second dependent resource
-- 4 bytes containing the length of client name
-- N bytes containing the client name, where 0 < N < 32
-- 4 bytes containing the length of resource name of first dependent resource
-- N bytes containing the resource name of first dependent resource, where 0 < N < 32
-- 4 bytes containing the length of resource name of second dependent resource
-- N bytes containing the resource name of second dependent resource, where 0 < N < 32
-*/
-ERegisterResourceDependency,
-/**
-Trace output for resource dependency deregistration
-Trace data format:
-- 4 bytes containing clientId
-- 4 bytes containing the Resource Id of first dependent resource
-- 4 bytes containing the resource id of second dependent resource
-- 4 bytes containing the address of first dependent resource
-- 4 bytes containing the address of second dependent resource
-- 4 bytes containing the length of client name
-- N bytes containing the client name, where 0 < N < 32
-- 4 bytes containing the length of resource name of first dependent resource
-- N bytes containing the resource name of first dependent resource, where 0 < N < 32
-- 4 bytes containing the length of resource name of second dependent resource
-- N bytes containing the resource name of second dependent resource, where 0 < N < 32
-*/
-EDeRegisterResourceDependency
-};
 /**
-Enumeration of sub-category values for trace category EResourceManagerUs.
+	Enumeration of sub-category values for trace category EResourceManagerUs.
-@see EResourceManagerUs
+	@see EResourceManagerUs
 @prototype 9.5
-*/
+	*/
-enum TResourceManagerUs
+	enum TResourceManagerUs
-{
+		{
-/**
+		/**
-Trace output for the start of opening a channel to the Resource Controller.
+		Trace output for the start of opening a channel to the Resource Controller.
-Trace data format:
+		Trace data format:
-- 4 bytes containing the client thread identifier.
+		- 4 bytes unused (displays 0)
-- 4 bytes containing the length of client name.
+		- 4 bytes containing the client thread identifier.
-- N bytes containing the client name, where 0 < N < 32
+		- N bytes containing the client name, where 0 < N < 32
-*/
+		*/
-EOpenChannelUsStart = 0,
+		EOpenChannelUsStart = 0,
-/**
+		/**
-Trace output for the end of opening a channel to the Resource Controller.
+		Trace output for the end of opening a channel to the Resource Controller.
-Trace data format:
+		Trace data format:
-- 4 bytes containing the client identifier provided by the Resource Controller
+		- 4 bytes unused (displays 0)
-- 4 bytes containing the length of client name.
+		- 4 bytes containing the client identifier provided by the Resource Controller
-- N bytes containing the client name, where 0 < N < 32
+		- N bytes containing the client name, where 0 < N < 32
-*/
+		*/
-EOpenChannelUsEnd,
+		EOpenChannelUsEnd,
-/**
+		/**
-Trace output for the start of registering a client with the Resource Controller.
+		Trace output for the start of registering a client with the Resource Controller.
-Trace data format:
+		Trace data format:
-- 4 bytes containing the client identifier provided by the Resource Controller
+		- 4 bytes the number of concurrent change resource state operations to be supported
-- 1 bytes the number of concurrent change resource state operations to be supported
+		- 4 bytes the number of concurrent notification requests to be supported
-- 1 bytes the number of concurrent notification requests to be supported
+		- N bytes containing the client name, where 0 < N < 32
-- 1 bytes the number of concurrent get resource state operations to be supported
+		- 4 bytes the number of concurrent get resource state operations to be supported
-- 1 bytes unused
+		*/
-- 4 bytes containing the length of client name.
+		ERegisterClientUsStart,
-- N bytes containing the client name, where 0 < N < 32
+		/**
-*/
+		Trace output for the end of registering a client with the Resource Controller.
-ERegisterClientUsStart,
-/**
+		Trace data format:
-Trace output for the end of registering a client with the Resource Controller.
+		- 4 bytes containing the client identifier provided by the Resource Controller.
+		- 4 bytes specifying the value returned from the call to Resource Controller's AllocReserve method
-Trace data format:
+		*/
-- 4 bytes containing the client identifier provided by the Resource Controller.
+		ERegisterClientUsEnd,
-- 4 bytes specifying the value returned from the call to Resource Controller's AllocReserve method
+		/**
-*/
+		Trace output for the start of de-registering a client with the Resource Controller.
-ERegisterClientUsEnd,
-/**
+		Trace data format:
-Trace output for the start of de-registering a client with the Resource Controller.
+		- 4 bytes unused (displays 0)
+		- 4 bytes containing the client identifier provided by the Resource Controller.
-Trace data format:
+		- N bytes containing the client name, where 0 < N < 32
-- 4 bytes containing the client identifier provided by the Resource Controller.
+		*/
-- 4 bytes containing the length of client name.
+		EDeRegisterClientUsStart,
-- N bytes containing the client name, where 0 < N < 32
+		/**
-*/
+		Trace output for the end of registering a client with the Resource Controller.
-EDeRegisterClientUsStart,
-/**
+		Trace data format:
-Trace output for the end of registering a client with the Resource Controller.
+		- 4 bytes containing the client identifier provided by the Resource Controller.
+		*/
-Trace data format:
+		EDeRegisterClientUsEnd,
-- 4 bytes containing the client identifier provided by the Resource Controller.
+		/**
-*/
+		Trace output for the start of a GetResourceState request to the Resource Controller.
-EDeRegisterClientUsEnd,
-/**
+		Trace data format:
-Trace output for the start of a GetResourceState request to the Resource Controller.
+		- 4 bytes specifying the resource ID
+		- 4 bytes containing the client identifier provided by the Resource Controller.
-Trace data format:
+		- N bytes containing the client name, where 0 < N < 32
-- 4 bytes specifying the resource ID
+		*/
-- 4 bytes containing the client identifier provided by the Resource Controller.
+		EGetResourceStateUsStart,
-- 4 bytes containing the length of client name.
+		/**
-- N bytes containing the client name, where 0 < N < 32
+		Trace output for the end of a GetResourceState request to the Resource Controller.
-*/
-EGetResourceStateUsStart,
+		Trace data format:
-/**
+		- 4 bytes specifying the resource ID
-Trace output for the end of a GetResourceState request to the Resource Controller.
+		- 4 bytes specifying the resource level
+		- 4 bytes containing the client identifier
-Trace data format:
+		- 4 bytes specifying the success code returned by the Resource Controller.
-- 4 bytes specifying the resource ID
+		*/
-- 4 bytes specifying the resource level
+		EGetResourceStateUsEnd,
-- 4 bytes containing the client identifier
+		/**
-- 4 bytes specifying the success code returned by the Resource Controller.
+		Trace output for the start of a ChangeResourceState request to the Resource Controller.
-*/
-EGetResourceStateUsEnd,
+		Trace data format:
-/**
+		- 4 bytes specifying the resource ID
-Trace output for the start of a ChangeResourceState request to the Resource Controller.
+		- 4 bytes specifying the required state
+		- N bytes containing the client name, where 0 < N < 32
-Trace data format:
+		- 4 bytes containing the client identifier provided by the Resource Controller.
-- 4 bytes specifying the resource ID
+		*/
-- 4 bytes specifying the required state
+		ESetResourceStateUsStart,
-- 4 bytes containing the client identifier provided by the Resource Controller.
+		/**
-- 4 bytes containing the length of client name.
+		Trace output for the end of a ChangeResourceState request to the Resource Controller.
-- N bytes containing the client name, where 0 < N < 32
-*/
+		Trace data format:
-ESetResourceStateUsStart,
+		- 4 bytes specifying the resource ID
-/**
+		- 4 bytes specifying the requested state
-Trace output for the end of a ChangeResourceState request to the Resource Controller.
+		- 4 bytes containing the client identifier
+		- 4 bytes specifying the success code returned by the Resource Controller.
-Trace data format:
+		*/
-- 4 bytes specifying the resource ID
+		ESetResourceStateUsEnd,
-- 4 bytes specifying the requested state
+		/**
-- 4 bytes containing the client identifier
+		Trace output for the start of a cancel GetResourceState request to the Resource Controller.
-- 4 bytes specifying the success code returned by the Resource Controller.
-*/
+		Trace data format:
-ESetResourceStateUsEnd,
+		- 4 bytes specifying the resource ID
-/**
+		- 4 bytes containing the client identifier provided by the Resource Controller.
-Trace output for the start of a cancel GetResourceState request to the Resource Controller.
+		- N bytes containing the client name, where 0 < N < 32
+		*/
-Trace data format:
+		ECancelGetResourceStateUsStart,
-- 4 bytes specifying the resource ID
+		/**
-- 4 bytes containing the client identifier provided by the Resource Controller.
+		Trace output for the end of a cancel GetResourceState request to the Resource Controller.
-- 4 bytes containing the length of client name.
-- N bytes containing the client name, where 0 < N < 32
+		Trace data format:
-*/
+		- 4 bytes specifying the resource ID
-ECancelGetResourceStateUsStart,
+		- 4 bytes containing the client identifier provided by the Resource Controller.
-/**
+		- N bytes containing the client name, where 0 < N < 32
-Trace output for the end of a cancel GetResourceState request to the Resource Controller.
+		*/
+		ECancelGetResourceStateUsEnd,
-Trace data format:
+		/**
-- 4 bytes specifying the resource ID
+		Trace output for the start of a cancel ChangeResourceState request to the Resource Controller.
-- 4 bytes containing the client identifier provided by the Resource Controller.
-- 4 bytes containing the length of client name.
+		Trace data format:
-- N bytes containing the client name, where 0 < N < 32
+		- 4 bytes specifying the resource ID
-*/
+		- 4 bytes containing the client identifier provided by the Resource Controller.
-ECancelGetResourceStateUsEnd,
+		- N bytes containing the client name, where 0 < N < 32
-/**
+		*/
-Trace output for the start of a cancel ChangeResourceState request to the Resource Controller.
+		ECancelSetResourceStateUsStart,
+		/**
-Trace data format:
+		Trace output for the end of a cancel ChangeResourceState request to the Resource Controller.
-- 4 bytes specifying the resource ID
-- 4 bytes containing the client identifier provided by the Resource Controller.
+		Trace data format:
-- 4 bytes containing the length of client name.
+		- 4 bytes specifying the resource ID
-- N bytes containing the client name, where 0 < N < 32
+		- 4 bytes containing the client identifier provided by the Resource Controller.
-*/
+		- N bytes containing the client name, where 0 < N < 32
-ECancelSetResourceStateUsStart,
+		*/
-/**
+		ECancelSetResourceStateUsEnd
-Trace output for the end of a cancel ChangeResourceState request to the Resource Controller.
+		};
-Trace data format:
+	/**
-- 4 bytes specifying the resource ID
+	Enumeration of sub-category values for trace category EThreadPriority.
-- 4 bytes containing the client identifier provided by the Resource Controller.
+	@see EThreadPriority
-- 4 bytes containing the length of client name.
+	@internalTechnology
-- N bytes containing the client name, where 0 < N < 32
-*/
-ECancelSetResourceStateUsEnd
-};
-/**
-Enumeration of sub-category values for trace category EThreadPriority.
-@see EThreadPriority
-@internalTechnology
 @prototype 9.3
-*/
+	*/
-enum TThreadPriority
+	enum TThreadPriority
-{
+		{
-/**
+		/**
-Trace output when a nanothread priority is changed.
+		Trace output when a nanothread priority is changed.
-Trace data format:
+		Trace data format:
-- 4 bytes containing the context id (an NThread*) for the thread whose priority is changing.
+		- 4 bytes containing the context id (an NThread*) for the thread whose priority is changing.
-- 4 bytes containing the new absolute priority.
+		- 4 bytes containing the new absolute priority.
-*/
+		*/
-ENThreadPriority=0,
+		ENThreadPriority=0,
-/**
+		/**
-Trace output when a DThread's default priority is set.
+		Trace output when a DThread's default priority is set.
-Trace data format:
+		Trace data format:
-- 4 bytes containing the context id (an NThread*) for the thread whose priority is changing.
+		- 4 bytes containing the context id (an NThread*) for the thread whose priority is changing.
-- 4 bytes containing the iThreadPriority member - a value from enum ::TThrdPriority.
+		- 4 bytes containing the iThreadPriority member - a value from enum ::TThrdPriority.
-- 4 bytes containing the new default absolute priority.
+		- 4 bytes containing the new default absolute priority.
-*/
+		*/
-EDThreadPriority=1,
+		EDThreadPriority=1,
-/**
+		/**
-Trace output when a DProcess priority is changed.
+		Trace output when a DProcess priority is changed.
-Trace data format:
+		Trace data format:
-- 4 bytes containing trace id (a DProcess*) for process.
+		- 4 bytes containing trace id (a DProcess*) for process.
-- 4 bytes containing the new process priority, a value from enum ::TProcPriority
+		- 4 bytes containing the new process priority, a value from enum ::TProcPriority
-*/
+		*/
-EProcessPriority=2
+		EProcessPriority=2
-};
+		};
 	/**
 	Enumeration of sub-category values for trace category EPagingMedia.
 	@see EPagingMedia
 	*/
 		*/
 		ERamAllocZoneContiguousRam,
 		/**
 		Event generated when DRamAllocator::ZoneAllocRamPages has successfully
-		allocated all the requested RAM pages.	If DRamAllocator::ZoneAllocRamPages
+		allocated all the requested RAM pages.  If DRamAllocator::ZoneAllocRamPages
 		couldn't allocate all the requested pages then this event is not generated.
 		Trace data format:
 		- no extra bytes sent
 		*/
 		ECpuIdfcSample,
 		/**
 		CPU sample from non-Symbian thread.
 		Trace data format:
 		- no extra bytes are sent
 		*/
 		ECpuNonSymbianThreadSample
 		};
 		--4 bytes containining the X co-ordinate
 		--4 bytes containining the Y co-ordinate
 		--4 bytes containining the Z co-ordinate
 		--4 bytes containining the PointerNumber
 		if there are  7*4 byte data
 		- 4 bytes containing the event type
 		--4 bytes containining the X co-ordinate
 		--4 bytes containining the Y co-ordinate
 		--4 bytes containining the Z co-ordinate
 		--4 bytes containining the Phi polar coordinate.
 		EMemoryMappingDestroy,
 		// The following traces associate memory model objects with the kernel objects that use them
 		/**
-		A memory object is being used for the contents of a chunk.
+	    A memory object is being used for the contents of a chunk.
 		Trace data format:
 		- 4 bytes containing the memory object id (a DMemoryObject*).
 		- 4 bytes containing the chunk id (a DChunk*)
 		*/
 		EMemoryObjectIsChunk,
 		/**
-		A memory object is being used for the contents of a code segment.
+	    A memory object is being used for the contents of a code segment.
 		Trace data format:
 		- 4 bytes containing the memory object id (a DMemoryObject*).
 		- 4 bytes containing the code segment id (a DCodeSeg*)
 		*/
 		EMemoryObjectIsCodeSeg,
 		/**
-		A memory object is being used for process static data.
+	    A memory object is being used for process static data.
 		Trace data format:
 		- 4 bytes containing the memory object id (a DMemoryObject*).
 		- 4 bytes containing the process id (a DProcess*)
 		*/
 		EMemoryObjectIsProcessStaticData,
 		/**
-		A memory object is being used for DLL static data.
+	    A memory object is being used for DLL static data.
 		Trace data format:
 		- 4 bytes containing the memory object id (a DMemoryObject*).
 		- 4 bytes containing the code segment id (a DCodeSeg*)
 		- 4 bytes containing the process id (a DProcess*)
 		*/
 		EMemoryObjectIsDllStaticData,
 		/**
-		A memory object is being used for a thread's supervisor stack.
+	    A memory object is being used for a thread's supervisor stack.
 		Trace data format:
 		- 4 bytes containing the memory object id (a DMemoryObject*).
 		- 4 bytes containing the thread id (a DThread*)
 		*/
 		EMemoryObjectIsSupervisorStack,
 		/**
-		A memory object is being used for a thread's user stack.
+	    A memory object is being used for a thread's user stack.
 		Trace data format:
 		- 4 bytes containing the memory object id (a DMemoryObject*).
 		- 4 bytes containing the thread id (a DThread*)
 		*/
 		- 2 spare bytes, currently zero
 		*/
 		EAddressSpaceId
 		};
-	/**
+/**
 	Enumeration of sub-category values for trace category EIic.
 	@see EIic
-	@prototype 9.6
+@prototype 9.6
 	*/
 	enum TIic
 		{
 		/**
 		Trace output for the invocation by the PSL of registering an array of pointers to channels with the IIC bus controller.
 		*/
 		ESStatExtEndPil = 51
 		};
 	/**
-	Enumeration of sub-category values for trace category EHSched.
-	@see EHSched
-	@prototype 9.6
-	*/
-	enum THSched
-		{
-		/**
-		Trace output when a thread has been processed by the load balancer
-		Trace data format:
-		- 4 bytes containing pointer to thread
-		- 4 bytes containing flags indicating result of balancing
-		*/
-		ELbDone = 0,
-		};
-	/**
 	Calculate the address of the next trace record.
 	@param aCurrentRecord A pointer to a trace record.
 	@return The address of the trace record which follows aCurrentRecord.
 	*/
 	inline static TUint8* NextRecord(TAny* aCurrentRecord);
 	The handler function should output all values which are appropriate for the
 	trace as specified in aHeader.
 	@param aHeader	The 4 bytes for the trace header.
-	@param aHeader2 The second header word.
+	@param aHeader2	The second header word.
 					(If EHeader2Present is set in the header flags.)
-	@param aContext The context id.
+	@param aContext	The context id.
 					(If EContextIdPresent is set in the header flags.)
 	@param a1		The first four bytes of trace data.
 					(Only if the header size indicates that this is present.)
 	@param a2		The second four bytes of trace data.
 					(Only if the header size indicates that this is present.)
 	@param aExtra	The 'extra' value.
 					(If EExtraPresent is set in the header flags.)
 	@param aPc		The Program Counter value.
 					(If EPcPresent is set in the header flags.)
-	@return 		True, if the trace handler is enabled and outputting trace.
+	@return			True, if the trace handler is enabled and outputting trace.
 					False otherwise.
 	Here is an example implementation of a trace handler:
 	@code
 	/**
 	Set the secondary trace filter to include only the specified UIDs.
-	@param aUids	Pointer to array of UIDs.
+	@param aUids    Pointer to array of UIDs.
 	@param aNumUids Number of UID values pointer to by \a aUid.
 	@return KErrNone on success.
 			Otherwise, a negative number representing a system wide error code.
 			(E.g. KErrNoMemory.)
 	/**
 	Get the contents of the secondary trace filter.
-	@param[out] aUids	Pointer to array of UIDs contained in the secondary filter.
+	@param[out] aUids   Pointer to array of UIDs contained in the secondary filter.
 						Ownership of this array is passed to the caller of this
 						function, which is then responsible for deleting it.
 						If filter is empty, \a aUid equals zero.
 	@param[out] aGlobalFilter	Set to 1 if the secondary filter passes all traces.
 								Set to 0 if the secondary filter rejects all traces.
 	@return Number of UIDs in returned array, if operation is successful.
 			Otherwise, a negative number representing a system wide error code.
 	@pre Call in a thread context.
-	@pre Calling thread must be in a critical section.
+@pre Calling thread must be in a critical section.
 	@publishedPartner
 	@released
 	*/
 	IMPORT_C static TInt Filter2(TUint32*& aUids, TInt& aGlobalFilter);
 	and filter UID would be output.
 	@param aCategory  A category value from enum BTrace::TCategory.
 					  Only the 8 least significant bits in this value are used;
 					  other bits are ignored.
-	@param aUid 	  A UID to filter on.
+	@param aUid       A UID to filter on.
 	@return True if a trace with this specification would be passed by the filters.
 			False if a trace with this specification would be dropped by the filters.
 	@publishedPartner
 	static void Init0();
 	/**
 	@internalComponent
 	*/
+	typedef TBool(*TBTrace1)(TUint32);
+	/**
+	@internalComponent
+	*/
+	typedef TBool(*TBTrace2)(TUint32,TUint32);
+	/**
+	@internalComponent
+	*/
+	typedef TBool(*TBTrace3)(TUint32,TUint32,TUint32);
+	/**
+	@internalComponent
+	*/
 	struct SExecExtension
 		{
-		TUint32 iA2;
+		TUint32	iA2;
-		TUint32 iA3;
+		TUint32	iA3;
-		TUint32 iPc;
+		TUint32	iPc;
 		};
 	/**
 	@internalComponent
 	*/
 //
 /**
 @internalComponent
 */
-#define BTRACE_HEADER(aSize,aCategory,aSubCategory) 		\
+#define BTRACE_HEADER(aSize,aCategory,aSubCategory)			\
 	(((aSize)<<BTrace::ESizeIndex*8)							\
 	+((aCategory)<<BTrace::ECategoryIndex*8)					\
 	+((aSubCategory)<<BTrace::ESubCategoryIndex*8))
 /**
 @return True if trace is enabled for aCategory, false otherwise.
 @publishedPartner
 @released
 */
 #define BTrace0(aCategory,aSubCategory) \
-	BTrace::Out \
+	((BTrace::TBTrace1)BTrace::Out) \
-		(BTRACE_HEADER(4,(aCategory),(aSubCategory)),0,0,0)
+		(BTRACE_HEADER(4,(aCategory),(aSubCategory)))
 /**
 Output a trace record of the specified category.
 The trace record data is 4 bytes in size.
 @return True if trace is enabled for aCategory, false otherwise.
 @publishedPartner
 @released
 */
 #define BTrace4(aCategory,aSubCategory,a1) \
-	BTrace::Out \
+	((BTrace::TBTrace2)BTrace::Out) \
-		(BTRACE_HEADER(8,(aCategory),(aSubCategory)),(TUint32)(a1),0,0)
+		(BTRACE_HEADER(8,(aCategory),(aSubCategory)),(TUint32)(a1))
 /**
 Output a trace record of the specified category.
 The trace record data is 8 bytes in size.
 @return True if trace is enabled for aCategory, false otherwise.
 @publishedPartner
 @released
 */
 #define BTrace8(aCategory,aSubCategory,a1,a2) \
-	BTrace::Out \
+	((BTrace::TBTrace3)BTrace::Out) \
-		(BTRACE_HEADER(12,(aCategory),(aSubCategory)),(TUint32)(a1),(TUint32)(a2),0)
+		(BTRACE_HEADER(12,(aCategory),(aSubCategory)),(TUint32)(a1),(TUint32)(a2))
 /**
 Output a trace record of the specified category.
 The trace record data is 12 bytes in size.
 @return True if trace is enabled for aCategory, false otherwise.
 @publishedPartner
 @released
 */
 #define BTraceContext0(aCategory,aSubCategory) \
-	BTrace::OutX \
+	((BTrace::TBTrace1)BTrace::OutX) \
-		(BTRACE_HEADER_C(4,(aCategory),(aSubCategory)),0,0,0)
+		(BTRACE_HEADER_C(4,(aCategory),(aSubCategory)))
 /**
 Output a trace record of the specified category which also includes a Context ID.
 The trace record data is 4 bytes in size.
 @return True if trace is enabled for aCategory, false otherwise.
 @publishedPartner
 @released
 */
 #define BTraceContext4(aCategory,aSubCategory,a1) \
-	BTrace::OutX \
+	((BTrace::TBTrace2)BTrace::OutX) \
-		(BTRACE_HEADER_C(8,(aCategory),(aSubCategory)),(TUint32)(a1),0,0)
+		(BTRACE_HEADER_C(8,(aCategory),(aSubCategory)),(TUint32)(a1))
 /**
 Output a trace record of the specified category which also includes a Context ID.
 The trace record data is 8 bytes in size.
 @return True if trace is enabled for aCategory, false otherwise.
 @publishedPartner
 @released
 */
 #define BTraceContext8(aCategory,aSubCategory,a1,a2) \
-	BTrace::OutX \
+	((BTrace::TBTrace3)BTrace::OutX) \
-		(BTRACE_HEADER_C(12,(aCategory),(aSubCategory)),(TUint32)(a1),(TUint32)(a2),0)
+		(BTRACE_HEADER_C(12,(aCategory),(aSubCategory)),(TUint32)(a1),(TUint32)(a2))
 /**
 Output a trace record of the specified category which also includes a Context ID.
 The trace record data is 12 bytes in size.
 @return True if trace is enabled for aCategory, false otherwise.
 @publishedPartner
 @released
 */
 #define BTracePc0(aCategory,aSubCategory) \
-	BTrace::Out \
+	((BTrace::TBTrace1)BTrace::Out) \
-		(BTRACE_HEADER_P(4,(aCategory),(aSubCategory)),0,0,0)
+		(BTRACE_HEADER_P(4,(aCategory),(aSubCategory)))
 /**
 Output a trace record of the specified category which also includes a Program Counter value.
 The trace record data is 4 bytes in size.
 @return True if trace is enabled for aCategory, false otherwise.
 @publishedPartner
 @released
 */
 #define BTracePc4(aCategory,aSubCategory,a1)	\
-	BTrace::Out \
+	((BTrace::TBTrace2)BTrace::Out) \
-		(BTRACE_HEADER_P(8,(aCategory),(aSubCategory)),(TUint32)(a1),0,0)
+		(BTRACE_HEADER_P(8,(aCategory),(aSubCategory)),(TUint32)(a1))
 /**
 Output a trace record of the specified category which also includes a Program Counter value.
 The trace record data is 8 bytes in size.
 @return True if trace is enabled for aCategory, false otherwise.
 @publishedPartner
 @released
 */
 #define BTracePc8(aCategory,aSubCategory,a1,a2) \
-	BTrace::Out \
+	((BTrace::TBTrace3)BTrace::Out) \
-		(BTRACE_HEADER_P(12,(aCategory),(aSubCategory)),(TUint32)(a1),(TUint32)(a2),0)
+		(BTRACE_HEADER_P(12,(aCategory),(aSubCategory)),(TUint32)(a1),(TUint32)(a2))
 /**
 Output a trace record of the specified category which also includes a Program Counter value.
 The trace record data is 12 bytes in size.
 @return True if trace is enabled for aCategory, false otherwise.
 @publishedPartner
 @released
 */
 #define BTraceContextPc0(aCategory,aSubCategory)	\
-	BTrace::OutX \
+	((BTrace::TBTrace1)BTrace::OutX) \
-		(BTRACE_HEADER_CP(4,(aCategory),(aSubCategory)),0,0,0)
+		(BTRACE_HEADER_CP(4,(aCategory),(aSubCategory)))
 /**
 Output a trace record of the specified category which also includes
 Context ID and Program Counter values.
 @return True if trace is enabled for aCategory, false otherwise.
 @publishedPartner
 @released
 */
-#define BTraceContextPc4(aCategory,aSubCategory,a1) \
+#define BTraceContextPc4(aCategory,aSubCategory,a1)	\
-	BTrace::OutX \
+	((BTrace::TBTrace2)BTrace::OutX) \
-		(BTRACE_HEADER_CP(8,(aCategory),(aSubCategory)),(TUint32)(a1),0,0)
+		(BTRACE_HEADER_CP(8,(aCategory),(aSubCategory)),(TUint32)(a1))
 /**
 Output a trace record of the specified category which also includes
 Context ID and Program Counter values.
 @return True if trace is enabled for aCategory, false otherwise.
 @publishedPartner
 @released
 */
 #define BTraceContextPc8(aCategory,aSubCategory,a1,a2) \
-	BTrace::OutX \
+	((BTrace::TBTrace3)BTrace::OutX) \
-		(BTRACE_HEADER_CP(12,(aCategory),(aSubCategory)),(TUint32)(a1),(TUint32)(a2),0)
+		(BTRACE_HEADER_CP(12,(aCategory),(aSubCategory)),(TUint32)(a1),(TUint32)(a2))
 /**
 Output a trace record of the specified category which also includes
 Context ID and Program Counter values.
 If the value of \a aUid is not contained in the secondary filter then the trace is discarded.
 @param aCategory	A value from enum BTrace::TCategory,
 @param aSubCategory Sub-category value between 0 and 255.
 					The meaning of this is dependent on the Category.
-@param aUid 		The 32bit quantity which forms the data of this trace record.
+@param aUid			The 32bit quantity which forms the data of this trace record.
 @return True if trace is enabled for aCategory and aUid, false otherwise.
 @publishedPartner
 @released
 */
 #define BTraceFiltered4(aCategory,aSubCategory,aUid) \
-	BTrace::OutFiltered \
+	((BTrace::TBTrace2)BTrace::OutFiltered) \
-		(BTRACE_HEADER(8,(aCategory),(aSubCategory)),(TUint32)(aUid),0,0)
+		(BTRACE_HEADER(8,(aCategory),(aSubCategory)),(TUint32)(aUid))
 /**
 Output a trace record of the specified category.
 The trace record data is 8 bytes in size.
 If the value of \a aUid is not contained in the secondary filter then the trace is discarded.
 @param aCategory	A value from enum BTrace::TCategory,
 @param aSubCategory Sub-category value between 0 and 255.
 					The meaning of this is dependent on the Category.
-@param aUid 		The first 32bit quantity which forms the data of this trace record.
+@param aUid			The first 32bit quantity which forms the data of this trace record.
 @param a1			The second 32bit quantity which forms the data of this trace record.
 @return True if trace is enabled for aCategory and aUid, false otherwise.
 @publishedPartner
 @released
 */
 #define BTraceFiltered8(aCategory,aSubCategory,aUid,a1) \
-	BTrace::OutFiltered \
+	((BTrace::TBTrace3)BTrace::OutFiltered) \
-		(BTRACE_HEADER(12,(aCategory),(aSubCategory)),(TUint32)(aUid),(TUint32)(a1),0)
+		(BTRACE_HEADER(12,(aCategory),(aSubCategory)),(TUint32)(aUid),(TUint32)(a1))
 /**
 Output a trace record of the specified category.
 The trace record data is 12 bytes in size.
 If the value of \a aUid is not contained in the secondary filter then the trace is discarded.
 @param aCategory	A value from enum BTrace::TCategory,
 @param aSubCategory Sub-category value between 0 and 255.
 					The meaning of this is dependent on the Category.
-@param aUid 		The first 32bit quantity which forms the data of this trace record.
+@param aUid			The first 32bit quantity which forms the data of this trace record.
 @param a1			The second 32bit quantity which forms the data of this trace record.
 @param a2			The third 32bit quantity which forms the data of this trace record.
 @return True if trace is enabled for aCategory and aUid, false otherwise.
 @publishedPartner
 If the value of \a aUid is not contained in the secondary filter then the trace is discarded.
 @param aCategory	A value from enum BTrace::TCategory,
 @param aSubCategory Sub-category value between 0 and 255.
 					The meaning of this is dependent on the Category.
-@param aUid 		The first 32bit quantity which forms the data of this trace record.
+@param aUid			The first 32bit quantity which forms the data of this trace record.
 @param a1			The second 32bit quantity which forms the data of this trace record.
 @param aData		Address of addition data to add to trace.
 					Must be word aligned, i.e. a multiple of 4.
 @param aDataSize	Number of bytes of additional data. If this value is greater than
 					KMaxBTraceDataArray then data is truncated to this size and the
 If the value of \a aUid is not contained in the secondary filter then the trace is discarded.
 @param aCategory	A value from enum BTrace::TCategory,
 @param aSubCategory Sub-category value between 0 and 255.
 					The meaning of this is dependent on the Category.
-@param aUid 		The first 32bit quantity which forms the data of this trace record.
+@param aUid			The first 32bit quantity which forms the data of this trace record.
 @param aData		Address of addition data to add to trace.
 					Must be word aligned, i.e. a multiple of 4.
 @param aDataSize	Number of bytes of additional data.
 @return True if trace is enabled for aCategory and aUid, false otherwise.
 If the value of \a aUid is not contained in the secondary filter then the trace is discarded.
 @param aCategory	A value from enum BTrace::TCategory,
 @param aSubCategory Sub-category value between 0 and 255.
 					The meaning of this is dependent on the Category.
-@param aUid 		The 32bit quantity which forms the data of this trace record.
+@param aUid			The 32bit quantity which forms the data of this trace record.
 @return True if trace is enabled for aCategory and aUid, false otherwise.
 @publishedPartner
 @released
 */
 #define BTraceFilteredContext4(aCategory,aSubCategory,aUid) \
-	BTrace::OutFilteredX \
+	((BTrace::TBTrace2)BTrace::OutFilteredX) \
-		(BTRACE_HEADER_C(8,(aCategory),(aSubCategory)),(TUint32)(aUid),0,0)
+		(BTRACE_HEADER_C(8,(aCategory),(aSubCategory)),(TUint32)(aUid))
 /**
 Output a trace record of the specified category which also includes a Context ID.
 The trace record data is 8 bytes in size.
 If the value of \a aUid is not contained in the secondary filter then the trace is discarded.
 @param aCategory	A value from enum BTrace::TCategory,
 @param aSubCategory Sub-category value between 0 and 255.
 					The meaning of this is dependent on the Category.
-@param aUid 		The first 32bit quantity which forms the data of this trace record.
+@param aUid			The first 32bit quantity which forms the data of this trace record.
 @param a1			The second 32bit quantity which forms the data of this trace record.
 @return True if trace is enabled for aCategory and aUid, false otherwise.
 @publishedPartner
 @released
 */
 #define BTraceFilteredContext8(aCategory,aSubCategory,aUid,a1) \
-	BTrace::OutFilteredX \
+	((BTrace::TBTrace3)BTrace::OutFilteredX) \
-		(BTRACE_HEADER_C(12,(aCategory),(aSubCategory)),(TUint32)(aUid),(TUint32)(a1),0)
+		(BTRACE_HEADER_C(12,(aCategory),(aSubCategory)),(TUint32)(aUid),(TUint32)(a1))
 /**
 Output a trace record of the specified category which also includes a Context ID.
 The trace record data is 12 bytes in size.
 If the value of \a aUid is not contained in the secondary filter then the trace is discarded.
 @param aCategory	A value from enum BTrace::TCategory,
 @param aSubCategory Sub-category value between 0 and 255.
 					The meaning of this is dependent on the Category.
-@param aUid 		The first 32bit quantity which forms the data of this trace record.
+@param aUid			The first 32bit quantity which forms the data of this trace record.
 @param a1			The second 32bit quantity which forms the data of this trace record.
 @param a2			The third 32bit quantity which forms the data of this trace record.
 @return True if trace is enabled for aCategory and aUid, false otherwise.
 @publishedPartner
 If the value of \a aUid is not contained in the secondary filter then the trace is discarded.
 @param aCategory	A value from enum BTrace::TCategory,
 @param aSubCategory Sub-category value between 0 and 255.
 					The meaning of this is dependent on the Category.
-@param aUid 		The first 32bit quantity which forms the data of this trace record.
+@param aUid			The first 32bit quantity which forms the data of this trace record.
 @param a1			The second 32bit quantity which forms the data of this trace record.
 @param aData		Address of addition data to add to trace.
 					Must be word aligned, i.e. a multiple of 4.
 @param aDataSize	Number of bytes of additional data. If this value is greater than
 					KMaxBTraceDataArray then data is truncated to this size and the
 If the value of \a aUid is not contained in the secondary filter then the trace is discarded.
 @param aCategory	A value from enum BTrace::TCategory,
 @param aSubCategory Sub-category value between 0 and 255.
 					The meaning of this is dependent on the Category.
-@param aUid 		The first 32bit quantity which forms the data of this trace record.
+@param aUid			The first 32bit quantity which forms the data of this trace record.
 @param aData		Address of addition data to add to trace.
 					Must be word aligned, i.e. a multiple of 4.
 @param aDataSize	Number of bytes of additional data.
 @return True if trace is enabled for aCategory and aUid, false otherwise.
 If the value of \a aUid is not contained in the secondary filter then the trace is discarded.
 @param aCategory	A value from enum BTrace::TCategory,
 @param aSubCategory Sub-category value between 0 and 255.
 					The meaning of this is dependent on the Category.
-@param aUid 		The 32bit quantity which forms the data of this trace record.
+@param aUid			The 32bit quantity which forms the data of this trace record.
 @return True if trace is enabled for aCategory and aUid, false otherwise.
 @publishedPartner
 @released
 */
 #define BTraceFilteredPc4(aCategory,aSubCategory,aUid)	\
-	BTrace::OutFiltered \
+	((BTrace::TBTrace2)BTrace::OutFiltered) \
-		(BTRACE_HEADER_P(8,(aCategory),(aSubCategory)),(TUint32)(aUid),0,0)
+		(BTRACE_HEADER_P(8,(aCategory),(aSubCategory)),(TUint32)(aUid))
 /**
 Output a trace record of the specified category which also includes a Program Counter value.
 The trace record data is 8 bytes in size.
 If the value of \a aUid is not contained in the secondary filter then the trace is discarded.
 @param aCategory	A value from enum BTrace::TCategory,
 @param aSubCategory Sub-category value between 0 and 255.
 					The meaning of this is dependent on the Category.
-@param aUid 		The first 32bit quantity which forms the data of this trace record.
+@param aUid			The first 32bit quantity which forms the data of this trace record.
 @param a1			The second 32bit quantity which forms the data of this trace record.
 @return True if trace is enabled for aCategory and aUid, false otherwise.
 @publishedPartner
 @released
 */
 #define BTraceFilteredPc8(aCategory,aSubCategory,aUid,a1) \
-	BTrace::OutFiltered \
+	((BTrace::TBTrace3)BTrace::OutFiltered) \
-		(BTRACE_HEADER_P(12,(aCategory),(aSubCategory)),(TUint32)(aUid),(TUint32)(a1),0)
+		(BTRACE_HEADER_P(12,(aCategory),(aSubCategory)),(TUint32)(aUid),(TUint32)(a1))
 /**
 Output a trace record of the specified category which also includes a Program Counter value.
 The trace record data is 12 bytes in size.
 If the value of \a aUid is not contained in the secondary filter then the trace is discarded.
 @param aCategory	A value from enum BTrace::TCategory,
 @param aSubCategory Sub-category value between 0 and 255.
 					The meaning of this is dependent on the Category.
-@param aUid 		The first 32bit quantity which forms the data of this trace record.
+@param aUid			The first 32bit quantity which forms the data of this trace record.
 @param a1			The second 32bit quantity which forms the data of this trace record.
 @param a2			The third 32bit quantity which forms the data of this trace record.
 @return True if trace is enabled for aCategory and aUid, false otherwise.
 @publishedPartner
 If the value of \a aUid is not contained in the secondary filter then the trace is discarded.
 @param aCategory	A value from enum BTrace::TCategory,
 @param aSubCategory Sub-category value between 0 and 255.
 					The meaning of this is dependent on the Category.
-@param aUid 		The first 32bit quantity which forms the data of this trace record.
+@param aUid			The first 32bit quantity which forms the data of this trace record.
 @param a1			The second 32bit quantity which forms the data of this trace record.
 @param aData		Address of addition data to add to trace.
 					Must be word aligned, i.e. a multiple of 4.
 @param aDataSize	Number of bytes of additional data. If this value is greater than
 					KMaxBTraceDataArray then data is truncated to this size and the
 If the value of \a aUid is not contained in the secondary filter then the trace is discarded.
 @param aCategory	A value from enum BTrace::TCategory,
 @param aSubCategory Sub-category value between 0 and 255.
 					The meaning of this is dependent on the Category.
-@param aUid 		The first 32bit quantity which forms the data of this trace record.
+@param aUid			The first 32bit quantity which forms the data of this trace record.
 @param aData		Address of addition data to add to trace.
 					Must be word aligned, i.e. a multiple of 4.
 @param aDataSize	Number of bytes of additional data.
 @return True if trace is enabled for aCategory and aUid, false otherwise.
 If the value of \a aUid is not contained in the secondary filter then the trace is discarded.
 @param aCategory	A value from enum BTrace::TCategory,
 @param aSubCategory Sub-category value between 0 and 255.
 					The meaning of this is dependent on the Category.
-@param aUid 		The 32bit quantity which forms the data of this trace record.
+@param aUid			The 32bit quantity which forms the data of this trace record.
 @return True if trace is enabled for aCategory and aUid, false otherwise.
 @publishedPartner
 @released
 */
 #define BTraceFilteredContextPc4(aCategory,aSubCategory,aUid)	\
-	BTrace::OutFilteredX \
+	((BTrace::TBTrace2)BTrace::OutFilteredX) \
-		(BTRACE_HEADER_CP(8,(aCategory),(aSubCategory)),(TUint32)(aUid),0,0)
+		(BTRACE_HEADER_CP(8,(aCategory),(aSubCategory)),(TUint32)(aUid))
 /**
 Output a trace record of the specified category which also includes
 Context ID and Program Counter values.
 If the value of \a aUid is not contained in the secondary filter then the trace is discarded.
 @param aCategory	A value from enum BTrace::TCategory,
 @param aSubCategory Sub-category value between 0 and 255.
 					The meaning of this is dependent on the Category.
-@param aUid 		The first 32bit quantity which forms the data of this trace record.
+@param aUid			The first 32bit quantity which forms the data of this trace record.
 @param a1			The second 32bit quantity which forms the data of this trace record.
 @return True if trace is enabled for aCategory and aUid, false otherwise.
 @publishedPartner
 @released
 */
 #define BTraceFilteredContextPc8(aCategory,aSubCategory,aUid,a1) \
-	BTrace::OutFilteredX \
+	((BTrace::TBTrace3)BTrace::OutFilteredX) \
-		(BTRACE_HEADER_CP(12,(aCategory),(aSubCategory)),(TUint32)(aUid),(TUint32)(a1),0)
+		(BTRACE_HEADER_CP(12,(aCategory),(aSubCategory)),(TUint32)(aUid),(TUint32)(a1))
 /**
 Output a trace record of the specified category which also includes
 Context ID and Program Counter values.
 If the value of \a aUid is not contained in the secondary filter then the trace is discarded.
 @param aCategory	A value from enum BTrace::TCategory,
 @param aSubCategory Sub-category value between 0 and 255.
 					The meaning of this is dependent on the Category.
-@param aUid 		The first 32bit quantity which forms the data of this trace record.
+@param aUid			The first 32bit quantity which forms the data of this trace record.
 @param a1			The second 32bit quantity which forms the data of this trace record.
 @param a2			The third 32bit quantity which forms the data of this trace record.
 @return True if trace is enabled for aCategory and aUid, false otherwise.
 @publishedPartner
 If the value of \a aUid is not contained in the secondary filter then the trace is discarded.
 @param aCategory	A value from enum BTrace::TCategory,
 @param aSubCategory Sub-category value between 0 and 255.
 					The meaning of this is dependent on the Category.
-@param aUid 		The first 32bit quantity which forms the data of this trace record.
+@param aUid			The first 32bit quantity which forms the data of this trace record.
 @param a1			The second 32bit quantity which forms the data of this trace record.
 @param aData		Address of addition data to add to trace.
 					Must be word aligned, i.e. a multiple of 4.
 @param aDataSize	Number of bytes of additional data. If this value is greater than
 					KMaxBTraceDataArray then data is truncated to this size and the
 If the value of \a aUid is not contained in the secondary filter then the trace is discarded.
 @param aCategory	A value from enum BTrace::TCategory,
 @param aSubCategory Sub-category value between 0 and 255.
 					The meaning of this is dependent on the Category.
-@param aUid 		The first 32bit quantity which forms the data of this trace record.
+@param aUid			The first 32bit quantity which forms the data of this trace record.
 @param aData		Address of addition data to add to trace.
 					Must be word aligned, i.e. a multiple of 4.
 @param aDataSize	Number of bytes of additional data.
 @return True if trace is enabled for aCategory and aUid, false otherwise.

branch	RCL_3
changeset 257	3e88ff8f41d5
parent 256	c1f20ce4abcf