FCL/sf/os/kernelhwsrv: comparison userlibandfileserver/fileserver/shostmassstorage/server/protocol/cscsiprotocol.cpp

equal deleted inserted replaced

-:947f0dc9f7a8
+:ef2a444a7410
-// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of the License "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available
 // at the URL "http://www.eclipse.org/legal/epl-v10.html".
 #include "msdebug.h"
 #include "msctypes.h"
 #include "shared.h"
 #include "msgservice.h"
-#include "mscutils.h"
 #include "mtransport.h"
 #include "mprotocol.h"
 #include "tscsiclientreq.h"
 #include "tscsiprimarycmds.h"
 #include "tscsiblockcmds.h"
 #include "cscsiprotocol.h"
 #include "usbmshostpanic.h"
 /**
 Create the CScsiProtocol object.
 @param aLun The LUN for the device represented by this object
 @param aTransport The transport interface
 }
 void CScsiProtocol::ConstructL(TLun aLun)
 {
 	__MSFNLOG
+	// iState = EEntry;
 iFsm = CMassStorageFsm::NewL(*this);
-	iState = EDisconnected;
 const TInt blockLength = 0x200;
 iHeadbuf.CreateL(blockLength);
 iTailbuf.CreateL(blockLength);
 void CScsiProtocol::InitialiseUnitL()
 {
 	__MSFNLOG
+iState = EDisconnected;
 	// A device may take time to mount the media. If the device fails attempt to
 	// retry the connection for a number of seconds
 TInt retryCounter = 20;
 do
 {
 retryCounter--;
 iFsm->ConnectLogicalUnitL();
-iState = iFsm->IsConnected() ? EConnected: EDisconnected;
+if (iFsm->IsConnected())
-if (iState == EConnected)
 {
+iState = EConnected;
 break;
 }
 User::After(1000 * 200);    // 200 mS
 }
 while (retryCounter);
 	TInt err = iSbcInterface->Read10L(I64LOW(lba), aCopybuf, len);
 if (err)
 {
 __SCSIPRINT1(_L("READ(10) Err=%d"), err);
-DoCheckConditionL();
+User::LeaveIfError(DoCheckConditionL());
-User::LeaveIfError(KErrAbort);
 }
 // handle residue
 while (len != aLen)
 {
 // read rest of the block
 TInt err = iSbcInterface->Read10L(aPos/blockLen, aCopybuf, len);
 if (err)
 {
-DoCheckConditionL();
+User::LeaveIfError(DoCheckConditionL());
-User::LeaveIfError(KErrAbort);
 }
 }
 }
 const TInt blockLen = iSbcInterface->iBlockTransfer.BlockLength();
 TInt len = aLen;
 	TInt err = iSbcInterface->Write10L(aPos/blockLen, aCopybuf, aOffset, len);
 if (err)
 {
-DoCheckConditionL();
+User::LeaveIfError(DoCheckConditionL());
-User::LeaveIfError(KErrAbort);
 }
 while (len != aLen)
 {
 // handle residue
 // write rest of the block
 TInt err = iSbcInterface->Write10L(aPos/blockLen, buf, aOffset, len);
 if (err)
 {
-DoCheckConditionL();
+User::LeaveIfError(DoCheckConditionL());
-User::LeaveIfError(KErrAbort);
 }
 }
 }
 do
 {
 err = iSbcInterface->ReadCapacity10L(lastLba, blockLength);
 } while (err == KErrCommandStalled && stallCounter-- > 0);
+if (err)
+{
+// DoCheckConditionL clears sense error
+// Media not present will return KErrNotReady so leave here
+User::LeaveIfError(DoCheckConditionL());
+}
+// update iWriteProtect
+err = MsModeSense10L();
 if (err)
 {
 if (err == KErrCommandFailed)
 {
 // Clear sense error
-DoCheckConditionL();
+err = DoCheckConditionL();
-}
+// ignore error if unsupported
-User::LeaveIfError(KErrAbort);
+if (err != KErrUnknown)
-}
+{
+User::LeaveIfError(err);
-// update iWriteProtect
+}
-err = MsModeSense10L();
-if (err)
-{
-if (err == KErrCommandFailed)
-{
-// Clear sense error
-DoCheckConditionL();
 }
 err = MsModeSense6L();
 if (err == KErrCommandFailed)
 {
 // Clear sense error
-DoCheckConditionL();
+err = DoCheckConditionL();
+// ignore error if unsupported
+if (err != KErrUnknown)
+{
+User::LeaveIfError(err);
+}
 }
 }
 aCapsInfo.iNumberOfBlocks = lastLba + 1;
 aCapsInfo.iBlockLength = blockLength;
 	__MSFNLOG
 return iSpcInterface.PreventAllowMediumRemovalL(aPrevent);
 }
-void CScsiProtocol::DoCheckConditionL()
+TInt CScsiProtocol::DoCheckConditionL()
 {
 	__MSFNLOG
 User::LeaveIfError(MsRequestSenseL());
+TInt err;
 // Check if init is needed
 if (iSenseInfo.iSenseCode == TSenseInfo::ENotReady &&
 iSenseInfo.iAdditional == TSenseInfo::EAscLogicalUnitNotReady &&
 iSenseInfo.iQualifier == TSenseInfo::EAscqInitializingCommandRequired)
 {
 // start unit
-TInt err = iSbcInterface->StartStopUnitL(ETrue);
+err = iSbcInterface->StartStopUnitL(ETrue);
 if (err)
 {
 User::LeaveIfError(MsRequestSenseL());
 }
+}
-}
+err = GetSystemWideSenseError(iSenseInfo);
-TInt r = GetSystemWideSenseError(iSenseInfo);
+TScsiState nextState = iState;
-if (((r == KErrNotReady) && (iState == EConnected)) ||
+if (err == KErrDisconnected)
-r == KErrDisconnected)
+{
-	    {
+nextState = EDisconnected;
-CompleteNotifyChangeL();
+}
-}
+else if (err == KErrNotReady)
+{
+nextState = EMediaNotPresent;
+}
+else
+{
+// no state change;
+}
+if (nextState != iState)
+{
+iMediaChangeNotifier.DoNotifyL();
+iState = nextState;
+}
+return err;
 }
 /**
 Map SCSI sense error to a system wide error code
 void CScsiProtocol::DoScsiReadyCheckEventL()
 	{
 __MSFNLOG
 	TInt err = KErrNone;
-	if(iFsm->IsRemovableMedia() || iState == EDisconnected)
+	if(iFsm->IsRemovableMedia() || iState != EConnected)
 {
 		iFsm->SetStatusCheck();
 		TRAP(err, iFsm->ConnectLogicalUnitL());
 		iFsm->ClearStatusCheck();
 iMediaChangeNotifier.DoNotifyL();
 			}
 }
 	}
-void CScsiProtocol::CompleteNotifyChangeL()
-	{
-__MSFNLOG
-if (!iFsm->IsStatusCheck())
-		{
-		if (iState == EConnected)
-			{
-			iState = EDisconnected;
-iMediaChangeNotifier.DoNotifyL();
-			}
-		}
-	}
 RMediaChangeNotifier::RMediaChangeNotifier()
 :   iRegistered(EFalse)
 {
 __MSFNSLOG

changeset 102	ef2a444a7410
parent 90	947f0dc9f7a8
child 97	41f0cfe18c80