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

equal deleted inserted replaced

-:94f2adf59133
+:b2826f67641f
-// 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".
 @internalTechnology
 */
 #include <e32base.h>
-#include "msdebug.h"
+#include "OstTraceDefinitions.h"
-#include "debug.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "tsbcclientinterfaceTraces.h"
+#endif
 #include "msctypes.h"
 #include "mtransport.h"
 #include "mprotocol.h"
 #include "tscsiclientreq.h"
 #include "mscutils.h"
 #include "usbmshostpanic.h"
 #include "tscsiblockcmds.h"
 #include "tsbcclientinterface.h"
 /**
 Constructor.
 @param aTransport The Transport interface to be used
 */
 TSbcClientInterface::TSbcClientInterface(MTransport& aTransport)
 :   iTransport(aTransport)
 {
-__MSFNLOG
 }
 TSbcClientInterface::~TSbcClientInterface()
 {
-__MSFNLOG
 }
 /**
 Constructor to create and send SCSI MODE SENSE (6) request to obtain the
 @return TInt KErrNone if successful, KErrCommandFailed to indicate a
 device status error, KErrCommandStalled to indicate device stall
 */
 TInt TSbcClientInterface::ModeSense6L(TUint aPageCode, TBool& aWriteProtected)
 {
-__MSFNLOG
 TScsiClientModeSense6Req modeSense6Req(TScsiClientModeSense6Req::ECurrentValues,
 aPageCode);
 TScsiClientModeSense6Resp modeSense6Resp;
 TInt err = iTransport.SendControlCmdL(&modeSense6Req, &modeSense6Resp);
 if (!err)
 {
-__SCSIPRINT1(_L("SCSI MODE SENSE (6) INFO WrProtect=%d"),
+OstTrace1(TRACE_SHOSTMASSSTORAGE_SCSI, TSBCCLIENTINTERFACE_10,
-modeSense6Resp.iWriteProtected);
+"SCSI MODE SENSE (6) INFO WrProtect=%d", modeSense6Resp.iWriteProtected);
 aWriteProtected = modeSense6Resp.iWriteProtected;
 }
 else
 {
 aWriteProtected = EFalse;
 }
-	return err;
+return err;
 }
 /**
 Create and send SCSI MODE SENSE (10) request to obtain the mediums Write Protect
 @return TInt KErrNone if successful, KErrCommandFailed to indicate a
 device status error, KErrCommandStalled to indicate a device stall
 */
 TInt TSbcClientInterface::ModeSense10L(TUint aPageCode, TBool& aWriteProtected)
 {
-__MSFNLOG
 TScsiClientModeSense10Req modeSense10Req(TScsiClientModeSense10Req::ECurrentValues,
 aPageCode);
 TScsiClientModeSense10Resp modeSense10Resp;
 TInt err = iTransport.SendControlCmdL(&modeSense10Req, &modeSense10Resp);
 if (!err)
 {
-__SCSIPRINT1(_L("SCSI MODE SENSE (10) INFO WrProtect=%d"),
+OstTrace1(TRACE_SHOSTMASSSTORAGE_SCSI, TSBCCLIENTINTERFACE_11,
-modeSense10Resp.iWriteProtected);
+"SCSI MODE SENSE (10) INFO WrProtect=%d", modeSense10Resp.iWriteProtected);
 aWriteProtected = modeSense10Resp.iWriteProtected;
 }
 else
 {
 aWriteProtected = EFalse;
 }
-	return err;
+return err;
 }
 /**
 Constructor to create SCSI MODE SENSE (10) request.
 iPageControl(aPageControl),
 iPageCode(aPageCode),
 iSubPageCode(aSubPageCode),
 iAllocationLength(KResponseLength)
 {
-__MSFNLOG
 }
 TInt TScsiClientModeSense10Req::EncodeRequestL(TDes8& aBuffer) const
 {
-__MSFNSLOG
+OstTrace0(TRACE_SHOSTMASSSTORAGE_SCSI, TSBCCLIENTINTERFACE_12,
-__SCSIPRINT(_L("<-- SCSI MODE SENSE (10)"));
+"<-- SCSI MODE SENSE (10)");
 TInt length = TScsiClientReq::EncodeRequestL(aBuffer);
 // PC
 aBuffer[2] = iPageCode;
 aBuffer[2] |= iPageControl << 6;
 device status error or KErrArgument to indicate that aLen is too large for the
 protocol.
 */
 TInt TSbcClientInterface::Read10L(TLba aLba, TDes8& aBuffer, TInt& aLen)
 {
-__MSFNLOG
+__ASSERT_DEBUG(iBlockTransfer.BlockLength(), User::Panic(KUsbMsHostPanicCat, EBlockLengthNotSet));
-	__ASSERT_DEBUG(iBlockTransfer.BlockLength(), User::Panic(KUsbMsHostPanicCat, EBlockLengthNotSet));
 __ASSERT_DEBUG(aLen % iBlockTransfer.BlockLength() == 0, User::Panic(KUsbMsHostPanicCat, EBlockDevice));
 TScsiClientRead10Req read10Req;
 read10Req.iLogicalBlockAddress = aLba;
 {
 User::Leave(KErrArgument);
 }
 read10Req.iBlockTransferLength = static_cast<TUint16>(blockTransferLength);
 TInt err = iTransport.SendDataRxCmdL(&read10Req, aBuffer, aLen);
-	return err;
+return err;
 }
 /**
 Create READ CAPACITY (10) request and send to the transport layer. The request
 returns the device servers capacity information. The device server's response
 @return TInt KErrNone if successful, KErrCommandFailed to indicate a
 device status error, KErrCommandStalled to indicate a device stall
 */
 TInt TSbcClientInterface::ReadCapacity10L(TLba& aLba, TUint32& aBlockSize)
 {
-__MSFNLOG
 TScsiClientReadCapacity10Req capacity10Req;
 TScsiClientReadCapacity10Resp capacity10Resp;
 TInt err = iTransport.SendControlCmdL(&capacity10Req, &capacity10Resp);
 if (!err)
 {
 aLba = capacity10Resp.iLba;
 aBlockSize = capacity10Resp.iBlockSize;
-__SCSIPRINT2(_L("Capacity LBA=0x%08x SIZE=0x%08x"),
+OstTraceExt2(TRACE_SHOSTMASSSTORAGE_SCSI, TSBCCLIENTINTERFACE__,
-aLba, aBlockSize);
+"Capacity LBA=0x%08x SIZE=0x%08x", aLba, aBlockSize);
 iBlockTransfer.SetCapacityL(aBlockSize, aLba);
 }
-	return err;
+return err;
 }
 /**
 Create START STOP UNIT request. The function leaves if the device response is
 @return TInt KErrNone if successful otherwise KErrCommandFailed to indicate a
 device status error
 */
 TInt TSbcClientInterface::StartStopUnitL(TBool aStart)
 {
-__MSFNLOG
 TScsiClientStartStopUnitReq startStopUnitReq;
 startStopUnitReq.iImmed = ETrue;
 startStopUnitReq.iLoej = EFalse;
 startStopUnitReq.iStart = aStart;
 TInt err = iTransport.SendControlCmdL(&startStopUnitReq);
-	return err;
+return err;
 }
 /**
 Create WRITE (10) request and send to the transport layer. This performs a
 device status error or KErrArgument to indicate that aLen is too large for the
 protocol.
 */
 TInt TSbcClientInterface::Write10L(TLba aLba, TDesC8& aBuffer, TUint aPos, TInt& aLen)
 {
-__MSFNLOG
+__ASSERT_DEBUG(iBlockTransfer.BlockLength(), User::Panic(KUsbMsHostPanicCat, EBlockLengthNotSet));
-	__ASSERT_DEBUG(iBlockTransfer.BlockLength(), User::Panic(KUsbMsHostPanicCat, EBlockLengthNotSet));
 __ASSERT_DEBUG(aLen % iBlockTransfer.BlockLength() == 0, User::Panic(KUsbMsHostPanicCat, EBlockDevice));
 // check that buffer size is large enough
-	if (aBuffer.Length() < (aPos + aLen))
+if (aBuffer.Length() < (aPos + aLen))
-		{
+{
 User::Leave(KErrArgument);
-		}
+}
 TScsiClientWrite10Req write10Req;
 write10Req.iLogicalBlockAddress = aLba;
 TInt blockTransferLength = aLen / iBlockTransfer.BlockLength();
 User::Leave(KErrArgument);
 }
 write10Req.iBlockTransferLength = static_cast<TUint16>(blockTransferLength);
 TInt err = iTransport.SendDataTxCmdL(&write10Req, aBuffer, aPos, aLen);
-	return err;
+return err;
 }

changeset 297	b2826f67641f
parent 33	0173bcd7697c