FCL/sf/os/kernelhwsrv: comparison kerneltest/e32test/dmav2/d

equal deleted inserted replaced

-:206a6eaaeb71
+:0659d0e1a03c
 // Contributors:
 //
 // Description:
 // e32test\dmav2\d_dma2.h
 // User-side API for LDD used to test DMAv2 framework.
 //
 //
 #ifndef __D_DMA2_H__
 #define __D_DMA2_H__
 	*/
 	void AppendString(TDes& aBuf) const
 		{
 		_LIT(KOutput, "TAddressParms: src=0x%08x (%d) dst=0x%08x (%d) count=0x%08x (%d)\0");
 #ifdef __KERNEL_MODE__
-		DmaAppendFormat(aBuf, (const char*)KOutput().Ptr(), iSrcAddr, iSrcAddr, iDstAddr, iDstAddr, iTransferCount, iTransferCount);
+		DmaAppendFormat(aBuf, (const char*)KOutput().Ptr(), iSrcAddr, iSrcAddr,
+						iDstAddr, iDstAddr, iTransferCount, iTransferCount);
 #else
 		aBuf.AppendFormat(KOutput, iSrcAddr, iSrcAddr, iDstAddr, iDstAddr, iTransferCount, iTransferCount);
 #endif
 		}
 	friend class DDmaTestSession;
 public:
 #ifndef __KERNEL_MODE__
 	TInt ChannelIsQueueEmpty(TUint aDriverCookie,TBool& aQueueEmpty)
 		{
 		return DoControl(EIsQueueEmpty, reinterpret_cast<TAny*>(aDriverCookie),	&aQueueEmpty);
 		}
 	TInt ChannelIsOpened(TUint aDriverCookie,TBool &aChannelOpen)
 		{
 		return DoControl(EIsOpened, reinterpret_cast<TAny*>(aDriverCookie), &aChannelOpen);
 		}
 	TInt ChannelCancelAll(TUint aDriverCookie)
 		{
 		return DoControl(ECancelAllChannel, reinterpret_cast<TAny*>(aDriverCookie));
 		}
 	TInt ChannelOpen(TUint aPslCookie,  TUint& aDriverCookie)
 		{
 		TPckg<SCreateInfoTest> package(aInfo);
 		return DoControl(EOpenChannelExposed,&aDriverCookie, &package);
 		}
 	TInt ChannelClose(TUint aDriverCookie)
 		{
 		return DoControl(ECloseChannel, reinterpret_cast<TAny*>(aDriverCookie));
 		}
 	TInt ChannelPause(TUint aDriverCookie)
 		{
 		return DoControl(EPauseChannel, reinterpret_cast<TAny*>(aDriverCookie));
 		}
 	TInt ChannelResume(TUint aDriverCookie)
 		{
 		return DoControl(EResumeChannel, reinterpret_cast<TAny*>(aDriverCookie));
 		}
 	TInt ChannelLinking(TUint aDriverCookie)
 		{
 		return DoControl(ELinkChannel, reinterpret_cast<TAny*>(aDriverCookie));
 		}
 	TInt ChannelUnLinking(TUint aDriverCookie)
 		{
 		return DoControl(EUnlinkChannel, reinterpret_cast<TAny*>(aDriverCookie));
 		}
 	TInt ChannelCaps(TUint aDriverCookie, SDmacCaps& aChannelCaps)
 		{
 	TInt ChannelCaps(TUint aDriverCookie, TDmacTestCaps& aChannelCaps)
 		{
 		TPckg<TDmacTestCaps> package(aChannelCaps);
 		return DoControl(EChannelCaps, reinterpret_cast<TAny*>(aDriverCookie), &package);
 		}
 	TInt Open()
 		{
-		TInt r = KErrNone;
+#if defined(DMA_INVERTED_THREAD_PRIORITIES)
-		r = DoCreate(KTestDmaLddNameHw,TestDmaLddVersion(), 0, NULL, NULL, EOwnerThread);
+		const TInt dfcThreadPriority = 11;
-		RDebug::Printf("RDmaSession::Open returned %d", r);
+#else
+		const TInt dfcThreadPriority = 26;
+#endif
+		const TInt r = DoCreate(KTestDmaLddNameHw, TestDmaLddVersion(), 0, NULL,
+								reinterpret_cast<const TDesC8*>(dfcThreadPriority), EOwnerThread);
+		if (r != KErrNone)
+			{
+			RDebug::Printf("RDmaSession::Open(): DoCreate() returned %d", r);
+			}
 		return r;
 		}
 	TInt OpenSim()
 		{
-		return DoCreate(KTestDmaLddNameSim,TestDmaLddVersion(), 0, NULL, NULL, EOwnerThread);
+#if defined(DMA_INVERTED_THREAD_PRIORITIES)
+		const TInt dfcThreadPriority = 11;
+#else
+		const TInt dfcThreadPriority = 26;
+#endif
+		const TInt r = DoCreate(KTestDmaLddNameSim, TestDmaLddVersion(), 0, NULL,
+								reinterpret_cast<const TDesC8*>(dfcThreadPriority), EOwnerThread);
+		if (r != KErrNone)
+			{
+			RDebug::Printf("RDmaSession::OpenSim(): DoCreate() returned %d", r);
+			}
+		return r;
 		}
 	TInt RequestCreateOld(TUint aChannelCookie, TUint& aRequestCookie, TUint aMaxTransferSize=0)
 		{
 		return DoRequestCreate(aChannelCookie, EFalse, aMaxTransferSize, aRequestCookie);
 		}
 	TInt RequestCreate(TUint aChannelCookie, TUint& aRequestCookie, TUint aMaxTransferSize=0)
 		{
 		return DoRequestCreate(aChannelCookie, ETrue, aMaxTransferSize, aRequestCookie);
 		}
 	TInt RequestDestroy(TUint aRequestCookie)
 		{
 		return DoControl(ERequestClose, reinterpret_cast<TAny*>(aRequestCookie));
 		}
 	TInt RequestFragmentCount(TUint aRequestCookie)
 		{
 		return DoControl(EFragmentCount, reinterpret_cast<TAny*>(aRequestCookie));
 		}
 	TInt RequestEnableDstElementCounting(TUint aRequestCookie)
 		{
 		return DoControl(EEnableDstElementCounting, reinterpret_cast<TAny*>(aRequestCookie));
 		}
 	TInt RequestEnableSrcElementCounting(TUint aRequestCookie)
 		{
 		return DoControl(EEnableSrcElementCounting, reinterpret_cast<TAny*>(aRequestCookie));
 		}
 	TInt RequestDisableDstElementCounting(TUint aRequestCookie)
 		{
 		return DoControl(EDisableDstElementCounting, reinterpret_cast<TAny*>(aRequestCookie));
 		}
 	TInt RequestDisableSrcElementCounting(TUint aRequestCookie)
 		{
 		return DoControl(EDisableSrcElementCounting, reinterpret_cast<TAny*>(aRequestCookie));
 		}
 	TInt RequestTotalNumDstElementsTransferred(TUint aRequestCookie)
 		{
 		return DoControl(ETotalNumDstElementsTransferred, reinterpret_cast<TAny*>(aRequestCookie));
 		}
 	TInt RequestTotalNumSrcElementsTransferred(TUint aRequestCookie)
 		{
 		return DoControl(ETotalNumSrcElementsTransferred, reinterpret_cast<TAny*>(aRequestCookie));
 		}
 	/**
 	Will fragment a DMA request using the legacy API
 	*/
-	TInt FragmentRequestOld(TUint aRequestCookie, const TDmaTransferArgs& aTransferArgs, TUint64* aDurationMicroSecs=NULL)
+	TInt FragmentRequestOld(TUint aRequestCookie, const TDmaTransferArgs& aTransferArgs,
+							TUint64* aDurationMicroSecs=NULL)
 		{
 		const TFragmentArgs args(aRequestCookie, aTransferArgs, aDurationMicroSecs);
 		TPckgC<TFragmentArgs> package(args);
 		return DoControl(EFragmentLegacy, &package);
 		}
 	/**
 	Will fragment a DMA request using the new API
 	*/
-	TInt FragmentRequest(TUint aRequestCookie, const TDmaTransferArgs& aTransferArgs, TUint64* aDurationMicroSecs=NULL)
+	TInt FragmentRequest(TUint aRequestCookie, const TDmaTransferArgs& aTransferArgs,
+						 TUint64* aDurationMicroSecs=NULL)
 		{
 		const TFragmentArgs args(aRequestCookie, aTransferArgs, aDurationMicroSecs);
 		TPckgC<TFragmentArgs> package(args);
 		return DoControl(EFragment, &package);
 		}
-	TInt QueueRequest(TUint aRequestCookie, TRequestStatus& aStatus, TCallbackRecord* aRecord = NULL, TUint64* aDurationMicroSecs=NULL)
+	TInt QueueRequest(TUint aRequestCookie, TRequestStatus& aStatus, TCallbackRecord* aRecord = NULL,
+					  TUint64* aDurationMicroSecs=NULL)
 		{
 		//These dummy values can accept the writeback from the driver
 		//if the client does not want them.
 		//(TClientDataRequest can not be programmed with a NULL to
 		//indicate that an argument is unwanted)
 		TCallbackRecord dummyRec;
 		TUint64 dummyTime=0;
 		aStatus = KRequestPending;
-		TQueueArgs args(aRequestCookie, &aStatus, aRecord ? aRecord : &dummyRec, aDurationMicroSecs ? aDurationMicroSecs : &dummyTime);
+		TQueueArgs args(aRequestCookie, &aStatus, aRecord ? aRecord : &dummyRec,
+						aDurationMicroSecs ? aDurationMicroSecs : &dummyTime);
 		TPckgC<TQueueArgs> package(args);
 		return DoControl(EQueueRequest, &package);
 		}
 	/**
 	Synchronous version of QueueRequest
 	*/
-	TInt QueueRequest(TUint aRequestCookie, TCallbackRecord* aRecord = NULL, TUint64* aDurationMicroSecs=NULL)
+	TInt QueueRequest(TUint aRequestCookie, TCallbackRecord* aRecord = NULL,
+					  TUint64* aDurationMicroSecs=NULL)
 		{
 		TRequestStatus status;
 		TInt r = QueueRequest(aRequestCookie, status, aRecord, aDurationMicroSecs);
 		User::WaitForRequest(status);
 		return r;
 	Additional request parameters are included in iRequeueArgs, these will be
 	transferred from ISR context callback using the TDmaChannel::IsrRedoRequest function
 	@pre Isr callback for completion must have been requested at request fragmentation time
 	*/
-	TInt QueueRequestWithRequeue(TUint aRequestCookie, TIsrRequeArgs* aRequeueArgs, TInt aCount, TRequestStatus& aStatus, TCallbackRecord* aRecord = NULL, TUint64* aDurationMicroSecs=NULL)
+	TInt QueueRequestWithRequeue(TUint aRequestCookie, TIsrRequeArgs* aRequeueArgs, TInt aCount,
+								 TRequestStatus& aStatus, TCallbackRecord* aRecord = NULL,
+								 TUint64* aDurationMicroSecs=NULL)
 		{
 		//These dummy values can accept the writeback from the driver
 		//if the client does not want them.
 		//(TClientDataRequest can not be programmed with a NULL to
 		//indicate that an argument is unwanted)
 		TCallbackRecord dummyRec;
 		TUint64 dummyTime=0;
 		aStatus = KRequestPending;
-		TQueueArgsWithReque args(aRequeueArgs, aCount, aRequestCookie, &aStatus, aRecord ? aRecord : &dummyRec, aDurationMicroSecs ? aDurationMicroSecs : &dummyTime);
+		TQueueArgsWithReque args(aRequeueArgs, aCount, aRequestCookie,
+								 &aStatus, aRecord ? aRecord : &dummyRec,
+								 aDurationMicroSecs ? aDurationMicroSecs : &dummyTime);
 		TPckgC<TQueueArgsWithReque> package(args);
 		return DoControl(EQueueRequestWithReque, &package);
 		}
 	/**
 	Synchronous version of QueueRequestWithRequeue
 	*/
-	TInt QueueRequestWithRequeue(TUint aRequestCookie, TIsrRequeArgs* aRequeueArgs, TInt aCount, TCallbackRecord* aRecord = NULL, TUint64* aDurationMicroSecs=NULL)
+	TInt QueueRequestWithRequeue(TUint aRequestCookie, TIsrRequeArgs* aRequeueArgs, TInt aCount,
+								 TCallbackRecord* aRecord = NULL, TUint64* aDurationMicroSecs=NULL)
 		{
 		TRequestStatus status;
-		TInt r = QueueRequestWithRequeue(aRequestCookie, aRequeueArgs, aCount, status, aRecord, aDurationMicroSecs);
+		TInt r = QueueRequestWithRequeue(aRequestCookie, aRequeueArgs, aCount, status, aRecord,
+										 aDurationMicroSecs);
 		User::WaitForRequest(status);
 		return r;
 		}
 	TInt OpenSharedChunk(RChunk& aChunk)
 	static void ApiTest();
 #endif // __KERNEL_MODE__
 private:
-	TInt DoRequestCreate(TUint aChannelCookie, TBool aNewStyle, TUint aMaxTransferSize, TUint& aRequestCookie)
+	TInt DoRequestCreate(TUint aChannelCookie, TBool aNewStyle, TUint aMaxTransferSize,
+						 TUint& aRequestCookie)
 		{
 		TRequestCreateArgs args(aChannelCookie, aNewStyle, aMaxTransferSize);
 		TPckgC<TRequestCreateArgs> package(args);
 		return DoControl(ERequestOpen, &package, &aRequestCookie);
 		}
 	struct TRequestCreateArgs
 		{
 		TRequestCreateArgs(TUint aChannelCookie, TBool aNewStyle, TUint aMaxFragmentSize)
 			:iChannelCookie(aChannelCookie), iNewStyle(aNewStyle), iMaxFragmentSize(aMaxFragmentSize)
 			{}
 	struct TFragmentArgs
 		{
 		TFragmentArgs()
 			:iRequestCookie(0), iTransferArgs(), iDurationMicroSecs(NULL)
 			{}
-		TFragmentArgs(TUint aRequestCookie, const TDmaTransferArgs& aTransferArgs, TUint64* aDurationMicroSecs = NULL)
+		TFragmentArgs(TUint aRequestCookie, const TDmaTransferArgs& aTransferArgs,
-			:iRequestCookie(aRequestCookie), iTransferArgs(aTransferArgs), iDurationMicroSecs(aDurationMicroSecs)
+					  TUint64* aDurationMicroSecs = NULL)
+			:iRequestCookie(aRequestCookie), iTransferArgs(aTransferArgs),
+			 iDurationMicroSecs(aDurationMicroSecs)
 			{}
 		const TUint iRequestCookie;
 		const TDmaTransferArgs iTransferArgs;
 		TUint64* const iDurationMicroSecs;
 		};
 	struct TQueueArgs
 		{
-		TQueueArgs(TUint aRequestCookie=0, TRequestStatus* aStatus=NULL, TCallbackRecord* aCallbackRecord=NULL, TUint64* aDurationMicroSecs=NULL)
+		TQueueArgs(TUint aRequestCookie=0, TRequestStatus* aStatus=NULL,
-			:iRequestCookie(aRequestCookie), iStatus(aStatus), iCallbackRecord(aCallbackRecord), iDurationMicroSecs(aDurationMicroSecs)
+				   TCallbackRecord* aCallbackRecord=NULL, TUint64* aDurationMicroSecs=NULL)
+			:iRequestCookie(aRequestCookie), iStatus(aStatus), iCallbackRecord(aCallbackRecord),
+			 iDurationMicroSecs(aDurationMicroSecs)
 			{}
 		TUint iRequestCookie;
 		TRequestStatus* iStatus;
 		TCallbackRecord* iCallbackRecord;
 		TUint64* iDurationMicroSecs;
 	to be setup from ISR context callback
 	*/
 	struct TQueueArgsWithReque : public TQueueArgs
 		{
 		TQueueArgsWithReque(TIsrRequeArgs* aRequeueArgs=NULL, TInt aCount=0,
-				TUint aRequestCookie=0, TRequestStatus* aStatus=NULL, TCallbackRecord* aCallbackRecord=NULL, TUint64* aDurationMicroSecs=NULL)
+							TUint aRequestCookie=0, TRequestStatus* aStatus=NULL,
-			:TQueueArgs(aRequestCookie, aStatus, aCallbackRecord, aDurationMicroSecs), iRequeSet(aRequeueArgs, aCount)
+							TCallbackRecord* aCallbackRecord=NULL, TUint64* aDurationMicroSecs=NULL)
+			:TQueueArgs(aRequestCookie, aStatus, aCallbackRecord, aDurationMicroSecs),
+			 iRequeSet(aRequeueArgs, aCount)
 			{
 			}
 		TIsrRequeArgsSet iRequeSet;
 		};
 		EDisableSrcElementCounting,
 		ETotalNumDstElementsTransferred,
 		ETotalNumSrcElementsTransferred,
 		};
 	};
 #endif // __D_DMA2_H__

changeset 293	0659d0e1a03c
parent 243	c7a0ce20c48c