FCL/sf/os/kernelhwsrv: comparison userlibandfileserver/fileserver/shostmassstorage/msproxy/hostusbmsproxy.cpp

equal deleted inserted replaced

-:947f0dc9f7a8
+:6e99f362aa46
-/*
+// Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
-* All rights reserved.
+// This component and the accompanying materials are made available
-* This component and the accompanying materials are made available
+// under the terms of the License "Eclipse Public License v1.0"
-* under the terms of the License "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
-* which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
 //
-// hostusbmsproxy.cpp
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
 //
-// This file system extension provides a way to access a drive on the MS system in "raw format".
+// Contributors:
-// It can be used to test large files / drives
+//
+// Description:
+// This file system extension provides a way to access a drive on the MS system
+// in "raw format". It can be used to test large files / drives
 //
 /** @file
 @internalTechnology
 */
 	}
 TInt CUsbHostMsProxyDrive::InitialiseOffset(TCapsInfo& aCapsInfo)
 	{
 	__MSFNSLOG
-const TInt KPartitionInfoSize = TMsDataMemMap::KSectorSize;
+RBuf8 partitionInfo;
-	TBuf8<KPartitionInfoSize> partitionInfo;
+TInt r;
-	TInt r;
+TRAP(r, partitionInfo.CreateL(aCapsInfo.iBlockLength));
+if (r != KErrNone)
-	r = iUsbHostMsLun.Read(0 , KPartitionInfoSize, (TDes8 &) partitionInfo);
+{
+return r;
+}
+	r = iUsbHostMsLun.Read(0, aCapsInfo.iBlockLength, partitionInfo);
 	if (r != KErrNone)
 {
 		__PXYPRINT1(_L("!! Reading medium failed with %d !!"), r);
+partitionInfo.Close();
 		return r;
 }
 	TUint8 *iIntBuf = (TUint8 *) partitionInfo.Ptr();
 	// Read of the first sector successful so check for a Master Boot Record
 }
 TMBRPartitionEntry& partitionEntry = pe[partitionIndex];
 			iMsDataMemMap.InitDataArea(partitionEntry.iFirstSector,
-partitionEntry.iNumSectors);
+partitionEntry.iNumSectors,
+aCapsInfo.iBlockLength);
 			__PXYPRINT2(_L("paritioncount = %d defaultpartition = %d"),
 						partitionCount, partitionIndex);
-			__PXYPRINT2(_L("iFirstSector = x%x iNumSectors = x%x"),
+			__PXYPRINT3(_L("iFirstSector = x%x iNumSectors = x%x iSectorSize = x%x"),
 						partitionEntry.iFirstSector,
-						partitionEntry.iNumSectors);
+						partitionEntry.iNumSectors,
+aCapsInfo.iBlockLength);
 			}
 		else
 			{
 __PXYPRINT(_L("No partition found"));
-			iMsDataMemMap.InitDataArea(0, aCapsInfo.iNumberOfBlocks);
+			iMsDataMemMap.InitDataArea(0, aCapsInfo.iNumberOfBlocks, aCapsInfo.iBlockLength);
-			__PXYPRINT2(_L("iFirstSector = x%x iNumSectors = x%x"),
+			__PXYPRINT3(_L("iFirstSector = x%x iNumSectors = x%x iSectorSize = x%x"),
-						0, aCapsInfo.iNumberOfBlocks);
+						0,
+aCapsInfo.iNumberOfBlocks,
+aCapsInfo.iBlockLength);
 			}
 		}
+partitionInfo.Close();
 	return KErrNone;
 	}
 /**
 Initialise the proxy drive.
 __HOSTPRINT1(_L("<<< HOST Write ret=%d"), KErrNone);
 	return KErrNone;
 	}
 /**
 Write to the proxy drive and pass flags to driver
 @param aPos    The address from where the write begins.
 @param aLength The length of the write.
 	__MSFNSLOG
 __HOSTPRINT3(_L("\n>>> HOST Write Pos=0x%lx LBA=0x%lx 0x%x"),
 aPos, aPos/KBlockSize, aSrc.Length());
 	return iUsbHostMsLun.Write(iMsDataMemMap.GetDataPos(aPos), aSrc.Length(), aSrc);
 	}
 /**
 Get the proxy drive's capabilities information.
 @param anInfo A descriptor of the connected drives capabilities.
 if (capsInfo.iWriteProtect)
 {
 c.iMediaAtt |= KMediaAttWriteProtected;
 }
+static const TInt K512ByteSectorSize = 0x200; // 512
+if(K512ByteSectorSize != capsInfo.iBlockLength)
+	{
+	        c.iMediaAtt &= ~KMediaAttFormattable;
+	}
 __HOSTPRINT4(_L("<<< HOST Caps Block[num=0x%x size=0x%x] Media[size=0x%lx WP=0x%x]"),
 capsInfo.iNumberOfBlocks, capsInfo.iBlockLength,
 		            caps().iSize, caps().iMediaAtt);
 		}
-	else
+	else if (KErrNotReady)
 {
 __HOSTPRINT(_L("<<< HOST Caps Media Not Present"));
 		c.iType = EMediaNotPresent;
-		if(r != KErrNotReady)
+		r = KErrNone;
-			r = KErrUnknown;
+}
+else
+{
+__HOSTPRINT(_L("<<< HOST Caps Unknown Error"));
+c.iType = EMediaUnknown;
+		r = KErrUnknown;
 }
 	anInfo = caps.Left(Min(caps.Length(),anInfo.MaxLength()));
 	return r;
 	}
 /**
 Format the proxy drive. The drive is assumed to be a single partition. The
 partition size is equivalent to the size of the media.
 */
 TInt CUsbHostMsProxyDrive::Format(TFormatInfo& aInfo)
 	{
 	__MSFNSLOG
-const TInt KDefaultMaxBytesPerFormat = 0x100 * TMsDataMemMap::KSectorSize;  // 128K
+const TInt KDefaultMaxBytesPerFormat = 0x100 * iMsDataMemMap.BlockLength();  // 128K
 if (aInfo.i512ByteSectorsFormatted < 0)
 return KErrArgument;
 if (!aInfo.iFormatIsCurrent)
 			return r;
 iMsDataMemMap.InitDataArea(caps().iSize);
 }
-TInt64 pos = static_cast<TInt64>(aInfo.i512ByteSectorsFormatted) << TMsDataMemMap::KFormatSectorShift;
+TInt64 pos = static_cast<TInt64>(aInfo.i512ByteSectorsFormatted) << iMsDataMemMap.FormatSectorShift();
 TInt length = aInfo.iMaxBytesPerFormat;
 TInt r = Erase(pos, length);
 if (r == KErrNone)
 {
-length += TMsDataMemMap::KSectorSize - 1;
+length += iMsDataMemMap.BlockLength() - 1;
-length >>= TMsDataMemMap::KFormatSectorShift;
+length >>= iMsDataMemMap.FormatSectorShift();
 aInfo.i512ByteSectorsFormatted += length;
 }
 return r;
 }

changeset 119	6e99f362aa46
parent 33	0173bcd7697c
child 124	5802e2ce68ed