diff -r 0ff03867bdb6 -r 39b39e1a406e userlibandfileserver/fileserver/sfile/sf_fmt.cpp --- a/userlibandfileserver/fileserver/sfile/sf_fmt.cpp Wed Jul 21 14:46:58 2010 +0100 +++ b/userlibandfileserver/fileserver/sfile/sf_fmt.cpp Thu Jul 22 16:46:39 2010 +0100 @@ -17,6 +17,10 @@ #include "sf_std.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "sf_fmtTraces.h" +#endif + LOCAL_C CFormatCB* GetFormatFromHandle(TInt aHandle,CSessionFs* aSession) // // Get the format control block from aHandle @@ -466,9 +470,11 @@ TPtr8 pStep((TUint8*)&format->CurrentStep(),sizeof(TInt)); aRequest->ReadL(KMsgPtr0,pStep); - TRACE1(UTF::EBorder, UTraceModuleFileSys::ECFormatCBDoFormatStepL, EF32TraceUidFileSys, format); + OstTrace1(TRACE_FILESYSTEM, FSYS_ECFORMATCBDOFORMATSTEPL, "this %x", format); + TRAP(r,format->DoFormatStepL()); - TRACERET2(UTF::EBorder, UTraceModuleFileSys::ECFormatCBDoFormatStepLRet, EF32TraceUidFileSys, r, format->CurrentStep()); + + OstTraceExt2(TRACE_FILESYSTEM, FSYS_ECFORMATCBDOFORMATSTEPLRET, "r %d iCurrentStep %d", r, (TUint) format->CurrentStep()); if (r==KErrNone) aRequest->WriteL(KMsgPtr0,pStep);