--- a/userlibandfileserver/fileserver/shostmassstorage/server/controller/cusbhostmsdevice.cpp	Mon Dec 21 16:14:42 2009 +0000
+++ b/userlibandfileserver/fileserver/shostmassstorage/server/controller/cusbhostmsdevice.cpp	Wed Dec 23 11:43:31 2009 +0000
@@ -19,12 +19,10 @@
 */
 
 #include <e32base.h>
-#include <e32base_private.h>
 #include <d32usbdi.h>
 
 #include <d32usbtransfers.h>
 #include "msctypes.h"
-#include "mscutils.h"
 #include "shared.h"
 #include "msgservice.h"
 #include "botmsctypes.h"
@@ -59,10 +57,9 @@
 
 CUsbHostMsDevice::CUsbHostMsDevice(THostMassStorageConfig& aConfig)
 :	iConfig(aConfig),
-	iState(EActive)
+	iState(EReady)
     {
     __MSFNLOG
-
 	}
 
 
@@ -186,19 +183,8 @@
 	iState = ESuspended;
 	}
 
-TBool CUsbHostMsDevice::IsActive()
-	{
-    __MSFNLOG
-	return (iState == EActive)? ETrue : EFalse;
-	}
 
-TBool CUsbHostMsDevice::IsSuspended()
-	{
-    __MSFNLOG
-	return (iState == ESuspended)? ETrue : EFalse;
-	}
-
-void CUsbHostMsDevice::ResumeL(TRequestStatus &aStatus)
+void CUsbHostMsDevice::Resume(TRequestStatus& aStatus)
 	{
     __MSFNLOG
 	if (iState == ESuspended)
@@ -206,10 +192,6 @@
 		StartTimer();
 		iDeviceSuspendResume->Resume(aStatus);
 		}
-	else
-		{
-        __HOSTPRINT(_L("CUsbHostMsDevice: Wierd we are not suspended but were asked to resume"));
-		}
 	}
 
 
@@ -358,6 +340,6 @@
 void CUsbHostMsDevice::ResumeCompletedL()
 	{
     __MSFNLOG
-	iState = EActive;
+	iState = EReady;
 	DoResumeLogicalUnitsL();
 	}