kerneltest/e32test/dma/t_dma.cpp
changeset 109 b3a1d9898418
parent 102 ef2a444a7410
--- a/kerneltest/e32test/dma/t_dma.cpp	Mon May 03 13:47:38 2010 +0300
+++ b/kerneltest/e32test/dma/t_dma.cpp	Fri May 14 17:13:29 2010 +0300
@@ -466,28 +466,27 @@
 	do
 		{
 		fragSize -= step;
-		// make sure size is aligned
+
+		// Make sure size is aligned
 		fragSize = fragSize & ~Info.iMemAlignMask;
+		if(fragSize == 0)
+			break;
 
 		r = OpenChannel(iMaxFragCount, fragSize);
 		test_KErrNone(r);
 
 		for(iFragCount=1; iFragCount <= iMaxFragCount; iFragCount++)
 			{
-			test.Printf(_L("Fragment size %d bytes, %d fragments\nIter: "), fragSize, iFragCount);
+			test.Printf(_L("Chan %d Fragment size %d bytes, %d fragments, %d iters\n"), iChannelId, fragSize, iFragCount, iInnerIterations);
 			for(TInt i=0; i<iInnerIterations; i++)
 				{
-
-				test.Printf(_L("%d "), i);
 				r = Transfer(fragSize);
 				test_KErrNone(r);
-
 				}
-			test.Printf(_L("\n"));
 			}
 		iChannel.Close();
-		// Reduce frag size by an eigth each iteration
-		step = (fragSize/8);
+		// Reduce frag size by a quarter each iteration
+		step = (fragSize/4);
 		} while (step > 0);
 
 	iTimer.Close();
@@ -527,7 +526,7 @@
 	User::WaitForRequest(rs, timerStatus);
 	if(rs.Int() == KRequestPending)
 		{
-		RDebug::Print(_L("Transfer timed out!"));
+		RDebug::Printf("Chan %d: Transfer timed out!", iChannelId);
 		// timed out
 		test(EFalse);
 		}
@@ -1188,9 +1187,9 @@
 	// intended to find errors in PSL implmentations
 	const TInt iterPerFragSize = 1;
 #else
-	const TInt iterPerFragSize = 30;
+	const TInt iterPerFragSize = 10;
 #endif
-	const TInt rangeMaxFragCount = 8;
+	const TInt rangeMaxFragCount = 5;
 
 	test.Next(_L("sb"));
 	RunSbTest(maxchannel, new CFragSizeRange(1, rangeMaxFragCount, rangeFragSize, iterPerFragSize));