kerneltest/f32test/server/t_fsrv.cpp
changeset 44 36bfc973b146
parent 43 96e5fb8b040d
child 109 b3a1d9898418
child 175 5af6c74cd793
--- a/kerneltest/f32test/server/t_fsrv.cpp	Thu Dec 17 09:24:54 2009 +0200
+++ b/kerneltest/f32test/server/t_fsrv.cpp	Thu Jan 07 13:38:45 2010 +0200
@@ -152,12 +152,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"));
 		}
@@ -285,7 +284,7 @@
 //
 	{
 
-	test(anInfo.iBattery==EBatLow || anInfo.iBattery==EBatGood || anInfo.iBattery==EBatNotSupported);
+	test(anInfo.iConnectionBusType==EConnectionBusInternal || anInfo.iConnectionBusType==EConnectionBusUsb);
 	
 	if (aDrive==EDriveZ)
 		{
@@ -1134,7 +1133,7 @@
 	r=TheFs.Volume(w,EDriveO);
 	test(r==KErrNone);
 	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);
@@ -1151,7 +1150,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"));