--- a/userlibandfileserver/fileserver/etshell/ts_com.cpp Fri Apr 23 22:38:37 2010 +0100
+++ b/userlibandfileserver/fileserver/etshell/ts_com.cpp Tue Apr 27 15:10:09 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 1996-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 1996-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"
@@ -978,7 +978,11 @@
default: aPrintBuf.Append(_L("??? Unknown Type")); break;
};
-
+ if (aDrvInfo.iConnectionBusType)
+ {
+ aPrintBuf.Append(_L(" USB"));
+ }
+
aPrintBuf.Append(_L("\n"));
}
--- a/userlibandfileserver/fileserver/group/release.txt Fri Apr 23 22:38:37 2010 +0100
+++ b/userlibandfileserver/fileserver/group/release.txt Tue Apr 27 15:10:09 2010 +0100
@@ -1,3 +1,11 @@
+Version 2.00.3035
+=================
+(Made by vfebvre 23/04/2010)
+
+1. niccox
+ 1. ou1cimx1#357492 Disconnecting memory card reader/writer from phone causes phone crash
+
+
Version 2.00.3034
=================
(Made by vfebvre 20/04/2010)
--- a/userlibandfileserver/fileserver/inc/f32ver.h Fri Apr 23 22:38:37 2010 +0100
+++ b/userlibandfileserver/fileserver/inc/f32ver.h Tue Apr 27 15:10:09 2010 +0100
@@ -58,6 +58,6 @@
@see TVersion
*/
-const TInt KF32BuildVersionNumber=3034;
+const TInt KF32BuildVersionNumber=3035;
//
#endif
--- a/userlibandfileserver/fileserver/shostmassstorage/msproxy/hostusbmsproxy.cpp Fri Apr 23 22:38:37 2010 +0100
+++ b/userlibandfileserver/fileserver/shostmassstorage/msproxy/hostusbmsproxy.cpp Tue Apr 27 15:10:09 2010 +0100
@@ -596,12 +596,18 @@
// do nothing
}
}
- else if (KErrNotReady)
+ else if (KErrNotReady == r)
{
__HOSTPRINT(_L("<<< HOST Caps Media Not Present"));
c.iType = EMediaNotPresent;
r = KErrNone;
}
+ else if (KErrGeneral == r)
+ {
+ RDebug::Print(_L("<<< HOST Caps Unable to communicate with media"));
+ c.iType = EMediaUnknown;
+ }
+
else
{
__HOSTPRINT(_L("<<< HOST Caps Unknown Error"));
--- a/userlibandfileserver/fileserver/shostmassstorage/server/controller/cusbhostmsdevice.cpp Fri Apr 23 22:38:37 2010 +0100
+++ b/userlibandfileserver/fileserver/shostmassstorage/server/controller/cusbhostmsdevice.cpp Tue Apr 27 15:10:09 2010 +0100
@@ -166,14 +166,14 @@
// interface suspension to the transport layer
for (TInt i = 0; i < iLuList.Count(); i++)
{
- CUsbHostMsLogicalUnit& lu = iLuList.GetLuL(i);
+ CUsbHostMsLogicalUnit& lu = iLuList.GetLu(i);
if (!lu.IsReadyToSuspend() && lu.IsConnected())
return;
}
for (TInt i = 0; i < iLuList.Count(); i++)
{
- CUsbHostMsLogicalUnit& lu = iLuList.GetLuL(i);
+ CUsbHostMsLogicalUnit& lu = iLuList.GetLu(i);
SetLunL(lu);
lu.SuspendL();
}
@@ -299,7 +299,7 @@
TInt err;
for (TInt i = 0; i < iLuList.Count(); i++)
{
- CUsbHostMsLogicalUnit& lu = iLuList.GetLuL(i);
+ CUsbHostMsLogicalUnit& lu = iLuList.GetLu(i);
SetLunL(lu);
TRAP(err, lu.DoLunReadyCheckL());
}
@@ -315,7 +315,7 @@
// interface suspension to the transport layer
for (TInt i = 0; i < iLuList.Count(); i++)
{
- CUsbHostMsLogicalUnit& lu = iLuList.GetLuL(i);
+ CUsbHostMsLogicalUnit& lu = iLuList.GetLu(i);
// Has any of the logical units have got its state changed?
if ( (lu.IsReadyToSuspend() && !lu.IsConnected()) ||
(!lu.IsReadyToSuspend() && lu.IsConnected()) )
@@ -327,7 +327,7 @@
for (TInt i = 0; i < iLuList.Count(); i++)
{
- CUsbHostMsLogicalUnit& lu = iLuList.GetLuL(i);
+ CUsbHostMsLogicalUnit& lu = iLuList.GetLu(i);
SetLunL(lu);
lu.SuspendL();
}
@@ -341,7 +341,7 @@
__MSFNLOG
for (TInt i = 0; i < iLuList.Count(); i++)
{
- CUsbHostMsLogicalUnit& lu = iLuList.GetLuL(i);
+ CUsbHostMsLogicalUnit& lu = iLuList.GetLu(i);
SetLunL(lu);
lu.ResumeL();
}
--- a/userlibandfileserver/fileserver/shostmassstorage/server/controller/include/tlogicalunitlist.h Fri Apr 23 22:38:37 2010 +0100
+++ b/userlibandfileserver/fileserver/shostmassstorage/server/controller/include/tlogicalunitlist.h Tue Apr 27 15:10:09 2010 +0100
@@ -1,4 +1,4 @@
-// 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"
@@ -29,9 +29,10 @@
void RemoveLuL(TLun aLun);
void RemoveAllLuL();
CUsbHostMsLogicalUnit& GetLuL(TLun aLun) const;
- TInt FindLu(TLun aLun) const;
+ CUsbHostMsLogicalUnit& GetLu(TInt aIndex) const;
TInt Count() const;
private:
+ TInt FindLu(TLun aLun) const;
RPointerArray<CUsbHostMsLogicalUnit> iLu;
};
--- a/userlibandfileserver/fileserver/shostmassstorage/server/controller/tlogicalunitlist.cpp Fri Apr 23 22:38:37 2010 +0100
+++ b/userlibandfileserver/fileserver/shostmassstorage/server/controller/tlogicalunitlist.cpp Tue Apr 27 15:10:09 2010 +0100
@@ -1,4 +1,4 @@
-// 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"
@@ -124,3 +124,10 @@
User::LeaveIfError(index);
return *iLu[index];
}
+
+
+CUsbHostMsLogicalUnit& TLogicalUnitList::GetLu(TInt aIndex) const
+ {
+ __MSFNSLOG
+ return *iLu[aIndex];
+ }
--- a/userlibandfileserver/fileserver/shostmassstorage/server/protocol/cscsiprotocol.cpp Fri Apr 23 22:38:37 2010 +0100
+++ b/userlibandfileserver/fileserver/shostmassstorage/server/protocol/cscsiprotocol.cpp Tue Apr 27 15:10:09 2010 +0100
@@ -264,7 +264,8 @@
__MSFNLOG
if (!IsConnected())
{
- DoScsiReadyCheckEventL();
+ if (!DoScsiReadyCheckEventL())
+ return;
}
if (!iSbcInterface)
@@ -800,7 +801,7 @@
}
-void CScsiProtocol::DoScsiReadyCheckEventL()
+TBool CScsiProtocol::DoScsiReadyCheckEventL()
{
__MSFNLOG
TInt err = KErrNone;
@@ -833,6 +834,7 @@
iMediaChangeNotifier.DoNotifyL();
}
}
+ return err = KErrNone ? ETrue : EFalse;
}
--- a/userlibandfileserver/fileserver/shostmassstorage/server/protocol/include/cscsiprotocol.h Fri Apr 23 22:38:37 2010 +0100
+++ b/userlibandfileserver/fileserver/shostmassstorage/server/protocol/include/cscsiprotocol.h Tue Apr 27 15:10:09 2010 +0100
@@ -1,4 +1,4 @@
-// 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"
@@ -36,7 +36,7 @@
void DoCancelL();
private:
- void CompleteNotifierL(TInt);
+ void CompleteNotifierL(TInt aReason);
private:
/** Notification service */
@@ -55,6 +55,8 @@
/** SCSI state */
enum TScsiState
{
+ EEntry,
+ EMediaNotPresent,
EConnected,
EDisconnected
};
@@ -83,13 +85,13 @@
// unit testing
void CreateSbcInterfaceL(TUint32 aBlockLen, TUint32 aLastLba);
- void DoScsiReadyCheckEventL();
+ TBool DoScsiReadyCheckEventL();
void NotifyChange(const RMessage2& aMessage);
void ForceCompleteNotifyChangeL();
void CancelChangeNotifierL();
- void CompleteNotifyChangeL();
- void SuspendL();
+
+ void SuspendL();
void ResumeL();
TBool IsConnected();
@@ -116,7 +118,7 @@
private:
void ResetSbc();
- void DoCheckConditionL();
+ TInt DoCheckConditionL();
TInt GetSystemWideSenseError(const TSenseInfo& aSenseInfo);
TInt ProcessAsCodes(const TSenseInfo& aSenseInfo);
--- a/userlibandfileserver/fileserver/shostmassstorage/server/protocol/include/mprotocol.h Fri Apr 23 22:38:37 2010 +0100
+++ b/userlibandfileserver/fileserver/shostmassstorage/server/protocol/include/mprotocol.h Tue Apr 27 15:10:09 2010 +0100
@@ -1,4 +1,4 @@
-// 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"
@@ -66,7 +66,7 @@
/** unit testing */
virtual void CreateSbcInterfaceL(TUint32 aBlockLen, TUint32 aLastLba) = 0;
- virtual void DoScsiReadyCheckEventL() = 0;
+ virtual TBool DoScsiReadyCheckEventL() = 0;
/**
Media change notification