--- a/kerneltest/e32test/dmav2/d_dma2_cmn.cpp	Tue Jul 06 15:50:07 2010 +0300
+++ b/kerneltest/e32test/dmav2/d_dma2_cmn.cpp	Wed Aug 18 11:08:29 2010 +0300
@@ -17,10 +17,20 @@
 */
 #ifdef __KERNEL_MODE__
 #include <platform.h>
+
+#ifdef __DMASIM__
+#ifdef __WINS__
+typedef TLinAddr TPhysAddr;
+#endif
+static inline TPhysAddr LinToPhys(TLinAddr aLin) {return aLin;}
+#else
+static inline TPhysAddr LinToPhys(TLinAddr aLin) {return Epoc::LinearToPhysical(aLin);}
+#endif
 #endif
 
 #include "d_dma2.h"
 
+
 TInt Log2(TInt aNum)
 	{
 	TInt res = -1;
@@ -240,7 +250,7 @@
 		iSrcAddr += aChunkBase;
 
 #ifdef __KERNEL_MODE__
-		iSrcAddr = Epoc::LinearToPhysical(iSrcAddr);
+		iSrcAddr = LinToPhys(iSrcAddr);
 		TEST_ASSERT(iSrcAddr != KPhysAddrInvalid);
 #endif
 		}
@@ -258,7 +268,7 @@
 		iDstAddr += aChunkBase;
 
 #ifdef __KERNEL_MODE__
-		iDstAddr = Epoc::LinearToPhysical(iDstAddr);
+		iDstAddr = LinToPhys(iDstAddr);
 		TEST_ASSERT(iDstAddr != KPhysAddrInvalid);
 #endif
 		}
@@ -321,9 +331,9 @@
 void TAddressParms::MakePhysical()
 	{
 #ifdef __KERNEL_MODE__
-	iSrcAddr = Epoc::LinearToPhysical(iSrcAddr);
+	iSrcAddr = LinToPhys(iSrcAddr);
 	TEST_ASSERT(iSrcAddr != KPhysAddrInvalid);
-	iDstAddr = Epoc::LinearToPhysical(iDstAddr);
+	iDstAddr = LinToPhys(iDstAddr);
 	TEST_ASSERT(iDstAddr != KPhysAddrInvalid);
 #else
 	TEST_FAULT;
@@ -385,7 +395,7 @@
 	{
 	TUint chunkStart = 0;
 #ifdef __KERNEL_MODE__
-	chunkStart = Epoc::LinearToPhysical(aStart);
+	chunkStart = LinToPhys(aStart);
 	TEST_ASSERT(chunkStart != KPhysAddrInvalid);
 #else
 	chunkStart = aStart;