--- a/kerneltest/f32test/fsstress/t_sesfs.cpp Wed Dec 23 11:43:31 2009 +0000
+++ b/kerneltest/f32test/fsstress/t_sesfs.cpp Thu Jan 07 13:38:45 2010 +0200
@@ -258,7 +258,7 @@
r=iFs.Volume(w,EDriveO);
test_KErrNone(r);
test(w.iDrive.iType==v.iDrive.iType);
- test(w.iDrive.iBattery==v.iDrive.iBattery);
+ test(w.iDrive.iConnectionBusType==v.iDrive.iConnectionBusType);
test(w.iDrive.iDriveAtt==KDriveAttSubsted);
test(w.iDrive.iMediaAtt==v.iDrive.iMediaAtt);
test(w.iUniqueID==v.iUniqueID);
@@ -287,7 +287,7 @@
test(d.iDriveAtt==KDriveAttSubsted);
test(d.iMediaAtt==origDI.iMediaAtt);
test(d.iType==origDI.iType);
- test(d.iBattery==origDI.iBattery);
+ test(d.iConnectionBusType==origDI.iConnectionBusType);
test.Next(_L("Test real name"));
@@ -707,12 +707,11 @@
test.Printf(_L("Formattable "));
if (anInfo.iMediaAtt&KMediaAttWriteProtected)
test.Printf(_L("WProtected "));
- test.Printf(_L("\n BATTERY="));
- switch(anInfo.iBattery)
+ test.Printf(_L("\n CONNECTION BUS="));
+ switch(anInfo.iConnectionBusType)
{
- case EBatNotSupported: test.Printf(_L("Not supported\n")); break;
- case EBatGood: test.Printf(_L("Good\n")); break;
- case EBatLow: test.Printf(_L("Low\n")); break;
+ case EConnectionBusInternal: test.Printf(_L("Internal\n")); break;
+ case EConnectionBusUsb: test.Printf(_L("USB\n")); break;
default:
test.Printf(_L("Unknown value\n"));
}
@@ -739,7 +738,7 @@
//
{
- test(anInfo.iBattery==EBatLow || anInfo.iBattery==EBatGood || anInfo.iBattery==EBatNotSupported);
+ test(anInfo.iConnectionBusType==EConnectionBusInternal || anInfo.iConnectionBusType==EConnectionBusUsb);
if (aDrive==EDriveZ)
{