kerneltest/e32test/dma/d_dma.cpp
branchRCL_3
changeset 44 3e88ff8f41d5
parent 43 c1f20ce4abcf
--- a/kerneltest/e32test/dma/d_dma.cpp	Tue Aug 31 16:34:26 2010 +0300
+++ b/kerneltest/e32test/dma/d_dma.cpp	Wed Sep 01 12:34:56 2010 +0100
@@ -159,7 +159,6 @@
 #endif
 
 
-#ifndef DMA_APIV2
 static TInt FragmentCount(DDmaRequest* aRequest)
 	{
 	TInt count = 0;
@@ -167,7 +166,6 @@
 		count++;
 	return count;
 	}
-#endif
 
 
 //////////////////////////////////////////////////////////////////////////////
@@ -260,19 +258,6 @@
 		r = TDmaChannel::Open(info, iChannel);
 		if (r!= KErrNone)
 			return r;
-
-		// ---> Code coverage of rarely called functions
-		const TDmac* const c = iChannel->Controller();
-		if (!c)
-			return KErrGeneral;
-		const TInt mts = iChannel->MaxTransferSize(0, iCookie);
-		if (mts == 0)
-			return KErrGeneral;
-		const TUint mam = iChannel->MemAlignMask(0, iCookie);
-		if (~mam == 0)
-			return KErrGeneral;
-		// <--- Code coverage of rarely called functions
-
 		iClient = &Kern::CurrentThread();
 		for (TInt i=0; i<KMaxRequests; ++i)
 			{
@@ -403,11 +388,7 @@
 		{
 		TInt reqIdx = (TInt)a1;
 		__ASSERT_DEBUG(0 <= reqIdx && reqIdx < KMaxRequests, Kern::PanicCurrentThread(KClientPanicCat, __LINE__));
-#ifdef DMA_APIV2
-		return iRequests[reqIdx]->FragmentCount();
-#else
 		return FragmentCount(iRequests[reqIdx]);
-#endif
 		}
 	case RTestDma::EMissInterrupts:
 		return iChannel->MissNextInterrupts((TInt)a1);