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

equal deleted inserted replaced

-:1df514389a47
+:41f0cfe18c80
 	// retry the connection for a number of seconds
 TInt retryCounter = 20;
 do
 {
 retryCounter--;
-iFsm->ConnectLogicalUnitL();
+TInt err = iFsm->ConnectLogicalUnitL();
+if (err == KErrNotSupported)
+{
+break;
+}
 if (iFsm->IsConnected())
 {
 iState = EConnected;
 break;
 }
 void CScsiProtocol::ReadL(TPos aPos,
 TDes8& aBuf,
 TInt aLength)
 {
 	__MSFNLOG
+if (!iSbcInterface)
+User::Leave(KErrNotSupported);
 if(!IsConnected())
 		User::Leave(KErrNotReady);
 iSbcInterface->iBlockTransfer.ReadL(*this, aPos, aLength, aBuf);
 }
 void CScsiProtocol::BlockReadL(TPos aPos, TDes8& aCopybuf, TInt aLen)
 {
 	__MSFNLOG
+if (!iSbcInterface)
+User::Leave(KErrNotSupported);
 	__ASSERT_DEBUG(aPos % iSbcInterface->iBlockTransfer.BlockLength() == 0,
 User::Panic(KUsbMsHostPanicCat, EBlockDevice));
 const TInt blockLen = iSbcInterface->iBlockTransfer.BlockLength();
 TInt len = aLen;
 void CScsiProtocol::WriteL(TPos aPosition,
 TDesC8& aBuf,
 TInt aLength)
 {
 	__MSFNLOG
+if (!iSbcInterface)
+User::Leave(KErrNotSupported);
 if(!IsConnected())
 		User::Leave(KErrNotReady);
 iSbcInterface->iBlockTransfer.WriteL(*this, aPosition, aLength, aBuf);
 }
 void CScsiProtocol::BlockWriteL(TPos aPos, TDesC8& aCopybuf, TUint aOffset, TInt aLen)
 {
 	__MSFNLOG
+if (!iSbcInterface)
+User::Leave(KErrNotSupported);
 	__ASSERT_DEBUG(aPos % iSbcInterface->iBlockTransfer.BlockLength() == 0,
 User::Panic(KUsbMsHostPanicCat, EBlockDevice));
 const TInt blockLen = iSbcInterface->iBlockTransfer.BlockLength();
 TInt len = aLen;
 	TInt err = iSbcInterface->Write10L(aPos/blockLen, aCopybuf, aOffset, len);
 	__MSFNLOG
 if (!IsConnected())
 {
 DoScsiReadyCheckEventL();
 }
+if (!iSbcInterface)
+{
+aCapsInfo.iMediaType = EMediaCdRom;
+aCapsInfo.iNumberOfBlocks = 0;
+aCapsInfo.iBlockLength = 0;
+aCapsInfo.iWriteProtect = ETrue;
+return;
+}
+aCapsInfo.iMediaType = EMediaHardDisk;
 	TLba lastLba;
 	TUint32 blockLength;
 // Retry ReadCapacity10L if stalled
 &info.iIdentification.iProductId,
 &info.iIdentification.iProductRev);
 if (info.iPeripheralQualifier != 0 && info.iPeripheralQualifier != 1)
 {
-__HOSTPRINT(_L("Peripheral Qualifier[Unknown device type]\n"))
+__HOSTPRINT(_L("Peripheral Qualifier[Unknown device type]"))
-return KErrUnknown;
+err = KErrUnknown;
 }
+else if (info.iPeripheralDeviceType == 0)
-if (info.iPeripheralDeviceType != 0)
+{
-{
+// SCSI SBC Direct access device
-__HOSTPRINT(_L("Peripheral Device Type[Unsupported device type]\n"))
+iRemovableMedia = info.iRemovable;
-return KErrUnknown;
-}
+// SCSI Block device
+iSbcInterface = new (ELeave) TSbcClientInterface(iSpcInterface.Transport());
-iRemovableMedia = info.iRemovable;
+iSbcInterface->InitBuffers(&iHeadbuf, &iTailbuf);
+err = KErrNone;
-// SCSI Block device
+}
-iSbcInterface = new (ELeave) TSbcClientInterface(iSpcInterface.Transport());
+else if (info.iPeripheralDeviceType == 5)
-iSbcInterface->InitBuffers(&iHeadbuf, &iTailbuf);
+{
+// SCSI MMC-2 CD-ROM device
-return KErrNone;
+__HOSTPRINT(_L("Peripheral Device Type[CD-ROM]"))
+iRemovableMedia = info.iRemovable;
+// MMC-2 is not supported. A SCSI interface call will return
+// KErrNotSupported. If SCSI support is extended in future then
+// TSbcInterface class should be replaced with a proper interface class.
+iSbcInterface = NULL;
+err = KErrNone;
+}
+else
+{
+__HOSTPRINT(_L("Peripheral Device Type[Unsupported device type]"))
+err = KErrUnknown;
+}
+return err;
 }
 /**
 Perform SCSI TEST UNIT READY command. The function leaves if the device response
 device status error, KErrCommandStalled to indicate a device stall
 */
 TInt CScsiProtocol::MsReadCapacityL()
 {
 	__MSFNLOG
+if (!iSbcInterface)
+{
+User::Leave(KErrNotSupported);
+}
 // READ CAPACITY
 TUint32 blockSize;
 TUint32 lastLba;
 TInt err = iSbcInterface->ReadCapacity10L(lastLba, blockSize);
 device status error, KErrCommandStalled to indicate a device stall
 */
 TInt CScsiProtocol::MsModeSense10L()
 {
 	__MSFNLOG
+if (!iSbcInterface)
+User::Leave(KErrNotSupported);
 TBool writeProtected;
 TInt err = iSbcInterface->ModeSense10L(TSbcClientInterface::EReturnAllModePages, writeProtected);
 if (!err)
 {
 device status error, KErrCommandStalled to indicate a device stall
 */
 TInt CScsiProtocol::MsModeSense6L()
 {
 	__MSFNLOG
+if (!iSbcInterface)
+User::Leave(KErrNotSupported);
 TBool writeProtected;
 TInt err = iSbcInterface->ModeSense6L(TSbcClientInterface::EReturnAllModePages, writeProtected);
 if (!err)
 {
 device status error
 */
 TInt CScsiProtocol::MsStartStopUnitL(TBool aStart)
 {
 	__MSFNLOG
+if (!iSbcInterface)
+User::Leave(KErrNotSupported);
 return iSbcInterface->StartStopUnitL(aStart);
 }
 /**
 // Check if init is needed
 if (iSenseInfo.iSenseCode == TSenseInfo::ENotReady &&
 iSenseInfo.iAdditional == TSenseInfo::EAscLogicalUnitNotReady &&
 iSenseInfo.iQualifier == TSenseInfo::EAscqInitializingCommandRequired)
 {
-// start unit
+		if (iSbcInterface)
-err = iSbcInterface->StartStopUnitL(ETrue);
+			{
-if (err)
+	        // start unit
-{
+			err = iSbcInterface->StartStopUnitL(ETrue);
-User::LeaveIfError(MsRequestSenseL());
+	        if (err)
-}
+		        {
+			    User::LeaveIfError(MsRequestSenseL());
+				}
+			}
 }
 err = GetSystemWideSenseError(iSenseInfo);
 TScsiState nextState = iState;
 void CScsiProtocol::DoScsiReadyCheckEventL()
 	{
 __MSFNLOG
 	TInt err = KErrNone;
-	if(iFsm->IsRemovableMedia() || iState != EConnected)
+	if(iRemovableMedia || iState != EConnected)
 {
 		iFsm->SetStatusCheck();
 		TRAP(err, iFsm->ConnectLogicalUnitL());
 		iFsm->ClearStatusCheck();

branch	RCL_3
changeset 97	41f0cfe18c80
parent 87	2f92ad2dc5db
child 110	c734af59ce98