userlibandfileserver/fileserver/sfile/sf_fmt.cpp
branchRCL_3
changeset 257 3e88ff8f41d5
parent 256 c1f20ce4abcf
equal deleted inserted replaced
256:c1f20ce4abcf 257:3e88ff8f41d5
    14 // f32\sfile\sf_fmt.cpp
    14 // f32\sfile\sf_fmt.cpp
    15 // 
    15 // 
    16 //
    16 //
    17 
    17 
    18 #include "sf_std.h"
    18 #include "sf_std.h"
    19 
       
    20 #ifdef OST_TRACE_COMPILER_IN_USE
       
    21 #include "sf_fmtTraces.h"
       
    22 #endif
       
    23 
    19 
    24 LOCAL_C CFormatCB* GetFormatFromHandle(TInt aHandle,CSessionFs* aSession)
    20 LOCAL_C CFormatCB* GetFormatFromHandle(TInt aHandle,CSessionFs* aSession)
    25 //
    21 //
    26 // Get the format control block from aHandle
    22 // Get the format control block from aHandle
    27 //
    23 //
   468         }
   464         }
   469 
   465 
   470 	TPtr8 pStep((TUint8*)&format->CurrentStep(),sizeof(TInt));
   466 	TPtr8 pStep((TUint8*)&format->CurrentStep(),sizeof(TInt));
   471 	aRequest->ReadL(KMsgPtr0,pStep);
   467 	aRequest->ReadL(KMsgPtr0,pStep);
   472 
   468 
   473 	OstTrace1(TRACE_FILESYSTEM, FSYS_ECFORMATCBDOFORMATSTEPL, "this %x", format);
   469 	TRACE1(UTF::EBorder, UTraceModuleFileSys::ECFormatCBDoFormatStepL, EF32TraceUidFileSys, format);
   474 
       
   475 	TRAP(r,format->DoFormatStepL());
   470 	TRAP(r,format->DoFormatStepL());
   476 
   471 	TRACERET2(UTF::EBorder, UTraceModuleFileSys::ECFormatCBDoFormatStepLRet, EF32TraceUidFileSys, r, format->CurrentStep());
   477 	OstTraceExt2(TRACE_FILESYSTEM, FSYS_ECFORMATCBDOFORMATSTEPLRET, "r %d  iCurrentStep %d", r, (TUint) format->CurrentStep());
       
   478 
   472 
   479 	if (r==KErrNone)
   473 	if (r==KErrNone)
   480 		aRequest->WriteL(KMsgPtr0,pStep);
   474 		aRequest->WriteL(KMsgPtr0,pStep);
   481 	if (r==KErrNone && format->CurrentStep()==0)
   475 	if (r==KErrNone && format->CurrentStep()==0)
   482 		{
   476 		{