--- a/kerneltest/e32test/pccd/t_atadrv.cpp Mon May 03 13:47:38 2010 +0300
+++ b/kerneltest/e32test/pccd/t_atadrv.cpp Fri May 14 17:13:29 2010 +0300
@@ -37,7 +37,12 @@
const TInt KLongFormatInBytes=(KLongFormatInSectors<<KAtaSectorShift);
const TInt KHeapSize=0x4000;
+
+#undef USE_IDLE_CURRENT
+#ifdef USE_IDLE_CURRENT
const TInt KAtaIdleCurrentInMilliAmps=1;
+#endif
+
#define PDD_NAME _L("MEDATA")
@@ -263,10 +268,13 @@
test(info.iDriveAtt==(TUint)(KDriveAttLocal|KDriveAttRemovable));
test(info.iMediaAtt==KMediaAttFormattable);
test(info.iFileSystemId==KDriveFileSysFAT);
-// TSupplyInfoV1Buf supply2;
-// test(UserHal::SupplyInfo(supply2)==KErrNone);
-// if (mediaChangeSupported)
-// test(supply2().iCurrentConsumptionMilliAmps==supply1().iCurrentConsumptionMilliAmps+KAtaIdleCurrentInMilliAmps); // Snowball idle current is zero
+#undef USE_IDLE_CURRENT
+#ifdef USE_IDLE_CURRENT
+ TSupplyInfoV1Buf supply2;
+ test(UserHal::SupplyInfo(supply2)==KErrNone);
+ if (mediaChangeSupported)
+ test(supply2().iCurrentConsumptionMilliAmps==supply1().iCurrentConsumptionMilliAmps+KAtaIdleCurrentInMilliAmps); // Snowball idle current is zero
+#endif
b.Format(_L("ATA drive: Sector RdWr(%d)"),KAtaSectorSize);
test.Next(b);
@@ -450,8 +458,11 @@
test.Next(_L("ATA drive: Caps following media change"));
test(theAtaDrive.Caps(infoPckg)==KErrNone);
test(info.iType==EMediaHardDisk);
-// test(UserHal::SupplyInfo(supply2)==KErrNone);
-// test(supply2().iCurrentConsumptionMilliAmps==supply1().iCurrentConsumptionMilliAmps+KAtaIdleCurrentInMilliAmps);
+#undef USE_IDLE_CURRENT
+#ifdef USE_IDLE_CURRENT
+ test(UserHal::SupplyInfo(supply2)==KErrNone);
+ test(supply2().iCurrentConsumptionMilliAmps==supply1().iCurrentConsumptionMilliAmps+KAtaIdleCurrentInMilliAmps);
+#endif
test.Next(_L("ATA drive: Caps while OOM"));
TInt err=KErrNoMemory;