diff -r 56f325a607ea -r 0173bcd7697c userlibandfileserver/fileserver/shostmassstorage/msproxy/hostusbmsproxy.cpp --- a/userlibandfileserver/fileserver/shostmassstorage/msproxy/hostusbmsproxy.cpp Wed Dec 23 11:43:31 2009 +0000 +++ b/userlibandfileserver/fileserver/shostmassstorage/msproxy/hostusbmsproxy.cpp Thu Jan 07 13:38:45 2010 +0200 @@ -535,31 +535,32 @@ TLocalDriveCapsV6Buf caps; caps.FillZ(); - caps().iType = EMediaHardDisk; - caps().iBattery = EBatNotSupported; - caps().iDriveAtt = KDriveAttLocal | KDriveAttRemovable; - caps().iMediaAtt = KMediaAttFormattable; - caps().iFileSystemId = KDriveFileSysFAT; - caps().iExtraInfo = EFalse; + TLocalDriveCapsV6& c = caps(); + + c.iType = EMediaHardDisk; + c.iConnectionBusType = EConnectionBusUsb; + c.iDriveAtt = KDriveAttLocal | KDriveAttRemovable | KDriveAttExternal; + c.iMediaAtt = KMediaAttFormattable; + c.iFileSystemId = KDriveFileSysFAT; TCapsInfo capsInfo; TInt r = iUsbHostMsLun.Caps(capsInfo); if (KErrNone == r) { - caps().iBlockSize = capsInfo.iBlockLength; + c.iBlockSize = capsInfo.iBlockLength; TUint64 size = iMsDataMemMap.DataSize(); if (size == 0) { // No valid partitions so specify the size of the disk size = static_cast(capsInfo.iNumberOfBlocks) * capsInfo.iBlockLength; } - caps().iSize = size; + c.iSize = size; - caps().iEraseBlockSize = 0; + c.iEraseBlockSize = 0; if (capsInfo.iWriteProtect) { - caps().iMediaAtt |= KMediaAttWriteProtected; + c.iMediaAtt |= KMediaAttWriteProtected; } __HOSTPRINT4(_L("<<< HOST Caps Block[num=0x%x size=0x%x] Media[size=0x%lx WP=0x%x]"), capsInfo.iNumberOfBlocks, capsInfo.iBlockLength, @@ -568,7 +569,7 @@ else { __HOSTPRINT(_L("<<< HOST Caps Media Not Present")); - caps().iType = EMediaNotPresent; + c.iType = EMediaNotPresent; if(r != KErrNotReady) r = KErrUnknown; }