--- a/kerneltest/f32test/shostmassstorage/testclient/usbtestmsclient/protocol/tscsiservercmds.cpp Tue Oct 26 11:12:58 2010 +0100
+++ b/kerneltest/f32test/shostmassstorage/testclient/usbtestmsclient/protocol/tscsiservercmds.cpp Tue Oct 26 12:49:20 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2009-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"
@@ -27,17 +27,15 @@
#include "tscsiserverreq.h"
#include "tscsiservercmds.h"
#include "debug.h"
-#include "msdebug.h"
/**
Default constructor for TSenseInfo
*/
TSrvSenseInfo::TSrvSenseInfo()
{
- __MSFNLOG
iSenseCode = ENoSense;
iAdditional = 0;
- iQualifier = 0;
+ iQualifier = 0;
}
/**
@@ -46,12 +44,11 @@
@param aSenseCode sense key
*/
void TSrvSenseInfo::SetSense(TSenseCode aSenseCode)
- {
- __MSFNLOG
- iSenseCode = static_cast<TUint8>(aSenseCode);
- iAdditional = 0;
- iQualifier = 0;
- }
+ {
+ iSenseCode = static_cast<TUint8>(aSenseCode);
+ iAdditional = 0;
+ iQualifier = 0;
+ }
/**
@@ -63,12 +60,11 @@
void TSrvSenseInfo::SetSense(TSenseCode aSenseCode,
TAdditionalCode aAdditional)
- {
- __MSFNLOG
- iSenseCode = static_cast<TUint8>(aSenseCode);
- iAdditional = static_cast<TUint8>(aAdditional);
- iQualifier = 0;
- }
+ {
+ iSenseCode = static_cast<TUint8>(aSenseCode);
+ iAdditional = static_cast<TUint8>(aAdditional);
+ iQualifier = 0;
+ }
/**
@@ -81,28 +77,26 @@
void TSrvSenseInfo::SetSense(TSenseCode aSenseCode,
TAdditionalCode aAdditional,
TUint8 aQualifier)
- {
- __MSFNLOG
- iSenseCode = static_cast<TUint8>(aSenseCode);
- iAdditional = static_cast<TUint8>(aAdditional);
- iQualifier = aQualifier;
- }
+ {
+ iSenseCode = static_cast<TUint8>(aSenseCode);
+ iAdditional = static_cast<TUint8>(aAdditional);
+ iQualifier = aQualifier;
+ }
// **** TEST UNIT READY ****
// **** REQUEST SENSE ****
void TScsiServerRequestSenseResp::Encode(TDes8& aBuffer) const
{
- __MSFNSLOG
aBuffer.FillZ(KCommandLength);
__PRINT(_L("->PROTOCOL(SCSI) REQUEST SENSE\n"));
//additional sense length
- aBuffer[07] = static_cast<TUint8>(KCommandLength - 8);
+ aBuffer[07] = static_cast<TUint8>(KCommandLength - 8);
aBuffer[0] = iResponseCode;
- aBuffer[02] = static_cast<TUint8>(iSensePtr->iSenseCode);
- aBuffer[12] = iSensePtr->iAdditional;
- aBuffer[13] = iSensePtr->iQualifier;
+ aBuffer[02] = static_cast<TUint8>(iSensePtr->iSenseCode);
+ aBuffer[12] = iSensePtr->iAdditional;
+ aBuffer[13] = iSensePtr->iQualifier;
//truncate to Allocation Length of the Request
TUint length = iAllocationLength < KCommandLength ?
@@ -113,8 +107,7 @@
// **** INQUIRY ****
void TScsiServerInquiryReq::DecodeL(const TDesC8& aPtr)
{
- __MSFNLOG
- TScsiServerReq::DecodeL(aPtr);
+ TScsiServerReq::DecodeL(aPtr);
iCmdDt = aPtr[1] & 0x2;
iEvpd = aPtr[1] & 0x1;
iPage = aPtr[2];
@@ -125,10 +118,9 @@
void TScsiServerInquiryResp::Encode(TDes8& aBuffer) const
{
- __MSFNSLOG
__PRINT(_L("->PROTOCOL(SCSI) INQUIRY\n"));
- aBuffer.FillZ(KResponseLength);
+ aBuffer.FillZ(KResponseLength);
// MSB: RMB : Removable
if (iRemovable)
@@ -140,12 +132,12 @@
aBuffer[3] |= (iResponseDataFormat & 0x0F);
// Additional Length
- aBuffer[4] = 0x1F;
+ aBuffer[4] = 0x1F;
// Vendor ID (Vendor Specific/Logged by T10)
- TPtr8 vendorId(&aBuffer[8], 8, 8);
- vendorId.Fill(' ', 8);
- vendorId.Copy(iConfig.iVendorId);
+ TPtr8 vendorId(&aBuffer[8], 8, 8);
+ vendorId.Fill(' ', 8);
+ vendorId.Copy(iConfig.iVendorId);
// Product ID (Vendor Specific)
TPtr8 productId(&aBuffer[16], 16, 16);
@@ -164,11 +156,10 @@
}
-// **** MODE SENSE (6) ****
+// **** MODE SENSE (6) ****
void TScsiServerModeSense6Req::DecodeL(const TDesC8& aPtr)
{
- __MSFNLOG
- TScsiServerReq::DecodeL(aPtr);
+ TScsiServerReq::DecodeL(aPtr);
iPageCode = aPtr[2] & 0x3F;
iPageControl = static_cast<TPageControl>(aPtr[2] >> 6);
iAllocationLength = aPtr[4];
@@ -178,7 +169,6 @@
void TScsiServerModeSense6Resp::Encode(TDes8& aBuffer) const
{
- __MSFNSLOG
__PRINT(_L("->PROTOCOL(SCSI) MODE SENSE (6)\n"));
// reserve 4 bytes for Length, Media type, Device-specific parameter and
// Block descriptor length
@@ -225,11 +215,10 @@
aBuffer.SetLength(length);
}
-// **** START STOP UNIT ****
+// **** START STOP UNIT ****
void TScsiServerStartStopUnitReq::DecodeL(const TDesC8& aPtr)
{
- __MSFNLOG
- TScsiServerReq::DecodeL(aPtr);
+ TScsiServerReq::DecodeL(aPtr);
const TUint8 KStartMask = 0x01;
const TUint8 KImmedMask = 0x01;
@@ -246,44 +235,41 @@
}
-// **** PREVENT MEDIA REMOVAL ****
+// **** PREVENT MEDIA REMOVAL ****
void TScsiServerPreventMediaRemovalReq::DecodeL(const TDesC8& aPtr)
{
- __MSFNLOG
- TScsiServerReq::DecodeL(aPtr);
- iPrevent = aPtr[4] & 0x01;
- __PRINT1(_L("<-PROTOCOL(SCSI) PREVENT MEDIA REMOVAL prevent = %d\n"), iPrevent);
+ TScsiServerReq::DecodeL(aPtr);
+ iPrevent = aPtr[4] & 0x01;
+ __PRINT1(_L("<-PROTOCOL(SCSI) PREVENT MEDIA REMOVAL prevent = %d\n"), iPrevent);
}
-// **** READ FORMAT CAPACITIES ****
+// **** READ FORMAT CAPACITIES ****
void TScsiServerReadFormatCapacitiesReq::DecodeL(const TDesC8& aPtr)
{
- __MSFNLOG
- TScsiServerReq::DecodeL(aPtr);
+ TScsiServerReq::DecodeL(aPtr);
const TUint8* ptr = aPtr.Ptr();
iAllocationLength = BigEndian::Get32(ptr+7);
- __PRINT(_L("<-PROTOCOL(SCSI) READ FORMAT CAPACITIES\n"));
+ __PRINT(_L("<-PROTOCOL(SCSI) READ FORMAT CAPACITIES\n"));
}
void TScsiServerReadFormatCapacitiesResp::Encode(TDes8& aBuffer) const
{
- __MSFNSLOG
- __PRINT(_L("->PROTOCOL(SCSI) READ FORMAT CAPACITIES\n"));
- aBuffer.FillZ(KResponseLength);
- aBuffer[3] = 0x08; // Capacity List Length
+ __PRINT(_L("->PROTOCOL(SCSI) READ FORMAT CAPACITIES\n"));
+ aBuffer.FillZ(KResponseLength);
+ aBuffer[3] = 0x08; // Capacity List Length
- aBuffer[4] = static_cast<TUint8>(iNumberBlocks >> 24); // Number of blocks
- aBuffer[5] = static_cast<TUint8>(iNumberBlocks >> 16); //
- aBuffer[6] = static_cast<TUint8>(iNumberBlocks >> 8); //
- aBuffer[7] = static_cast<TUint8>(iNumberBlocks); //
+ aBuffer[4] = static_cast<TUint8>(iNumberBlocks >> 24); // Number of blocks
+ aBuffer[5] = static_cast<TUint8>(iNumberBlocks >> 16); //
+ aBuffer[6] = static_cast<TUint8>(iNumberBlocks >> 8); //
+ aBuffer[7] = static_cast<TUint8>(iNumberBlocks); //
- aBuffer[8] = 0x02; // Formatted size
+ aBuffer[8] = 0x02; // Formatted size
- aBuffer[9] = 0x00; // 512 Byte Blocks
- aBuffer[10] = 0x02; //
- aBuffer[11] = 0x00; //
+ aBuffer[9] = 0x00; // 512 Byte Blocks
+ aBuffer[10] = 0x02; //
+ aBuffer[11] = 0x00; //
// Truncate to Allocation Length of the Request
// Truncate to Allocation Length of the Request
@@ -293,21 +279,19 @@
}
-// **** READ CAPACITY (10) ****
+// **** READ CAPACITY (10) ****
void TScsiServerReadCapacity10Req::DecodeL(const TDesC8& aPtr)
{
- __MSFNLOG
- TScsiServerReq::DecodeL(aPtr);
+ TScsiServerReq::DecodeL(aPtr);
iPmi = aPtr[8] & 0x01;
const TUint8* ptr = aPtr.Ptr();
- iLogicalBlockAddress = BigEndian::Get32(ptr+2);
+ iLogicalBlockAddress = BigEndian::Get32(ptr+2);
__PRINT(_L("<-PROTOCOL(SCSI) READ CAPACITY (10)\n"));
}
void TScsiServerReadCapacity10Resp::Encode(TDes8& aBuffer) const
{
- __MSFNSLOG
aBuffer.FillZ(KCommandLength);
__PRINT3(_L("->PROTOCOL(SCSI) READ CAPACITY (10) Block size=0x%X, NumBlocks=0x%08X%08X\n"),
@@ -331,7 +315,7 @@
aBuffer[0] = aBuffer[1] = aBuffer[2] = aBuffer[3] = 0xFF;
}
- // Block Size
+ // Block Size
aBuffer[4] = static_cast<TUint8>(iBlockSize >> 24);
aBuffer[5] = static_cast<TUint8>(iBlockSize >> 16);
aBuffer[6] = static_cast<TUint8>(iBlockSize >> 8);
@@ -339,32 +323,30 @@
}
-// **** RdWr10 ****
+// **** RdWr10 ****
void TScsiServerRdWr10Req::DecodeL(const TDesC8& aDes)
{
- __MSFNLOG
- TScsiServerReq::DecodeL(aDes);
+ TScsiServerReq::DecodeL(aDes);
// PROTECT
- iProtect = aDes[1] >> 5;
+ iProtect = aDes[1] >> 5;
const TUint8* ptr = aDes.Ptr();
// LOGICAL BLOCK ADDRESS
- iLogicalBlockAddress = BigEndian::Get32(ptr+2);
+ iLogicalBlockAddress = BigEndian::Get32(ptr+2);
// TRANSFER LENGTH
- iTransferLength = BigEndian::Get16(ptr+7);
+ iTransferLength = BigEndian::Get16(ptr+7);
- __PRINT2(_L("<-PROTOCOL(SCSI) RD/WR (10) : LBA = %x, Length = %x (blocks)\n"),
+ __PRINT2(_L("<-PROTOCOL(SCSI) RD/WR (10) : LBA = %x, Length = %x (blocks)\n"),
iLogicalBlockAddress, iTransferLength);
}
-// **** READ (10) ****
-// **** WRITE (10) ****
-// **** VERIFY (10) ****
+// **** READ (10) ****
+// **** WRITE (10) ****
+// **** VERIFY (10) ****
void TScsiServerVerify10Req::DecodeL(const TDesC8& aPtr)
{
- __MSFNLOG
- TScsiServerRdWr10Req::DecodeL(aPtr);
- iBytchk = aPtr[1] & 0x02 ? ETrue : EFalse;
+ TScsiServerRdWr10Req::DecodeL(aPtr);
+ iBytchk = aPtr[1] & 0x02 ? ETrue : EFalse;
}