# HG changeset patch
# User hgs
# Date 1274722735 -3600
# Node ID 95847726fe57fb5f4ebccab50cbd007daffed66e
# Parent  2a0ada0a1bf865b15d483159a7fd851c00bc9746
201019_07

diff -r 2a0ada0a1bf8 -r 95847726fe57 bsptemplate/asspandvariant/template_assp/pa_usbc.cpp
--- a/bsptemplate/asspandvariant/template_assp/pa_usbc.cpp	Wed May 12 10:34:10 2010 +0100
+++ b/bsptemplate/asspandvariant/template_assp/pa_usbc.cpp	Mon May 24 18:38:55 2010 +0100
@@ -1904,7 +1904,7 @@
 #ifdef _DEBUG
 	_LIT(KIns, "inserted");
 	_LIT(KRem, "removed");
-	__KTRACE_OPT(KUSB, Kern::Printf(" > USB cable now %lS", ptr->iCableConnected ? &KIns : &KRem));
+	__KTRACE_OPT(KUSB, Kern::Printf(" > USB cable now %S", ptr->iCableConnected ? &KIns : &KRem));
 #endif
 	if (ptr->iCableConnected)
 		{
diff -r 2a0ada0a1bf8 -r 95847726fe57 kernel/eka/drivers/locmedia/locmedia.cpp
--- a/kernel/eka/drivers/locmedia/locmedia.cpp	Wed May 12 10:34:10 2010 +0100
+++ b/kernel/eka/drivers/locmedia/locmedia.cpp	Mon May 24 18:38:55 2010 +0100
@@ -2878,9 +2878,10 @@
 			}
 		else
 #endif
-
-		CompleteRequest(m, s);
-		OstTraceDefExt3( OST_TRACE_CATEGORY_RND, TRACE_INTERNALS, DPRIMARYMEDIABASE_DOREQUEST_RETURN, "Return req Id=%d; Remote Thread=0x%x; retval=%d", (TInt) m.Id(), (TUint) m.RemoteThread(), (TInt) s);
+			{
+			CompleteRequest(m, s);
+			OstTraceDefExt2( OST_TRACE_CATEGORY_RND, TRACE_INTERNALS, DPRIMARYMEDIABASE_DOREQUEST_RETURN, "Return Remote Thread=0x%x; retval=%d", (TUint) m.RemoteThread(), (TInt) s);
+			}
 		}
 
 	iCurrentReq=NULL;
@@ -4956,7 +4957,7 @@
 	{
 	OstTraceFunctionEntry0( LOCDRV_REGISTERMEDIADEVICE_ENTRY );
 	// Create TLocDrv / DMedia objects to handle a media device
-	__KTRACE_OPT(KBOOT,Kern::Printf("RegisterMediaDevice %lS dev=%1d #drives=%d 1st=%d PM=%08x #media=%d",&aName,aDevice,aDriveCount,*aDriveList,aPrimaryMedia,aNumMedia));
+	__KTRACE_OPT(KBOOT,Kern::Printf("RegisterMediaDevice %S dev=%1d #drives=%d 1st=%d PM=%08x #media=%d",&aName,aDevice,aDriveCount,*aDriveList,aPrimaryMedia,aNumMedia));
 	OstTraceExt5( TRACE_INTERNALS, LOCDRV_REGISTERMEDIADEVICE1, "aDevice=%d; aDriveCount=%d; aDriveList=%d; aPrimaryMedia=0x%08x; aNumMedia=%d", (TInt) aDevice, (TInt) aDriveCount, (TInt) *aDriveList, (TUint) aPrimaryMedia, (TInt) aNumMedia );
 
 	if (UsedMedia+aNumMedia>KMaxLocalDrives)
@@ -5331,7 +5332,7 @@
 			drive = TheDrives[i];
 			if(drive && drive->iPrimaryMedia == aPrimaryMedia)
 				{
-				__KTRACE_OPT2(KBOOT,KLOCDPAGING, Kern::Printf("RegisterPagingDevice: local drive %d, partition type %x base %lx size %lx name %lS", i, drive->iPartitionType, drive->iPartitionBaseAddr, drive->iPartitionLen, DriveNames[i] ? DriveNames[i] : &KNullDesC8));
+				__KTRACE_OPT2(KBOOT,KLOCDPAGING, Kern::Printf("RegisterPagingDevice: local drive %d, partition type %x base %lx size %lx name %S", i, drive->iPartitionType, drive->iPartitionBaseAddr, drive->iPartitionLen, DriveNames[i] ? DriveNames[i] : &KNullDesC8));
 				// ROM partition ?
 				if ((romPagingDriveNumber == KErrNotFound) && 
 					(drive->iPartitionType == KPartitionTypeROM) &&
@@ -5388,7 +5389,7 @@
 
 #ifdef __DEBUG_DEMAND_PAGING__
 	Kern::Printf("PagingDevice :");
-	Kern::Printf("Name %lS", firstLocalDriveNumber >= 0 && DriveNames[firstLocalDriveNumber] ? DriveNames[firstLocalDriveNumber] : &KNullDesC8);
+	Kern::Printf("Name %S", firstLocalDriveNumber >= 0 && DriveNames[firstLocalDriveNumber] ? DriveNames[firstLocalDriveNumber] : &KNullDesC8);
 	Kern::Printf("iType 0x%x", pagingDevice->iType);
 	Kern::Printf("iReadUnitShift 0x%x", pagingDevice->iReadUnitShift);
 	Kern::Printf("iFirstLocalDriveNumber 0x%x", pagingDevice->iFirstLocalDriveNumber);
@@ -5612,7 +5613,7 @@
 				if (!(sock_mask & (1<<sockNum)))
 					{
 					info.iSocketName[sockNum]=*DriveNames[i];
-					__KTRACE_OPT(KLOCDRV,Kern::Printf("Socket %d device %d name %lS", sockNum, pM->iDevice, DriveNames[i]));
+					__KTRACE_OPT(KLOCDRV,Kern::Printf("Socket %d device %d name %S", sockNum, pM->iDevice, DriveNames[i]));
 					OstTraceExt2( TRACE_INTERNALS, GETDRIVEINFO1, "Socket=%d; device=%d", sockNum, (TUint) pM->iDevice );
 					if ( (sockNum + 1) > sockets )
 						sockets = sockNum + 1;
@@ -5620,7 +5621,7 @@
 				sock_mask |= (1<<sockNum);
 				}
 			info.iDriveName[i]=*DriveNames[i];
-			__KTRACE_OPT(KLOCDRV,Kern::Printf("Drive %d device %d name %lS",i,pM->iDevice,DriveNames[i]));
+			__KTRACE_OPT(KLOCDRV,Kern::Printf("Drive %d device %d name %S",i,pM->iDevice,DriveNames[i]));
 			OstTraceExt2( TRACE_INTERNALS, GETDRIVEINFO2, "Drive=%d; device=%d", i, (TUint) pM->iDevice );
 			
 			info.iRegisteredDriveBitmask |= (0x01 << i);
diff -r 2a0ada0a1bf8 -r 95847726fe57 kernel/eka/drivers/pbus/mmc/stack.cpp
--- a/kernel/eka/drivers/pbus/mmc/stack.cpp	Wed May 12 10:34:10 2010 +0100
+++ b/kernel/eka/drivers/pbus/mmc/stack.cpp	Mon May 24 18:38:55 2010 +0100
@@ -6408,6 +6408,9 @@
 			{
 			EStBegin=0,
 			EStNextIndex,
+			EStSendStatus,
+			EStGetStatus,
+			EStUnlock,
 			EStInitStackAfterUnlock,
 			EStIssuedLockUnlock,
 			EStDone,
@@ -6470,6 +6473,25 @@
 		//
 		// Upon completion, test the next card before performing further initialisation.
 		//
+		
+		SMF_STATE(EStSendStatus)
+		        
+		s.FillCommandDesc(ECmdSendStatus, 0);
+		                        
+		SMF_INVOKES(ExecCommandSMST,EStGetStatus)
+		                        
+		SMF_STATE(EStGetStatus)
+		                        
+		const TMMCStatus st = s.LastStatus();
+		if((st & KMMCStatCardIsLocked) == 0)
+			{
+		    SMF_RETURN(err)
+		    }
+		                        
+		SMF_STATE(EStUnlock)
+		                        
+		const TMapping *mp = NULL;
+		mp = iSocket->iPasswordStore->FindMappingInStore(iCardArray->CardP(iAutoUnlockIndex)->CID());
 
 		TMMCard &cd = *(iCardArray->CardP(iAutoUnlockIndex++));
 		OstTrace1( TRACE_INTERNALS, DMMCSTACK_CIMAUTOUNLOCKSM4, "Attempting to unlock card %d", cd.Number() );
diff -r 2a0ada0a1bf8 -r 95847726fe57 kernel/eka/drivers/pbus/pccard/epoc/pccd_init.cpp
--- a/kernel/eka/drivers/pbus/pccard/epoc/pccd_init.cpp	Wed May 12 10:34:10 2010 +0100
+++ b/kernel/eka/drivers/pbus/pccard/epoc/pccd_init.cpp	Mon May 24 18:38:55 2010 +0100
@@ -122,7 +122,7 @@
 			if (!pM)
 				return KErrNoMemory;
 			r=LocDrv::RegisterMediaDevice(mdi.iDevice,mdi.iDriveCount,mdi.iDriveList,pM,mdi.iNumMedia,*mdi.iDeviceName);
-			__KTRACE_OPT(KPBUS1,Kern::Printf("Registering PcCard device %lS (socket %d) for %d drives returns %d",mdi.iDeviceName,pM->iSocket->iSocketNumber,mdi.iDriveCount,r));
+			__KTRACE_OPT(KPBUS1,Kern::Printf("Registering PcCard device %S (socket %d) for %d drives returns %d",mdi.iDeviceName,pM->iSocket->iSocketNumber,mdi.iDriveCount,r));
 			if (r!=KErrNone)
 				return r;
 			}
diff -r 2a0ada0a1bf8 -r 95847726fe57 kernel/eka/drivers/pbus/pccard/socket.cpp
--- a/kernel/eka/drivers/pbus/pccard/socket.cpp	Wed May 12 10:34:10 2010 +0100
+++ b/kernel/eka/drivers/pbus/pccard/socket.cpp	Mon May 24 18:38:55 2010 +0100
@@ -141,7 +141,7 @@
 //
 	{
 
-	__KTRACE_OPT(KPBUS1,Kern::Printf(">Skt(%d):Create(%lS)",iSocketNumber,aName));
+	__KTRACE_OPT(KPBUS1,Kern::Printf(">Skt(%d):Create(%S)",iSocketNumber,aName));
 
 	TInt r=DPBusSocket::Create(aName);
 	if (r!=KErrNone)
diff -r 2a0ada0a1bf8 -r 95847726fe57 kernel/eka/drivers/pbus/spbus.cpp
--- a/kernel/eka/drivers/pbus/spbus.cpp	Wed May 12 10:34:10 2010 +0100
+++ b/kernel/eka/drivers/pbus/spbus.cpp	Mon May 24 18:38:55 2010 +0100
@@ -683,7 +683,7 @@
 TInt DPBusSocket::Create(const TDesC* aName)
 	{
 	OstTraceFunctionEntry1( DPBUSSOCKET_CREATE_ENTRY, this );
-	__KTRACE_OPT(KPBUS1,Kern::Printf(">DPBusSocket(%d)::Create %lS",iSocketNumber,aName));
+	__KTRACE_OPT(KPBUS1,Kern::Printf(">DPBusSocket(%d)::Create %S",iSocketNumber,aName));
 	OstTrace1(TRACE_INTERNALS, DPBUSSOCKET_CREATE, "iSocketNumber=%d",iSocketNumber);
 	iName=aName;
 	DPBusPowerHandler* pH=new DPBusPowerHandler(this);
diff -r 2a0ada0a1bf8 -r 95847726fe57 kernel/eka/include/d32comm.h
--- a/kernel/eka/include/d32comm.h	Wed May 12 10:34:10 2010 +0100
+++ b/kernel/eka/include/d32comm.h	Mon May 24 18:38:55 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 1995-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 1995-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"
@@ -30,64 +30,6 @@
 #include <d32public.h>
 
 /**
- Enumeration of number of data bits for serial port configuration.
- Typically, these values are used to initialize the iDataBits of 
- TCommConfigV01 before calling DComm::Configure() or any other serial
- comm API to configure the serial port's databits size.
- */
-enum TDataBits {EData5,EData6,EData7,EData8};
-/**
- Enumeration of number of stop bits for serial port configuration.
- Typically, these values are used to initialize the iStopBits of 
- TCommConfigV01 before calling DComm::Configure() or any other serial
- comm API to configure the serial port's stopbits.
- */
-enum TStopBits {EStop1,EStop2};
-/**
- Enumeration of types of parity for serial port configuration.
- Typically, these values are used to initialize the iParity of 
- TCommConfigV01 before calling DComm::Configure() or any other serial
- comm API to configure the serial port's parity setting.
- */
-enum TParity {EParityNone,EParityEven,EParityOdd,EParityMark,EParitySpace};
-/**
- Enumeration of baud rates in bits per second for serial port configuration.
- * e.g EBps115200 is for 115200Bps data rate  
- Typically, these values are used to initialize the iRate of TCommConfigV01 
- before calling DComm::Configure() or any other serial comm API to configure
- the serial port's baud rate.
- */
-enum TBps
-	{
-	EBps50,
-	EBps75,
-	EBps110,
-	EBps134,
-	EBps150,
-	EBps300,
-	EBps600,
-	EBps1200,
-	EBps1800,
-	EBps2000,
-	EBps2400,
-	EBps3600,
-	EBps4800,
-	EBps7200,
-	EBps9600,
-	EBps19200,
-	EBps38400,
-	EBps57600,
-	EBps115200,
-	EBps230400,
-	EBps460800,
-	EBps576000,
-	EBps1152000,
-	EBps4000000,
-	EBps921600,
-	EBpsAutobaud=0x40000000,
-	EBpsSpecial=0x80000000,
-	};
-/**
  Enumeration of Fifo status (enable and disable) for serial port configuration.
  Typically, these values are used to initialize the iFifo of TCommConfigV01 
  before calling DComm::Configure() or any other serial comm API to configure
diff -r 2a0ada0a1bf8 -r 95847726fe57 kernel/eka/include/d32public.h
--- a/kernel/eka/include/d32public.h	Wed May 12 10:34:10 2010 +0100
+++ b/kernel/eka/include/d32public.h	Mon May 24 18:38:55 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 1995-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 1995-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"
@@ -26,6 +26,67 @@
 #ifndef __D32PUBLIC_H__
 #define __D32PUBLIC_H__
 
+/**
+ Enumeration of number of data bits for serial port configuration.
+ Typically, these values are used to initialize the iDataBits of 
+ TCommConfigV01 before calling DComm::Configure() or any other serial
+ comm API to configure the serial port's databits size.
+ */
+enum TDataBits {EData5,EData6,EData7,EData8};
+
+/**
+ Enumeration of number of stop bits for serial port configuration.
+ Typically, these values are used to initialize the iStopBits of 
+ TCommConfigV01 before calling DComm::Configure() or any other serial
+ comm API to configure the serial port's stopbits.
+ */
+enum TStopBits {EStop1,EStop2};
+
+/**
+ Enumeration of types of parity for serial port configuration.
+ Typically, these values are used to initialize the iParity of 
+ TCommConfigV01 before calling DComm::Configure() or any other serial
+ comm API to configure the serial port's parity setting.
+ */
+enum TParity {EParityNone,EParityEven,EParityOdd,EParityMark,EParitySpace};
+
+/**
+ Enumeration of baud rates in bits per second for serial port configuration.
+ * e.g EBps115200 is for 115200Bps data rate  
+ Typically, these values are used to initialize the iRate of TCommConfigV01 
+ before calling DComm::Configure() or any other serial comm API to configure
+ the serial port's baud rate.
+ */
+enum TBps
+	{
+	EBps50,
+	EBps75,
+	EBps110,
+	EBps134,
+	EBps150,
+	EBps300,
+	EBps600,
+	EBps1200,
+	EBps1800,
+	EBps2000,
+	EBps2400,
+	EBps3600,
+	EBps4800,
+	EBps7200,
+	EBps9600,
+	EBps19200,
+	EBps38400,
+	EBps57600,
+	EBps115200,
+	EBps230400,
+	EBps460800,
+	EBps576000,
+	EBps1152000,
+	EBps4000000,
+	EBps921600,
+	EBpsAutobaud=0x40000000,
+	EBpsSpecial=0x80000000,
+	};
 
 enum TFlowControl
 	{
diff -r 2a0ada0a1bf8 -r 95847726fe57 kernel/eka/include/e32ver.h
--- a/kernel/eka/include/e32ver.h	Wed May 12 10:34:10 2010 +0100
+++ b/kernel/eka/include/e32ver.h	Mon May 24 18:38:55 2010 +0100
@@ -28,7 +28,7 @@
 
 const TInt KE32MajorVersionNumber=2;
 const TInt KE32MinorVersionNumber=0;
-const TInt KE32BuildVersionNumber=3081;
+const TInt KE32BuildVersionNumber=3083;
 
 const TInt KMachineConfigurationMajorVersionNumber=1;
 const TInt KMachineConfigurationMinorVersionNumber=0;
diff -r 2a0ada0a1bf8 -r 95847726fe57 kernel/eka/kernel/device.cpp
--- a/kernel/eka/kernel/device.cpp	Wed May 12 10:34:10 2010 +0100
+++ b/kernel/eka/kernel/device.cpp	Mon May 24 18:38:55 2010 +0100
@@ -629,9 +629,9 @@
 			r=pdev.FindByFullName(h,n,fn);
 			if (r!=KErrNone)
 				break;
-			__KTRACE_OPT(KDEVICE,Kern::Printf("Found PDD %lS",&fn));
+			__KTRACE_OPT(KDEVICE,Kern::Printf("Found PDD %S",&fn));
 			pP=(DPhysicalDevice *)pdev.At(h);
-			__KTRACE_OPT(KDEVICE,{TBuf<16> verBuf(iVersion.Name()); Kern::Printf("unit=%d, info=%08x, ver=%lS",aInfo.iUnit,aInfo.iInfo,&verBuf);});
+			__KTRACE_OPT(KDEVICE,{TBuf<16> verBuf(iVersion.Name()); Kern::Printf("unit=%d, info=%08x, ver=%S",aInfo.iUnit,aInfo.iInfo,&verBuf);});
 			r=pP->Validate(aInfo.iUnit,aInfo.iInfo,iVersion);
 			__KTRACE_OPT(KDEVICE,Kern::Printf("DPhysicalDevice::Validate returns %d",r));
 			if (r!=KErrNotSupported)
@@ -692,7 +692,7 @@
 		info.iPhysicalDevice=&pddName;
 		}
 
-	__KTRACE_OPT(KDEVICE,Kern::Printf("Exec::ChannelCreate LDD %lS PDD %lS Unit %d",&lddName,info.iPhysicalDevice,info.iUnit));
+	__KTRACE_OPT(KDEVICE,Kern::Printf("Exec::ChannelCreate LDD %S PDD %S Unit %d",&lddName,info.iPhysicalDevice,info.iUnit));
 
 	TInt r=Kern::ValidateName(lddName);
 	if (r<0)
diff -r 2a0ada0a1bf8 -r 95847726fe57 kernel/eka/kernel/object.cpp
--- a/kernel/eka/kernel/object.cpp	Wed May 12 10:34:10 2010 +0100
+++ b/kernel/eka/kernel/object.cpp	Mon May 24 18:38:55 2010 +0100
@@ -441,7 +441,7 @@
 EXPORT_C TInt DObject::SetName(const TDesC* aName)
 	{
 	CHECK_PRECONDITIONS(MASK_THREAD_CRITICAL,"DObject::SetName");		
-	__KTRACE_OPT(KOBJECT,Kern::Printf("SetName %O (%lS)",this,aName));
+	__KTRACE_OPT(KOBJECT,Kern::Printf("SetName %O (%S)",this,aName));
 	TAny* pN=NULL;
 	if (aName)
 		{
@@ -456,7 +456,7 @@
 	pN = __e32_atomic_swp_ord_ptr(&iName, pN);
 	if (iName)
 		{
-		__KTRACE_OPT(KOBJECT,Kern::Printf("Name is now %lS",iName));
+		__KTRACE_OPT(KOBJECT,Kern::Printf("Name is now %S",iName));
 		}
 	else
 		{
@@ -1164,7 +1164,7 @@
 			__KTRACE_OPT(KOBJECT,Kern::Printf("Container %d created OK",pC->UniqueID()));
 			return pC;
 			}
-		__KTRACE_OPT(KOBJECT,Kern::Printf("Error %d creating mutex %lS",r,&n));
+		__KTRACE_OPT(KOBJECT,Kern::Printf("Error %d creating mutex %S",r,&n));
 		}
 	return NULL;
 	}
diff -r 2a0ada0a1bf8 -r 95847726fe57 kernel/eka/kernel/power.cpp
--- a/kernel/eka/kernel/power.cpp	Wed May 12 10:34:10 2010 +0100
+++ b/kernel/eka/kernel/power.cpp	Mon May 24 18:38:55 2010 +0100
@@ -194,7 +194,7 @@
 // Called in CS
 void DPowerManager::AppendHandler(DPowerHandler* aPh)
 	{ // called by drivers (power handler)
-	__KTRACE_OPT(KPOWER,Kern::Printf("PowerManger::AppendHandler('%lS')", &aPh->iName));
+	__KTRACE_OPT(KPOWER,Kern::Printf("PowerManger::AppendHandler('%S')", &aPh->iName));
 	__ASSERT_CRITICAL;
 	//Check to ensure that handler is not added multiple times and not part of any other list
 	__PM_ASSERT(!(aPh->iPrev) && !(aPh->iNext));
@@ -220,7 +220,7 @@
 // Called in CS
 void DPowerManager::RemoveHandler(DPowerHandler* aPh)
 	{ // called by drivers (power handler)
-	__KTRACE_OPT(KPOWER,Kern::Printf("PowerManger::RemoveHandler('%lS')", &aPh->iName));
+	__KTRACE_OPT(KPOWER,Kern::Printf("PowerManger::RemoveHandler('%S')", &aPh->iName));
 	__ASSERT_CRITICAL;
 	Lock();
 	__PM_ASSERT(aPh);
@@ -529,7 +529,7 @@
 	iStatus |= EDone;
 #endif
 	NKern::Lock();
-	__KTRACE_OPT(KPOWER,Kern::Printf("DPowerHandler::Done('%lS') sem=0x%x", &iName, iSem));
+	__KTRACE_OPT(KPOWER,Kern::Printf("DPowerHandler::Done('%S') sem=0x%x", &iName, iSem));
 	NFastSemaphore* sem = (NFastSemaphore*)__e32_atomic_swp_ord_ptr(&iSem, 0);
 	if (sem)
 		sem->Signal();
diff -r 2a0ada0a1bf8 -r 95847726fe57 kernel/eka/kernel/scodeseg.cpp
--- a/kernel/eka/kernel/scodeseg.cpp	Wed May 12 10:34:10 2010 +0100
+++ b/kernel/eka/kernel/scodeseg.cpp	Mon May 24 18:38:55 2010 +0100
@@ -671,7 +671,7 @@
 	const TInt KValidAttrMask =
 		ECodeSegAttKernel | ECodeSegAttGlobal | ECodeSegAttFixed | ECodeSegAttABIMask | ECodeSegAttHDll | ECodeSegAttExpVer | ECodeSegAttNmdExpData | ECodeSegAttSMPSafe;
 	
-	__KTRACE_OPT(KDLL,Kern::Printf("DCodeSeg::Create %08x file %lS ver %08x process %O",this,&aInfo.iFileName,aInfo.iModuleVersion,aProcess));
+	__KTRACE_OPT(KDLL,Kern::Printf("DCodeSeg::Create %08x file %S ver %08x process %O",this,&aInfo.iFileName,aInfo.iModuleVersion,aProcess));
 	TInt32 uid1=aInfo.iUids.iUid[0].iUid;
 	if (uid1!=KDynamicLibraryUidValue && uid1!=KExecutableImageUidValue)
 		return KErrNotSupported;
@@ -1420,7 +1420,7 @@
 	{
 	TCodeSegCreateInfo info;
 	kumemget32(&info, &aInfo, sizeof(info));
-	__KTRACE_OPT2(KEXEC,KDLL,Kern::Printf("Exec::CodeSegCreate %lS ver %08x", &info.iFileName, info.iModuleVersion));
+	__KTRACE_OPT2(KEXEC,KDLL,Kern::Printf("Exec::CodeSegCreate %S ver %08x", &info.iFileName, info.iModuleVersion));
 	__KTRACE_OPT(KDLL,DumpCodeSegCreateInfo(info));
 	K::CheckFileServerAccess();			// only F32 can use this exec function
 	info.iHandle=NULL;
@@ -1448,7 +1448,7 @@
 	{
 	TCodeSegCreateInfo info;
 	kumemget32(&info, &aInfo, sizeof(info));
-	__KTRACE_OPT2(KEXEC,KDLL,Kern::Printf("Exec::CodeSegLoaded %lS ver %08x", &info.iFileName, info.iModuleVersion));
+	__KTRACE_OPT2(KEXEC,KDLL,Kern::Printf("Exec::CodeSegLoaded %S ver %08x", &info.iFileName, info.iModuleVersion));
 	__KTRACE_OPT(KDLL,DumpCodeSegCreateInfo(info));
 	DCodeSeg* pS=DCodeSeg::VerifyCallerAndHandle(info.iHandle);
 	Kern::AccessCode();
@@ -1667,7 +1667,7 @@
 	{
 	TProcessCreateInfo info;
 	kumemget32(&info, &aInfo, sizeof(info));
-	__KTRACE_OPT2(KEXEC,KDLL,Kern::Printf("Exec::ProcessCreate %lS ver %08x", &info.iFileName, info.iModuleVersion));
+	__KTRACE_OPT2(KEXEC,KDLL,Kern::Printf("Exec::ProcessCreate %S ver %08x", &info.iFileName, info.iModuleVersion));
 	__KTRACE_OPT(KDLL,DumpProcessCreateInfo(info));
 	K::CheckFileServerAccess();			// only F32 can use this exec function
 	if (info.iHandle)
@@ -1794,7 +1794,7 @@
 	{
 	TProcessCreateInfo info;
 	kumemget32(&info, &aInfo, sizeof(info));
-	__KTRACE_OPT2(KEXEC,KDLL,Kern::Printf("Exec::ProcessLoaded %lS ver %08x", &info.iFileName, info.iModuleVersion));
+	__KTRACE_OPT2(KEXEC,KDLL,Kern::Printf("Exec::ProcessLoaded %S ver %08x", &info.iFileName, info.iModuleVersion));
 	__KTRACE_OPT(KDLL,DumpProcessCreateInfo(info));
 	K::CheckFileServerAccess();			// only F32 can use this exec function
 	NKern::LockSystem();
diff -r 2a0ada0a1bf8 -r 95847726fe57 kernel/eka/kernel/server.cpp
--- a/kernel/eka/kernel/server.cpp	Wed May 12 10:34:10 2010 +0100
+++ b/kernel/eka/kernel/server.cpp	Mon May 24 18:38:55 2010 +0100
@@ -840,7 +840,7 @@
 	TBuf<KMaxExitCategoryName> cat;
 	if (aType==EExitPanic && aCategory)
 		GetCategory(cat,*aCategory);
-	__KTRACE_OPT(KEXEC,Kern::Printf("Exec::ThreadKill %d,%d,%lS",aType,aReason,&cat));
+	__KTRACE_OPT(KEXEC,Kern::Printf("Exec::ThreadKill %d,%d,%S",aType,aReason,&cat));
 	K::CheckKernelUnlocked();
 	NKern::LockSystem();
 	DThread* pT=(DThread*)K::ObjectFromHandle(aHandle,EThread);
@@ -856,7 +856,7 @@
 	TBuf<KMaxExitCategoryName> cat;
 	if (aType==EExitPanic && aCategory)
 		GetCategory(cat,*aCategory);
-	__KTRACE_OPT(KEXEC,Kern::Printf("Exec::ProcessKill %d,%d,%lS",aType,aReason,&cat));
+	__KTRACE_OPT(KEXEC,Kern::Printf("Exec::ProcessKill %d,%d,%S",aType,aReason,&cat));
 	K::CheckKernelUnlocked();
 	NKern::LockSystem();
 	DProcess* pP=(DProcess*)K::ThreadEnterCS(aHandle,EProcess);
@@ -932,7 +932,7 @@
 	{
 	CHECK_PRECONDITIONS(MASK_THREAD_STANDARD,"Kern::PanicCurrentThread");			
 	// enter with system unlocked
-	__KTRACE_OPT(KEXEC,Kern::Printf("Kern::PanicCurrentThread %lS %d",&aCategory,aReason));
+	__KTRACE_OPT(KEXEC,Kern::Printf("Kern::PanicCurrentThread %S %d",&aCategory,aReason));
 	K::CheckKernelUnlocked();
 	NKern::LockSystem();
 	TheCurrentThread->Die(EExitPanic,aReason,aCategory);	// doesn't return
diff -r 2a0ada0a1bf8 -r 95847726fe57 kernel/eka/kernel/sexec.cpp
--- a/kernel/eka/kernel/sexec.cpp	Wed May 12 10:34:10 2010 +0100
+++ b/kernel/eka/kernel/sexec.cpp	Mon May 24 18:38:55 2010 +0100
@@ -36,7 +36,7 @@
 	TFindHandle h;
 	Kern::KUDesGet(match,aName);
 	kumemget32(&h,&aFindHandle,sizeof(h));
-	__KTRACE_OPT(KEXEC,Kern::Printf("ObjN: %lS %08x", &match, h.Handle()));
+	__KTRACE_OPT(KEXEC,Kern::Printf("ObjN: %S %08x", &match, h.Handle()));
 	NKern::ThreadEnterCS();
 	TInt r=pC->FindByFullName(h, match, fn);
 	NKern::ThreadLeaveCS();
@@ -758,7 +758,7 @@
 
 	__KTRACE_OPT(KEXEC,Kern::Printf("Exec::ThreadRequestSignal"));
 	if(aThread->iOwningProcess!=TheCurrentThread->iOwningProcess)
-		K::ProcessIsolationFailure(__PLATSEC_DIAGNOSTIC_STRING("Attempt to use RThread::RequestComplete on a thread in another process"));
+		K::ProcessIsolationFailure(__PLATSEC_DIAGNOSTIC_STRING("Attempt to use RThread::RequestComplete or RThread::RequestSignal on a thread in another process"));
 	NKern::ThreadRequestSignal(&aThread->iNThread, SYSTEM_LOCK);
 	}
 
@@ -812,7 +812,7 @@
 	TKName n;
 	if (aName)
 		Kern::KUDesGet(n,*aName);
-	__KTRACE_OPT(KEXEC,Kern::Printf("Exec::ChunkCreate %lS",&n));
+	__KTRACE_OPT(KEXEC,Kern::Printf("Exec::ChunkCreate %S",&n));
 	TChunkCreate uinfo;
 	SChunkCreateInfo info;
 	kumemget32(&uinfo,&anInfo,sizeof(uinfo));
@@ -938,9 +938,9 @@
 
 TInt ExecHandler::OpenObject(TObjectType aObjType, const TDesC8& aName, TOwnerType aType)
 	{
-	__KTRACE_OPT(KTHREAD,Kern::Printf("Exec::OpenObject %lS",&aName));
 	TFullName n;
 	Kern::KUDesGet(n,aName);
+	__KTRACE_OPT(KTHREAD,Kern::Printf("Exec::OpenObject %S",&n));
 	if (Kern::ValidateFullName(n)!=KErrNone)
 		K::PanicKernExec(EBadName);
 	if ((TUint)aObjType>=(TUint)ENumObjectTypes)
@@ -1012,12 +1012,12 @@
 		{
 		Kern::KUDesGet(n,*aName);
 		pN=&n;
+		__KTRACE_OPT(KSEMAPHORE,Kern::Printf("Exec::MutexCreate %S",pN));
 		}
 	else if (aType==EOwnerThread)
 		pO=TheCurrentThread;
 	else
 		pO=TheCurrentThread->iOwningProcess;
-	__KTRACE_OPT(KSEMAPHORE,Kern::Printf("Exec::MutexCreate %lS",aName));
 	NKern::ThreadEnterCS();
 	DMutex* pM;
 	TInt r=K::MutexCreate(pM, *pN, pO, ETrue, KMutexOrdUser);
@@ -1036,7 +1036,6 @@
 
 TInt ExecHandler::SemaphoreCreate(const TDesC8* aName, TInt aCount, TOwnerType aType)
 	{
-	__KTRACE_OPT(KSEMAPHORE,Kern::Printf("Exec::SemaphoreCreate %lS",aName));
 	TKName n;
 	DObject* pO=NULL;
 	const TDesC* pN=NULL;
@@ -1044,6 +1043,7 @@
 		{
 		Kern::KUDesGet(n,*aName);
 		pN=&n;
+		__KTRACE_OPT(KSEMAPHORE,Kern::Printf("Exec::SemaphoreCreate %S",pN));
 		}
 	else if (aType==EOwnerThread)
 		pO=TheCurrentThread;
@@ -1230,7 +1230,7 @@
 	{
 	TKName n;
 	Kern::KUDesGet(n,aName);
-	__KTRACE_OPT(KEXEC,Kern::Printf("Exec::ThreadRename %lS",&n));
+	__KTRACE_OPT(KEXEC,Kern::Printf("Exec::ThreadRename %S",&n));
 	NKern::LockSystem();
 	DThread* pT=(DThread*)K::ThreadEnterCS(aHandle,EThread);
 	if (pT!=TheCurrentThread &&
@@ -1255,7 +1255,7 @@
 	{
 	TKName n;
 	Kern::KUDesGet(n,aName);
-	__KTRACE_OPT(KEXEC,Kern::Printf("Exec::ProcessRename %lS",&n));
+	__KTRACE_OPT(KEXEC,Kern::Printf("Exec::ProcessRename %S",&n));
 	NKern::LockSystem();
 	DProcess* pP=(DProcess*)K::ThreadEnterCS(aHandle,EProcess);
 	if (pP->iSecurityZone!=TheCurrentThread->iOwningProcess->iSecurityZone)
@@ -1615,6 +1615,15 @@
 			break;
 			}
 
+		case EDbgGetAllocFail:
+			{
+			NKern::ThreadEnterCS();
+			TInt allocFail = K::Allocator->__DbgGetAllocFail();
+			NKern::ThreadLeaveCS();
+			kumemput32(a2, (TAny*)&allocFail, sizeof(TInt));
+			break;
+			}
+
 		default:
 			panic=EBadKernelHeapDebugFunction;
 			break;
@@ -1898,7 +1907,7 @@
 	{
 	TKName n;
 	Kern::KUDesGet(n,aName);
-	__KTRACE_OPT(KEXEC,Kern::Printf("Exec::ThreadCreate %lS",&n));
+	__KTRACE_OPT(KEXEC,Kern::Printf("Exec::ThreadCreate %S",&n));
 	TUint32 infoBuf[KMaxThreadCreateInfo/sizeof(TUint32)];
 	SThreadCreateInfo& info = *(SThreadCreateInfo*)infoBuf;
 	kumemget32(&info, &aInfo, sizeof(SThreadCreateInfo));
@@ -1933,7 +1942,7 @@
 
 TInt K::MutexCreate(DMutex*& aMutex, const TDesC& aName, DObject* anOwner, TBool aVisible, TUint aOrder)
 	{
-	__KTRACE_OPT(KSEMAPHORE,Kern::Printf("K::MutexCreate %lS owner %O visible=%d order=%02x",&aName,anOwner,aVisible,aOrder));
+	__KTRACE_OPT(KSEMAPHORE,Kern::Printf("K::MutexCreate %S owner %O visible=%d order=%02x",&aName,anOwner,aVisible,aOrder));
 	DMutex* pM=new DMutex;
 	TInt r=KErrNoMemory;
 	if (pM)
@@ -2000,7 +2009,7 @@
 EXPORT_C TInt Kern::ThreadCreate(SThreadCreateInfo& aInfo)
 	{
 	CHECK_PRECONDITIONS(MASK_THREAD_CRITICAL,"Kern::ThreadCreate");		
-	__KTRACE_OPT(KEXEC,Kern::Printf("Kern::ThreadCreate %lS",&aInfo.iName));
+	__KTRACE_OPT(KEXEC,Kern::Printf("Kern::ThreadCreate %S",&aInfo.iName));
 	aInfo.iHandle=NULL;
 	DThread* pT=NULL;
 	TBool svc = aInfo.iType!=EThreadUser;
diff -r 2a0ada0a1bf8 -r 95847726fe57 kernel/eka/kernel/sipc.cpp
--- a/kernel/eka/kernel/sipc.cpp	Wed May 12 10:34:10 2010 +0100
+++ b/kernel/eka/kernel/sipc.cpp	Mon May 24 18:38:55 2010 +0100
@@ -1144,7 +1144,7 @@
 
 		if(m->IsDelivered() || m->IsAccepted())
 			{
-			if (!IsClosing())
+			if (!IsClosing() && t->iMState != DThread::EDead)
 				{
 				m->SetCompleting();
 				Kern::QueueRequestComplete(t, m, aReason);
@@ -1752,7 +1752,7 @@
 		s->iConnectMsgPtr = NULL;
 
 	__KTRACE_OPT(KIPC,Kern::Printf("MsgCo: M:%d r:%d %O->%O", m.iFunction, aReason, TheCurrentThread, m.iClient));
-	if (!s->IsClosing())
+	if (!s->IsClosing() && m.iClient->iMState != DThread::EDead)
 		{
 		m.SetCompleting();
 		Kern::QueueRequestComplete(m.iClient, &m, aReason);
@@ -2044,7 +2044,7 @@
 	TBuf<KMaxExitCategoryName> cat;
 	if (aType==EExitPanic && aCategory)
 		GetCategory(cat,*aCategory);
-	__KTRACE_OPT(KEXEC,Kern::Printf("Exec::MessageKill %d,%d,%lS",aType,aReason,&cat));
+	__KTRACE_OPT(KEXEC,Kern::Printf("Exec::MessageKill %d,%d,%S",aType,aReason,&cat));
 	K::CheckKernelUnlocked();
 	NKern::LockSystem();
 	RMessageK* pM = RMessageK::MessageK(aHandle);
diff -r 2a0ada0a1bf8 -r 95847726fe57 kernel/eka/kernel/skernel.cpp
--- a/kernel/eka/kernel/skernel.cpp	Wed May 12 10:34:10 2010 +0100
+++ b/kernel/eka/kernel/skernel.cpp	Mon May 24 18:38:55 2010 +0100
@@ -53,7 +53,7 @@
 // Enter and return with system unlocked.
 TInt DSemaphore::Create(DObject* aOwner, const TDesC* aName, TInt aInitialCount, TBool aVisible)
 	{
-	__KTRACE_OPT(KSEMAPHORE,Kern::Printf("DSemaphore::Create owner %O, name %lS, init count=%d, visible=%d",aOwner,aName,aInitialCount,aVisible));
+	__KTRACE_OPT(KSEMAPHORE,Kern::Printf("DSemaphore::Create owner %O, name %S, init count=%d, visible=%d",aOwner,aName,aInitialCount,aVisible));
 	if (aInitialCount<0)
 		return KErrArgument;
 	SetOwner(aOwner);
@@ -306,7 +306,7 @@
 // Enter and return with system unlocked.
 TInt DMutex::Create(DObject* aOwner, const TDesC* aName, TBool aVisible, TUint aOrder)
 	{
-	__KTRACE_OPT(KSEMAPHORE,Kern::Printf("DMutex::Create owner %O, name %lS, visible=%d, order=%02x",aOwner,aName,aVisible,aOrder));
+	__KTRACE_OPT(KSEMAPHORE,Kern::Printf("DMutex::Create owner %O, name %S, visible=%d, order=%02x",aOwner,aName,aVisible,aOrder));
 	iOrder = (TUint8)aOrder;
 	SetOwner(aOwner);
 	TInt r=KErrNone;
@@ -654,7 +654,7 @@
 // Enter and return with system unlocked.
 TInt DCondVar::Create(DObject* aOwner, const TDesC* aName, TBool aVisible)
 	{
-	__KTRACE_OPT(KSEMAPHORE,Kern::Printf("DCondVar::Create owner %O, name %lS, visible=%d",aOwner,aName,aVisible));
+	__KTRACE_OPT(KSEMAPHORE,Kern::Printf("DCondVar::Create owner %O, name %S, visible=%d",aOwner,aName,aVisible));
 	SetOwner(aOwner);
 	TInt r=KErrNone;
 	if (aName && aName->Length())
@@ -1080,12 +1080,12 @@
 		{
 		Kern::KUDesGet(n,*aName);
 		pN=&n;
+		__KTRACE_OPT(KSEMAPHORE,Kern::Printf("Exec::CondVarCreate %S", pN));
 		}
 	else if (aType==EOwnerThread)
 		pO=TheCurrentThread;
 	else
 		pO=TheCurrentThread->iOwningProcess;
-	__KTRACE_OPT(KSEMAPHORE,Kern::Printf("Exec::CondVarCreate %lS", aName));
 	NKern::ThreadEnterCS();
 	TInt r=KErrNoMemory;
 	DCondVar* pV = new DCondVar;
diff -r 2a0ada0a1bf8 -r 95847726fe57 kernel/eka/kernel/smonitor.cpp
--- a/kernel/eka/kernel/smonitor.cpp	Wed May 12 10:34:10 2010 +0100
+++ b/kernel/eka/kernel/smonitor.cpp	Mon May 24 18:38:55 2010 +0100
@@ -322,7 +322,7 @@
 		}
 	PrintLine(buf);
 	Printf("Default priority %d WaitLink Priority %d\r\n",pT->iDefaultPriority,pT->iWaitLink.iPriority);
-	Printf("ExitInfo %d,%d,%lS\r\n",pT->iExitType,pT->iExitReason,&pT->iExitCategory);
+	Printf("ExitInfo %d,%d,%S\r\n",pT->iExitType,pT->iExitReason,&pT->iExitCategory);
 	Printf("Flags %08x, Handles %08x\r\n",pT->iFlags,&pT->iHandles);
 	Printf("Supervisor stack base %08x size %x\r\n", pT->iSupervisorStack, pT->iSupervisorStackSize);
 	Printf("User stack base %08x size %x\r\n", pT->iUserStackRunAddress, pT->iUserStackSize);
@@ -493,7 +493,7 @@
  
 void Monitor::DumpProcessData(DProcess* pP)
 	{
-	Printf("ExitInfo %d,%d,%lS\r\n",pP->iExitType,pP->iExitReason,&pP->iExitCategory);
+	Printf("ExitInfo %d,%d,%S\r\n",pP->iExitType,pP->iExitReason,&pP->iExitCategory);
 	Printf("Flags %08x, Handles %08x, Attributes %08x\r\n",pP->iFlags,&pP->iHandles,pP->iAttributes);
 	Printf("DataBssChunk %08x, CodeSeg %08x\r\n",pP->iDataBssStackChunk,pP->iCodeSeg);
 	Printf("DllLock %08x, Process Lock %08x SID %08x\r\n",pP->iDllLock,pP->iProcessLock,pP->iS.iSecureId);
diff -r 2a0ada0a1bf8 -r 95847726fe57 kernel/eka/kernel/sprocess.cpp
--- a/kernel/eka/kernel/sprocess.cpp	Wed May 12 10:34:10 2010 +0100
+++ b/kernel/eka/kernel/sprocess.cpp	Mon May 24 18:38:55 2010 +0100
@@ -324,7 +324,7 @@
 
 	iGeneration = NextGeneration(aName, iUids.iUid[2]);
 
-	__KTRACE_OPT(KTHREAD,Kern::Printf("DProcess::Rename %O to %lS",this,&aName));
+	__KTRACE_OPT(KTHREAD,Kern::Printf("DProcess::Rename %O to %S",this,&aName));
 	TInt r = SetName(&aName);
 #ifdef BTRACE_THREAD_IDENTIFICATION
 	Name(n);
@@ -530,7 +530,7 @@
 // Kill a process. Enter and return with system unlocked and calling thread in critical section.
 //
 	{
-	__KTRACE_OPT(KPROC,Kern::Printf("Process %O Die: %d %d %lS",this,aType,aReason,&aCategory));
+	__KTRACE_OPT(KPROC,Kern::Printf("Process %O Die: %d %d %S",this,aType,aReason,&aCategory));
 
 	TInt r=WaitProcessLock();
 	if (r!=KErrNone)
@@ -612,7 +612,7 @@
 TInt DProcess::NewThread(DThread*& aThread, SThreadCreateInfo& anInfo, TInt* aHandle, TOwnerType aType)
 	{
 	__KTRACE_OPT(KTHREAD,Kern::Printf("NewThread proc %O, func %08x ptr %08x",this,anInfo.iFunction,anInfo.iPtr));
-	__KTRACE_OPT(KTHREAD,Kern::Printf("type %d name %lS pri %d",anInfo.iType,&anInfo.iName,anInfo.iInitialThreadPriority));
+	__KTRACE_OPT(KTHREAD,Kern::Printf("type %d name %S pri %d",anInfo.iType,&anInfo.iName,anInfo.iInitialThreadPriority));
 	if (aHandle)
 		*aHandle=0;
 	TInt r=GetNewThread(aThread,anInfo);
diff -r 2a0ada0a1bf8 -r 95847726fe57 kernel/eka/kernel/sthread.cpp
--- a/kernel/eka/kernel/sthread.cpp	Wed May 12 10:34:10 2010 +0100
+++ b/kernel/eka/kernel/sthread.cpp	Mon May 24 18:38:55 2010 +0100
@@ -114,8 +114,23 @@
 	iTls.Close();
 	if (iSyncMsgPtr)
 		{
-		__KTRACE_OPT(KSERVER,Kern::Printf("DThread::Destruct(%08X) freeing sync message at %08X", this, iSyncMsgPtr));
-		iSyncMsgPtr->ReleaseMessagePool(RMessageK::ESync, 1);
+		// The sync message might still be outstanding; in particular it may be
+		// on the kernel server's list of messages to be cleaned up on behalf of
+		// dead clients. So we only release it here if it's free; otherwise, we
+		// mutate the type, so that cleanup will return it to the Global pool.
+		NKern::LockSystem();
+		if (iSyncMsgPtr->IsFree())
+			{
+			NKern::UnlockSystem();
+			__KTRACE_OPT(KSERVER,Kern::Printf("DThread::Destruct(%08X) releasing sync message at %08X", this, iSyncMsgPtr));
+			iSyncMsgPtr->ReleaseMessagePool(RMessageK::ESync, 1);
+			}
+		else
+			{
+			__KTRACE_OPT(KSERVER,Kern::Printf("DThread::Destruct(%08X) mutating sync message at %08X", this, iSyncMsgPtr));
+			iSyncMsgPtr->iMsgType = RMessageK::EGlobal;
+			NKern::UnlockSystem();
+			}
 		iSyncMsgPtr = NULL;
 		}
 	FreeSupervisorStack();
@@ -684,7 +699,7 @@
 #ifdef KPANIC
 	if (iExitType==EExitPanic)
 		{
-		__KTRACE_OPT2(KPANIC,KSCHED,Kern::Printf("Thread %O Panic %lS %d",this,&iExitCategory,iExitReason));
+		__KTRACE_OPT2(KPANIC,KSCHED,Kern::Printf("Thread %O Panic %S %d",this,&iExitCategory,iExitReason));
 		}
 	else if (iExitType==EExitTerminate)
 		{
@@ -815,7 +830,7 @@
 void DThread::Die(TExitType aType, TInt aReason, const TDesC& aCategory)
 	{
 	CHECK_PRECONDITIONS(MASK_SYSTEM_LOCKED,"DThread::Die");				
-	__KTRACE_OPT(KTHREAD,Kern::Printf("Thread %O Die: %d,%d,%lS",this,aType,aReason,&aCategory));
+	__KTRACE_OPT(KTHREAD,Kern::Printf("Thread %O Die: %d,%d,%S",this,aType,aReason,&aCategory));
 	SetExitInfo(aType,aReason,aCategory);
 
 	// If necessary, decrement count of running user threads in this process.  We get here if the
@@ -908,7 +923,7 @@
 
 TInt DThread::Create(SThreadCreateInfo& aInfo)
 	{
-	__KTRACE_OPT(KTHREAD,Kern::Printf("DThread::Create %lS owner %O size %03x", &aInfo.iName,
+	__KTRACE_OPT(KTHREAD,Kern::Printf("DThread::Create %S owner %O size %03x", &aInfo.iName,
 																iOwningProcess, aInfo.iTotalSize));
 
 	if (aInfo.iTotalSize < (TInt)sizeof(SThreadCreateInfo))
@@ -1253,7 +1268,7 @@
 	TInt r=K::Containers[EThread]->CheckUniqueFullName(this,aName);
 	if (r==KErrNone)
 		{
-		__KTRACE_OPT(KTHREAD,Kern::Printf("DThread::Rename %O to %lS",this,&aName));
+		__KTRACE_OPT(KTHREAD,Kern::Printf("DThread::Rename %O to %S",this,&aName));
 		r=SetName(&aName);
 #ifdef BTRACE_THREAD_IDENTIFICATION
 		Name(n);
diff -r 2a0ada0a1bf8 -r 95847726fe57 kernel/eka/kernel/sutils.cpp
--- a/kernel/eka/kernel/sutils.cpp	Wed May 12 10:34:10 2010 +0100
+++ b/kernel/eka/kernel/sutils.cpp	Mon May 24 18:38:55 2010 +0100
@@ -1580,7 +1580,7 @@
 
 TInt DThread::OpenObject(TOwnerType aType, const TDesC& aName, TInt& aHandle, DObject*& anObj, TInt aObjType)
 	{
-	__KTRACE_OPT(KEXEC,Kern::Printf("DThread::OpenObject %lS",&aName));
+	__KTRACE_OPT(KEXEC,Kern::Printf("DThread::OpenObject %S",&aName));
 	anObj=NULL;
 	TInt r=Kern::ValidateFullName(aName);
 	if (r!=KErrNone)
@@ -2373,7 +2373,7 @@
 EXPORT_C TInt Kern::SemaphoreCreate(DSemaphore*& aSem, const TDesC& aName, TInt aInitialCount)
 	{
 	CHECK_PRECONDITIONS(MASK_THREAD_CRITICAL,"Kern::SemaphoreCreate");				
-	__KTRACE_OPT(KSEMAPHORE,Kern::Printf("Kern::SemaphoreCreate %lS init %d", &aName, aInitialCount));
+	__KTRACE_OPT(KSEMAPHORE,Kern::Printf("Kern::SemaphoreCreate %S init %d", &aName, aInitialCount));
 	TInt r = KErrNoMemory;
 	DSemaphore* pS = new DSemaphore;
 	if (pS)
diff -r 2a0ada0a1bf8 -r 95847726fe57 kernel/eka/memmodel/emul/win32/mcodeseg.cpp
--- a/kernel/eka/memmodel/emul/win32/mcodeseg.cpp	Wed May 12 10:34:10 2010 +0100
+++ b/kernel/eka/memmodel/emul/win32/mcodeseg.cpp	Mon May 24 18:38:55 2010 +0100
@@ -66,8 +66,8 @@
 	Kern::Printf("iAccessCount = %d", a.iAccessCount);
 	Kern::Printf("iEntryPtVeneer = %08x", a.iEntryPtVeneer);
 	Kern::Printf("iFileEntryPoint = %08x", a.iFileEntryPoint);
-	Kern::Printf("iFileName = %lS", a.iFileName);
-	Kern::Printf("iRootName = %lS", &a.iRootName);
+	Kern::Printf("iFileName = %S", a.iFileName);
+	Kern::Printf("iRootName = %S", &a.iRootName);
 	Kern::Printf("iExtOffset = %d", a.iExtOffset);
 	Kern::Printf("iModuleVersion = %08x", a.iModuleVersion);
 	Kern::Printf("iUids = %08x %08x %08x", uid[0], uid[1], uid[2]);
@@ -1111,7 +1111,7 @@
 // in order to make them appear to be in z:\system\libs
 void P::NormalizeExecutableFileName(TDes& a)
 	{
-	__KTRACE_OPT(KDLL, Kern::Printf("NormalizeExecutableFileName %lS", &a));
+	__KTRACE_OPT(KDLL, Kern::Printf("NormalizeExecutableFileName %S", &a));
 	if (a.Length()<3 || a[1]!=':' || a[2]!='\\')
 		{
 		// don't have a drive so assume in 'ROM'
@@ -1120,7 +1120,7 @@
 		if (initial.Length()==0 || initial[0]!='\\')
 			a.Append('\\');
 		a+=initial;
-		__KTRACE_OPT(KDLL, Kern::Printf("NormalizeExecutableFileName -> %lS", &a));
+		__KTRACE_OPT(KDLL, Kern::Printf("NormalizeExecutableFileName -> %S", &a));
 		}
 	}
 
diff -r 2a0ada0a1bf8 -r 95847726fe57 kernel/eka/release.txt
--- a/kernel/eka/release.txt	Wed May 12 10:34:10 2010 +0100
+++ b/kernel/eka/release.txt	Mon May 24 18:38:55 2010 +0100
@@ -1,3 +1,32 @@
+Version 2.00.3083
+=================
+(Made by vfebvre 13/05/2010)
+
+1.	famustaf
+	1.	ou1cimx1#380321 Build on Linux - Incorrect slash in #include in sf_sys.cpp
+
+2.	cnotton
+	1.	ou1cimx1#380725 Public headers in bt are including platform headers
+
+
+Version 2.00.3082
+=================
+(Made by vfebvre 12/05/2010)
+
+1.	mipetzol
+	1.	MINOR_CHANGE Update to DMAv2 Porting Guide
+
+2.	lanerobe
+	1.	ou1cimx1#378811 Change kernel use of %lS to %S
+	2.	ou1cimx1#378808 MCL Stop ExecHandler accessing user descriptors directly
+
+3.	migubarr
+	1.	ou1cimx1#377322 New T_FILECACHE test failures (t_filecache.cpp:356)
+
+4.	hengrant
+	1.	ou1cimx1#370931 Memory card gets locked by itself MCL
+
+
 Version 2.00.3081
 =================
 (Made by vfebvre 11/05/2010)
diff -r 2a0ada0a1bf8 -r 95847726fe57 kernel/eka/rombuild/base.iby
--- a/kernel/eka/rombuild/base.iby	Wed May 12 10:34:10 2010 +0100
+++ b/kernel/eka/rombuild/base.iby	Mon May 24 18:38:55 2010 +0100
@@ -92,7 +92,6 @@
 
 secondary=ABI_DIR\DEBUG_DIR\efile.exe                       \sys\bin\efile.exe  FIXED HEAPMAX(0x40000)
 file=ABI_DIR\DEBUG_DIR\efsrv.dll                            \sys\bin\EFSrv.dll
-device[VARID]=KERNEL_DIR\DEBUG_DIR\d_ftrace.ldd             \sys\bin\d_ftrace.ldd
 
 #ifdef WITH_EXFAT
 file=ABI_DIR\DEBUG_DIR\exfat.fsy                            sys\bin\exfat.fsy
diff -r 2a0ada0a1bf8 -r 95847726fe57 kerneltest/e32test/hcr/d_hcrut_psl.cpp
--- a/kerneltest/e32test/hcr/d_hcrut_psl.cpp	Wed May 12 10:34:10 2010 +0100
+++ b/kerneltest/e32test/hcr/d_hcrut_psl.cpp	Mon May 24 18:38:55 2010 +0100
@@ -127,7 +127,7 @@
 #if !defined(__WINS__) && !defined(__X86__)
     
     // Note to future implementor:
-	// #include <kernel\kernboot.h>
+	// #include <kernel/kernboot.h>
 	// First check to see if SMRIB was created during boot time. 
     // If SSuperPageBase::iSmrData == KSuperPageAddressFieldUndefined (i.e. -1) 
 	// it does not exist, return KErrNotSupported, SMR not support by base port
diff -r 2a0ada0a1bf8 -r 95847726fe57 kerneltest/e32test/mediaext/d_nfe.cpp
--- a/kerneltest/e32test/mediaext/d_nfe.cpp	Wed May 12 10:34:10 2010 +0100
+++ b/kerneltest/e32test/mediaext/d_nfe.cpp	Mon May 24 18:38:55 2010 +0100
@@ -21,7 +21,7 @@
 #include "nfe.h"
 
 #if defined(_DEBUG)
-	#define TRACE_ENABLED
+//	#define TRACE_ENABLED
 #else
 #endif
 
@@ -782,7 +782,6 @@
 			break;
 
 		case DLocalDrive::EWrite:
-			WriteEncryptionStatusToBootSector(di, EFalse);	// a write to the drive clears the finalised state
 			r=HandleWrite(aReq);
 			break;
 
@@ -1471,8 +1470,7 @@
 	if (!aDi.IsUDADrive())
 		return KErrNone;
 
-	if (aDi.iDriveFinalised == aFinalised)
-		return KErrNone;
+	aDi.iDriveFinalised = aFinalised;
 
 	TNfeDiskStatus status = aDi.Status();
 
diff -r 2a0ada0a1bf8 -r 95847726fe57 kerneltest/e32test/smr/d_smr.cpp
--- a/kerneltest/e32test/smr/d_smr.cpp	Wed May 12 10:34:10 2010 +0100
+++ b/kerneltest/e32test/smr/d_smr.cpp	Mon May 24 18:38:55 2010 +0100
@@ -19,7 +19,7 @@
 
 #include "d_trace.h"
 
-#include <memmodel\epoc\platform.h>
+#include <memmodel/epoc/platform.h>
 #include <bootdefs.h>
 #include <kernel/kernboot.h>
 #include <kernel/kern_priv.h>
diff -r 2a0ada0a1bf8 -r 95847726fe57 kerneltest/e32utils/group/bld.inf
--- a/kerneltest/e32utils/group/bld.inf	Wed May 12 10:34:10 2010 +0100
+++ b/kerneltest/e32utils/group/bld.inf	Mon May 24 18:38:55 2010 +0100
@@ -45,7 +45,6 @@
 ../demandpaging/dptestcons.oby 				/epoc32/rom/include/dptestcons.oby
 
 PRJ_TESTEXPORTS
-../trace/btracevw.pl /epoc32/tools/btracevw.pl
 
 PRJ_TESTMMPFILES
 #if defined(TOOLS2)
diff -r 2a0ada0a1bf8 -r 95847726fe57 kerneltest/e32utils/trace/btracevw.pl
--- a/kerneltest/e32utils/trace/btracevw.pl	Wed May 12 10:34:10 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1952 +0,0 @@
-#
-# Copyright (c) 2009 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"
-# which accompanies this distribution, and is available
-# at the URL "http://www.eclipse.org/legal/epl-v10.html".
-#
-# Initial Contributors:
-# Nokia Corporation - initial contribution.
-#
-# Contributors:
-#
-# Description:
-#
-
-#!/usr/bin/perl
-
-use File::Find;
-use File::Spec::Functions;
-
-
-	my $TraceFileName;
-	
-	my $PrintFlagFilePos = 0;
-	my $PrintFlagHdrLen = 0;
-	my $PrintFlagHdrFlags = 0;
-	my $PrintFlagFormatString = 0;
-	my $VerboseMode = 0;
-	my $RawMode = 0;
-	my $FormatIdIsSubCategory = 0;
-	my $OutputSawDictionaryMode = 0;
-	
-	# for the category range 0-191, the format string is indexed by the category & subcategory
-	%FormatTables = 
-		(
-		0 => 			# ERDebugPrintf
-			{
-			0 => "ThreadId %h, %s",
-			},
-	
-		1 => 			# ERKernPrintf
-			{
-			0 => "ThreadId %h, %s",
-			},
-
-		3 =>			# EThreadIdentification
-			{	
-			0 => "ENanoThreadCreate, NThread %x",
-			1 => "ENanoThreadDestroy, NThread %x",
-			2 => "EThreadCreate, NThread %x, DProcess %x, name %s",
-			3 => "EThreadDestroy, NThread %x, DProcess %x, Id %x",
-			4 => "EThreadName, NThread %x, DProcess %x, name %s",
-			5 => "EProcessName, NThread %x, DProcess %x, name %s",
-			6 => "EThreadId, NThread %x, DProcess %x, Id %x",
-			7 => "EProcessCreate, DProcess %x",
-			8 => "EProcessDestroy, DProcess %x",
-			},
-		);
-
-	my @typedefs;
-	my @members;
-	my %values	= (
-#		UTF::KInitialClientFormat		=>	{type=>"TFormatId", size=>2, value=>512}
-		KMaxTUint8						=> {type=>"TUint8", size=>1, value=>255},
-		KMaxTUint16						=> {type=>"TUint16", size=>2, value=>65535}
-	);
-	my %macros;
-	my @classes;
-	my @enums;
-	my %formatStrings;		# each enum may have it's own format string
-	my %formatCategories;	# each enum may have it's own format category
-	
-	my %filescope;
-	$filescope{file}=1;
-	undef $filescope{name};	
-
-	$filescope{typedefs}=\@typedefs;
-	$filescope{members}=\@members;
-	$filescope{values}=\%values;
-	$filescope{macros} = \%macros;
-	$filescope{FormatTables} = \%FormatTables;
-	
-	$filescope{classes} = \@classes;
-	$filescope{enums} = \@enums;
-
-	$filescope{formatStrings} =\%formatStrings;
-	$filescope{formatCategories} = \%formatCategories;
-	
-		
-		
-	if (@ARGV == 0)
-  		{
-  		print "BTraceVw.pl \n";
-  		print "An unsupported utility which extracts UTrace-style format-strings\n";
-  		print "from header files & uses these to decode a BTrace output file\n";
-  		print "Syntax : BTraceVw.pl [-v] [-r] [-sd] [-i <IncFilePath>] [<BTrace file>]\n";
-  		print "where  : -v  = verbose mode\n";
-  		print "       : -r  = raw output mode\n";
-  		print "       : -sd = produce SAW trace viewer dictionary file\n";
-  		print "       :       this file then needs to be merged into the 'com.symbian.analysis.trace.ui.prefs' file\n";
-  		print "       :       located under the carbide workspace directory\n";
-		print "\n";
-  		
-		print "e.g. (this decodes a trace file & produces a comma-separated output file) : \n";
-		print "btracevw.pl -i /os/kernelhwsrv/userlibandfileserver/fileserver/inc/f32tracedef.h -i /os/kernelhwsrv/userlibandfileserver/fileserver/inc/utraceefsrv.h -i /os/kernelhwsrv/userlibandfileserver/fileserver/inc/utraceefile.h trace.utf >trace.csv\n";
-		print "\n";
-		print "e.g. (this overwrites the SAW dictioany file) : \n";
-		print "btracevw.pl -sd -i /os/kernelhwsrv/userlibandfileserver/fileserver/inc/f32tracedef.h -i /os/kernelhwsrv/userlibandfileserver/fileserver/inc/utraceefsrv.h -i /os/kernelhwsrv/userlibandfileserver/fileserver/inc/utraceefile.h >com.symbian.analysis.trace.ui.prefs\n";
-  		
-		exit;
-		}
-
-	while (@ARGV > 0)
-		{
-		
-		if ($ARGV[0] eq "-i")
-	        {
-	        shift @ARGV;
-		    ($FilePath) = @ARGV;
-	        shift @ARGV;
-
-	        undef @incFiles;
-		    @incFiles;
-		
-		    find sub { push @incFiles, $File::Find::name if m/\.h$/i;}, $FilePath ;
-		    foreach $incFile (@incFiles)
-		        {
-				H2Trace($incFile, \%filescope);
-		        }
-	        }
-		elsif ($ARGV[0] eq "-r")
-	        {
-		    $RawMode = 1;
-   	        shift @ARGV;
-	        }
-		elsif ($ARGV[0] eq "-sd")
-	        {
-		    $OutputSawDictionaryMode = 1;
-   	        shift @ARGV;
-	        }
-		elsif ($ARGV[0] eq "-v")
-	        {
-		    $VerboseMode = 1;
-   	        shift @ARGV;
-	        }
-	    else
-	    	{
-			$TraceFileName = "$ARGV[0]";
-	        shift @ARGV;
-	    	}
-        }
-		
-	if ($VerboseMode)
-		{
-		dump_scope(\%filescope);
-		PrintFormatTables(\%FormatTables);
-		}
-	if ($OutputSawDictionaryMode)
-		{
-		OutputSawDictionary(\%FormatTables);
-		}
-
-    if (defined ($TraceFileName))
-        {
-        ReadTraceFile($RawMode);
-        }
-
-        
-        
-        
-sub ReadTraceFile($)
-    {
-	(my $RawMode) = @_;
-#	print "Trace file is $TraceFileName, RawMode $RawMode, VerboseMode $VerboseMode\n\n";
-
-	open (LOGFILE, "<$TraceFileName") or die "Can't open $TraceFileName: $!\n";
-	binmode (LOGFILE);
-
-	my $val = 0;
-
-
-	# enum TFlags from e32btrace.h
-	$EHeader2Present	= 1<<0;
-	$ETimestampPresent	= 1<<1;
-	$ETimestamp2Present	= 1<<2;
-	$EContextIdPresent	= 1<<3;
-	$EPcPresent			= 1<<4;
-	$EExtraPresent		= 1<<5;
-	$ERecordTruncated	= 1<<6;
-	$EMissingRecord		= 1<<7;
-	
-	# enum TFlags2 from e32btrace.h
-	$EMultipartFlagMask	= 3<<0;
-	$ECpuIdMask			= 0xfff<<20;
-
-	# enum TMultiPart from e32btrace.h
-	$EMultipartFirst	= 1;
-	$EMultipartMiddle	= 2;
-	$EMultipartLast		= 3;
-	
-	$EMaxBTraceDataArray = 80;
-	
-	# enum TCategory from e32btrace.h
-	$EThreadIdentification = 3;
-	
-	# enum TThreadIdentification from e32btrace.h
-	$EThreadCreate = 2;
-	$EThreadName = 4;
-	$EProcessName = 5;
-	$EThreadId = 6;
-	
-	# Context Id bits from e32btrace.h
-	$EContextIdMask = 0x00000003;
-	$EContextIdThread = 0;
-	$EContextIdFIQ = 0x1;
-	$EContextIdIRQ = 0x2;
-	$EContextIdIDFC = 0x3;
-
-	# enum TClassificationRange from e32btraceu.h
-	$EAllRangeFirst = 192;
-	$EAllRangeLast = 222;
-
-	%TCategoryIdToString = 
-		(
-		0 => "ERDebugPrintf",
-		1 => "EKernPrintf",
-		2 => "EPlatsecPrintf",
-		3 => "EThreadIdentification",
-		4 => "ECpuUsage",
-        5 => "EKernPerfLog",
-        6 => "EClientServer",
-        7 => "ERequests",
-        8 => "EChunks",
-        9 => "ECodeSegs",
-		10 => "EPaging",
-		11 => "EThreadPriority",
-		12 => "EPagingMedia",
-		13 => "EKernelMemory",
-		14 => "EHeap",
-		15 => "EMetaTrace",
-		16 => "ERamAllocator",
-		17 => "EFastMutex",
-		18 => "EProfiling", 
-        19 => "EResourceManager",
-        20 => "EResourceManagerUs",
-		21 => "ERawEvent ",
-		128 => "EPlatformSpecificFirst",
-		191 => "EPlatformSpecificLast",
-		192 => "ESymbianExtentionsFirst",
-
-		# UTrace "ALL" range 
-		192 => "EPanic",
-		193 => "EError",
-		194 => "EWarning", 
-		195 => "EBorder", 
-		196 => "EState", 
-		197 => "EInternals", 
-		198 => "EDump", 
-		199 => "EFlow", 
-		200 => "ESystemCharacteristicMetrics", 
-		201 => "EAdhoc",
-
-		253 => "ESymbianExtentionsLast",
-		254 => "ETest1",
-		255 => "ETest2",
-		);
-
-
-	%ProcessNames;
-	%ThreadNames;
-	%ThreadIds;
-	
-	
-	# print column titles
-	if ($PrintFlagFilePos) {printf "FilePos, ";}	# col #0
-	if ($PrintFlagHdrLen) {	printf "Len, ";}		# col #1
-	if ($PrintFlagHdrFlags) {printf "Flags, "; }	# col #2
-	printf "Category, ";			# col #3
-	printf "TimeStamp, ";			# col #4
-	printf "Delta, ";				# col #5
-	printf "context Id, ";			# col #6
-	printf "PC, ";					# col #7
-	printf "UID, ";					# col #8
-	if ($PrintFlagFormatString){printf "Format string, ";}	# col #9
-	printf "Formatted text, ";		# col #10
-	print "\n\n";
-
-	
-	while (1)
-		{
-		my $pos = tell (LOGFILE);
-		
-		# print file pos (col #0)
-		if ($PrintFlagFilePos){	printf ("0x%08X, ", $pos);}
-		
-		my $category;
-		my $subCategory;
-		my $multipartFlags = 0;
-		my $recordData = "";
-		my $recordLen;
-		my $recordPos = 0;
-		
-		$recordLen = ReadRecord(LOGFILE, \$pos, \$recordData, \$category, \$subCategory, \$multipartFlags, $RawMode);
-		if ($recordLen == -1)
-			{last;}
-
-			
-		if (!$RawMode && ($multipartFlags == $EMultipartMiddle || $multipartFlags == $EMultipartLast))
-			{next;}
-					
-#		print record contents
-#		my $buf;
-#					for (my $i=0; $i < $recordLen; $i+=4)
-#						{
-#		$buf.= sprintf ("%08X ", unpack("V", substr($recordData, $recordPos+$i, 4)));
-#						}
-#		printf "\n[$buf\n]";				
-
-
-		# for UTrace "ALL" range, read UID 
-		if ($category >= $EAllRangeFirst && $category <= $EAllRangeLast && 
-			(!$RawMode) && $multipartFlags != $EMultipartMiddle && $multipartFlags != $EMultipartLast)
-			{
-			$uid = unpack("V", substr($recordData, $recordPos, 4));
-			$recordPos+= 4;	
-
-			# then read formatID			
-			$FormatIdIsSubCategory = ($subCategory != 0) ? 1 : 0;
-			if ($FormatIdIsSubCategory)
-				{
-				$formatId = $subCategory
-				}
-			else				
-				{
-				$formatId = unpack("V", substr($recordData, $recordPos, 4));
-  				$recordPos+= 4;
-				}
-			}
-		
-					
-		# print UID (col #8)
-		printf "0x%08X, ", $uid;
-
-			
-		my $formatTable;
-		my $formatString;
-		if ($category >= $EAllRangeFirst && $category <= $EAllRangeLast)
-			{
-			$formatString = $FormatTables{$uid}{$formatId};
-			}
-		else
-			{
-			$formatString = $FormatTables{$category}{$subCategory};
-			}
-
-
-		# Get thread names
-		if ($category == $EThreadIdentification)
-			{
-			if ($subCategory == $EProcessName)
-				{
-				my $process = unpack("V", substr($recordData, 4, 4));
-				my $processName = substr($recordData, 8, $recordLen - 8);	
-#				printf ("\nprocess [%08X] processName [$processName]\n", $process);
-				$ProcessNames{$process} = $processName;
-				}
-			elsif ($subCategory == $EThreadCreate || $subCategory == $EThreadName)
-				{
-				my $thread = unpack("V", substr($recordData, 0, 4));
-				my $process = unpack("V", substr($recordData, 4, 4));
-				my $threadName = substr($recordData, 8, $recordLen - 8);	
-#				printf ("\nprocess [%08X] thread [%08X] threadName [$threadName]\n", $process, $thread, $threadName);
-				$ThreadNames{$thread} = $ProcessNames{$process} . "::" . $threadName;
-				}
-			elsif ($subCategory == $EThreadId)
-				{
-				my $thread = unpack("V", substr($recordData, 0, 4));
-				my $process = unpack("V", substr($recordData, 4, 4));
-				my $threadId = unpack("V", substr($recordData, 8, 4));
-#				printf ("\nprocess [%08X] thread [%08X] threadId [%08X]\n", $process, $thread, $threadId);
-				$ThreadIds{$thread} = $threadId;
-				}
-			}
-			
-			
-		# print Format string (col #9)
-		if ($PrintFlagFormatString)
-			{
-			my $formatStringWithoutCommas = $formatString;
-			$formatStringWithoutCommas=~ s/,/ /g;
-			printf "%s, ", $formatStringWithoutCommas;
-			}
-
-		my $formattedText;
-		
-		my $lenFormatString = length($formatString);
-		if ($lenFormatString && !$RawMode && $multipartFlags != $EMultipartMiddle && $multipartFlags != $EMultipartLast)
-			{
-			for (my $i=0; $i<$lenFormatString; $i++)
-				{
-				my $c = (substr ($formatString, $i, 1));
-#				printf "$c\n";
-				if ($c eq "%")
-					{
-					undef my $fieldLen;
-					$i++;
-	        		$c = (substr ($formatString, $i, 1));
-					if ($c eq "%")
-						{
-						$formattedText.= substr ($formatString, $i, 1);
-						next;
-						}
-					if ($c eq "*")	## take length from buffer
-						{
-						$fieldLen = unpack("V", substr($recordData, $recordPos, 4));
-						if ($fieldLen > $recordLen-$recordPos)
-							{
-							$formattedText.= "*** Invalid field length ***";
-							last;
-							}
-						$recordPos+= 4;
-						$i++;
-		        		$c = (substr ($formatString, $i, 1));
-						}
-					if (lc $c eq "x" || $c eq "h")
-						{
-						if (defined $fieldLen)
-							{
-							if (($fieldLen & 3) == 0)
-								{
-								for (my $i=0; $i< $fieldLen; $i+= 4)
-									{
-									$formattedText.= sprintf ("%08X ", unpack("V", substr($recordData, $recordPos, 4)));
-									$recordPos+= 4;
-									}
-								}
-							else
-								{
-								for (my $i=0; $i< $fieldLen; $i++)
-									{
-									$formattedText.= sprintf ("%02X ", unpack("C", substr($recordData, $recordPos, 1)));
-									$recordPos++;
-									}
-								}
-							}
-						else
-							{
-							$formattedText.= sprintf ("0x%08X", unpack("V", substr($recordData, $recordPos, 4)));
-							$recordPos+= 4;
-							}
-						$recordPos = ($recordPos + 3) & ~3;
-						next;
-						}
-					# display "%ld" as hex for now as don't know how to get perl to use or display a 64 decimal value
-					elsif (lc $c eq "l" && substr ($formatString, $i+1, 1) eq "d")
-						{
-						$i++;
-						my $loWord = unpack("V", substr($recordData, $recordPos, 4));
-						$recordPos+= 4;
-						my $hiWord = unpack("V", substr($recordData, $recordPos, 4));
-						$recordPos+= 4;
-						$formattedText.= sprintf ("0x%X:%08X", $hiWord, $loWord);
-						}
-					elsif (lc $c eq "l" && substr ($formatString, $i+1, 1) eq "x")
-						{
-						$i++;
-						my $loWord = unpack("V", substr($recordData, $recordPos, 4));
-						$recordPos+= 4;
-						my $hiWord = unpack("V", substr($recordData, $recordPos, 4));
-						$recordPos+= 4;
-						$formattedText.= sprintf ("0x%X:%08X", $hiWord, $loWord);
-						}
-					elsif (lc $c eq "d")
-						{
-						$formattedText.= sprintf ("%d", unpack("V", substr($recordData, $recordPos, 4)));
-						$recordPos+= 4;
-						$recordPos = ($recordPos + 3) & ~3;
-						next;
-						}
-					elsif ($c eq "s")
-						{
-						if (!defined $fieldLen) 
-							{$fieldLen = $recordLen - $recordPos;}
-						$formattedText.= substr($recordData, $recordPos, $fieldLen);
-						$recordPos+= $fieldLen; 
-						$recordPos = ($recordPos + 3) & ~3;
-						next;
-						}
-					elsif ($c eq "S")
-						{
-						if (!defined $fieldLen) 
-							{$fieldLen = $recordLen-$recordPos;}
-						for (my $j=0; $j < $fieldLen; $j+=2)
-							{
-					        my $byte = unpack("c", substr ($recordData, $recordPos+$j, 1));
- 							$formattedText.= sprintf ("%c", $byte);
-							}
-						$recordPos+= $fieldLen; 
-						$recordPos = ($recordPos + 3) & ~3;
-						next;
-						}
-					elsif ($c eq "c")
-						{
-				        my $byte = unpack("c", substr ($recordData, $recordPos, 1));
-						$formattedText.= sprintf ("%c", $byte);
-						}
-					}
-				else
-					{
-					$formattedText.= $c;
-					}
-				}
-			}
-		else	# no format string : print as hex
-			{
-			for (my $i=0; $i < $recordLen; $i+=4)
-				{
-				$formattedText.= sprintf ("%08X ", unpack("V", substr($recordData, $i, 4)));
-				}
-			$recordPos+= $recordLen; $recordLen = 0;
-			
-			}
-		
-
-		# print Formatted text (col #10)
-		$formattedText=~ s/,/;/g;
-		$formattedText=~ s/\r//g;
-		$formattedText=~ s/\n/,/g;
-		printf "%s", $formattedText;
-
-		printf("\n");
-
-		if ($len < 0 || $recordLen < 0)	{die "truncated file";}
-  
-
-		$pos+= ($len +3) & ~3;
-		seek (LOGFILE, $pos, SEEK_SET) or die "truncated file";
-		$i++;
-		}
-
-	close (LOGFILE);
-
-	if ($VerboseMode)
-		{
-		print "*** Processes ***\n";
-		for $id ( keys %ProcessNames )
-			{
-			printf ("process %08X ProcessName %s\n", $id, $ProcessNames{$id});
-			}
-		print "*** Thread ***\n";
-		for $id ( keys %ThreadNames )
-			{
-			printf ("thread %08X ThreadName %s::%X\n", $id, $ThreadNames{$id}, $ThreadIds{$id});
-			}
-		}
-
-    }
-
-    
-sub ReadSingleRecord
-	{
-	($fh, $data, $dataLen, $recordLen, $category, $subCategory, $multipartFlags, $extraN, $totalLen, $offset, $RawMode) = @_;	
-	
-	my $hdr;
-	my $flags;
-	my $header2;
-	my $timestamp;
-	my $timestamp2;
-	my $contextId;
-	my $programConter;	
-	
-	my $recordOffset = 0;
-	
-	$timestampLast;	
-	my $timestampDelta = 0;	
-	
-	my $bytesRead = read($fh, $hdr, 4);
-	
-	
-	if ($bytesRead < 4)	
-		{return -1;}
-
-	($$recordLen,$flags,$$category,$$subCategory) = unpack("CCCC", $hdr);
-	$$dataLen = $$recordLen-4;
-	
-	if ($flags & $EHeader2Present)
-		{$$multipartFlags = (ReadDword($fh) & $EMultipartFlagMask); $$dataLen-= 4}
-	else
-		{$$multipartFlags = 0;}
-	if ($flags & $ETimestampPresent)
-		{$timestamp = ReadDword($fh); $$dataLen-= 4;}
-	if ($flags & $ETimestamp2Present)
-		{$timestamp2 = ReadDword($fh); $$dataLen-= 4;}
-	if ($flags & $EContextIdPresent)
-		{$contextId = ReadDword($fh); $$dataLen-= 4;}
-	if ($flags & $EPcPresent)
-		{$programConter = ReadDword($fh); $$dataLen-= 4;}
-	if ($flags & $EExtraPresent)
-		{$$extraN = ReadDword($fh); $$dataLen-= 4;}
-	if ($$multipartFlags != 0)
-		{
-		$$totalLen = ReadDword($fh);  $$dataLen-= 4;
-		if ($$multipartFlags == $EMultipartMiddle || $$multipartFlags == $EMultipartLast)
-			{$$offset = ReadDword($fh);  $$totalLen-= 4; $$dataLen-= 4;}
-		}				
-
-	$timestampDelta = $timestamp - $timestampLast;
-	$timestampLast = $timestamp;
-
-	read($fh, $$data, ($$dataLen + 3) & ~3);
-
-
-	if ($RawMode || $$multipartFlags == $EMultipartFirst || $$multipartFlags == 0)
-		{
-		# print header len (col #1)
-		if ($PrintFlagHdrLen){printf ("0x%02X, ", $$recordLen);}
-	
-		# print header flags (col #2)
-		if ($PrintFlagHdrFlags)
-			{
-			printf ("%02X ", $flags);
-			if ($flags & $EHeader2Present) {printf "EHeader2Present ";}
-			if ($flags & $ETimestampPresent) {printf "ETimestampPresent ";}
-			if ($flags & $ETimestamp2Present) {printf "ETimestamp2Present ";}
-			if ($flags & $EContextIdPresent) {printf "EContextIdPresent ";}
-			if ($flags & $EPcPresent) {printf "EPcPresent ";}
-			if ($$multipartFlags != 0)
-				{
-				printf "EExtraPresent ";
-				if ($$multipartFlags == $EMultipartFirst) {print "EMultipartFirst ";}
-				elsif ($$multipartFlags == $EMultipartMiddle) {print "EMultipartMiddle ";}
-				elsif ($$multipartFlags == $EMultipartLast) {print "EMultipartLast ";}
-				printf ("ExtraN(0x%08X) ", $$extraN);
-				}
-			if ($flags & $ERecordTruncated) {printf "ERecordTruncated ";}
-			if ($flags & $EMissingRecord) {printf "EMissingRecord ";}
-			print ",";
-			}
-				
-		# print category (col #3)
-		printf "(%d;%d) $categoryString  , ", $$category, $$subCategory;
-	
-		# print timestamp(s) (col #4)
-		printf "0x";
-		if (defined $timestamp2) {printf "%08X : ", $timestamp2;}
-		printf "%08X", $timestamp;
-		printf ", ";;
-	
-		# print timestamp delta (col #5)
-		printf "0x%08X, ", $timestampDelta;
-
-		# print context Id (col #6)
-		if (!$RawMode && defined $ThreadNames{$contextId})
-			{
-			printf ("%s::%X, ", $ThreadNames{$contextId}, $ThreadIds{$contextId});
-			}
-		else			
-			{
-			if ((($contextId & $EContextIdMask) == $EContextIdThread) || $RawMode)
-				{printf "0x%08X, ", $contextId;}
-			elsif (($contextId & $EContextIdMask) == $EContextIdFIQ)
-				{printf "FIQ, ";}
-			elsif (($contextId & $EContextIdMask) == $EContextIdIRQ)
-				{printf "IRQ, ";}
-			elsif (($contextId & $EContextIdMask) == $EContextIdIDFC)
-				{printf "IDFC, ";}
-			}
-	
-		# print Program Counter (col #7)
-		printf "0x%08X, ", $programConter;
-		}
-
-		
-	
-	
-#########################################################
-#	my $hex;
-#	for (my $i=0; $i < $$dataLen; $i+=4)
-#		{
-#		$hex.= sprintf ("%08X ", unpack("V", substr($$data, $i, 4)));
-#		}
-#	printf "\nadding [$hex]\n";
-#########################################################
-	return $bytesRead
-	}
-
-	      
-sub ReadRecord 
-	{
-	($fh, $recordPos, $recordData, $category, $subCategory, $multipartFlags, $RawMode) = @_;
-#	printf "CurrentPos %08X\n", $pos;
-
-
-
-	seek ($fh, $$recordPos, SEEK_SET) or die "truncated file";
-	my $recordLen;
-	my $extraN;
-	my $totalLen;
-	my $offset;
-	my $dataLen;
-	my $data;
-	my $bytesRead;
-	
-	
-	$bytesRead = ReadSingleRecord($fh,  \$data, \$dataLen, \$recordLen, \$$category, \$$subCategory, \$$multipartFlags, \$extraN, \$totalLen, \$offset, $RawMode);
-
-	if ($bytesRead == -1)	# eof ?
-		{return -1; }
-	$$recordPos+= ($recordLen +3) & ~3;
-	
-	$$recordData = $data;
-    $offset = $dataLen;
-
-	$offset-= 4;		# subtract 4 bytes for UID ?????????
-    
-    if ($RawMode || $$multipartFlags != $EMultipartFirst)
-    	{return $dataLen;}
-
-    $pos = $$recordPos;
-
-	while (1)
-		{
-		
-		# find next record, i.e. look for a record which matches $extraN 
-		
-		seek ($fh, $pos, SEEK_SET) or die "truncated file";
-
-		my $recordLen;
-		
-		my $category;
-		my $subCategory;
-		my $multipartFlags;
-		my $currentExtraN;
-		my $currentOffset;
-		
-		my $totalLen;
-		my $currentDataLen;
-		my $data;
-		$bytesRead = ReadSingleRecord($fh, \$data, \$currentDataLen, \$recordLen, \$category, \$subCategory, \$multipartFlags, \$currentExtraN, \$totalLen, \$currentOffset, $RawMode);
-		if ($bytesRead == -1)	# eof ?
-			{return -1; }
-		$pos+= ($recordLen +3) & ~3;
-		
-#		printf "\npos %08X, Seaching for (extra %08X, offset %08X), found (extra %08X, offset %08X)\n",
-#			$pos, $extraN, $offset, $currentExtraN, $currentOffset;
-
-		if ($currentExtraN == $extraN && $currentOffset == $offset)
-			{
-			$$recordData.= $data;
-			$offset+= $currentDataLen;
-			$dataLen+= $currentDataLen;
-			}
-			
-		if ($multipartFlags == $EMultipartLast)
-			{last;}
-		}
-	
-	return $dataLen;
-	}	
-
-sub ReadDword {
-	(my $fh) = @_;
-	my $buffer;
-
-	$bytesRead = read($fh, $buffer, 4);
-	if ($bytesRead < 4) 	{die "truncated file";}
-
-	my $dword = unpack("V", $buffer);
-
-	return $dword
-	};
-
-sub ReadByte {
-	(my $fh) = @_;
-	my $buffer;
-
-	$bytesRead = read($fh, $buffer, 1);
-	if ($bytesRead < 1) 	{die "truncated file";}
-
-	my $byte = unpack("C", $buffer);
-
-	return $byte
-	};
-
-    
-	
-sub PrintFormatTables($)
-	{
-	my ($formatTables) = @_;
-		
-	for $tableIndex ( sort keys %$formatTables )
-		{
-		printf ("SYMTraceFormatCategory %08X:\n", $tableIndex);
-		for $formatId (sort keys %{ $$formatTables{$tableIndex} } )
-			{
-			printf ("%08X => %s\n", $formatId, $$formatTables{$tableIndex}{$formatId});
-			}
-			print "\n";
-		}
-	}
-        
-
-
-sub OutputSawDictionary($)
-	{
-	my ($formatTables) = @_;
-
-
-	# SAW enums
-	$EFieldTypeHexDump = 0;
-	$EFieldTypeHex = 1;
-	$EFieldTypeDecimal = 2;
-	$EFieldTypeStringToEnd = 3;
-	$EFieldTypeNullTerminatedString = 4;
-	$EFieldTypeHexDumpToEnd = 5;
-	$EFieldTypeUnicodeToEnd = 6;
-	$EFieldTypeNullTerminatedUnicode = 7;
-	$EFieldTypeCountedUnicode = 8;
-	$EFieldTypeCountedHexDump = 9;
-	$EFieldTypeCountedString = 10;
-
-	my $moduleIds;	# string containg all UIDs separared by semi-colons
-		
-	for $tableIndex ( sort keys %$formatTables )
-		{
-		if ($tableIndex < 256)
-			{
-			next;
-			}
-		$moduleIds.= sprintf ("%08X;", $tableIndex);
-		
-		printf ("MODULEID_%08X_DESC=\n", $tableIndex);
-		printf ("MODULEID_%08X_NAME=%08X\n", $tableIndex, $tableIndex);
-		
-		my $formatIds;
-		$formatIds = sprintf ("MODULEID_%08X_FORMATIDS=", $tableIndex);
-		
-		for $formatId  (sort keys %{ $$formatTables{$tableIndex} } )
-			{
-			$formatIds.= sprintf ("%d;", $formatId);
-			}
-		printf ("$formatIds\n");
-		
-		
-		for $formatId (sort keys %{ $$formatTables{$tableIndex} } )
-			{
-			my $fieldCount = 0;
-			my $formatString = $$formatTables{$tableIndex}{$formatId};
-			
-#printf ("formatString = (%s)\n", $formatString);
-
-			# format name is the first format string up until the first space or '%' character or end-of line ...
-			$formatString=~ m/^[^%\s]*/;
-			my $formatName = $&;
-			
-			# thow the format name away
-			$formatString = $';
-			
-			# strip the leading space
-			$formatString=~ s/\s*//;
-
-			printf ("MODULEID_%08X_FORMATID_%d_NAME=%s\n", $tableIndex, $formatId, $formatName);
-#printf ("MODULEID_%08X_FORMATID_%d_DESC=\n", $tableIndex, $formatId);
-
-			my $lenFormatString = length($formatString);
-			
-			my $formattedText;
-			my $fieldType = $EFieldTypeHex;
-			my $fieldLen = 0;
-			while (length($formatString))
-				{
-				my $c = (substr ($formatString, 0, 1));
-#print ("[$formatString][$c]\n");				
-				$formatString=~ s/.//;	# strip the leading space
-				if ($c eq "%")
-					{
-#print "found %\n";							
-					my $fieldLenSpecified = 0;
-	        		$c = (substr ($formatString, 0, 1));
-					$formatString=~ s/.//;	# discard char
-#print "c2=$c\n";							
-					if ($c eq "%")
-						{
-						$formattedText.= substr ($formatString, 0, 1);
-						next;
-						}
-					if ($c eq "*")	## take length from buffer
-						{
-						$fieldLenSpecified = 1;
-		        		$c = (substr ($formatString, 0, 1));
-						$formatString=~ s/.//;	# discard char
-						}
-					if (lc $c eq "x" || $c eq "h")
-						{
-						## deal wilth $fieldLenSpecified
-						if ($fieldLenSpecified)
-							{
-							$fieldType = $EFieldTypeCountedHexDump;
-							$fieldLen = 0;
-							}
-						else
-							{
-							$fieldType = $EFieldTypeHex;
-							$fieldLen = 4;
-							}
-						}
-					elsif (lc $c eq "l" && substr ($formatString, 0, 1) eq "d")
-						{
-						$formatString=~ s/.//;	# discard char
-						$fieldType = $EFieldTypeDecimal;
-						$fieldLen = 8;
-						}
-					elsif (lc $c eq "l" && substr ($formatString, 0, 1) eq "x")
-						{
-						$formatString=~ s/.//;	# discard char
-						$fieldType = $EFieldTypeHex;
-						$fieldLen = 8;
-						}
-					elsif (lc $c eq "d")
-						{
-						$fieldType = $EFieldTypeDecimal;
-						$fieldLen = 4;
-						}
-					elsif ($c eq "s")
-						{
-						## deal wilth $fieldLenSpecified
-						if ($fieldLenSpecified)
-							{
-							$fieldType = $EFieldTypeCountedString;
-							$fieldLen = 0;
-							}
-						else
-							{
-							$fieldType = $EFieldTypeStringToEnd;
-							$fieldLen = 0;
-							}
-						}
-					elsif ($c eq "S")
-						{
-						## deal wilth $fieldLenSpecified
-						if ($fieldLenSpecified)
-							{
-							$fieldType = $EFieldTypeCountedUnicode;
-							$fieldLen = 0;
-							}
-						else
-							{
-							$fieldType = EFieldTypeUnicodeToEnd;
-							$fieldLen = 0;
-							}
-						}
-					elsif ($c eq "c")
-						{
-						$fieldType = $EFieldTypeHex;
-						$fieldLen = 1;
-						}
-					printf ("MODULEID_%08X_FORMATID_%d_FIELD_%d_NAME=%s\n", $tableIndex, $formatId, $fieldCount, $formattedText);
-					printf ("MODULEID_%08X_FORMATID_%d_FIELD_%d_TYPE=%s\n", $tableIndex, $formatId, $fieldCount, $fieldType);
-					if ($fieldLen > 0)
-						{printf ("MODULEID_%08X_FORMATID_%d_FIELD_%d_LENGTH=%s\n", $tableIndex, $formatId, $fieldCount, $fieldLen);}
-					$fieldCount++;
-					$formattedText="";
-					
-					$formatString=~ s/\s//;	# strip the leading space
-					}
-				else
-					{
-#					if ($c eq ":") {$formattedText.= '\\'; }
-					$formattedText.= $c;
-					}
-				}
-			printf ("MODULEID_%08X_FORMATID_%d_FIELDS=%d\n", $tableIndex, $formatId, $fieldCount);
-			
-			}
-		print "MODULEIDS=$moduleIds\n";
-		}
-	}
-	
-	
-	
-	
-	
-	
-	        
-        
-sub H2Trace($$)
-{
-	%basictypes = (
-		TInt8		=>	1,
-		TUint8		=>	1,
-		TInt16		=>	2,
-		TUint16		=>	2,
-		TInt32		=>	4,
-		TUint32		=>	4,
-		TInt		=>	4,
-		TUint		=>	4,
-		TBool		=>	4,
-		TInt64		=>	8,
-		TUint64		=>	8,
-		TLinAddr	=>	4,
-		TVersion	=>	4,
-		TPde		=>	4,
-		TPte		=>	4,
-		TProcessPriority => 4,
-		TFormatId	=>  2,
-	);
-	
-	if (scalar(@_)!= 2) {
-		die "perl h2trace.pl <input.h>\n";
-	}
-	my ($infile, $filescope) = @_;
-	
-	if ($VerboseMode)
-		{print "\nOpening $infile\n";}
-	
-	open IN, $infile or die "Can't open $infile for input\n";
-	my $in;
-	while (<IN>) {
-		$in.=$_;
-	}
-	close IN;
-	
-	# First remove any backslash-newline combinations
-	$in =~ s/\\\n//gms;
-	
-	# Remove any character constants
-	$in =~  s/\'(.?(${0})*?)\'//gms;
-	
-	# Strip comments beginning with //
-	$in =~ s/\/\/(.*?)\n/\n/gms;    #//(.*?)\n
-	
-	# Strip comments (/* */) but leave doxygen comments (/** */)
-	$in =~ s/\/\*[^*](.*?)\*\//\n/gms;  #/*(.*?)*/
-	
-	
-	# Collapse whitespace into a single space or newline
-	$in =~ s/\t/\ /gms;
-	$in =~ s/\r/\ /gms;
-	
-	# Tokenize on non-identifier characters
-	my @tokens0 = split(/(\W)/,$in);
-	my @tokens;
-	my $inString = 0;
-	my $inComment = 0;
-	my $string;
-	foreach $t (@tokens0) {
-		next if ($t eq "");
-		next if (!$inString && ($t eq " " or $t eq ""));
-		if ($inComment == 0) 
-			{
-			if ($t eq "/")
-				{$inComment = 1;}
-			}
-		elsif ($inComment == 1) 
-			{
-			if ($t eq "*")
-				{$inComment = 2;}
-			else
-				{$inComment = 0;}
-			}
-		elsif ($inComment == 2) 
-			{
-			if ($t eq "*")
-				{$inComment = 3;}
-			}
-		elsif ($inComment == 3) 
-			{
-			if ($t eq "/")
-				{
-				$inComment = 0;
-		        # if we were in a string, need to push previous '*'
-		        if ($inString)
-		          {
-		          push @tokens, "*";
-		          }
-				$inString = 0;	# end of comment aborts a string
-				$string = "";
-				}
-			else
-				{$inComment = 2;}
-			}
-			
-		if ($t eq "\"")
-			{
-			if (!$inString) 
-				{
-				$inString=1;
-				next;
-				}
-			else
-				{
-				$inString=0;
-				$t = $string;
-				$string = "";
-#				if ($VerboseMode) {print "string : [$t]\n";	}
-				}
-			}
-			
-		if ($inString)
-			{
-			$string.= $t;
-			next;
-			}
-		push @tokens, $t;
-	}
-	
-	my $CurrentTraceFormatString;
-	my $CurrentTraceFormatCategory;
-	# format Key as specified by the @TraceFormatCategory tag is either the current category 
-	# or the current UID
-	my $CurrentFormatTableKey;	
-	
-	
-	my $line=1;
-	parse_scope($filescope, \@tokens, \$line);
-
-	#print $in;
-	#print join (" ", @tokens);
-}	# end of     H2Trace
-	
-
-
-	sub parse_scope($$$) {
-		my ($scope, $tokens, $line) = @_;
-		my $state = 1;
-		
-		my @classes;
-		my $curr_offset=0;
-		my $overall_align=0;
-#		print ">parse_scope $scope->{name}\n";
-		
-		while (scalar(@$tokens))
-			{
-			my $t = shift @$tokens;
-#			printf "t: [$t] [$$line]\n";
-	    	if (!defined ($t)) {
-	      		printf "undefined !";
-	      		next;
-	      	}
-			if ($state>=-1 and $t eq "\n") {
-				++$$line;
-				$state=1;
-				next;
-			} elsif ($state==-1 and $t ne "\n") {
-				next;
-			} elsif ($state==-2 and $t ne ';') {
-				next;
-			}
-			
-			if ($state>0 and $t eq '#') {
-				$t = shift @$tokens;
-				if ($t eq 'define') {
-					my $ident = shift @$tokens;
-					my $defn = shift @$tokens;
-					if ($defn ne '(') {	# don't do macros with parameters
-#					print "MACRO: $ident :== $defn\n";
-					$macros{$ident} = $defn;
-					}
-				}
-				$state=-1;	# skip to next line
-				next;
-			}
-			
-			
-			if (parse_doxygen($scope,$tokens, $line, $t) == 1)
-				{next;}
-	
-			if ($t eq "namespace" ) {
-				$state=0;
-				my %cl;
-				$cl{specifier}=$t;
-				$cl{scope}=$scope;
-				$cl{values}=$scope->{values};
-				$cl{members}=\$scope->{members};
-				$cl{typedefs}=\$scope->{typedefs};
-				$cl{FormatTables}=$scope->{FormatTables};
-				$cl{formatStrings} =$scope->{formatStrings};
-				$cl{formatCategories} =$scope->{formatCategories};
-				
-				my $new_namespace = \%cl;
-				my $n = get_token($scope,$tokens,$line);
-				if ($n !~ /\w+/) {
-					warn "Unnamed $t not supported at line $$line\n";
-					return;
-				}
-				$new_namespace->{name}=$n;
-				my @class_match = grep {$_->{name} eq $n} @classes;
-				my $exists = scalar(@class_match);
-				my $b = get_token($scope,$tokens,$line);
-				if ($b eq ':') {
-					die "Inheritance not supported at line $$line\n";
-				} elsif ($b eq ';') {
-					# forward declaration
-					push @classes, $new_namespace unless ($exists);
-					next;
-				} elsif ($b ne '{') {
-					warn "Syntax error#1 at line $$line\n";
-					return;
-				}
-				if ($exists) {
-					$new_namespace = $class_match[0];
-					if ($new_namespace->{complete}) {
-						warn "Duplicate definition of $cl{specifier} $n\n";
-					}
-				}
-				push @classes, $new_namespace unless ($exists);
-				parse_scope($new_namespace, $tokens, $line);
-				next;
-			}
-			
-			if ($t eq "struct" or $t eq "class" or $t eq "NONSHARABLE_CLASS") {
-				next if ($state==0);
-				$state=0;
-				my %cl;
-				$cl{specifier}=$t;
-				$cl{scope}=$scope;
-				my @members;
-				my @typedefs;
-				$cl{members}=\@members;
-				$cl{typedefs}=\@typedefs;
-				$cl{FormatTables}=$scope->{FormatTables};
-				my $new_class = \%cl;
-				my $n;
-
-				if ($t eq "NONSHARABLE_CLASS")
-					{
-					my $b = get_token($scope,$tokens,$line);
-					if ($b !~ /\(/) {die "Syntax error at line $$line\n";}
-					$n = get_token($scope,$tokens,$line);
-  				$b = get_token($scope,$tokens,$line);
-					if ($b !~ /\)/) {die "Syntax error at line $$line\n";}
-					}
-				else					
-					{
-					$n = get_token($scope,$tokens,$line);
-					}
-								
-				
-				if ($n !~ /\w+/) {
-					warn "Unnamed $t not supported at line $$line\n";
-					return;
-				}
-				$new_class->{name}=$n;
-				my @class_match = grep {$_->{name} eq $n} @classes;
-				my $exists = scalar(@class_match);
-				my $b = get_token($scope,$tokens,$line);
-				#skip inheritance etc until we get to a '{' or \ ';'
-				while ($b ne '{' && $b ne ';')
-					{
-			        $b = get_token($scope,$tokens,$line);
-			        die "Syntax error#2 at line $$line\n" if  (!defined $b);
-					}
-				if ($b eq ';') {
-					# forward declaration
-					push @classes, $new_class unless ($exists);
-					next;
-				} 
-				if ($exists) {
-					$new_class = $class_match[0];
-					if ($new_class->{complete}) {
-						warn "Duplicate definition of $cl{specifier} $n\n";
-					}
-				}
-				push @classes, $new_class unless ($exists);
-				parse_scope($new_class, $tokens, $line);
-				next;
-			} elsif ($t eq "enum") {
-				$state=0;
-				my $n = get_token($scope,$tokens,$line);
-				my $name="";
-				if ($n =~ /\w+/) {
-					$name = $n;
-					$n = get_token($scope,$tokens,$line);
-				}
-				push @enums, $name;
-				if ($n ne '{') {
-					die "Syntax error#4 at line $$line\n";
-				}
-				parse_enum($scope, $tokens, $line, $name);
-				next;
-			} elsif ($t eq '}') {
-				$state=0;
-				if ($scope->{scope}) {
-			        if ($scope->{specifier} eq "namespace")
-			        	{
-						$scope->{complete}=1;
-#						print "Scope completed\n";
-						last;
-						}
-					$t = get_token($scope,$tokens,$line);
-					# skip to next ';'
-					while (defined ($t) and $t ne ';')
-						{$t = get_token($scope,$tokens,$line);}
-					die "Syntax error#5 at line $$line\n" if ($t ne ';');
-					$scope->{complete}=1;
-#					print "Scope completed\n";
-					last;
-				}
-				warn "Syntax error#5 at line $$line\n";
-				return;
-			}
-			$state=0;
-			if ($scope->{scope}) {
-				if ($t eq "public" or $t eq "private" or $t eq "protected") {
-					if (shift (@$tokens) eq ':') {
-						next;	# ignore access specifiers
-					}
-				die "Syntax error#6 at line $$line\n";
-				}
-			}
-			unshift @$tokens, $t;
-			
-			my @currdecl = parse_decl_def($scope, $tokens, $line);
-#			print scalar (@currdecl), "\n";
-			if ($t eq 'static') {
-				next;	# skip static members
-			}
-			my $typedef;
-			if ($t eq 'typedef') {
-#			print "TYPEDEF\n";
-				$typedef = 1;
-				$t = shift @currdecl;
-				$t = $currdecl[0];
-			} else {
-#			print "NOT TYPEDEF\n";
-				$typedef = 0;
-			}
-#			print "$currdecl[0]\n";
-			next if (scalar(@currdecl)==0);
-			
-			if ($t eq "const") {
-				# check for constant declaration
-#				print "CONST $currdecl[1] $currdecl[2] $currdecl[3]\n";
-				my $ctype = lookup_type($scope, $currdecl[1]);
-#				print "$ctype->{basic}    $ctype->{size}\n";
-				if ($ctype->{basic} and $currdecl[2]=~/^\w+$/ and $currdecl[3] eq '=') {
-					if ($typedef!=0) {
-						die "Syntax error#7 at line $$line\n";
-					}
-					shift @currdecl;
-					shift @currdecl;
-					my $type = $ctype->{name};
-					my $name;		#### = shift @currdecl;
-
-					if ($scope->{name})
-						{	
-						$name = $scope->{name} . "::" . shift @currdecl;
-						}
-					else
-						{
-						$name = shift @currdecl;
-						}
-#					printf "[$name,$scope->{name}]";
-					my $size = $ctype->{size};
-					shift @currdecl;
-					my $value = get_constant_expr($scope,\@currdecl,$line);
-					$values{$name} = {type=>$type, size=>$size, value=>$value};
-					next;
-				}
-			}
-			
-			
-			
-		}
-	}
-	
-	sub get_token($$$) {
-		my ($scope,$tokenlist,$line) = @_;
-		while (scalar(@$tokenlist)) {
-			my $t = shift @$tokenlist;
-			return $t if (!defined($t));
-			if (parse_doxygen($scope,$tokenlist, $line, $t) == 1)
-				{next;}
-			if ($t !~ /^[\s]*$/)
-				{
-				if ($$tokenlist[0] eq ":" and $$tokenlist[1] eq ":")
-					{
-					$t.= shift @$tokenlist;
-					$t.= shift @$tokenlist;
-					$t.= shift @$tokenlist;
-#					print "Colon-separated token";
-					}
-				return $t
-				}
-			++$$line;
-		}
-  		return undef;
-	}
-	
-	sub skip_qualifiers($) {
-		my ($tokens) = @_;
-		my $f=0;
-		my %quals = (
-			EXPORT_C => 1,
-			IMPORT_C => 1,
-			inline => 1,
-			virtual => 0,
-			const => 0,
-			volatile => 0,
-			static => 0,
-			extern => 0,
-			LOCAL_C => 0,
-			LOCAL_D => 0,
-			GLDEF_C => 0,
-			GLREF_C => 0,
-			GLDEF_D => 0,
-			GLREF_D => 0
-			);
-		for (;;) {
-			my $t = $$tokens[0];
-			my $q = $quals{$t};
-			last unless (defined ($q));
-			$f |= $q;
-			shift @$tokens;
-		}
-		return $f;
-	}
-	
-	sub parse_indirection($) {
-		my ($tokens) = @_;
-		my $level = 0;
-		for (;;) {
-			my $t = $$tokens[0];
-			if ($t eq '*') {
-				++$level;
-				shift @$tokens;
-				next;
-			}
-			last if ($t ne "const" and $t ne "volatile");
-			shift @$tokens;
-		}
-		return $level;
-	}
-	
-	sub get_operand($$$) {
-		my ($scope,$tokens,$line) = @_;
-		my $t = get_token($scope,$tokens,$line);
-		if ($t eq '-') {
-			my $x = get_operand($scope,$tokens,$line);
-			return -$x;
-		} elsif ($t eq '+') {
-			my $x = get_operand($scope,$tokens,$line);
-			return $x;
-		} elsif ($t eq '~') {
-			my $x = get_operand($scope,$tokens,$line);
-			return ~$x;
-		} elsif ($t eq '!') {
-			my $x = get_operand($scope,$tokens,$line);
-			return $x ? 0 : 1;
-		} elsif ($t eq '(') {
-			my $x = get_constant_expr($scope,$tokens,$line);
-			my $t = get_token($scope,$tokens,$line);
-			if ($t ne ')') {
-				warn "Missing ) at line $$line\n";
-				return undefined;
-			}
-			return $x;
-		} elsif ($t eq "sizeof") {
-			my $ident = get_token($scope,$tokens,$line);
-			if ($ident eq '(') {
-				$ident = get_token($scope,$tokens,$line);
-				my $cb = get_token($scope,$tokens,$line);
-				if ($cb ne ')') {
-					warn "Bad sizeof() syntax at line $$line\n";
-					return undefined;
-				}
-			}
-			$ident = look_through_macros($ident);
-			if ($ident !~ /^\w+$/) {
-				warn "Bad sizeof() syntax at line $$line\n";
-				return undefined;
-			}
-			my $type = lookup_type($scope, $ident);
-			if (!defined $type) {
-				warn "Unrecognised type $ident at line $$line\n";
-				return undefined;
-			}
-			if ($type->{basic}) {
-				return $type->{size};
-			} elsif ($type->{enum}) {
-				return 4;
-			} elsif ($type->{ptr}) {
-				return 4;
-			} elsif ($type->{fptr}) {
-				return 4;
-			}
-			my $al = $type->{class}->{align};
-			my $sz = $type->{class}->{size};
-			return ($sz+$al-1)&~($al-1);
-		}
-		$t = look_through_macros($t);
-		if ($t =~ /^0x/i) {
-			return oct($t);
-		} elsif ($t =~ /^\d/) {
-			return $t;
-		} elsif ($t =~ /^\w+$/) {
-			my $x = lookup_value($scope,$t);
-#			die "Unrecognised identifier '$t' at line $$line\n" unless defined($x);
-			if (!defined($x)) {
-				print "Unrecognised identifier '$t' at line $$line\n" ;
-			}
-			return $x;
-		} elsif ($t =~ /^\w+::\w+$/) {
-			my $x = lookup_value($scope,$t);
-#			die "Unrecognised identifier '$t' at line $$line\n" unless defined($x);
-			if (!defined($x)) {
-				print "Unrecognised identifier '$t' at line $$line\n" ;
-			}
-			return $x;
-		} else {
-			warn "Syntax error#10 at line $$line\n";
-			return undefined;
-		}
-	}
-	
-	sub look_through_macros($) {
-		my ($ident) = @_;
-		while ($ident and $macros{$ident}) {
-			$ident = $macros{$ident};
-		}
-		return $ident;
-	}
-	
-	sub lookup_value($$) {
-		my ($scope,$ident) = @_;
-		while ($scope) {
-			my $vl = $scope->{values};
-			if (defined($vl->{$ident})) {
-				return $vl->{$ident}->{value};
-			}
-			$scope = $scope->{scope};
-		}
-		return undef();
-	}
-	
-	sub lookup_type($$) {
-		my ($scope,$ident) = @_;
-		if ($basictypes{$ident}) {
-			return {scope=>$scope, basic=>1, name=>$ident, size=>$basictypes{$ident} };
-		}
-		while ($scope) {
-			if ($basictypes{$ident}) {
-				return {scope=>$scope, basic=>1, name=>$ident, size=>$basictypes{$ident} };
-			}
-			my $el = $scope->{enums};
-			my $cl = $scope->{classes};
-			my $td = $scope->{typedefs};
-			if (grep {$_ eq $ident} @$el) {
-				return {scope=>$scope, enum=>1, name=>$ident, size=>4 };
-			}
-			my @match_class = (grep {$_->{name} eq $ident} @$cl);
-			if (scalar(@match_class)) {
-				return {scope=>$scope, class=>$match_class[0]};
-			}
-			my @match_td = (grep {$_->{name} eq $ident} @$td);
-			if (scalar(@match_td)) {
-				my $tdr = $match_td[0];
-				my $cat = $tdr->{category};
-				if ($cat eq 'basic' or $cat eq 'enum' or $cat eq 'class') {
-					$ident = $tdr->{alias};
-					next;
-				} else {
-					return { scope=>$scope, $cat=>1, $size=>$tdr->{size} };
-				}
-			}
-			$scope = $scope->{scope};
-		}
-		return undef();
-	}
-	
-	sub get_mult_expr($$$) {
-		my ($scope,$tokens,$line) = @_;
-		my $x = get_operand($scope,$tokens,$line);
-		my $t;
-		for (;;) {
-			$t = get_token($scope,$tokens,$line);
-			if ($t eq '*') {
-				my $y = get_operand($scope,$tokens,$line);
-				$x = $x * $y;
-			} elsif ($t eq '/') {
-				my $y = get_operand($scope,$tokens,$line);
-				if ($y != 0)
-					{$x = int($x / $y);}
-			} elsif ($t eq '%') {
-				my $y = get_operand($scope,$tokens,$line);
-				if ($y != 0)
-					{$x = int($x % $y);}
-			} else {
-				last;
-			}
-		}
-		unshift @$tokens, $t;
-		return $x;
-	}
-	
-	sub get_add_expr($$$) {
-		my ($scope,$tokens,$line) = @_;
-		my $x = get_mult_expr($scope,$tokens,$line);
-		my $t;
-		for (;;) {
-			$t = get_token($scope,$tokens,$line);
-			if ($t eq '+') {
-				my $y = get_mult_expr($scope,$tokens,$line);
-				$x = $x + $y;
-			} elsif ($t eq '-') {
-				my $y = get_mult_expr($scope,$tokens,$line);
-				$x = $x - $y;
-			} else {
-				last;
-			}
-		}
-		unshift @$tokens, $t;
-		return $x;
-	}
-	
-	sub get_shift_expr($$$) {
-		my ($scope,$tokens,$line) = @_;
-		my $x = get_add_expr($scope,$tokens,$line);
-		my $t, $t2;
-		for (;;) {
-			$t = get_token($scope,$tokens,$line);
-			if ($t eq '<' or $t eq '>') {
-				$t2 = get_token($scope,$tokens,$line);
-				if ($t2 ne $t) {
-					unshift @$tokens, $t2;
-					last;
-				}
-			}
-			if ($t eq '<') {
-				my $y = get_add_expr($scope,$tokens,$line);
-				$x = $x << $y;
-			} elsif ($t eq '>') {
-				my $y = get_add_expr($scope,$tokens,$line);
-				$x = $x >> $y;
-			} else {
-				last;
-			}
-		}
-		unshift @$tokens, $t;
-		return $x;
-	}
-	
-	sub get_and_expr($$$) {
-		my ($scope,$tokens,$line) = @_;
-		my $x = get_shift_expr($scope,$tokens,$line);
-		my $t;
-		for (;;) {
-			$t = get_token($scope,$tokens,$line);
-			if ($t eq '&') {
-				my $y = get_shift_expr($scope,$tokens,$line);
-				$x = $x & $y;
-			} else {
-				last;
-			}
-		}
-		unshift @$tokens, $t;
-		return $x;
-	}
-	
-	sub get_xor_expr($$$) {
-		my ($scope,$tokens,$line) = @_;
-		my $x = get_and_expr($scope,$tokens,$line);
-		my $t;
-		for (;;) {
-			$t = get_token($scope,$tokens,$line);
-			if ($t eq '^') {
-				my $y = get_and_expr($scope,$tokens,$line);
-				$x = $x ^ $y;
-			} else {
-				last;
-			}
-		}
-		unshift @$tokens, $t;
-		return $x;
-	}
-	
-	sub get_ior_expr($$$) {
-		my ($scope,$tokens,$line) = @_;
-		my $x = get_xor_expr($scope,$tokens,$line);
-		my $t;
-		for (;;) {
-			$t = get_token($scope,$tokens,$line);
-			if ($t eq '|') {
-				my $y = get_xor_expr($scope,$tokens,$line);
-				$x = $x | $y;
-			} else {
-				last;
-			}
-		}
-		unshift @$tokens, $t;
-		return $x;
-	}
-	
-	sub get_constant_expr($$$) {
-		my ($scope,$tokens,$line) = @_;
-		my $x = get_ior_expr($scope,$tokens,$line);
-		return $x;
-	}
-	
-	sub parse_enum($$$$) {
-		my ($scope,$tokens,$line,$enum_name) = @_;
-		my $vl = $scope->{values};
-		my $fstr = $scope->{formatStrings};
-		my $fcat = $scope->{formatCategories};
-		my $fmtTable = $scope->{FormatTables};
-		
-		my $x = 0;
-		for (;;) {
-			my $t = get_token($scope,$tokens,$line);
-			last if ($t eq '}');
-			if (!defined($t)) {
-				die "Unexpected end of file #2 at line $$line\n";
-			}
-			
-			if ($t eq '#') {
-				next;
-				}
-			
-			if ($t !~ /^\w+$/) {
-				warn "Syntax error#11 at line $$line\n";
-				next;
-			}
-
-			if ($scope->{name})
-				{	
-				$t = $scope->{name} . "::" . $t;
-				}
-
-			if (defined($vl->{$t})) {
-				warn "Duplicate identifier [$t] at line $$line\n";
-			}
-			my $t2 = get_token($scope,$tokens,$line);
-			if ($t2 eq ',') {
-				$vl->{$t} = {type=>$enum_name, size=>4, value=>$x, enum=>1};
-				$fstr->{$t} = $CurrentTraceFormatString; 
-				$fcat->{$t} = $CurrentTraceFormatCategory; 
-				if (defined $CurrentTraceFormatCategory && defined $CurrentTraceFormatString)
-					{ $fmtTable->{$CurrentTraceFormatCategory}{$x} = $CurrentTraceFormatString; }
-				undef $CurrentTraceFormatString;
-				++$x;
-			} elsif ($t2 eq '}') {
-				$vl->{$t} = {type=>$enum_name, size=>4, value=>$x, enum=>1};
-				$fstr->{$t} = $CurrentTraceFormatString; 
-				$fcat->{$t} = $CurrentTraceFormatCategory; 
-				if (defined $CurrentTraceFormatCategory && defined $CurrentTraceFormatString)
-					{ $fmtTable->{$CurrentTraceFormatCategory}{$x} = $CurrentTraceFormatString; }
-				undef $CurrentTraceFormatString;
-				++$x;
-				last;
-			} elsif ($t2 eq '=') {
-				$x = get_constant_expr($scope, $tokens, $line);
-				$vl->{$t} = {type=>$enum_name, size=>4, value=>$x, enum=>1};
-				$fstr->{$t} = $CurrentTraceFormatString; 
-				$fcat->{$t} = $CurrentTraceFormatCategory;
-				if (defined $CurrentTraceFormatCategory && defined $CurrentTraceFormatString)
-					{ $fmtTable->{$CurrentTraceFormatCategory}{$x} = $CurrentTraceFormatString; }
-				undef $CurrentTraceFormatString; 
-				++$x;
-				$t2 = get_token($scope,$tokens,$line);
-				last if ($t2 eq '}');
-				next if ($t2 eq ',');
-				warn "Syntax error#12 at line $$line\n";
-			} else {
-				unshift @$tokens, $t2;
-			}
-		}
-		my $t = get_token($scope,$tokens,$line);
-		if ($t ne ';') {
-			warn "Missing ; at line $$line\n";
-		}
-	}
-	
-	
-	sub  parse_decl_def($$$) {
-		my ($scope,$tokens,$line) = @_;
-		my $level=0;
-		my @decl;
-		while ( scalar(@$tokens) ) {
-			my $t = get_token($scope,$tokens, $line);
-			if ( (!defined ($t) || $t eq ';') and ($level==0)) {
-				return @decl;
-			}
-	
-			if ($t eq "static")
-				{
-				next;
-				}
-	
-			push @decl, $t;
-			if ($t eq '{') {
-				++$level;
-			}
-			if ($t eq '}') {
-				if ($level==0) {
-					warn "Syntax error#13 at line $$line\n";
-					unshift @$tokens, $t;
-					return @decl;
-					
-				}
-				if (--$level==0) {
-					return ();	# end of function definition reached
-				}
-			}
-		}
-		die "Unexpected end of file #3 at line $$line\n";
-	}
-	
-	sub dump_scope($) {
-		my ($scope) = @_;
-		my $el = $scope->{enums};
-		my $cl = $scope->{classes};
-		my $vl = $scope->{values};
-		my $fstr = $scope->{formatStrings};
-		my $fcat = $scope->{formatCategories};
-		print "SCOPE: $scope->{name}\n";
-		if (scalar(@$el)) {
-			print "\tenums:\n";
-			foreach (@$el) {
-				print "\t\t$_\n";
-			}
-		}
-		if (scalar(keys(%$vl))) {
-			print "\tvalues:\n";
-			foreach $vname (keys(%$vl)) {
-				my $v = $vl->{$vname};
-				my $x = $v->{value};
-				my $t = $v->{type};
-				my $sz = $v->{size};
-				my $fstring = $fstr->{$vname};
-				my $fcategory = $fcat->{$vname};
-				if ($v->{enum}) {
-					printf ("\t\t$vname\=$x (enum $t) size=$sz fcat=[0x%x] fstr=[%s]\n", $fcategory,$fstring);
-				} else {
-					printf ("\t\t$vname\=$x (type $t) size=$sz fcat=[0x%x] fstr=[%s]\n", $fcategory, $fstring);
-				}
-			}
-		}
-		if ($scope->{scope}) {
-			my $members = $scope->{members};
-			foreach (@$members) {
-				my $n = $_->{name};
-				my $sz = $_->{size};
-				my $off = $_->{offset};
-				my $spc = $_->{spacing};
-				if (defined $spc) {
-					print "\t$n\[\]\: spacing $spc size $sz offset $off\n";
-				} else {
-					print "\t$n\: size $sz offset $off\n";
-				}
-			}
-			print "\tOverall size : $scope->{size}\n";
-			print "\tOverall align: $scope->{align}\n";
-		}
-		foreach $s (@$cl) {
-			dump_scope($s);
-		}
-	}
-	
-	
-	
-		
-	sub parse_doxygen($$$$) {
-		my ($scope,$tokens,$line,$t) = @_;
-	
-		if ($t ne "/")
-			{
-			return 0;	# not a doxygen comment
-			}
-		if ($t eq "/") {
-			$state=0;
-			my $t2 = shift @$tokens;
-			my $t3 = shift @$tokens;
-	
-			if ($t2 ne "*" || $t3 ne "*")
-				{
-				unshift @$tokens, $t3;
-				unshift @$tokens, $t2;
-				return 0;	# not a doxygen comment
-				}
-		}
-#		printf "doxygen start on line %d\n", $$line;
-		for (;;) {
-			my $t = shift @$tokens;
-			if (!defined($t)) 
-					{
-					warn "Unexpected end of file #4 at line $$line\n";	
-					return
-					}
-			
-			if ($t eq "\n"){++$$line };
-			
-			if ($t eq '*')
-				{
-				my $t2 = shift @$tokens;
-				last if ($t2 eq '/');
-				unshift @$tokens, $t2;
-				}
-			
-			if ($t eq '@')
-				{
-				my $t2 = shift @$tokens;
-				if ($t2 eq 'SYMTraceFormatString')
-					{
-					my $t3 = shift @$tokens;
-#					if ($VerboseMode){print "SYMTraceFormatString = [$t3]\n";}
-					$CurrentTraceFormatString = $t3;
-					}
-				if ($t2 eq 'SYMTraceFormatCategory')
-					{
-					$CurrentTraceFormatCategory = get_operand($scope,$tokens,$line);
-#					if ($VerboseMode){printf ("SYMTraceFormatCategory = 0x%x\n", $CurrentTraceFormatCategory);}
-					}
-				else
-					{
-					unshift @$tokens, $t2;
-					}
-				}
-	
-		}
-#		printf ("doxygen end  on line %d\n", $$line);
-		return 1;	# is a doxygen comment
-	}
-	
-
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-                
diff -r 2a0ada0a1bf8 -r 95847726fe57 kerneltest/f32test/group/bld.inf
--- a/kerneltest/f32test/group/bld.inf	Wed May 12 10:34:10 2010 +0100
+++ b/kerneltest/f32test/group/bld.inf	Mon May 24 18:38:55 2010 +0100
@@ -268,8 +268,6 @@
 #include "../plugins/version_2/file64bit/group/file64bit_plugin.inf"
 #endif
 
-t_ftrace
-
 t_surrogatepair
 
 // this test loads a actual codepage dll (cp932.dll),  should be the last test.
diff -r 2a0ada0a1bf8 -r 95847726fe57 kerneltest/f32test/group/t_ftrace.mmp
--- a/kerneltest/f32test/group/t_ftrace.mmp	Wed May 12 10:34:10 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +0,0 @@
-// Copyright (c) 1997-2009 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"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-// f32test/group/t_ftrace.mmp
-//
-//
-
-TARGET         t_ftrace.exe
-TARGETTYPE     EXE
-SOURCEPATH	../server
-SOURCE         t_ftrace.cpp
-SOURCE         t_main.cpp
-SOURCEPATH     ../fileutils/src
-SOURCE         t_chlffs.cpp
-
-LIBRARY        euser.lib efsrv.lib hal.lib btracec.lib
-OS_LAYER_SYSTEMINCLUDE_SYMBIAN
-USERINCLUDE    ../server
-USERINCLUDE    ../fileutils/inc
-
-CAPABILITY		TCB DISKADMIN ALLFILES
-VENDORID 0x70000001
-
-SMPSAFE
diff -r 2a0ada0a1bf8 -r 95847726fe57 kerneltest/f32test/server/t_filecache.cpp
--- a/kerneltest/f32test/server/t_filecache.cpp	Wed May 12 10:34:10 2010 +0100
+++ b/kerneltest/f32test/server/t_filecache.cpp	Mon May 24 18:38:55 2010 +0100
@@ -22,7 +22,7 @@
 #include "t_server.h"
 #include <e32twin.h>
 #include <e32rom.h>
-#include <u32hal.h>	//*test*
+#include <u32hal.h>
 
 
 //----------------------------------------------------------------------------------------------
@@ -251,7 +251,6 @@
 		}
 	}
 
-//*test**************************************************************************
 TInt FreeRam()
 	{
 	// wait for any async cleanup in the supervisor to finish first...
@@ -261,7 +260,85 @@
 	UserHal::MemoryInfo(meminfo);
 	return meminfo().iFreeRamInBytes;
 	}
-//*test**************************************************************************
+
+void LowMemoryTest()
+	{
+	TInt fileSize = 0;
+	
+	const TInt KWriteLen = 128*1024;
+	test.Next(_L("Test appending to a file with low memory"));
+	gBufPtr.SetLength(KBufSize);
+
+	RFile f;
+	TFileName testFile   = _L("TEST.BIN");
+
+	TInt r = f.Replace(TheFs, testFile, EFileWrite | EFileWriteBuffered);
+	test_KErrNone(r);
+
+	TInt pos = 0;
+
+	TPtrC8 writePtr;
+	writePtr.Set(gBufPtr.MidTPtr(pos, KWriteLen));
+
+	r = f.Write(pos, writePtr);
+	test_KErrNone(r);
+	pos+= writePtr.Length();
+
+	r = f.Size(fileSize);
+	test_KErrNone(r);
+	test_Equal(fileSize,pos);
+
+
+
+	TUint freeRam = FreeRam();
+	const TInt KPageSize=4096;
+	freeRam = (freeRam + KPageSize -1) & ~(KPageSize-1);
+	test.Printf(_L("FreeRam = %d"), freeRam);
+
+	RChunk chunk;
+	TChunkCreateInfo chunkInfo;
+	chunkInfo.SetDisconnected(0, 0, freeRam);
+	chunkInfo.SetPaging(TChunkCreateInfo::EUnpaged);
+	test_KErrNone(chunk.Create(chunkInfo));
+
+	test.Printf(_L("Gobbling all of memory..."));
+	
+	TUint commitEnd;
+	for (commitEnd = 0; commitEnd < freeRam; commitEnd += KPageSize) 
+		{
+		r = chunk.Commit(commitEnd,KPageSize);
+		if (r != KErrNone)
+			break;
+		
+		}
+	test.Printf(_L("commitEnd %d, r %d"), commitEnd, r);
+	test_Value(r, r == KErrNoMemory || r == KErrNone);
+
+	test.Printf(_L("FreeRam = %d"), FreeRam());
+
+	pos-= KSegmentSize;
+	writePtr.Set(gBufPtr.MidTPtr(pos, KWriteLen));
+
+	test.Printf(_L("Writing to file..."));
+
+	r = f.Write(pos, writePtr);
+	test_KErrNone(r);
+	pos+= writePtr.Length();
+
+	test.Printf(_L("Setting size of file ..."));
+	r = f.Size(fileSize);
+	test_KErrNone(r);
+	test_Equal(fileSize,pos);
+
+	test.Printf(_L("Closing file ..."));
+	f.Close();
+
+	test.Printf(_L("Closing chunk ..."));
+	chunk.Close();
+
+	test.Printf(_L("FreeRam = %d"), FreeRam());
+	}
+
 
 
 LOCAL_C void UnitTests()
@@ -312,67 +389,7 @@
 	TInt uncachedPacketsRead;
 #endif
 
-//*test**************************************************************************
-	{
-	TInt fileSize = 0;
-	
-	const TInt KWriteLen = 128*1024;
-	test.Next(_L("Test appending to a file with low memory"));
-	gBufPtr.SetLength(KBufSize);
-
-	r = f.Replace(TheFs, testFile, EFileWrite | EFileWriteBuffered);
-	test_KErrNone(r);
-
-	pos = 0;
-
-	writePtr.Set(gBufPtr.MidTPtr(pos, KWriteLen));
-
-	r = f.Write(pos, writePtr);
-	test_KErrNone(r);
-	pos+= writePtr.Length();
-
-	r = f.Size(fileSize);
-	test_KErrNone(r);
-	test_Equal(fileSize,pos);
-
-
-
-	TInt freeRam = FreeRam();
-	test.Printf(_L("FreeRam = %d"), freeRam);
-	const TInt KPageSize=4096;
-
-	RChunk chunk;
-	TChunkCreateInfo chunkInfo;
-	chunkInfo.SetDisconnected(0, 0, freeRam);
-	chunkInfo.SetPaging(TChunkCreateInfo::EUnpaged);
-	test_KErrNone(chunk.Create(chunkInfo));
-
-	TUint commitEnd = 0;
-	TInt r;
-	while(KErrNone == (r = chunk.Commit(commitEnd,KPageSize)))
-		{
-		commitEnd += KPageSize;
-		}
-	test_Equal(KErrNoMemory, r);
-
-
-
-	pos-= KSegmentSize;
-	writePtr.Set(gBufPtr.MidTPtr(pos, KWriteLen));
-
-	r = f.Write(pos, writePtr);
-	test_KErrNone(r);
-	pos+= writePtr.Length();
-
-	r = f.Size(fileSize);
-	test_KErrNone(r);
-	test_Equal(fileSize,pos);
-
-	f.Close();
-
-	chunk.Close();
-	}
-//*test**************************************************************************
+	LowMemoryTest();
 
 	// create an empty file, so that any writes overlapping segemt boundaries
 	// need a read first
diff -r 2a0ada0a1bf8 -r 95847726fe57 kerneltest/f32test/server/t_ftrace.cpp
--- a/kerneltest/f32test/server/t_ftrace.cpp	Wed May 12 10:34:10 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,423 +0,0 @@
-// Copyright (c) 2009 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"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-// f32test\server\t_ftrace.cpp
-// 
-//
-
-#include <f32file.h>
-#include <f32tracedef.h>
-#include <e32test.h>
-#include "t_server.h"
-
-#include "../../../kernel/eka/include/d32btrace.h"
-#include "../../../kernel/eka/include/e32btrace.h"
-#include <utraceefsrv.h>
-
-RTest test(_L("T_FTRACE"));
-
-RBTrace Trace;
-
-void SetBTraceFilter(const TUint32* aNew,TUint32* aOld)
-	{
-	TUint category = 0;
-	do
-		{
-		TUint32 newBits = *aNew++;
-		TUint32 oldBits = 0;
-		do
-			{
-			oldBits >>= 1;
-			if(Trace.SetFilter(category,newBits&1))
-				oldBits |= 0x80000000u;
-			newBits >>= 1;
-			++category;
-			}
-		while(category&31);
-		if(aOld)
-			*aOld++ = oldBits;
-		}
-	while(category<256);
-	}
-
-
-
-//---------------------------------------------------------------------------------------------------------------------
-//! @SYMTestCaseID				KBASE-T_FTRACE-0001
-//! @SYMTestCaseDesc			Test File Server Tracing of RFile::Replace()
-//! @SYMTestType				UT
-//! @SYMPREQ					PREQ1617
-//! @SYMTestPriority			Medium
-//! @SYMTestActions				
-//! 	1.	Call RFile::Replace() to create a file
-//! 	2.	Get trace data from BTrace and verify that the expected trace data is present
-//! 
-//! @SYMTestExpectedResults
-//! 	1.	Trace data payload should be as expected, i.e. it should contain the file name, mode etc.
-//---------------------------------------------------------------------------------------------------------------------
-void TestRFileReplace()
-	{
-	test.Start(_L("Test trace output from creating a file"));
-	RFile file;
-	TFileName testFileName = _L("File.txt");
-
-	TheFs.Delete(testFileName);
-
-	Trace.Empty();
-
-	TInt r = file.Replace(TheFs,testFileName,EFileStreamText);
-	test(r==KErrNone);
-
-
-	TBool funcInFound = EFalse;
-	TBool funcOutFound = EFalse;
-
-	TBuf8<1024> buf;
-	for(;;)
-		{
-		TUint8* record;
-		TInt dataSize = Trace.GetData(record);
-		if(!dataSize)
-			break;
-		TUint8* end = record+dataSize;
-
-		while(record<end)
-			{
-			TUint size = record[BTrace::ESizeIndex];
-			TUint flags = record[BTrace::EFlagsIndex];
-			TUint category = record[BTrace::ECategoryIndex];
-			TUint subCategory = record[BTrace::ESubCategoryIndex];
-			TUint8* data = record+4;
-			size -= 4;
-
-			buf.Zero();
-			if(flags&(BTrace::EHeader2Present))
-				{
-				data += 4;
-				size -= 4;
-				}
-
-			if((flags&(BTrace::ETimestampPresent|BTrace::ETimestamp2Present))==(BTrace::ETimestampPresent|BTrace::ETimestamp2Present))
-				{
-				buf.AppendFormat(_L8("time:%08x:%08x "),((TUint32*)data)[1],*(TUint32*)data);
-				data += 8;
-				size -= 8;
-				}
-			else if(flags&(BTrace::ETimestampPresent|BTrace::ETimestamp2Present))
-				{
-				buf.AppendFormat(_L8("time:%08x "),*(TUint32*)data);
-				data += 4;
-				size -= 4;
-				}
-
-			if(flags&(BTrace::EContextIdPresent))
-				{
-				buf.AppendFormat(_L8("context:%08x "),*(TUint32*)data);
-				data += 4;
-				size -= 4;
-				}
-			else
-				{
-				buf.AppendFormat(_L8("                 "));
-				}
-
-			if(flags&(BTrace::EPcPresent))
-				{
-				buf.AppendFormat(_L8("pc:%08x "),*(TUint32*)data);
-				data += 4;
-				size -= 4;
-				}
-
-			if(flags&(BTrace::EExtraPresent))
-				{
-				data += 4;
-				size -= 4;
-				}
-
-			TUint32 data0 = (size>0) ? *(TUint32*)(data) : 0;
-			TUint32 data1 = (size>4) ? *(TUint32*)(data+4) : 0;
-			TPtrC8 des(0,0);
-			if(size>=8)
-				des.Set(data+8,size-8);
-
-			buf.AppendFormat(_L8("size:%d flags:%02x cat:%d,%d data: "),size,flags,category,subCategory);
-			for(TUint i=0; i<size; i+=4)
-				buf.AppendFormat(_L8("%08x "),*(TUint32*)(data+i));
-			buf.Append('\r');
-			buf.Append('\n');
-			test(buf.MaxLength() >= (buf.Length()*2));
-			RDebug::RawPrint(buf.Expand());
-
-
-			if (category == UTF::EBorder && subCategory == 0 && data0 == EF32TraceUidEfsrv)
-				{
-				if (data1 == UTraceModuleEfsrv::EFileReplace)
-					{
-					TInt sessionHandle = (size>8) ? *(TUint32*)(data+8) : 0;
-					TUint32 fileMode = (size>12) ? *(TUint32*)(data+12) : 0;
-					TInt fileNameLen = (size>16) ? *(TUint32*)(data+16) : 0;
-					fileNameLen/= 2;	// convert to unicode length
-					TText16* fileName = (TText16*) ((size>20) ? (data+20) : NULL);
-
-					test(sessionHandle == TheFs.Handle());
-					test(fileMode == EFileStreamText);
-					test(fileNameLen == testFileName.Length());
-					TPtrC16 fileNamePtr (fileName, fileNameLen);
-					test(fileName != NULL);
-					test(testFileName.Compare(fileNamePtr) == 0);
-					funcInFound = ETrue;
-					}
-				else if (data1 == UTraceModuleEfsrv::EFileReplaceReturn)
-					{
-					TInt retCode = (size>8) ? *(TUint32*)(data+8) : 0;
-					TInt subsessionHandle = (size>12) ? *(TUint32*)(data+12) : 0;
-
-					test(retCode == KErrNone);
-					test(subsessionHandle == file.SubSessionHandle());
-					funcOutFound = ETrue;
-					}
-				}
-
-			record = BTrace::NextRecord(record);
-			}
-		Trace.DataUsed();
-		}
-
-	file.Close();
-	TheFs.Delete(testFileName);
-
-	test (funcInFound);
-	test (funcOutFound);
-	}
-
-//---------------------------------------------------------------------------------------------------------------------
-//! @SYMTestCaseID				KBASE-T_FTRACE-0002
-//! @SYMTestCaseDesc			Test File Server Tracing of RFs::Rename()
-//! @SYMTestType				UT
-//! @SYMPREQ					PREQ1617
-//! @SYMTestPriority			Medium
-//! @SYMTestActions				
-//! 	1.	Call RFile::Replace() to create a file
-//! 	2.	Close the file
-//! 	3.	Call RFs::Rename to rename the file
-//! 	4.	Get trace data from BTrace and verify that the expected trace data is present
-//! 
-//! @SYMTestExpectedResults
-//! 	1.	Trace data payload should be as expected, i.e. it should contain both file names, etc.
-//---------------------------------------------------------------------------------------------------------------------
-void TestRFsRename()
-	{
-	test.Start(_L("Test trace output from renaming a file"));
-	RFile file;
-	TFileName testFileName1 = _L("File1.txt");
-	TFileName testFileName2 = _L("File2.txt");
-
-	TheFs.Delete(testFileName1);
-	TheFs.Delete(testFileName2);
-
-	TInt r = file.Replace(TheFs,testFileName1,EFileStreamText);
-	test(r==KErrNone || KErrAlreadyExists);
-	file.Close();
-
-	Trace.Empty();
-
-	r = TheFs.Rename(testFileName1, testFileName2);
-	test(r==KErrNone);
-
-
-	TBool funcInFound = EFalse;
-	TBool funcOutFound = EFalse;
-
-	TBuf8<1024> buf;
-	for(;;)
-		{
-		TUint8* record;
-		TInt dataSize = Trace.GetData(record);
-		if(!dataSize)
-			break;
-		TUint8* end = record+dataSize;
-
-		while(record<end)
-			{
-			TUint size = record[BTrace::ESizeIndex];
-			TUint flags = record[BTrace::EFlagsIndex];
-			TUint category = record[BTrace::ECategoryIndex];
-			TUint subCategory = record[BTrace::ESubCategoryIndex];
-			TUint8* data = record+4;
-			size -= 4;
-
-			buf.Zero();
-			if(flags&(BTrace::EHeader2Present))
-				{
-				data += 4;
-				size -= 4;
-				}
-
-			if((flags&(BTrace::ETimestampPresent|BTrace::ETimestamp2Present))==(BTrace::ETimestampPresent|BTrace::ETimestamp2Present))
-				{
-				buf.AppendFormat(_L8("time:%08x:%08x "),((TUint32*)data)[1],*(TUint32*)data);
-				data += 8;
-				size -= 8;
-				}
-			else if(flags&(BTrace::ETimestampPresent|BTrace::ETimestamp2Present))
-				{
-				buf.AppendFormat(_L8("time:%08x "),*(TUint32*)data);
-				data += 4;
-				size -= 4;
-				}
-
-			if(flags&(BTrace::EContextIdPresent))
-				{
-				buf.AppendFormat(_L8("context:%08x "),*(TUint32*)data);
-				data += 4;
-				size -= 4;
-				}
-			else
-				{
-				buf.AppendFormat(_L8("                 "));
-				}
-
-			if(flags&(BTrace::EPcPresent))
-				{
-				buf.AppendFormat(_L8("pc:%08x "),*(TUint32*)data);
-				data += 4;
-				size -= 4;
-				}
-
-			if(flags&(BTrace::EExtraPresent))
-				{
-				data += 4;
-				size -= 4;
-				}
-
-			TUint32 data0 = (size>0) ? *(TUint32*)(data) : 0;
-			TUint32 data1 = (size>4) ? *(TUint32*)(data+4) : 0;
-			TPtrC8 des(0,0);
-			if(size>=8)
-				des.Set(data+8,size-8);
-
-			buf.AppendFormat(_L8("size:%d flags:%02x cat:%d,%d data: "),size,flags,category,subCategory);
-			for(TUint i=0; i<size; i+=4)
-				buf.AppendFormat(_L8("%08x "),*(TUint32*)(data+i));
-			buf.Append('\r');
-			buf.Append('\n');
-			test(buf.MaxLength() >= (buf.Length()*2));
-			RDebug::RawPrint(buf.Expand());
-
-
-			if (category == UTF::EBorder && subCategory == 0 && data0 == EF32TraceUidEfsrv)
-				{
-				TUint8* recData = data+8;
-				if (data1 == UTraceModuleEfsrv::EFsRename)
-					{
-					TInt sessionHandle = *(TUint32*) recData; recData+= 4;
-
-					TInt fileNameLen1 = *(TUint32*) recData; recData+= 4;
-					TText16* fileName1 = (TText16*) recData; recData+= ((fileNameLen1 +4) & ~3);
-
-					TInt fileNameLen2 = *(TUint32*) recData; recData+= 4;
-					TText16* fileName2 = (TText16*) recData; recData+= fileNameLen2;
-
-					fileNameLen1/= 2;	// convert to unicode length
-					fileNameLen2/= 2;	// convert to unicode length
-
-
-					test(sessionHandle == TheFs.Handle());
-					
-					test(fileNameLen1 == testFileName1.Length());
-					TPtrC16 fileNamePtr1 (fileName1, fileNameLen1);
-					test(fileName1 != NULL);
-					test(testFileName1.Compare(fileNamePtr1) == 0);
-
-					test(fileNameLen2 == testFileName2.Length());
-					TPtrC16 fileNamePtr2 (fileName2, fileNameLen2);
-					test(fileName2 != NULL);
-					test(testFileName2.Compare(fileNamePtr2) == 0);
-
-					funcInFound = ETrue;
-					}
-				else if (data1 == UTraceModuleEfsrv::EFsRenameReturn)
-					{
-					TInt retCode = (size>8) ? *(TUint32*)(data+8) : 0;
-
-					test(retCode == KErrNone);
-
-					funcOutFound = ETrue;
-					}
-				}
-
-			record = BTrace::NextRecord(record);
-			}
-		Trace.DataUsed();
-		}
-
-
-	test (funcInFound);
-	test (funcOutFound);
-
-	TheFs.Delete(testFileName1);
-	TheFs.Delete(testFileName2);
-	}
-
-void CallTestsL()
-	{
-
-// By default, file server trace-points are only compiled in in debug mode
-#if defined(_DEBUG)
-	test.Title();
-	TInt r;
-
-	test.Start(_L("Open LDD"));
-	r = Trace.Open();
-	test(r == KErrNone);
-
-
-	TUint32 OldTraceFilter[8] = {0};
-
-	TUint savedMode = Trace.Mode();
-	SetBTraceFilter(OldTraceFilter,OldTraceFilter);
-
-	Trace.ResizeBuffer(0x100000);
-	Trace.Empty();
-
-	Trace.SetMode(RBTrace::EEnable | RBTrace::EFreeRunning);
-
-	TBool b;
-//	b = Trace.SetFilter(BTrace::EThreadIdentification, ETrue);
-//	test(b >= 0);
-	b = Trace.SetFilter(UTF::EPanic, ETrue);
-	test(b >= 0);
-	b = Trace.SetFilter(UTF::EError, ETrue);
-	test(b >= 0);
-	b = Trace.SetFilter(UTF::EBorder, ETrue);
-	test(b >= 0);
-
-	b = Trace.SetFilter2(EF32TraceUidEfsrv, ETrue);
-	test(b >= 0);
-
-	TestRFileReplace();
-	TestRFsRename();
-
-	// restore trace settings...
-	Trace.SetMode(0);
-	SetBTraceFilter(OldTraceFilter,OldTraceFilter);
-	Trace.SetMode(savedMode);
-
-
-	test.Next(_L("Close LDD"));
-	Trace.Close();
-
-	test.End();
-#endif
-	}
-
diff -r 2a0ada0a1bf8 -r 95847726fe57 userlibandfileserver/fileserver/automounter/base_f32_automounter.mrp
--- a/userlibandfileserver/fileserver/automounter/base_f32_automounter.mrp	Wed May 12 10:34:10 2010 +0100
+++ b/userlibandfileserver/fileserver/automounter/base_f32_automounter.mrp	Mon May 24 18:38:55 2010 +0100
@@ -1,19 +1,4 @@
-#
-# Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-# All rights reserved.
-# This component and the accompanying materials are made available
-# under the terms of "Eclipse Public License v1.0"
-# which accompanies this distribution, and is available
-# at the URL "http://www.eclipse.org/legal/epl-v10.html".
-#
-# Initial Contributors:
-# Nokia Corporation - initial contribution.
-#
-# Contributors:
-#
-# Description: 
-#
-# component name "exFAT File System"
+# component name "Automounter File System"
 
 component   base_f32_automounter
 
diff -r 2a0ada0a1bf8 -r 95847726fe57 userlibandfileserver/fileserver/ftrace/d_ftrace.cpp
--- a/userlibandfileserver/fileserver/ftrace/d_ftrace.cpp	Wed May 12 10:34:10 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,215 +0,0 @@
-/*
-* Copyright (c) 2009 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
-// D_FTRACE.CPP
-//
-//
-//
-#include "plat_priv.h"
-#include <kernel/kernel.h>
-
-#include "f32trace.h"
-
-DMutex* TheTraceMutex = NULL;
-_LIT(KLitTraceMutexName, "FTRACE_MUTEX");
-
-const TInt KMajorVersionNumber=1;
-const TInt KMinorVersionNumber=0;
-const TInt KBuildVersionNumber=0;
-
-
-class DLddFactoryFTrace : public DLogicalDevice
-	{
-public:
-	DLddFactoryFTrace();
-	virtual ~DLddFactoryFTrace();
-	virtual TInt Install();
-	virtual void GetCaps(TDes8 &aDes) const;
-	virtual TInt Create(DLogicalChannelBase*& aChannel); 	//overriding pure virtual
-	};
-
-class DLddFTrace : public DLogicalChannelBase
-	{
-public:
-	DLddFTrace();
-	~DLddFTrace();
-protected:
-	virtual TInt DoCreate(TInt aUnit, const TDesC8* anInfo, const TVersion& aVer);
-
-	virtual TInt Request(TInt aReqNo, TAny* a1, TAny* a2);
-
-private:
-	void DoCancel(TInt aReqNo);
-	TInt DoRequest(TInt aReqNo, TRequestStatus* aStatus, TAny* a1, TAny* a2);
-	TInt DoControl(TInt aFunction, TAny* a1, TAny* a2);
-
-private:
-    };
-
-DECLARE_STANDARD_LDD()
-	{
-	TInt r = Kern::MutexCreate(TheTraceMutex,  KLitTraceMutexName, KMutexOrdNone);
-	if (r != KErrNone)
-		return NULL;
-
-	return new DLddFactoryFTrace;
-	}
-
-DLddFactoryFTrace::DLddFactoryFTrace()
-	{
-
-    iParseMask=KDeviceAllowUnit;  // Pass stack number as unit
-	iUnitsMask=0xffffffff;
-	iVersion=TVersion(KMajorVersionNumber,KMinorVersionNumber,KBuildVersionNumber);
-	}
-
-TInt DLddFactoryFTrace::Create(DLogicalChannelBase*& aChannel)
-	{
-	aChannel=new DLddFTrace;
-	return aChannel ? KErrNone : KErrNoMemory;
-	}
-
-TInt DLddFactoryFTrace::Install()
-	{
-    TPtrC name=_L("FTrace");
-	return(SetName(&name));
-	}
-
-void DLddFactoryFTrace::GetCaps(TDes8& /*aDes*/) const
-	{
-	}
-
-DLddFactoryFTrace::~DLddFactoryFTrace()
-	{
-	}
-
-DLddFTrace::DLddFTrace()
-	{
-    }
-
-DLddFTrace::~DLddFTrace()
-	{
-    }
-
-TInt DLddFTrace::DoCreate(TInt /*aUnit*/, const TDesC8* /*aInfo*/, const TVersion& aVer)
-	{
-
-	if (!Kern::QueryVersionSupported(TVersion(KMajorVersionNumber,KMinorVersionNumber,KBuildVersionNumber),aVer))
-		return(KErrNotSupported);
-
-    return(KErrNone);
-	}
-
-void DLddFTrace::DoCancel(TInt /*aReqNo*/)
-	{
-	}
-
-TInt DLddFTrace::Request(TInt aReqNo, TAny* a1, TAny* a2)
-	{
-	NKern::ThreadEnterCS();
-	Kern::MutexWait(*TheTraceMutex);
-	TInt r = DoControl(aReqNo, a1, a2);
-	Kern::MutexSignal(*TheTraceMutex);
-	NKern::ThreadLeaveCS();
-
-	return r;
-	}
-
-
-const TUint KTraceBufferSize = 4096;
-TUint8 gTraceBuffer[KTraceBufferSize];
-
-
-#define MIN(a,b)			((a) < (b) ? (a) : (b))
-
-TInt DLddFTrace::DoControl(TInt aFunction, TAny* a1, TAny* a2)
-//
-// Mostly requests (but some kernel server async ones)
-//
-	{
-	TInt r=KErrNotSupported;
-	switch (aFunction)
-		{
-        case RFTrace::ETraceMultiple:
-            {
-			typedef struct {
-				TClassification iCategory;
-				TUint8 iPadding1[sizeof(TUint) - sizeof(TClassification)];
-
-				TFormatId iFormatId;
-				TUint8 iPadding2[sizeof(TUint) - sizeof(TFormatId)];
-
-				TUint32 iUid;
-				TInt iDescriptorCount;
-				} TraceArgs;
-
-			TraceArgs args={0};
-
-			XTRAP(r, XT_DEFAULT, kumemget32(&args, a1, sizeof(args)));
-			if (r != KErrNone)
-				return r;
-
-			// current descriptor - MUST be either a TPtr8 or a TBuf8<4>
-			TUint32 desc[2] = {0, 0};
-			TUint32& desLength = desc[0];
-
-			TUint offset = 0;
-
-			*((TUint*) (gTraceBuffer+offset)) = args.iFormatId;
-			offset+= sizeof(TUint);
-
-			TDesC8* des = (TDesC8*) ((TUint8*) a2);
-			const TInt desSize = sizeof(TPtrC8);
-			for (TInt n=0; n< args.iDescriptorCount; n++, des = (TDesC8*) (((TUint8*) des) + desSize) )
-				{
-
-				XTRAP(r, XT_DEFAULT, kumemget32(desc, des, sizeof(desc)));
-				TUint32 desType = desLength >> KShiftDesType;
-				desLength &= (TUint) (KMaskDesLength);
-				if (desType == EPtrC)
-					{
-					*((TUint*) (gTraceBuffer+offset)) = desLength;
-					desLength = (desLength+3)&~3;
-					offset+= sizeof(TUint);
-					}
-				else if (desType == EBufC)
-					{
-					*((TUint*) (gTraceBuffer+offset)) = desc[1];
-					offset+= sizeof(TUint);
-					if (desLength > 4)
-						return KErrArgument;
-					desLength = 0;
-					continue;
-					}
-				else
-					return KErrArgument;
-
-				TUint len = MIN(KTraceBufferSize - offset, desLength);
-				XTRAP(r, XT_DEFAULT, kumemget(gTraceBuffer+offset, (const TUint8*) desc[1], len));
-				offset+= len;
-
-				}
-
-			BTrace::OutFilteredBig
-				(BTRACE_HEADER_C(8,args.iCategory, 0), args.iUid, gTraceBuffer, offset);
-
-			r=KErrNone;
-			break;
-            }
-		}
-	return(r);
-	}
-
diff -r 2a0ada0a1bf8 -r 95847726fe57 userlibandfileserver/fileserver/ftrace/f32trace.h
--- a/userlibandfileserver/fileserver/ftrace/f32trace.h	Wed May 12 10:34:10 2010 +0100
+++ b/userlibandfileserver/fileserver/ftrace/f32trace.h	Mon May 24 18:38:55 2010 +0100
@@ -22,20 +22,6 @@
 #if !defined(__FTRACE_H__)
 #define __FTRACE_H__
 
-#include <e32cmn.h>
-#include <e32btrace.h>
-
-
-#ifndef __KERNEL_MODE__
-	#include <e32std.h>
-#endif
-
-#include "f32tracedef.h"
-
-#if defined(__EABI__)
-#pragma diag_suppress 1446		// non-POD class type passed through ellipsis
-#endif
-
 /**
 @internalComponent
 @prototype
@@ -43,218 +29,41 @@
 
 #if ((defined (_DEBUG) && defined (SYMBIAN_FTRACE_ENABLE_UDEB)) ||		\
 	(!defined(_DEBUG) && defined (SYMBIAN_FTRACE_ENABLE_UREL)))
-	#define SYMBIAN_FTRACE_ENABLE
+	#include "OstTraceDefinitions.h"			// may or may not define OST_TRACE_COMPILER_IN_USE
+#else
+	#undef OST_TRACE_COMPILER_IN_USE
+	#undef OST_TRACE_CATEGORY
+	#define OST_TRACE_CATEGORY OST_TRACE_CATEGORY_NONE
+
+	#undef OstTrace0
+	#undef OstTrace1
+	#undef OstTraceData
+	#undef OstTraceExt1
+	#undef OstTraceExt2
+	#undef OstTraceExt3
+	#undef OstTraceExt4
+	#undef OstTraceExt5
+
+	#define OstTrace0( aGroupName, aTraceName, aTraceText )
+	#define OstTrace1( aGroupName, aTraceName, aTraceText, aParam )
+	#define OstTraceData( aGroupName, aTraceName, aTraceText, aPtr, aLength )
+	#define OstTraceExt1( aGroupName, aTraceName, aTraceText, aParam )
+	#define OstTraceExt2( aGroupName, aTraceName, aTraceText, aParam1, aParam2 )
+	#define OstTraceExt3( aGroupName, aTraceName, aTraceText, aParam1, aParam2, aParam3 )
+	#define OstTraceExt4( aGroupName, aTraceName, aTraceText, aParam1, aParam2, aParam3, aParam4 )
+	#define OstTraceExt5( aGroupName, aTraceName, aTraceText, aParam1, aParam2, aParam3, aParam4, aParam5 )
 #endif
 
 
-
-inline TBool Trace1(TClassification aClassification, TFormatId aFormatId, TModuleUid aUid, TUint a1)
-	{
-	return BTraceFilteredContext12(
-		aClassification,					// Category
-		0,								// Sub-category
-		aUid,		// UID
-		aFormatId,
-		a1);							
-	}
-
-inline TBool TraceN(TClassification aClassification, TFormatId aFormatId,  TModuleUid aUid, TInt aArgCount, TUint a1, ...)
-	{
-	const TInt KMaxArgs = 8;
-	if (aArgCount > KMaxArgs)
-		return EFalse;
-	TUint args[KMaxArgs];
-	TInt argLen = aArgCount << 2;
-	memcpy(args, &a1, argLen);
-	
-	return BTraceFilteredContextN(
-		aClassification,					// Category
-		0,									// Sub-category
-		aUid,		// UID
-		aFormatId,
-		args,
-		argLen);								
-	}
-
-
-inline TBool TraceStr(TClassification aClassification, TFormatId aFormatId,  TModuleUid aUid, const TAny* aData, TInt aDataSize)
-	{
-	// NB This will truncate the data (!!!) - 
-	// we can't use BTraceFilteredContextBig for this as it doesn't have room for the format Id
-	return BTraceFilteredContextN(		
-		aClassification,					// Category
-		0,								// Sub-category
-		aUid,		// UID
-		aFormatId,
-		aData, 
-		aDataSize);							
-	}
-
-
-
-
-
-
-
-class RFTrace : public RBusLogicalChannel
-	{
-public:
-	enum {EMajorVersionNumber=1,EMinorVersionNumber=0,EBuildVersionNumber=1};
-	enum TControl
-        {
-		ETraceMultiple,
-		};
-
-#ifndef __KERNEL_MODE__
-
-public:
-	inline TInt Open(TOwnerType aType)
-		{return DoCreate(_L("FTrace"),TVersion(),0,NULL,NULL,aType);}
-
-	inline 	TBool TraceMultiple(TClassification aClassification, TFormatId aFormatId, TUint32 aUid, TInt aDescriptorCount, TUint64 aParam1, ...)
+#if defined (OST_TRACE_COMPILER_IN_USE)
+	// This class is used to reconstruct an RMessage2 object from a message handle so that we can 
+	// call RMessagePtr2::Client() and then RThread::Id() to retrieve the client's thread Id.
+	// This is useful for matching client requests to calls to the proxydrive
+	class RDummyMessage : public RMessage2
 		{
-		if (Handle() == NULL)
-			return EFalse;
-		// ARM passes first 4 parameters in registers, so....
-		// parcel-up the first four parameters in an array and pass a pointer to the array to the LDD; 
-		// the next parameter(s) should be on the stack, so we can just pass a pointer to the first element 
-		TUint args[4] = {aClassification, aFormatId, aUid, aDescriptorCount};
-		TUint64* pArg1 = &aParam1;
-		TInt r = DoControl(ETraceMultiple, (TAny*) args, pArg1);
-		if (r |= KErrNone)
-			User::Panic(_L("FSCLIENT Trace panic"), 0);
-		return ETrue;
-		}
-
-	static inline TUint64 PkgData(const TDesC16& aDes)	{return MAKE_TUINT64( ((TUint) aDes.Ptr()), (aDes.Length()<<1) | (EPtrC<<KShiftDesType));}
-	static inline TUint64 PkgData(const TDesC8& aDes)	{return MAKE_TUINT64( ((TUint) aDes.Ptr()), aDes.Length() | (EPtrC<<KShiftDesType));}
-
-	static inline TUint64 PkgData(TChar aVal)			{return MAKE_TUINT64(aVal, sizeof(aVal));}
-	static inline TUint64 PkgData(TUint8 aVal)			{return MAKE_TUINT64(aVal, sizeof(aVal));}
-	static inline TUint64 PkgData(TInt8 aVal)			{return MAKE_TUINT64(aVal, sizeof(aVal));}
-	static inline TUint64 PkgData(TUint16 aVal)			{return MAKE_TUINT64(aVal, sizeof(aVal));}
-	static inline TUint64 PkgData(TInt16 aVal)			{return MAKE_TUINT64(aVal, sizeof(aVal));}
-	static inline TUint64 PkgData(TUint32 aVal)			{return MAKE_TUINT64(aVal, sizeof(aVal));}
-	static inline TUint64 PkgData(TInt32 aVal)			{return MAKE_TUINT64(aVal, sizeof(aVal));}
-	static inline TUint64 PkgData(TUint aVal)			{return MAKE_TUINT64(aVal, sizeof(aVal));}
-	static inline TUint64 PkgData(TInt aVal)			{return MAKE_TUINT64(aVal, sizeof(aVal));}
-	
-#endif	// __KERNEL_MODE__
-
-private:
-
-	};
-
-// This class is used to reconstruct an RMessage2 object from a message handle so that we can 
-// call RMessagePtr2::Client() and then RThread::Id() to retrieve the client's thread Id.
-// This is useful for matching client requests to calls to the proxydrive
-class RDummyMessage : public RMessage2
-	{
-public:
-	inline RDummyMessage(TInt aHandle) {iHandle = aHandle; iFunction=-1;}
-	};
-
-
-
-#ifdef SYMBIAN_FTRACE_ENABLE
-
-	// Use these macros for tracing 1-8 TUints...
-	#define TRACE0(aClassification, aFormatId, aUid)								Trace1(aClassification, aFormatId, aUid, 0)
-	#define TRACE1(aClassification, aFormatId, aUid, a1)							Trace1(aClassification, aFormatId, aUid, (TUint) a1)
-	#define TRACE2(aClassification, aFormatId, aUid, a1, a2)						TraceN(aClassification, aFormatId, aUid, 2, (TUint) a1, (TUint) a2)
-	#define TRACE3(aClassification, aFormatId, aUid, a1, a2, a3)					TraceN(aClassification, aFormatId, aUid, 3, (TUint) a1, (TUint) a2, (TUint) a3)
-	#define TRACE4(aClassification, aFormatId, aUid, a1, a2, a3, a4)				TraceN(aClassification, aFormatId, aUid, 4, (TUint) a1, (TUint) a2, (TUint) a3, (TUint) a4)
-	#define TRACE5(aClassification, aFormatId, aUid, a1, a2, a3, a4, a5)			TraceN(aClassification, aFormatId, aUid, 5, (TUint) a1, (TUint) a2, (TUint) a3, (TUint) a4, (TUint) a5)
-	#define TRACE6(aClassification, aFormatId, aUid, a1, a2, a3, a4, a5, a6)		TraceN(aClassification, aFormatId, aUid, 6, (TUint) a1, (TUint) a2, (TUint) a3, (TUint) a4, (TUint) a5, (TUint) a6)
-	#define TRACE7(aClassification, aFormatId, aUid, a1, a2, a3, a4, a5, a6, a7)	TraceN(aClassification, aFormatId, aUid, 7, (TUint) a1, (TUint) a2, (TUint) a3, (TUint) a4, (TUint) a5, (TUint) a6, (TUint) a7)
-	#define TRACE8(aClassification, aFormatId, aUid, a1, a2, a3, a4, a5, a6, a7, a8)TraceN(aClassification, aFormatId, aUid, 8, (TUint) a1, (TUint) a2, (TUint) a3, (TUint) a4, (TUint) a5, (TUint) a6, (TUint) a7, (TUint) a8)
-
-	#define TRACESTR(aClassification, aFormatId, aUid, aData, aDataSize)			TraceStr(aClassification, aFormatId, aUid, aData, aDataSize)
-
-	#define RFTRACE_LOAD							\
-		User::LoadLogicalDevice(_L("D_FTRACE"));	
-
-	// macros for opening and closing the trace LDD, which is used for tracing arbitrary data types....
-#if defined(__DLL__)
-	#define RFTRACE_OPEN							\
-		RFTrace TheFtrace;							\
-		TheFtrace.SetHandle((TInt) Dll::Tls());		\
-		if (TheFtrace.Handle() == NULL)				\
-			{										\
-			TheFtrace.Open(EOwnerThread);			\
-			Dll::SetTls((TAny*) TheFtrace.Handle());\
-			}
-
-	#define RFTRACE_CLOSE							\
-		{											\
-		RFTrace ftrace;								\
-		TInt handle = (TInt) Dll::Tls();			\
-		ftrace.SetHandle(handle);					\
-		ftrace.Close();								\
-		Dll::SetTls(NULL);							\
-		}		
-#else
-	extern RFTrace TheFtrace;
-	#define RFTRACE_OPEN
-	#define RFTRACE_CLOSE 
-#endif
-	
-	// Use these macros for tracing 1-8 arbitrary data types....
-	#define TRACEMULT1(aClassification, aFormatId, aUid, a1)						\
-		if (BTrace::CheckFilter2(aClassification, aUid))								\
-			{																			\
-			RFTRACE_OPEN																\
-			TheFtrace.TraceMultiple(aClassification,aFormatId,aUid,1,RFTrace::PkgData(a1));	\
-			}
-
-	#define TRACEMULT2(aClassification, aFormatId, aUid, a1, a2)					\
-		if (BTrace::CheckFilter2(aClassification, aUid))								\
-			{																			\
-			RFTRACE_OPEN																\
-			TheFtrace.TraceMultiple(aClassification,aFormatId,aUid,2,RFTrace::PkgData(a1),RFTrace::PkgData(a2));	\
-			}
-
-	#define TRACEMULT3(aClassification, aFormatId, aUid, a1, a2, a3)				\
-		if (BTrace::CheckFilter2(aClassification, aUid))								\
-			{																			\
-			RFTRACE_OPEN																\
-			TheFtrace.TraceMultiple(aClassification,aFormatId,aUid,3,RFTrace::PkgData(a1),RFTrace::PkgData(a2),RFTrace::PkgData(a3)); \
-			}
-
-	#define TRACEMULT4(aClassification, aFormatId, aUid, a1, a2, a3, a4)			\
-		if (BTrace::CheckFilter2(aClassification, aUid))								\
-			{																			\
-			RFTRACE_OPEN																\
-			TheFtrace.TraceMultiple(aClassification,aFormatId,aUid,4,RFTrace::PkgData(a1),RFTrace::PkgData(a2),RFTrace::PkgData(a3),RFTrace::PkgData(a4)); \
-			}
-
-	#define TRACEMULT5(aClassification, aFormatId, aUid, a1, a2, a3, a4, a5)		\
-		if (BTrace::CheckFilter2(aClassification, aUid))								\
-			{																			\
-			RFTRACE_OPEN																\
-			TheFtrace.TraceMultiple(aClassification,aFormatId,aUid,5,RFTrace::PkgData(a1),RFTrace::PkgData(a2),RFTrace::PkgData(a3),RFTrace::PkgData(a4),RFTrace::PkgData(a5)); \
-			}
-
-	#define TRACEMULT6(aClassification, aFormatId, aUid, a1, a2, a3, a4, a5, a6)	\
-		if (BTrace::CheckFilter2(aClassification, aUid))								\
-			{																			\
-			RFTRACE_OPEN																\
-			TheFtrace.TraceMultiple(aClassification,aFormatId,aUid,6,RFTrace::PkgData(a1),RFTrace::PkgData(a2),RFTrace::PkgData(a3),RFTrace::PkgData(a4),RFTrace::PkgData(a5),RFTrace::PkgData(a6)); \
-			}
-
-	#define TRACEMULT7(aClassification, aFormatId, aUid, a1, a2, a3, a4, a5, a6, a7)\
-		if (BTrace::CheckFilter2(aClassification, aUid))								\
-			{																			\
-			RFTRACE_OPEN																\
-			TheFtrace.TraceMultiple(aClassification,aFormatId,aUid,7,RFTrace::PkgData(a1),RFTrace::PkgData(a2),RFTrace::PkgData(a3),RFTrace::PkgData(a4),RFTrace::PkgData(a5),RFTrace::PkgData(a6),RFTrace::PkgData(a7)); \
-			}
-
-	#define TRACEMULT8(aClassification, aFormatId, aUid, a1, a2, a3, a4, a5, a6, a7, a8)\
-		if (BTrace::CheckFilter2(aClassification, aUid))								\
-			{																			\
-			RFTRACE_OPEN																\
-			TheFtrace.TraceMultiple(aClassification,aFormatId,aUid,8,RFTrace::PkgData(a1),RFTrace::PkgData(a2),RFTrace::PkgData(a3),RFTrace::PkgData(a4),RFTrace::PkgData(a5),RFTrace::PkgData(a6),RFTrace::PkgData(a7),RFTrace::PkgData(a8)); \
-			}
+	public:
+		inline RDummyMessage(TInt aHandle) {iHandle = aHandle; iFunction=-1;}
+		};
 
 
 	// This macro retrieves the client thread ID from a message, which is useful for 
@@ -276,78 +85,18 @@
 		RDummyMessage msg(aMsgHandle);			\
 		TRACETHREADID(msg);		
 
-
-	// Use these macros for tracing a return code followed by 1-7 TUints...
-	// If the return code is negative the UTF::EError classification is used IF ENABLED  - otherwise the passed classification is used
-	#define TRACERET1(aClassification, aFormatId, aUid, r)								TRACE1( (TClassification) ((r < 0 && BTrace::CheckFilter2(UTF::EError, aUid)) ? UTF::EError : aClassification), aFormatId, aUid, r);
-	#define TRACERET2(aClassification, aFormatId, aUid, r, a2)							TRACE2( (TClassification) ((r < 0 && BTrace::CheckFilter2(UTF::EError, aUid)) ? UTF::EError : aClassification), aFormatId, aUid, r, a2)
-	#define TRACERET3(aClassification, aFormatId, aUid, r, a2, a3)						TRACE3( (TClassification) ((r < 0 && BTrace::CheckFilter2(UTF::EError, aUid)) ? UTF::EError : aClassification), aFormatId, aUid, r, a2, a3)
-	#define TRACERET4(aClassification, aFormatId, aUid, r, a2, a3, a4)					TRACE4( (TClassification) ((r < 0 && BTrace::CheckFilter2(UTF::EError, aUid)) ? UTF::EError : aClassification), aFormatId, aUid, r, a2, a3, a4)
-	#define TRACERET5(aClassification, aFormatId, aUid, r, a2, a3, a4, a5)				TRACE5( (TClassification) ((r < 0 && BTrace::CheckFilter2(UTF::EError, aUid)) ? UTF::EError : aClassification), aFormatId, aUid, r, a2, a3, a4, a5)
-	#define TRACERET6(aClassification, aFormatId, aUid, r, a2, a3, a4, a5, a6)			TRACE6( (TClassification) ((r < 0 && BTrace::CheckFilter2(UTF::EError, aUid)) ? UTF::EError : aClassification), aFormatId, aUid, r, a2, a3, a4, a5, a6)
-	#define TRACERET7(aClassification, aFormatId, aUid, r, a2, a3, a4, a5, a6, a7)		TRACE7( (TClassification) ((r < 0 && BTrace::CheckFilter2(UTF::EError, aUid)) ? UTF::EError : aClassification), aFormatId, aUid, r, a2, a3, a4, a5, a6, a7)
-	#define TRACERET8(aClassification, aFormatId, aUid, r, a2, a3, a4, a5, a6, a7, a8)	TRACE8( (TClassification) ((r < 0 && BTrace::CheckFilter2(UTF::EError, aUid)) ? UTF::EError : aClassification), aFormatId, aUid, r, a2, a3, a4, a5, a6, a7, a8)
-
-	// Use these macros for tracing a return code followed by 1-7 arbitrary data types....
-	// If the return code is negative the UTF::EError classification is used IF ENABLED  - otherwise the passed classification is used
-	#define TRACERETMULT1(aClassification, aFormatId, aUid, r)								TRACEMULT1( (TClassification) ((r < 0 && BTrace::CheckFilter2(UTF::EError, aUid)) ? UTF::EError : aClassification), aFormatId, aUid, r);
-	#define TRACERETMULT2(aClassification, aFormatId, aUid, r, a2)							TRACEMULT2( (TClassification) ((r < 0 && BTrace::CheckFilter2(UTF::EError, aUid)) ? UTF::EError : aClassification), aFormatId, aUid, r, a2)
-	#define TRACERETMULT3(aClassification, aFormatId, aUid, r, a2, a3)						TRACEMULT3( (TClassification) ((r < 0 && BTrace::CheckFilter2(UTF::EError, aUid)) ? UTF::EError : aClassification), aFormatId, aUid, r, a2, a3)
-	#define TRACERETMULT4(aClassification, aFormatId, aUid, r, a2, a3, a4)					TRACEMULT4( (TClassification) ((r < 0 && BTrace::CheckFilter2(UTF::EError, aUid)) ? UTF::EError : aClassification), aFormatId, aUid, r, a2, a3, a4)
-	#define TRACERETMULT5(aClassification, aFormatId, aUid, r, a2, a3, a4, a5)				TRACEMULT5( (TClassification) ((r < 0 && BTrace::CheckFilter2(UTF::EError, aUid)) ? UTF::EError : aClassification), aFormatId, aUid, r, a2, a3, a4, a5)
-	#define TRACERETMULT6(aClassification, aFormatId, aUid, r, a2, a3, a4, a5, a6)			TRACEMULT6( (TClassification) ((r < 0 && BTrace::CheckFilter2(UTF::EError, aUid)) ? UTF::EError : aClassification), aFormatId, aUid, r, a2, a3, a4, a5, a6)
-	#define TRACERETMULT7(aClassification, aFormatId, aUid, r, a2, a3, a4, a5, a6, a7)		TRACEMULT7( (TClassification) ((r < 0 && BTrace::CheckFilter2(UTF::EError, aUid)) ? UTF::EError : aClassification), aFormatId, aUid, r, a2, a3, a4, a5, a6, a7)
-	#define TRACERETMULT8(aClassification, aFormatId, aUid, r, a2, a3, a4, a5, a6, a7, a8)	TRACEMULT8( (TClassification) ((r < 0 && BTrace::CheckFilter2(UTF::EError, aUid)) ? UTF::EError : aClassification), aFormatId, aUid, r, a2, a3, a4, a5, a6, a7, a8)
-
+#else	// #if defined (OST_TRACE_COMPILER_IN_USE)
 
-#else		// #ifdef SYMBIAN_FTRACE_ENABLE
-	#define TRACE0(aClassification, aFormatId, aUid)
-	#define TRACE1(aClassification, aFormatId, aUid, a1)
-	#define TRACE2(aClassification, aFormatId, aUid, a1, a2)
-	#define TRACE3(aClassification, aFormatId, aUid, a1, a2, a3)
-	#define TRACE4(aClassification, aFormatId, aUid, a1, a2, a3, a4)
-	#define TRACE5(aClassification, aFormatId, aUid, a1, a2, a3, a4, a5)
-	#define TRACE6(aClassification, aFormatId, aUid, a1, a2, a3, a4, a5, a6)
-	#define TRACE7(aClassification, aFormatId, aUid, a1, a2, a3, a4, a5, a6, a7)
-	#define TRACE8(aClassification, aFormatId, aUid, a1, a2, a3, a4, a5, a6, a7, a8)
-	#define TRACESTR(aClassification, aFormatId, aUid, aData, aDataSize)
-
-	#define RFTRACE_LOAD
-	#define RFTRACE_OPEN
-	#define RFTRACE_CLOSE
-
-	#define TRACEMULT1(aClassification, aFormatId, aUid, a1)
-	#define TRACEMULT2(aClassification, aFormatId, aUid, a1, a2)
-	#define TRACEMULT3(aClassification, aFormatId, aUid, a1, a2, a3)
-	#define TRACEMULT4(aClassification, aFormatId, aUid, a1, a2, a3, a4)
-	#define TRACEMULT5(aClassification, aFormatId, aUid, a1, a2, a3, a4, a5)
-	#define TRACEMULT6(aClassification, aFormatId, aUid, a1, a2, a3, a4, a5, a6)
-	#define TRACEMULT7(aClassification, aFormatId, aUid, a1, a2, a3, a4, a5, a6, a7)
-	#define TRACEMULT8(aClassification, aFormatId, aUid, a1, a2, a3, a4, a5, a6, a7, a8)
 	#define TRACETHREADID(aMsg)
 	#define TRACETHREADIDH(aMsgHandle)
 
-	#define TRACERET1(aClassification, aFormatId, aUid, r)
-	#define TRACERET2(aClassification, aFormatId, aUid, r, a2)
-	#define TRACERET3(aClassification, aFormatId, aUid, r, a2, a3)
-	#define TRACERET4(aClassification, aFormatId, aUid, r, a2, a3, a4)
-	#define TRACERET5(aClassification, aFormatId, aUid, r, a2, a3, a4, a5)
-	#define TRACERET6(aClassification, aFormatId, aUid, r, a2, a3, a4, a5, a6)
-	#define TRACERET7(aClassification, aFormatId, aUid, r, a2, a3, a4, a5, a6, a7)
-	#define TRACERET8(aClassification, aFormatId, aUid, r, a2, a3, a4, a5, a6, a7, a8)
-
-	#define TRACERETMULT1(aClassification, aFormatId, aUid, r)
-	#define TRACERETMULT2(aClassification, aFormatId, aUid, r, a2)
-	#define TRACERETMULT3(aClassification, aFormatId, aUid, r, a2, a3)
-	#define TRACERETMULT4(aClassification, aFormatId, aUid, r, a2, a3, a4)
-	#define TRACERETMULT5(aClassification, aFormatId, aUid, r, a2, a3, a4, a5)
-	#define TRACERETMULT6(aClassification, aFormatId, aUid, r, a2, a3, a4, a5, a6)
-	#define TRACERETMULT7(aClassification, aFormatId, aUid, r, a2, a3, a4, a5, a6, a7)
-	#define TRACERETMULT8(aClassification, aFormatId, aUid, r, a2, a3, a4, a5, a6, a7, a8)
-#endif
+#endif	// #if defined (OST_TRACE_COMPILER_IN_USE)
 
 
 
 
-#endif
+
 
+#endif	// #if !defined(__FTRACE_H__)
+
+
diff -r 2a0ada0a1bf8 -r 95847726fe57 userlibandfileserver/fileserver/group/bld.inf
--- a/userlibandfileserver/fileserver/group/bld.inf	Wed May 12 10:34:10 2010 +0100
+++ b/userlibandfileserver/fileserver/group/bld.inf	Mon May 24 18:38:55 2010 +0100
@@ -46,17 +46,13 @@
 ../inc/F32plugin.h								SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(f32plugin.h)
 ../inc/f32plugin.inl							SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(f32plugin.inl)
 
-../inc/f32tracedef.h							SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(f32tracedef.h)
-../inc/utraceefsrv.h							SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(utraceefsrv.h)
-../inc/utraceefile.h							SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(utraceefile.h)
 ../rom/f32.iby	 		/epoc32/rom/f32/f32.iby
 
 PRJ_MMPFILES
 
 #if !defined(SMP)
-efsrv
-efile
+../sfsrv/efsrv
+../sfile/efile
 runtests
 #endif
 
-ftrace
diff -r 2a0ada0a1bf8 -r 95847726fe57 userlibandfileserver/fileserver/group/efile.mmh
--- a/userlibandfileserver/fileserver/group/efile.mmh	Wed May 12 10:34:10 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,106 +0,0 @@
-// Copyright (c) 1996-2009 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"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-// f32\group\efile.mmp
-// efile.exe File Server
-// 
-//
-
-/**
- @file
-*/
-
-
-SOURCEPATH	../sfsrv
-USERINCLUDE	../sfsrv
-USERINCLUDE	../ftrace
-SOURCE			 cl_file.cpp
-SOURCE			 cl_cli.cpp
-SOURCE			 cl_dir.cpp
-
-SOURCEPATH	../sfile
-USERINCLUDE	.
-SOURCE			 sf_amh.cpp sf_dat.cpp sf_debug.cpp sf_dir.cpp
-SOURCE			 sf_drv.cpp sf_file.cpp sf_fmt.cpp
-SOURCE			 sf_ldr.cpp sf_main.cpp sf_nbs.cpp sf_ses.cpp
-SOURCE			 sf_svr.cpp sf_sys.cpp sf_utl.cpp sf_mnt.cpp
-SOURCE			 sf_raw.cpp sf_prel.cpp sf_disk.cpp
-SOURCE			 sf_request.cpp sf_ops.cpp sf_notify.cpp
-SOURCE			 sf_thread.cpp sf_local.cpp sf_obj.cpp
-SOURCE			 sf_ext.cpp sf_hash.cpp
-SOURCE			 sf_plugin.cpp sf_plugin_ops.cpp sf_plugin_man.cpp
-SOURCE			 Sf_plugin_util.cpp
-SOURCE			 sf_cache_man.cpp sf_cache_client.cpp
-SOURCE			 sf_file_cache.cpp
-SOURCE			 sf_memory_man.cpp sf_memory_client.cpp
-SOURCE			 sf_plugin_shim.cpp
-SOURCE			 sf_notifier_handlers.cpp
-#ifdef SYMBIAN_F32_ENHANCED_CHANGE_NOTIFICATION
-SOURCE			 sf_pool.cpp sf_notifier.cpp
-#endif
-
-#ifdef WINS
-SOURCE			 sf_lwins.cpp
-
-library			emulator.lib
-#else
-SOURCE			 sf_lepoc.cpp  sf_inflate.cpp sf_cache.cpp sf_decomp.cpp
-SOURCE			 sf_pgcompr.cpp
-
-#ifdef MARM
-SOURCEPATH	../../../kernel/eka/kernel/arm
-SOURCE			 byte_pair.cia
-#else
-SOURCEPATH	../../../kernel/eka/kernel
-SOURCE			 byte_pair.cpp
-#endif
-
-
-SOURCEPATH	../srom
-SOURCE			 sr_rom.cpp
-#endif
-
-STRICTDEPEND
-
-SOURCEPATH	.
-DOCUMENT		 release.txt
-
-TARGETTYPE		exexp
-
-DEFFILE			efile.def
-
-USERINCLUDE	../inc
-#ifdef SYMBIAN_OLD_EXPORT_LOCATION
-SYSTEMINCLUDE	../inc
-#endif
-OS_LAYER_SYSTEMINCLUDE_SYMBIAN
-USERINCLUDE	../../../kernel/eka/include
-
-LIBRARY			 efsrv.lib euser.lib hal.lib btracec.lib
-
-EPOCSTACKSIZE	0x6000
-EPOCHEAPSIZE	0x00001000	0x800000
-
-START WINS
-BASEADDRESS		0x62000000
-WIN32_LIBRARY	kernel32.lib
-END
-UID		0x1000008c 0x100039e3
-VENDORID 0x70000001
-
-unpagedcode
-unpageddata
-
-SMPSAFE
-
-
diff -r 2a0ada0a1bf8 -r 95847726fe57 userlibandfileserver/fileserver/group/efile.mmp
--- a/userlibandfileserver/fileserver/group/efile.mmp	Wed May 12 10:34:10 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,41 +0,0 @@
-// Copyright (c) 1996-2009 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"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-// f32/group/efile.mmp
-// efile.exe File Server
-// 
-//
-
-/**
- @file
-*/
-
-
-TARGET			efile.exe
-
-#include "f32caps.mmh"  // Capabilities of File Server process
-#include "f32.mmh"  	// Generic definitions for the whole f32 component
-
-MACRO			SYMBIAN_PRIVATE_EFSRV
-
-#ifdef SYMBIAN_TRACE_SYSTEM_INCLUDE
-	macro SYMBIAN_FTRACE_ENABLE_UDEB
-//	macro SYMBIAN_FTRACE_ENABLE_UREL
-#endif
-
-#include "efile.mmh"
-
-
-
-
-
diff -r 2a0ada0a1bf8 -r 95847726fe57 userlibandfileserver/fileserver/group/efile_instrumented.mmp
--- a/userlibandfileserver/fileserver/group/efile_instrumented.mmp	Wed May 12 10:34:10 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,37 +0,0 @@
-// Copyright (c) 1996-2009 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"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-// f32/group/efile.mmp
-// efile_instrumented.exe Instrumented version of the File Server
-// 
-//
-
-/**
- @file
-*/
-
-
-TARGET			efile_instrumented.exe
-
-#include "f32caps.mmh"  // Capabilities of File Server process
-#include "f32.mmh"  	// Generic definitions for the whole f32 component
-
-MACRO			SYMBIAN_PRIVATE_EFSRV
-
-#ifdef SYMBIAN_TRACE_SYSTEM_INCLUDE
-	macro SYMBIAN_FTRACE_ENABLE_UDEB
-	macro SYMBIAN_FTRACE_ENABLE_UREL
-#endif
-
-#include "efile.mmh"
-
diff -r 2a0ada0a1bf8 -r 95847726fe57 userlibandfileserver/fileserver/group/efsrv.mmh
--- a/userlibandfileserver/fileserver/group/efsrv.mmh	Wed May 12 10:34:10 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,61 +0,0 @@
-// Copyright (c) 1996-2009 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"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-// f32\group\efsrv.mmp
-// efsrv.dll File Server client-side library
-// 
-//
-
-/**
- @file
-*/
-
-
-
-USERINCLUDE		../ftrace
-
-SOURCEPATH		../sfsrv
-SOURCE			 cl_cdir.cpp cl_cli.cpp cl_debug.cpp cl_dir.cpp
-SOURCE			 cl_drive.cpp cl_entry.cpp cl_file.cpp cl_find.cpp
-SOURCE			 cl_fman.cpp cl_fmt.cpp cl_fraw.cpp cl_ftext.cpp
-SOURCE			 cl_main.cpp cl_parse.cpp cl_scan.cpp cl_insecure.cpp
-SOURCE			 cl_plugin.cpp cl_blockmap.cpp cl_clamp.cpp
-SOURCE			 cl_shim.cpp
-SOURCE			 cl_notification.cpp
-SOURCEPATH	.
-DOCUMENT		 release.txt
-
-TARGETTYPE		dll
-
-DEFFILE			 efsrv.def
-
-USERINCLUDE	../inc
-#ifdef SYMBIAN_OLD_EXPORT_LOCATION
-SYSTEMINCLUDE	../inc
-#endif
-OS_LAYER_SYSTEMINCLUDE_SYMBIAN
-
-LIBRARY			 euser.lib hal.lib
-
-START WINS
-BASEADDRESS		0x66000000
-END
-
-UID		0x1000008d 0x100039e4
-VENDORID 0x70000001
-CAPABILITY	All
-
-unpagedcode
-
-SMPSAFE
-
diff -r 2a0ada0a1bf8 -r 95847726fe57 userlibandfileserver/fileserver/group/efsrv.mmp
--- a/userlibandfileserver/fileserver/group/efsrv.mmp	Wed May 12 10:34:10 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +0,0 @@
-// Copyright (c) 1996-2009 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"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-// f32/group/efsrv.mmp
-// efsrv.dll File Server client-side library
-// 
-//
-
-/**
- @file
-*/
-
-
-TARGET			efsrv.dll
-
-#include "f32.mmh"  	// Generic definitions for the whole f32 component
-
-#ifdef SYMBIAN_TRACE_SYSTEM_INCLUDE
-	macro SYMBIAN_FTRACE_ENABLE_UDEB
-//	macro SYMBIAN_FTRACE_ENABLE_UREL
-#endif
-
-
-#include "efsrv.mmh"
diff -r 2a0ada0a1bf8 -r 95847726fe57 userlibandfileserver/fileserver/group/efsrv_instrumented.mmp
--- a/userlibandfileserver/fileserver/group/efsrv_instrumented.mmp	Wed May 12 10:34:10 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +0,0 @@
-// Copyright (c) 1996-2009 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"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-// f32/group/efsrv.mmp
-// efsrv_instrumented.dll Instrumented version of the File Server client-side library
-// 
-//
-
-/**
- @file
-*/
-
-
-TARGET			efsrv_instrumented.dll
-
-#include "f32.mmh"  	// Generic definitions for the whole f32 component
-
-#ifdef SYMBIAN_TRACE_SYSTEM_INCLUDE
-	macro SYMBIAN_FTRACE_ENABLE_UDEB
-	macro SYMBIAN_FTRACE_ENABLE_UREL
-#endif
-
-
-#include "efsrv.mmh"
diff -r 2a0ada0a1bf8 -r 95847726fe57 userlibandfileserver/fileserver/group/ftrace.mmp
--- a/userlibandfileserver/fileserver/group/ftrace.mmp	Wed May 12 10:34:10 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,38 +0,0 @@
-// Copyright (c) 2008-2009 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"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-#include "kernel/kern_ext.mmh"
-#include "f32.mmh"
-
-USERINCLUDE		../inc
-
-TARGET         d_ftrace.ldd
-TARGETTYPE     LDD
-SOURCEPATH	../ftrace
-SOURCE         d_ftrace.cpp
-
-epocallowdlldata
-
-OS_LAYER_SYSTEMINCLUDE_SYMBIAN
-
-start wins
-win32_headers
-end
-
-capability	all
-VENDORID 0x70000001
-
-UNPAGED
-SMPSAFE
diff -r 2a0ada0a1bf8 -r 95847726fe57 userlibandfileserver/fileserver/group/release.txt
--- a/userlibandfileserver/fileserver/group/release.txt	Wed May 12 10:34:10 2010 +0100
+++ b/userlibandfileserver/fileserver/group/release.txt	Mon May 24 18:38:55 2010 +0100
@@ -1,3 +1,31 @@
+Version 2.00.3042
+=================
+(Made by vfebvre 14/05/2010)
+
+1.	migubarr
+	1.	REQ 428-1297 Migrate File Server Tracing from UTF to OST
+		PackageReleaseID=495120
+
+
+Version 2.00.3041
+=================
+(Made by vfebvre 13/05/2010)
+
+1.	famustaf
+	1.	ou1cimx1#380321 Build on Linux - Incorrect slash in #include in sf_sys.cpp
+
+
+Version 2.00.3040
+=================
+(Made by vfebvre 12/05/2010)
+
+1.	cnotton
+	1.	MINOR_CHANGE Corrected MRP comment text
+
+2.	hengrant
+	1.	ou1cimx1#370931 Memory card gets locked by itself MCL
+
+
 Version 2.00.3039
 =================
 (Made by vfebvre 06/05/2010)
diff -r 2a0ada0a1bf8 -r 95847726fe57 userlibandfileserver/fileserver/inc/f32tracedef.h
--- a/userlibandfileserver/fileserver/inc/f32tracedef.h	Wed May 12 10:34:10 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,71 +0,0 @@
-/*
-* Copyright (c) 2009 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-* WARNING: This file contains some APIs which are internal and are subject
-*          to change without notice. Such APIs should therefore not be used
-*          outside the Kernel and Hardware Services package.
-*/
-// F32TRACEDEF.H
-//
-
-#if !defined(__F32TRACEDEF_H__)
-#define __F32TRACEDEF_H__
-
-//*********************************
-// from e32utrace_basic_types.h
-//*********************************
-typedef TUint8  TClassification;	// same as BTrace::TCategory
-typedef TUint32 TModuleUid;			
-typedef TUint16 TFormatId;			// 2 bytes occupying first 32-bit word of data
-
-namespace UTF
-	{
-	const static TFormatId KInitialClientFormat = 512; 
-	const static TFormatId KMaxFormatId = KMaxTUint16;		// 0xFFFF
-
-	enum TClassificationAll
-		{
-		EPanic = 192,
-		EError = 193,
-		EWarning = 194, 
-		EBorder = 195, 
-		EState = 196, 
-		EInternals = 197, 
-		EDump = 198, 
-		EFlow = 199, 
-		ESystemCharacteristicMetrics = 200, 
-		EAdhoc = 201,
-		EClassificationAllHighWaterMark, 
-		};
-	}	// namespace UTF
-
-
-enum TF32TraceFormatUids
-	{
-	EF32TraceUidEfsrv		=	0x100039e4,	// 268450276
-	EF32TraceUidFirst		=	0x10286575,	// 271082869
-	EF32TraceUidLast		=	0x10286594,	// 271082900
-	
-	EF32TraceUidFileSys		=	0x10286575,	// 271082869
-	EF32TraceUidProxyDrive	=	0x10286576,	// 271082870
-
-    // Provided to allow the following compile time assert.
-    ETraceUidHighWaterMark,
-    };
-    __ASSERT_COMPILE(ETraceUidHighWaterMark <= (EF32TraceUidLast + 1));
-	
-
-#endif
-
diff -r 2a0ada0a1bf8 -r 95847726fe57 userlibandfileserver/fileserver/inc/f32ver.h
--- a/userlibandfileserver/fileserver/inc/f32ver.h	Wed May 12 10:34:10 2010 +0100
+++ b/userlibandfileserver/fileserver/inc/f32ver.h	Mon May 24 18:38:55 2010 +0100
@@ -58,6 +58,6 @@
 
 @see TVersion
 */
-const TInt KF32BuildVersionNumber=3039;
+const TInt KF32BuildVersionNumber=3042;
 //
 #endif
diff -r 2a0ada0a1bf8 -r 95847726fe57 userlibandfileserver/fileserver/inc/utraceefile.h
--- a/userlibandfileserver/fileserver/inc/utraceefile.h	Wed May 12 10:34:10 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,603 +0,0 @@
-
-// Copyright (c) 2008-2009 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"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-// File Server tracing
-// 
-//
-
-/**
- @file
- @publishedPartner
- @prototype
-*/
-
-#ifndef UTRACEEFILE_H
-#define UTRACEEFILE_H
-
-
-#include <f32tracedef.h>
-
-/**
-This defines trace attributes to be used by file-system tracing
-
-*/
-namespace UTraceModuleFileSys
-    {
-
-	/** 
-	@SYMTraceFormatCategory EF32TraceUidFileSys 
-    @SYMTraceFormatId
-    */
-    enum TFormatId
-        {
-		EReserved = UTF::KInitialClientFormat-1,
-
-        /** @SYMTraceFormatString "+CFileSystem::CFileSystem()" */
-		ECFileSystemConstructor,
-        /** @SYMTraceFormatString "-CFileSystem::CFileSystem()" */
-        ECFileSystemConstructorReturn,
-
-        /** @SYMTraceFormatString "+~CFileSystem::CFileSystem()" */
-		ECFileSystemDestructor,
-        /** @SYMTraceFormatString "-~CFileSystem::CFileSystem()" */
-        ECFileSystemDestructorReturn,
-
-        /** @SYMTraceFormatString "+CFileSystem::New() handle %x" */
-		ECFileSystemNew,
-        /** @SYMTraceFormatString "-CFileSystem::New() fileSystem %x" */
-        ECFileSystemNewRet,
-
-        /** @SYMTraceFormatString "+CFileSystem::Remove() this %x" */
-		ECFileSystemRemove,
-        /** @SYMTraceFormatString "-CFileSystem::Remove()" */
-        ECFileSystemRemoveRet,
-
-        /** @SYMTraceFormatString "CFileSystem::IsExtensionSupported() this %x r %d" */
-		ECFileSystemIsExtensionSupported,
-
-		/** @SYMTraceFormatString "+CFileSystem::Install() this %x" */
-		ECFileSystemInstall,
-        /** @SYMTraceFormatString "-CFileSystem::Install() r %d Name %*S" */
-        ECFileSystemInstallRet,
-
-		/** @SYMTraceFormatString "+CFileSystem::NewMountL() this %x drive %d" */
-		ECFileSystemNewMountL,
-        /** @SYMTraceFormatString "-CFileSystem::NewMountL() r %d CMountCB %x" */
-        ECFileSystemNewMountLRet,
-
-		/** @SYMTraceFormatString "+CFileSystem::NewFileL() this %x drive %d" */
-		ECFileSystemNewFileL,
-        /** @SYMTraceFormatString "-CFileSystem::NewFileL() r %d CFileCB %x" */
-        ECFileSystemNewFileLRet,
-
-		/** @SYMTraceFormatString "+CFileSystem::NewDirL() this %x drive %d" */
-		ECFileSystemNewDirL,
-        /** @SYMTraceFormatString "-CFileSystem::NewDirL() r %d CDirCB %x" */
-        ECFileSystemNewDirLRet,
-
-		/** @SYMTraceFormatString "+CFileSystem::NewFormatL() this %x drive %d" */
-		ECFileSystemNewFormatL,
-        /** @SYMTraceFormatString "-CFileSystem::NewFormatL() r %d CFormatCB %x" */
-        ECFileSystemNewFormatLRet,
-
-		/** @SYMTraceFormatString "+CFileSystem::DriveInfo() this %x aDriveNumber %d" */
-		ECFileSystemDriveInfo,
-        /** @SYMTraceFormatString "-CFileSystem::DriveInfo() type %d driveAtt %x mediaAtt %x" */
-        ECFileSystemDriveInfoRet,
-
-
-        
-		/** @SYMTraceFormatString "+CMountCB::ReMount() drive %d" */
-		ECMountCBReMount,
-        /** @SYMTraceFormatString "-CMountCB::ReMount() success %d" */
-        ECMountCBReMountRet,
-
-		/** @SYMTraceFormatString "+CMountCB::Dismounted() drive %d" */
-		ECMountCBDismounted,
-        /** @SYMTraceFormatString "-CMountCB::Dismounted()" */
-        ECMountCBDismountedRet,
-
-
-		/** @SYMTraceFormatString "+CMountCB::VolumeL() drive %d" */
-		ECMountCBVolumeL,
-        /** @SYMTraceFormatString "-CMountCB::VolumeL() r %d iUniqueID %x iSize %ld iFree %ld iFileCacheFlags %x" */
-        ECMountCBVolumeLRet,
-
-		/** @SYMTraceFormatString "+CMountCB::SetVolumeL() drive %d aName %*S" */
-		ECMountCBSetVolumeL,
-        /** @SYMTraceFormatString "-CMountCB::SetVolumeL() r %d" */
-        ECMountCBSetVolumeLRet,
-
-		/** @SYMTraceFormatString "+CMountCB::MkDirL() drive %d aName %*S" */
-		ECMountCBMkDirL,
-        /** @SYMTraceFormatString "-CMountCB::MkDirL() r %d" */
-        ECMountCBMkDirLRet,
-
-		/** @SYMTraceFormatString "+CMountCB::RmDirL() drive %d aName %*S" */
-		ECMountCBRmDirL,
-        /** @SYMTraceFormatString "-CMountCB::RmDirL() r %d" */
-        ECMountCBRmDirLRet,
-
-		/** @SYMTraceFormatString "+CMountCB::DeleteL() drive %d aName %*S" */
-		ECMountCBDeleteL,
-        /** @SYMTraceFormatString "-CMountCB::DeleteL() r %d" */
-        ECMountCBDeleteLRet,
-
-		/** @SYMTraceFormatString "+CMountCB::RenameL() drive %d anOldName %*S anNewName *S" */
-		ECMountCBRenameL,
-        /** @SYMTraceFormatString "-CMountCB::RenameL() r %d" */
-        ECMountCBRenameLRet,
-
-		/** @SYMTraceFormatString "+CMountCB::ReplaceL() drive %d anOldName %*S anNewName *S" */
-		ECMountCBReplaceL,
-        /** @SYMTraceFormatString "-CMountCB::ReplaceL() r %d" */
-        ECMountCBReplaceLRet,
-
-		/** @SYMTraceFormatString "+CMountCB::EntryL() drive %d aName %*S" */
-		ECMountCBEntryL,
-        /** @SYMTraceFormatString "-CMountCB::EntryL() r %d att %x modified %lx size %d" */
-        ECMountCBEntryLRet,
-
-		/** @SYMTraceFormatString "+CMountCB::SetEntryL() drive %d aName %*S aTime %lx aSetAttMask %x aClearAttMask %x" */
-		ECMountCBSetEntryL,
-        /** @SYMTraceFormatString "-CMountCB::SetEntryL() r %d" */
-        ECMountCBSetEntryLRet,
-
-        /** @SYMTraceFormatString "+CMountCB::FileOpenL() drive %d aName %*S aMode %x anOpen %d aFile %x" */
-		ECMountCBFileOpenL,
-        /** @SYMTraceFormatString "-CMountCB::FileOpenL() r %d" */
-        ECMountCBFileOpenLRet,
-
-        /** @SYMTraceFormatString "+CMountCB::DirOpenL() drive %d aName %*S aDir %x" */
-		ECMountCBDirOpenL,
-        /** @SYMTraceFormatString "-CMountCB::DirOpenL() r %d" */
-        ECMountCBDirOpenLRet,
-
-		/** @SYMTraceFormatString "+CMountCB::RawReadL() drive %d aPos %ld aLength %d aTrg %x anOffset %x threadId %x" */
-		ECMountCBRawReadL,
-        /** @SYMTraceFormatString "-CMountCB::RawReadL() r %d" */
-        ECMountCBRawReadLRet,
-
-		/** @SYMTraceFormatString "+CMountCB::RawWriteL() drive %d aPos %ld aLength %d aTrg %x anOffset %x threadId %x" */
-		ECMountCBRawWriteL,
-        /** @SYMTraceFormatString "-CMountCB::RawWriteL() r %d" */
-        ECMountCBRawWriteLRet,
-
-		/** @SYMTraceFormatString "+CMountCB::GetShortNameL() drive %d aLongName %*S" */
-		ECMountCBGetShortNameL,
-        /** @SYMTraceFormatString "-CMountCB::GetShortNameL() r %d aShortName %*S" */
-        ECMountCBGetShortNameLRet,
-
-		/** @SYMTraceFormatString "+CMountCB::GetLongNameL() drive %d aShortName %*S" */
-		ECMountCBGetLongNameL,
-        /** @SYMTraceFormatString "-CMountCB::GetLongNameL() r %d aLongName %*S" */
-        ECMountCBGetLongNameLRet,
-
-		/** @SYMTraceFormatString "+CMountCB::ReadFileSectionL() drive %d aName %*S aPos %ld aTrg %x aLength %d threadId %x" */
-		ECMountCBReadFileSectionL,
-        /** @SYMTraceFormatString "-CMountCB::ReadFileSectionL() r %d" */
-        ECMountCBReadFileSectionLRet,
-
-		/** @SYMTraceFormatString "+CMountCB::CheckDisk1() drive %d" */
-		ECMountCBCheckDisk1,
-        /** @SYMTraceFormatString "-CMountCB::CheckDisk1() r %d" */
-        ECMountCBCheckDisk1Ret,
-
-		/** @SYMTraceFormatString "+CMountCB::CheckDisk2() drive %d aOperation %d aParam1 %x aParam2 %x" */
-		ECMountCBCheckDisk2,
-        /** @SYMTraceFormatString "-CMountCB::CheckDisk2() r %d" */
-        ECMountCBCheckDisk2Ret,
-
-		/** @SYMTraceFormatString "+CMountCB::ScanDrive1() drive %d" */
-		ECMountCBScanDrive1,
-        /** @SYMTraceFormatString "-CMountCB::ScanDrive1() r %d" */
-        ECMountCBScanDrive1Ret,
-
-		/** @SYMTraceFormatString "+CMountCB::ScanDrive2() drive %d aOperation %d aParam1 %x aParam2 %x" */
-		ECMountCBScanDrive2,
-        /** @SYMTraceFormatString "-CMountCB::ScanDrive2() r %d" */
-        ECMountCBScanDrive2Ret,
-
-		/** @SYMTraceFormatString "+CMountCB::ControlIO() drive %d aCommand %d aParam1 %x aParam2 %x threadId %x" */
-		ECMountCBControlIO,
-        /** @SYMTraceFormatString "-CMountCB::ControlIO() r %d" */
-        ECMountCBControlIORet,
-
-		/** @SYMTraceFormatString "+CMountCB::Lock() drive %d aStore %d" */
-		ECMountCBLock,
-        /** @SYMTraceFormatString "-CMountCB::Lock() r %d" */
-        ECMountCBLockRet,
-
-		/** @SYMTraceFormatString "+CMountCB::Unlock() drive %d aStore %d" */
-		ECMountCBUnlock,
-        /** @SYMTraceFormatString "-CMountCB::Unlock() r %d" */
-        ECMountCBUnlockRet,
-
-		/** @SYMTraceFormatString "+CMountCB::ClearPassword() drive %d" */
-		ECMountCBClearPassword,
-        /** @SYMTraceFormatString "-CMountCB::ClearPassword() r %d" */
-        ECMountCBClearPasswordRet,
-
-		/** @SYMTraceFormatString "+CMountCB::ForceRemountDrive() drive %d aMountInfo %x aMountInfoMessageHandle %x aFlags %x" */
-		ECMountCBForceRemountDrive,
-        /** @SYMTraceFormatString "-CMountCB::ForceRemountDrive() r %d" */
-        ECMountCBForceRemountDriveRet,
-
-		/** @SYMTraceFormatString "+CMountCB::FinaliseMount1() drive %d" */
-		ECMountCBFinaliseMount1,
-        /** @SYMTraceFormatString "-CMountCB::FinaliseMount1() r %d" */
-        ECMountCBFinaliseMount1Ret,
-
-		/** @SYMTraceFormatString "+CMountCB::FinaliseMount2() drive %d" */
-		ECMountCBFinaliseMount2,
-        /** @SYMTraceFormatString "-CMountCB::FinaliseMount2() r %d" */
-        ECMountCBFinaliseMount2Ret,
-
-		/** @SYMTraceFormatString "+CMountCB::MountControl() drive %d aLevel %d aOption %x aParam %x" */
-		ECMountCBMountControl,
-        /** @SYMTraceFormatString "-CMountCB::MountControl() r %d" */
-        ECMountCBMountControlRet,
-
-		/** @SYMTraceFormatString "+CMountCB::ESQ_RequestFreeSpace() drive %d" */
-		ECMountCBFreeSpace,
-        /** @SYMTraceFormatString "-CMountCB::ESQ_RequestFreeSpace() r %d FreeSpace %ld" */
-        ECMountCBFreeSpaceRet,
-
-		/** @SYMTraceFormatString "+CMountCB::ESQ_GetCurrentFreeSpace() drive %d" */
-		ECMountCBCurrentFreeSpace,
-        /** @SYMTraceFormatString "-CMountCB::ESQ_GetCurrentFreeSpace() r %d FreeSpace %ld" */
-        ECMountCBCurrentFreeSpaceRet,
-
-		/** @SYMTraceFormatString "+CMountCB::ESQ_MountedVolumeSize() drive %d" */
-		ECMountCBVolumeSize,
-        /** @SYMTraceFormatString "-CMountCB::ESQ_MountedVolumeSize() r %d size %ld" */
-        ECMountCBVolumeSizeRet,
-
-		/** @SYMTraceFormatString "+CMountCB::ErasePassword() drive %d" */
-		ECMountCBErasePassword,
-        /** @SYMTraceFormatString "-CMountCB::ErasePassword() r %d" */
-        ECMountCBErasePasswordRet,
-
-		/** @SYMTraceFormatString "+CMountCB::GetInterface() drive %d aInterfaceId %d aInput %x" */
-		ECMountCBGetInterface,
-        /** @SYMTraceFormatString "-CMountCB::GetInterface() r %d aInterface %x" */
-        ECMountCBGetInterfaceRet,
-
-		/** @SYMTraceFormatString "+CFileCB::RenameL() this %x aNewName %*S" */
-		ECFileCBRenameL,
-        /** @SYMTraceFormatString "-CFileCB::RenameL() r %d" */
-        ECFileCBRenameLRet,
-
-		/** @SYMTraceFormatString "+CFileCB::ReadL() this %x aPos %ld aLength %d aDes %x threadId %x aOffset %x" */
-		ECFileCBReadL,
-        /** @SYMTraceFormatString "-CFileCB::ReadL() r %d" */
-        ECFileCBReadLRet,
-
-		/** @SYMTraceFormatString "+CFileCB::WriteL() this %x aPos %ld aLength %d aDes %x threadId %x aOffset %x" */
-		ECFileCBWriteL,
-        /** @SYMTraceFormatString "-CFileCB::WriteL() r %d" */
-        ECFileCBWriteLRet,
-
-		/** @SYMTraceFormatString "+CFileCB::SetSizeL() this %x aSize %ld" */
-		ECFileCBSetSizeL,
-        /** @SYMTraceFormatString "-CFileCB::SetSizeL() r %d" */
-        ECFileCBSetSizeLRet,
-
-		/** @SYMTraceFormatString "+CFileCB::SetEntryL() this %x aTime %lx aSetAttMask %x aClearAttMask %x" */
-		ECFileCBSetEntryL,
-        /** @SYMTraceFormatString "-CFileCB::SetEntryL() r %d" */
-        ECFileCBSetEntryLRet,
-
-		/** @SYMTraceFormatString "+CFileCB::FlushDataL() this %x" */
-		ECFileCBFlushDataL,
-        /** @SYMTraceFormatString "-CFileCB::FlushDataL() r %d" */
-        ECFileCBFlushDataLRet,
-
-		/** @SYMTraceFormatString "+CFileCB::GetInterface() aInterfaceId %d aInput %x" */
-		ECFileCBGetInterface,
-        /** @SYMTraceFormatString "-CFileCB::GetInterface() r %d aInterface %x" */
-        ECFileCBGetInterfaceRet,
-
-
-		/** @SYMTraceFormatString "+CDirCB::ReadL() this %x" */
-		ECDirCBReadL,
-        /** @SYMTraceFormatString "-CDirCB::ReadL() r %d att %x modified %lx size %d" */
-        ECDirCBReadLRet,
-
-		/** @SYMTraceFormatString "+CDirCB::StoreLongEntryNameL() this %x" */
-		ECDirCBStoreLongEntryNameL,
-        /** @SYMTraceFormatString "-CDirCB::StoreLongEntryNameL() r %d" */
-        ECDirCBStoreLongEntryNameLRet,
-
-
-		/** @SYMTraceFormatString "+CFormatCB::DoFormatStepL() this %x" */
-		ECFormatCBDoFormatStepL,
-        /** @SYMTraceFormatString "-CFormatCB::DoFormatStepL() r %d  iCurrentStep %d" */
-        ECFormatCBDoFormatStepLRet,
-
-
-
-
-
-        /**
-        Provided to allow the following compile time assert.
-        */
-        EFormatIdHighWaterMark,
-        };
-    __ASSERT_COMPILE(EFormatIdHighWaterMark <= (UTF::KMaxFormatId + 1));
-	}
-
-namespace UTraceModuleProxyDrive
-    {
-	/** 
-	@SYMTraceFormatCategory EF32TraceUidProxyDrive 
-    @SYMTraceFormatId
-    */
-    enum TFormatId
-        {
-		EReserved = UTF::KInitialClientFormat-1,
-
-		/** @SYMTraceFormatString "+CLocalProxyDrive::New() aMount %x drive %d" */
-		ECLocalProxyDriveNew,
-        /** @SYMTraceFormatString "-CLocalProxyDrive::New() proxyDrive %x" */
-        ECLocalProxyDriveNewRet,
-
-
-		/** @SYMTraceFormatString "+CBaseExtProxyDrive::Initialise() this %x" */
-		ECBaseExtProxyDriveInitialise,
-        /** @SYMTraceFormatString "-CBaseExtProxyDrive::Initialise() r %d" */
-        ECBaseExtProxyDriveInitialiseRet,
-
-		/** @SYMTraceFormatString "+CLocalProxyDrive::Initialise() this %x" */
-		ECLocalProxyDriveInitialise,
-        /** @SYMTraceFormatString "-CLocalProxyDrive::Initialise() r %d" */
-        ECLocalProxyDriveInitialiseRet,
-
-		/** @SYMTraceFormatString "+CBaseExtProxyDrive::ControlIO() this %x" */
-		ECBaseExtProxyDriveControlIO,
-        /** @SYMTraceFormatString "-CBaseExtProxyDrive::ControlIO() r %d" */
-        ECBaseExtProxyDriveControlIORet,
-
-		/** @SYMTraceFormatString "+CLocalProxyDrive::ControlIO() this %x" */
-		ECLocalProxyDriveControlIO,
-        /** @SYMTraceFormatString "-CLocalProxyDrive::ControlIO() r %d" */
-        ECLocalProxyDriveControlIORet,
-
-		/** @SYMTraceFormatString "+CBaseExtProxyDrive::Read1() this %x aPos %ld aLength %d aTrg %x threadId %x aOffset %x aFlags %x" */
-		ECBaseExtProxyDriveRead1,
-        /** @SYMTraceFormatString "-CBaseExtProxyDrive::Read1() r %d" */
-        ECBaseExtProxyDriveRead1Ret,
-
-		/** @SYMTraceFormatString "+CLocalProxyDrive::Read1() this %x aPos %ld aLength %d aTrg %x threadId %x aOffset %x aFlags %x" */
-		ECLocalProxyDriveRead1,
-        /** @SYMTraceFormatString "-CLocalProxyDrive::Read1() r %d" */
-        ECLocalProxyDriveRead1Ret,
-
-		/** @SYMTraceFormatString "+CBaseExtProxyDrive::Read2() this %x aPos %ld aLength %d aTrg %x threadId %x aOffset %x" */
-		ECBaseExtProxyDriveRead2,
-        /** @SYMTraceFormatString "-CBaseExtProxyDrive::Read2() r %d" */
-        ECBaseExtProxyDriveRead2Ret,
-
-		/** @SYMTraceFormatString "+CLocalProxyDrive::Read2() this %x aPos %ld aLength %d aTrg %x threadId %x aOffset %x" */
-		ECLocalProxyDriveRead2,
-        /** @SYMTraceFormatString "-CLocalProxyDrive::Read2() r %d" */
-        ECLocalProxyDriveRead2Ret,
-
-		/** @SYMTraceFormatString "+CBaseExtProxyDrive::Read3() this %x aPos %ld aLength %d aTrg %x" */
-		ECBaseExtProxyDriveRead3,
-        /** @SYMTraceFormatString "-CBaseExtProxyDrive::Read3() r %d" */
-        ECBaseExtProxyDriveRead3Ret,
-
-		/** @SYMTraceFormatString "+CLocalProxyDrive::Read3() this %x aPos %ld aLength %d aTrg %x" */
-		ECLocalProxyDriveRead3,
-        /** @SYMTraceFormatString "-CLocalProxyDrive::Read3() r %d" */
-        ECLocalProxyDriveRead3Ret,
-
-
-		/** @SYMTraceFormatString "+CBaseExtProxyDrive::Write1() this %x aPos %ld aLength %d aSrc %x threadId %x aOffset %x aFlags %x" */
-		ECBaseExtProxyDriveWrite1,
-        /** @SYMTraceFormatString "-CBaseExtProxyDrive::Write1() r %d" */
-        ECBaseExtProxyDriveWrite1Ret,
-
-		/** @SYMTraceFormatString "+CLocalProxyDrive::Write1() this %x aPos %ld aLength %d aSrc %x threadId %x aOffset %x aFlags %x" */
-		ECLocalProxyDriveWrite1,
-        /** @SYMTraceFormatString "-CLocalProxyDrive::Write1() r %d" */
-        ECLocalProxyDriveWrite1Ret,
-
-		/** @SYMTraceFormatString "+CBaseExtProxyDrive::Write2() this %x aPos %ld aLength %d aSrc %x threadId %x aOffset %x" */
-		ECBaseExtProxyDriveWrite2,
-        /** @SYMTraceFormatString "-CBaseExtProxyDrive::Write2() r %d" */
-        ECBaseExtProxyDriveWrite2Ret,
-
-		/** @SYMTraceFormatString "+CLocalProxyDrive::Write2() this %x aPos %ld aLength %d aSrc %x threadId %x aOffset %x" */
-		ECLocalProxyDriveWrite2,
-        /** @SYMTraceFormatString "-CLocalProxyDrive::Write2() r %d" */
-        ECLocalProxyDriveWrite2Ret,
-
-		/** @SYMTraceFormatString "+CBaseExtProxyDrive::Write3() this %x aPos %ld aLength %d aSrc %x" */
-		ECBaseExtProxyDriveWrite3,
-        /** @SYMTraceFormatString "-CBaseExtProxyDrive::Write3() r %d" */
-        ECBaseExtProxyDriveWrite3Ret,
-
-		/** @SYMTraceFormatString "+CLocalProxyDrive::Write3() this %x aPos %ld aLength %d aSrc %x" */
-		ECLocalProxyDriveWrite3,
-        /** @SYMTraceFormatString "-CLocalProxyDrive::Write3() r %d" */
-        ECLocalProxyDriveWrite3Ret,
-
-		/** @SYMTraceFormatString "+CBaseExtProxyDrive::Dismounted() this %x" */
-		ECBaseExtProxyDriveDismounted,
-        /** @SYMTraceFormatString "-CBaseExtProxyDrive::Dismounted() r %d" */
-        ECBaseExtProxyDriveDismountedRet,
-
-		/** @SYMTraceFormatString "+CLocalProxyDrive::Dismounted() this %x" */
-		ECLocalProxyDriveDismounted,
-        /** @SYMTraceFormatString "-CLocalProxyDrive::Dismounted() r %d" */
-        ECLocalProxyDriveDismountedRet,
-
-		/** @SYMTraceFormatString "+CBaseExtProxyDrive::Enlarge() this %x aLength %d" */
-		ECBaseExtProxyDriveEnlarge,
-        /** @SYMTraceFormatString "-CBaseExtProxyDrive::Enlarge() r %d" */
-        ECBaseExtProxyDriveEnlargeRet,
-
-		/** @SYMTraceFormatString "+CLocalProxyDrive::Enlarge() this %x aLength %d" */
-		ECLocalProxyDriveEnlarge,
-        /** @SYMTraceFormatString "-CLocalProxyDrive::Enlarge() r %d" */
-        ECLocalProxyDriveEnlargeRet,
-
-		/** @SYMTraceFormatString "+CBaseExtProxyDrive::ReduceSize() this %x aPos %d aLength %d" */
-		ECBaseExtProxyDriveReduceSize,
-        /** @SYMTraceFormatString "-CBaseExtProxyDrive::ReduceSize() r %d" */
-        ECBaseExtProxyDriveReduceSizeRet,
-
-		/** @SYMTraceFormatString "+CLocalProxyDrive::ReduceSize() this %x aPos %d aLength %d" */
-		ECLocalProxyDriveReduceSize,
-        /** @SYMTraceFormatString "-CLocalProxyDrive::ReduceSize() r %d" */
-        ECLocalProxyDriveReduceSizeRet,
-
-		/** @SYMTraceFormatString "+CBaseExtProxyDrive::Caps() this %x" */
-		ECBaseExtProxyDriveCaps,
-        /** @SYMTraceFormatString "-CBaseExtProxyDrive::Caps() r %d" */
-        ECBaseExtProxyDriveCapsRet,
-
-		/** @SYMTraceFormatString "+CLocalProxyDrive::Caps() this %x" */
-		ECLocalProxyDriveCaps,
-        /** @SYMTraceFormatString "-CLocalProxyDrive::Caps() r %d" */
-        ECLocalProxyDriveCapsRet,
-
-		/** @SYMTraceFormatString "+CBaseExtProxyDrive::Format1() this %x" */
-		ECBaseExtProxyDriveFormat1,
-        /** @SYMTraceFormatString "-CBaseExtProxyDrive::Format1() r %d iFormatIsCurrent %d i512ByteSectorsFormatted %d iMaxBytesPerFormat %d" */
-        ECBaseExtProxyDriveFormat1Ret,
-
-		/** @SYMTraceFormatString "+CLocalProxyDrive::Format1() this %x" */
-		ECLocalProxyDriveFormat1,
-        /** @SYMTraceFormatString "-CLocalProxyDrive::Format1() r %d iFormatIsCurrent %d i512ByteSectorsFormatted %d iMaxBytesPerFormat %d" */
-        ECLocalProxyDriveFormat1Ret,
-
-		/** @SYMTraceFormatString "+CBaseExtProxyDrive::Format2() this %x aPos %ld aLength %d" */
-		ECBaseExtProxyDriveFormat2,
-        /** @SYMTraceFormatString "-CBaseExtProxyDrive::Format2() r %d" */
-        ECBaseExtProxyDriveFormat2Ret,
-
-		/** @SYMTraceFormatString "+CLocalProxyDrive::Format2() this %x aPos %ld aLength %d" */
-		ECLocalProxyDriveFormat2,
-        /** @SYMTraceFormatString "-CLocalProxyDrive::Format2() r %d" */
-        ECLocalProxyDriveFormat2Ret,
-
-		/** @SYMTraceFormatString "+CBaseExtProxyDrive::SetMountInfo() this %x" */
-		ECBaseExtProxyDriveSetMountInfo,
-        /** @SYMTraceFormatString "-CBaseExtProxyDrive::SetMountInfo() r %d" */
-        ECBaseExtProxyDriveSetMountInfoRet,
-
-		/** @SYMTraceFormatString "+CLocalProxyDrive::SetMountInfo() this %x" */
-		ECLocalProxyDriveSetMountInfo,
-        /** @SYMTraceFormatString "-CLocalProxyDrive::SetMountInfo() r %d" */
-        ECLocalProxyDriveSetMountInfoRet,
-
-		/** @SYMTraceFormatString "+CBaseExtProxyDrive::ForceRemount() this %x" */
-		ECBaseExtProxyDriveForceRemount,
-        /** @SYMTraceFormatString "-CBaseExtProxyDrive::ForceRemount() r %d" */
-        ECBaseExtProxyDriveForceRemountRet,
-
-		/** @SYMTraceFormatString "+CLocalProxyDrive::ForceRemount() this %x" */
-		ECLocalProxyDriveForceRemount,
-        /** @SYMTraceFormatString "-CLocalProxyDrive::ForceRemount() r %d" */
-        ECLocalProxyDriveForceRemountRet,
-
-		/** @SYMTraceFormatString "+CBaseExtProxyDrive::Unlock() this %x aPassword %d" */
-		ECBaseExtProxyDriveUnlock,
-        /** @SYMTraceFormatString "-CBaseExtProxyDrive::Unlock() r %d" */
-        ECBaseExtProxyDriveUnlockRet,
-
-		/** @SYMTraceFormatString "+CLocalProxyDrive::Unlock() this %x aPassword %d" */
-		ECLocalProxyDriveUnlock,
-        /** @SYMTraceFormatString "-CLocalProxyDrive::Unlock() r %d" */
-        ECLocalProxyDriveUnlockRet,
-
-		/** @SYMTraceFormatString "+CBaseExtProxyDrive::Lock() this %x aPassword %d" */
-		ECBaseExtProxyDriveLock,
-        /** @SYMTraceFormatString "-CBaseExtProxyDrive::Lock() r %d" */
-        ECBaseExtProxyDriveLockRet,
-
-		/** @SYMTraceFormatString "+CLocalProxyDrive::Lock() this %x aPassword %d" */
-		ECLocalProxyDriveLock,
-        /** @SYMTraceFormatString "-CLocalProxyDrive::Lock() r %d" */
-        ECLocalProxyDriveLockRet,
-
-		/** @SYMTraceFormatString "+CBaseExtProxyDrive::Clear() this %x" */
-		ECBaseExtProxyDriveClear,
-        /** @SYMTraceFormatString "-CBaseExtProxyDrive::Clear() r %d" */
-        ECBaseExtProxyDriveClearRet,
-
-		/** @SYMTraceFormatString "+CLocalProxyDrive::Clear() this %x" */
-		ECLocalProxyDriveClear,
-        /** @SYMTraceFormatString "-CLocalProxyDrive::Clear() r %d" */
-        ECLocalProxyDriveClearRet,
-
-		/** @SYMTraceFormatString "+CBaseExtProxyDrive::ErasePassword() this %x" */
-		ECBaseExtProxyDriveErasePassword,
-        /** @SYMTraceFormatString "-CBaseExtProxyDrive::ErasePassword() r %d" */
-        ECBaseExtProxyDriveErasePasswordRet,
-
-		/** @SYMTraceFormatString "+CLocalProxyDrive::ErasePassword() this %x" */
-		ECLocalProxyDriveErasePassword,
-        /** @SYMTraceFormatString "-CLocalProxyDrive::ErasePassword() r %d" */
-        ECLocalProxyDriveErasePasswordRet,
-
-		/** @SYMTraceFormatString "+CBaseExtProxyDrive::DeleteNotify() this %x aPos %ld aLength %d" */
-		ECBaseExtProxyDriveDeleteNotify,
-        /** @SYMTraceFormatString "-CBaseExtProxyDrive::DeleteNotify() r %d" */
-        ECBaseExtProxyDriveDeleteNotifyRet,
-
-		/** @SYMTraceFormatString "+CLocalProxyDrive::DeleteNotify() this %x aPos %ld aLength %d" */
-		ECLocalProxyDriveDeleteNotify,
-        /** @SYMTraceFormatString "-CLocalProxyDrive::DeleteNotify() r %d" */
-        ECLocalProxyDriveDeleteNotifyRet,
-
-		/** @SYMTraceFormatString "+CBaseExtProxyDrive::GetLastErrorInfo() this %x" */
-		ECBaseExtProxyDriveGetLastErrorInfo,
-        /** @SYMTraceFormatString "-CBaseExtProxyDrive::GetLastErrorInfo() r %d" */
-        ECBaseExtProxyDriveGetLastErrorInfoRet,
-
-		/** @SYMTraceFormatString "+CLocalProxyDrive::GetLastErrorInfo() this %x" */
-		ECLocalProxyDriveGetLastErrorInfo,
-        /** @SYMTraceFormatString "-CLocalProxyDrive::GetLastErrorInfo() r %d" */
-        ECLocalProxyDriveGetLastErrorInfoRet,
-
-		/** @SYMTraceFormatString "+CBaseExtProxyDrive::GetInterface() this %x aInterfaceId %d aInput %x" */
-		ECBaseExtProxyDriveGetInterface,
-        /** @SYMTraceFormatString "-CBaseExtProxyDrive::GetInterface() r %d aInterface %x" */
-        ECBaseExtProxyDriveGetInterfaceRet,
-
-		/** @SYMTraceFormatString "+CLocalProxyDrive::GetInterface() this %x aInterfaceId %d aInput %x" */
-		ECLocalProxyDriveGetInterface,
-        /** @SYMTraceFormatString "-CLocalProxyDrive::GetInterface() r %d aInterface %x" */
-        ECLocalProxyDriveGetInterfaceRet,
-
-
-
-
-        /**
-        Provided to allow the following compile time assert.
-        */
-        EFormatIdHighWaterMark,
-        };
-    __ASSERT_COMPILE(EFormatIdHighWaterMark <= (UTF::KMaxFormatId + 1));
-
-
-
-    } // end of namespace UTraceModuleFileSys
-
-	
-#endif // UTRACEEFILE_H
diff -r 2a0ada0a1bf8 -r 95847726fe57 userlibandfileserver/fileserver/inc/utraceefsrv.h
--- a/userlibandfileserver/fileserver/inc/utraceefsrv.h	Wed May 12 10:34:10 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,995 +0,0 @@
-
-// Copyright (c) 2008-2009 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"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-// File Server client-side tracing
-// 
-//
-
-/**
- @file
- @publishedPartner
- @prototype
-*/
-
-#ifndef UTRACEEFSRV_H
-#define UTRACEEFSRV_H
-
-
-#include <f32tracedef.h>
-
-#define MODULEUID EF32TraceUidEfsrv
-
-
-/**
-This defines trace attributes to be used by trace points within the efsrv.dll executable.
-*/
-namespace UTraceModuleEfsrv
-    {
-
-	/** 
-	@SYMTraceFormatCategory EF32TraceUidEfsrv 
-	*/
-
-
-
-    /**
-    @SYMTraceFormatId
-    */
-    enum TFormatId
-        {
-		EReserved = UTF::KInitialClientFormat-1,
-
-        /** @SYMTraceFormatString "+RFile::Replace() sess %x mode %x FileName %*S" */
-		EFileReplace,
-        /** @SYMTraceFormatString "-RFile::Replace() r %d subs %x" */
-        EFileReplaceReturn,
-
-        /** @SYMTraceFormatString "+RFile::Create() sess %x mode %x FileName %*S" */
-		EFileCreate,
-        /** @SYMTraceFormatString "-RFile::Create() r %d subs %x" */
-        EFileCreateReturn,
-
-        /** @SYMTraceFormatString "+RFile::Open() sess %x mode %x FileName %*S" */
-		EFileOpen,
-        /** @SYMTraceFormatString "-RFile::Open() r %d subs %x" */
-        EFileOpenReturn,
-
-        /** @SYMTraceFormatString "+RFile::Adopt() sess %x subs %x" */
-        EFileAdopt,
-        /** @SYMTraceFormatString "-RFile::Adopt() r %d sess %x subs %x" */
-        EFileAdoptReturn,
-
-        /** @SYMTraceFormatString "+RFile::AdoptFromServer() sess %x subs %x" */
-        EFileAdoptFromServer,
-        /** @SYMTraceFormatString "-RFile::AdoptFromServer() r %d sess %x subs %x" */
-        EFileAdoptFromServerReturn,
-
-        /** @SYMTraceFormatString "+RFile::AdoptFromClient() sess %x subs %x aFsHandleIndex %d aFileHandleIndex %d " */
-        EFileAdoptFromClient,
-        /** @SYMTraceFormatString "-RFile::AdoptFromClient() r %d sess %x subs %x" */
-        EFileAdoptFromClientReturn,
-
-        /** @SYMTraceFormatString "+RFile::AdoptFromCreator() subs %x aFsHandleIndex %d aFileHandleIndex %d" */
-        EFileAdoptFromCreator,
-        /** @SYMTraceFormatString "-RFile::AdoptFromCreator() r %d sess %x subs %x" */
-        EFileAdoptFromCreatorReturn,
-
-        /** @SYMTraceFormatString "+RFile::Duplicate() sess %x subs %x aType %d" */
-        EFileDuplicate,
-        /** @SYMTraceFormatString "-RFile::Duplicate() r %d sess %x subs %x" */
-        EFileDuplicateReturn,
-
-        
-        /** @SYMTraceFormatString "+RFile::TransferToServer() sess %x subs %x aFsHandleIndex %d aFileHandleIndex %d" */
-        EFileTransferToServer,
-        /** @SYMTraceFormatString "-RFile::TransferToServer() r %d" */
-        EFileTransferToServerReturn,
-
-        /** @SYMTraceFormatString "+RFile::TransferToClient() sess %x subs %x aFileHandleIndex %d" */
-        EFileTransferToClient,
-        /** @SYMTraceFormatString "-RFile::TransferToClient() r %d" */
-        EFileTransferToClientReturn,
-
-        /** @SYMTraceFormatString "+RFile::TransferToProcess() sess %x subs %x aFsHandleIndex %d aFileHandleIndex %d" */
-        EFileTransferToProcess,
-        /** @SYMTraceFormatString "-RFile::TransferToProcess() r %d" */
-        EFileTransferToProcessReturn,
-
-		
-		/** @SYMTraceFormatString "+RFile::Name() sess %x subs %x" */
-        EFileName,
-		/** @SYMTraceFormatString "-RFile::Name() r %d aName %*S" */
-        EFileNameReturn,
-
-		/** @SYMTraceFormatString "+RFile::FullName() sess %x subs %x" */
-        EFileFullName,
-		/** @SYMTraceFormatString "-RFile::FullName() r %d aName %*S" */
-        EFileFullNameReturn,
-
-		
-		
-		/** @SYMTraceFormatString "+RFile::Temp() sess %x aPath %*S aMode %x" */
-        EFileTemp,
-        /** @SYMTraceFormatString "-RFile::Temp() r %d subs %x aName %*S" */
-        EFileTempReturn,
-
-
-        /** @SYMTraceFormatString "+RFile::Write1() sess %x subs %x len %d" */
-        EFileWrite1,
-		/** @SYMTraceFormatString "-RFile::Write1() r %d" */
-        EFileWrite1Return,
-		
-        /** @SYMTraceFormatString "+RFile::Write2() sess %x subs %x len %d status %x" */
-        EFileWrite2,
-		/** @SYMTraceFormatString "-RFile::Write2()" */
-        EFileWrite2Return,
-		
-        /** @SYMTraceFormatString "+RFile::Write3() sess %x subs %x pos %ld len %d" */
-        EFileWrite3,
-		/** @SYMTraceFormatString "-RFile::Write3() r %d" */
-        EFileWrite3Return,
-		
-        /** @SYMTraceFormatString "+RFile::Write4() sess %x subs %x pos %ld len %d status %x" */
-        EFileWrite4,
-		/** @SYMTraceFormatString "-RFile::Write4()" */
-        EFileWrite4Return,
-		
-
-
-
-        /** @SYMTraceFormatString "+RFile::Read1() sess %x subs %x maxlen %d" */
-        EFileRead1,
-		/** @SYMTraceFormatString "-RFile::Read1() r %d len %d" */
-        EFileRead1Return,
-
-        /** @SYMTraceFormatString "+RFile::Read2() sess %x subs %x maxlen %d status %x" */
-        EFileRead2,
-		/** @SYMTraceFormatString "-RFile::Read2()" */
-        EFileRead2Return,
-
-        /** @SYMTraceFormatString "+RFile::Read3() sess %x subs %x aPos %ld maxlen %d" */
-        EFileRead3,
-		/** @SYMTraceFormatString "-RFile::Read3() r %d len %d" */
-        EFileRead3Return,
-
-        /** @SYMTraceFormatString "+RFile::Read4() sess %x subs %x aPos %ld maxlen %d status %x" */
-        EFileRead4,
-		/** @SYMTraceFormatString "-RFile::Read4()" */
-        EFileRead4Return,
-
-
-
-
-
-		/** @SYMTraceFormatString "+RFile::Lock() sess %x subs %x aPos %ld aLength %d" */
-        EFileLock,
-        /** @SYMTraceFormatString "-RFile::Lock() r %d" */
-        EFileLockReturn,
-
-		/** @SYMTraceFormatString "+RFile::UnLock() sess %x subs %x aPos %ld aLength %d" */
-        EFileUnLock,
-        /** @SYMTraceFormatString "-RFile::UnLock() r %d" */
-        EFileUnLockReturn,
-
-		/** @SYMTraceFormatString "+RFile::Seek() sess %x subs %x aMode %x aPos %ld" */
-        EFileSeek,
-        /** @SYMTraceFormatString "-RFile::Seek() r %d" */
-        EFileSeekReturn,
-
-		/** @SYMTraceFormatString "+RFile::Flush() sess %x subs %x status %x" */
-        EFileFlush,
-        /** @SYMTraceFormatString "-RFile::Flush() r %d" */
-        EFileFlushReturn,
-
-		/** @SYMTraceFormatString "+RFile::Size1() sess %x subs %x" */
-        EFileSize,
-        /** @SYMTraceFormatString "-RFile::Size1() r %d aSize %d" */
-        EFileSizeReturn,
-
-		/** @SYMTraceFormatString "+RFile::Size2() sess %x subs %x" */
-        EFileSize2,
-        /** @SYMTraceFormatString "-RFile::Size2() r %d aSize %ld" */
-        EFileSize2Return,
-
-		/** @SYMTraceFormatString "+RFile::SetSize() sess %x subs %x aSize %ld" */
-        EFileSetSize,
-        /** @SYMTraceFormatString "-RFile::SetSize() r %d" */
-        EFileSetSizeReturn,
-
-		/** @SYMTraceFormatString "+RFile::Att() sess %x subs %x" */
-        EFileAtt,
-        /** @SYMTraceFormatString "-RFile::Att() r %d aVal %x" */
-        EFileAttReturn,
-
-		/** @SYMTraceFormatString "+RFile::SetAtt() sess %x subs %x aSetAttMask %x aClearAttMask %x" */
-        EFileSetAtt,
-        /** @SYMTraceFormatString "-RFile::SetAtt() r %d" */
-        EFileSetAttReturn,
-
-		/** @SYMTraceFormatString "+RFile::Modified() sess %x subs %x" */
-        EFileModified,
-        /** @SYMTraceFormatString "-RFile::Modified() r %d aTime %lx" */
-        EFileModifiedReturn,
-
-		/** @SYMTraceFormatString "+RFile::SetModified() sess %x subs %x aTime %lx" */
-        EFileSetModified,
-        /** @SYMTraceFormatString "-RFile::SetModified() r %d" */
-        EFileSetModifiedReturn,
-
-		/** @SYMTraceFormatString "+RFile::Set() sess %x subs %x aTime %lx aSetAttMask %x aClearAttMask %x" */
-        EFileSet,
-        /** @SYMTraceFormatString "-RFile::Set() r %d" */
-        EFileSetReturn,
-
-		/** @SYMTraceFormatString "+RFile::ChangeMode() sess %x subs %x aNewMode %x" */
-        EFileChangeMode,
-        /** @SYMTraceFormatString "-RFile::ChangeMode() r %d" */
-        EFileChangeModeReturn,
-
-		/** @SYMTraceFormatString "+RFile::Rename() sess %x subs %x aNewName %*S" */
-        EFileRename,
-        /** @SYMTraceFormatString "-RFile::Rename() r %d" */
-        EFileRenameReturn,
-
-		/** @SYMTraceFormatString "+RFile::Drive() sess %x subs %x" */
-        EFileDrive,
-        /** @SYMTraceFormatString "-RFile::Drive() r %d driveAtt %x mediaAtt %x type %x" */
-        EFileDriveReturn,
-
-		/** @SYMTraceFormatString "+RFile::Clamp() sess %x subs %x" */
-        EFileClamp,
-        /** @SYMTraceFormatString "-RFile::Clamp() r %d" */
-        EFileClampReturn,
-
-		/** @SYMTraceFormatString "+RFile::BlockMap() sess %x subs %x aStartPos %ld aEndPos %ld aBlockMapusage %d" */
-        EFileBlockMap,
-        /** @SYMTraceFormatString "-RFile::BlockMap() r %d" */
-        EFileBlockMapReturn,
-
-		/** @SYMTraceFormatString "+RFile::Close() sess %x subs %x" */
-        EFileClose,
-        /** @SYMTraceFormatString "-RFile::Close()" */
-        EFileCloseReturn,
-
-
-
-		/** @SYMTraceFormatString "+RFS::DriveToChar() aDrive %d" */
-		EFsDriveToChar,
-		/** @SYMTraceFormatString "-RFs::DriveToChar() r %d aChar %c" */
-		EFsDriveToCharReturn,
-		/** @SYMTraceFormatString "+RFs::IsRomAddress() aPtr %x" */
-		EFsIsRomAddress,
-		/** @SYMTraceFormatString "-RFS::IsRomAddress() r %d" */
-		EFsIsRomAddressReturn,
-		/** @SYMTraceFormatString "+RFs::GetSystemDrive()" */
-		EFsGetSystemDrive,
-		/** @SYMTraceFormatString "-RFs::GetSystemDrive() r %d" */
-		EFsGetSystemDriveReturn,
-		/** @SYMTraceFormatString "+RFs::GetSystemDriveChar()" */
-		EFsGetSystemDriveChar,
-		/** @SYMTraceFormatString "-RFs::GetSystemDriveChar() r %c" */
-		EFsGetSystemDriveCharReturn,
-		/** @SYMTraceFormatString "+RFs::SetSystemDrive() sess %x" */
-		EFsSetSystemDrive,
-		/** @SYMTraceFormatString "-RFs::SetSystemDrive() r %d" */
-		EFsSetSystemDriveReturn,
-		/** @SYMTraceFormatString "+RFs::Connect()" */
-		EFsConnect,
-		/** @SYMTraceFormatString "-RFs::Connect() r %d sess %x" */
-		EFsConnectReturn,
-		/** @SYMTraceFormatString "+RFs::SetSessionToPrivate() sess %x" */
-		EFsSetSessionToPrivate,
-		/** @SYMTraceFormatString "-RFs::SetSessionToPrivate() r %d" */
-		EFsSetSessionToPrivateReturn,
-		/** @SYMTraceFormatString "+RFs::PrivatePath() sess %x" */
-		EFsPrivatePath,
-		/** @SYMTraceFormatString "-RFs::PrivatePath() r %d aPath %*S" */
-		EFsPrivatePathReturn,
-		/** @SYMTraceFormatString "+RFs::CreatePrivatePath() sess %x aDrive %d" */
-		EFsCreatePrivatePath,
-		/** @SYMTraceFormatString "-RFs::CreatePrivatePath() r %d" */
-		EFsCreatePrivatePathReturn,
-		/** @SYMTraceFormatString "+RFs::Version() sess %x" */
-		EFsVersion,
-		/** @SYMTraceFormatString "-RFs::Version() iMajor %d iMinor %d iBuild %d" */
-		EFsVersionReturn,
-		/** @SYMTraceFormatString "+RFs::AddFileSystem() sess %x aFileName %*S" */
-		EFsAddFileSystem,
-		/** @SYMTraceFormatString "-RFs::AddFileSystem() r %d" */
-		EFsAddFileSystemReturn,
-		/** @SYMTraceFormatString "+RFs::RemoveFileSystem() sess %x aFileName %*S" */
-		EFsRemoveFileSystem,
-		/** @SYMTraceFormatString "-RFs::RemoveFileSystem() r %d" */
-		EFsRemoveFileSystemReturn,
-		/** @SYMTraceFormatString "+RFs::MountFileSystem1() sess %x aFileSystemName %*S aDrive %d" */
-		EFsMountFileSystem1,
-		/** @SYMTraceFormatString "-RFs::MountFileSystem1() r %d" */
-		EFsMountFileSystem1Return,
-		/** @SYMTraceFormatString "+RFs::MountFileSystem2() sess %x aFileSystemName %*S aDrive %d aIsSync %d" */
-		EFsMountFileSystem2,
-		/** @SYMTraceFormatString "-RFs::MountFileSystem2() r %d" */
-		EFsMountFileSystem2Return,
-		/** @SYMTraceFormatString "+RFs::MountFileSystem3() sess %x aFileSystemName %*S aExtensionName %*S aDrive %d" */
-		EFsMountFileSystem3,
-		/** @SYMTraceFormatString "-RFs::MountFileSystem3() r %d" */
-		EFsMountFileSystem3Return,
-		/** @SYMTraceFormatString "+RFs::MountFileSystem4() sess %x aFileSystemName %*S aExtensionName %*S aDrive %d aIsSync %d" */
-		EFsMountFileSystem4,
-		/** @SYMTraceFormatString "-RFs::MountFileSystem4() r %d" */
-		EFsMountFileSystem4Return,
-		/** @SYMTraceFormatString "+RFs::MountFileSystemAndScan1() sess %x aFileSystemName %*S aDrive %d" */
-		EFsMountFileSystemAndScan1,
-		/** @SYMTraceFormatString "-RFs::MountFileSystemAndScan1() r %d" */
-		EFsMountFileSystemAndScan1Return,
-		/** @SYMTraceFormatString "+RFs::MountFileSystemAndScan2() sess %x aFileSystemName %*S aExtensionName %*S aDrive %d " */
-		EFsMountFileSystemAndScan2,
-		/** @SYMTraceFormatString "-RFs::MountFileSystemAndScan2() r %d aIsMountSuccess %d" */
-		EFsMountFileSystemAndScan2Return,
-		/** @SYMTraceFormatString "+RFs::DismountFileSystem() sess %x aFileSystemName %*S aDrive %d" */
-		EFsDismountFileSystem,
-		/** @SYMTraceFormatString "-RFs::DismountFileSystem() r %d" */
-		EFsDismountFileSystemReturn,
-		/** @SYMTraceFormatString "+RFs::FileSystemName() sess %x aDrive %d" */
-		EFsFileSystemName,
-		/** @SYMTraceFormatString "-RFs::FileSystemName() r %d aName %*S" */
-		EFsFileSystemNameReturn,
-		/** @SYMTraceFormatString "+RFs::AddExtension() sess %x aFileName %*S" */
-		EFsAddExtension,
-		/** @SYMTraceFormatString "-RFs::AddExtension() r %d" */
-		EFsAddExtensionReturn,
-		/** @SYMTraceFormatString "+RFs::MountExtension() sess %x aExtensionName %*S aDrive %d" */
-		EFsMountExtension,
-		/** @SYMTraceFormatString "-RFs::MountExtension() r %d" */
-		EFsMountExtensionReturn,
-		/** @SYMTraceFormatString "+RFs::DismountExtension() sess %x aExtensionName %*S aDrive %d" */
-		EFsDismountExtension,
-		/** @SYMTraceFormatString "-RFs::DismountExtension() r %d" */
-		EFsDismountExtensionReturn,
-		/** @SYMTraceFormatString "+RFs::RemoveExtension() sess %x aExtensionName %*S" */
-		EFsRemoveExtension,
-		/** @SYMTraceFormatString "-RFs::RemoveExtension() r %d" */
-		EFsRemoveExtensionReturn,
-		/** @SYMTraceFormatString "+RFs::ExtensionName() sess %x aExtensionName %*S aDrive %d aPos %d" */
-		EFsExtensionName,
-		/** @SYMTraceFormatString "-RFs::ExtensionName() r %d" */
-		EFsExtensionNameReturn,
-		/** @SYMTraceFormatString "+RFs::RemountDrive() sess %x aDrive %d aMountInfo %x aFlags %x" */
-		EFsRemountDrive,
-		/** @SYMTraceFormatString "-RFs::RemountDrive() r %d" */
-		EFsRemountDriveReturn,
-		/** @SYMTraceFormatString "+RFs::NotifyChange1() sess %x aType %x status %x" */
-		EFsNotifyChange1,
-		/** @SYMTraceFormatString "-RFs::NotifyChange1() r %d" */
-		EFsNotifyChange1Return,
-		/** @SYMTraceFormatString "+RFs::NotifyChange2() sess %x aType %x status %x aPathName %*S" */
-		EFsNotifyChange2,
-		/** @SYMTraceFormatString "-RFs::NotifyChange2() r %d" */
-		EFsNotifyChange2Return,
-		/** @SYMTraceFormatString "+RFs::NotifyChangeCancel1() sess %x" */
-		EFsNotifyChangeCancel1,
-		/** @SYMTraceFormatString "-RFs::NotifyChangeCancel1() r %d" */
-		EFsNotifyChangeCancel1Return,
-		/** @SYMTraceFormatString "+RFs::NotifyChangeCancel2() sess %x status %x" */
-		EFsNotifyChangeCancel2,
-		/** @SYMTraceFormatString "-RFs::NotifyChangeCancel2() r %d" */
-		EFsNotifyChangeCancel2Return,
-		/** @SYMTraceFormatString "+RFs::NotifyDiskSpace() sess %x aThreshold %ld aDrive %d status %x" */
-		EFsNotifyDiskSpace,
-		/** @SYMTraceFormatString "-RFs::NotifyDiskSpace() r %d" */
-		EFsNotifyDiskSpaceReturn,
-		/** @SYMTraceFormatString "+RFs::NotifyDiskSpaceCancel1() sess %x status %x" */
-		EFsNotifyDiskSpaceCancel1,
-		/** @SYMTraceFormatString "-RFs::NotifyDiskSpaceCancel1() r %d" */
-		EFsNotifyDiskSpaceCancel1Return,
-		/** @SYMTraceFormatString "+RFs::NotifyDiskSpaceCancel2() sess %x" */
-		EFsNotifyDiskSpaceCancel2,
-		/** @SYMTraceFormatString "-RFs::NotifyDiskSpaceCancel2() r %d" */
-		EFsNotifyDiskSpaceCancel2Return,
-		/** @SYMTraceFormatString "+RFs::DriveList1() sess %x" */
-		EFsDriveList1,
-		/** @SYMTraceFormatString "-RFs::DriveList1() r %d" */
-		EFsDriveList1Return,
-		/** @SYMTraceFormatString "+RFs::DriveList2() sess %x aFlags %x" */
-		EFsDriveList2,
-		/** @SYMTraceFormatString "-RFs::DriveList2() r %d" */
-		EFsDriveList2Return,
-		/** @SYMTraceFormatString "+RFs::Drive() sess %x aDrive %d" */
-		EFsDrive,
-		/** @SYMTraceFormatString "-RFs::Drive() r %d driveAtt %x mediaAtt %x type %x" */
-		EFsDriveReturn,
-		/** @SYMTraceFormatString "+RFs::Volume1() sess %x aDrive %d" */
-		EFsVolume1,
-		/** @SYMTraceFormatString "-RFs::Volume1() r %d iUniqueID %x iSize %ld iFree %ld iFileCacheFlags %x" */
-		EFsVolume1Return,
-		/** @SYMTraceFormatString "+RFs::Volume2() sess %x aDrive %d status %x" */
-		EFsVolume2,
-		/** @SYMTraceFormatString "-RFs::Volume2() r %d" */
-		EFsVolume2Return,
-		/** @SYMTraceFormatString "+RFs::SetVolumeLabel() sess %x aName %*S aDrive %d" */
-		EFsSetVolumeLabel,
-		/** @SYMTraceFormatString "-RFs::SetVolumeLabel() r %d" */
-		EFsSetVolumeLabelReturn,
-		/** @SYMTraceFormatString "+RFs::Subst() sess %x aPath %*S aDrive %d" */
-		EFsSubst,
-		/** @SYMTraceFormatString "-RFs::Subst() r %d" */
-		EFsSubstReturn,
-		/** @SYMTraceFormatString "+RFs::SetSubst() sess %x aPath %%S aDrive %d" */
-		EFsSetSubst,
-		/** @SYMTraceFormatString "-RFs::SetSubst() r %d" */
-		EFsSetSubstReturn,
-		/** @SYMTraceFormatString "+RFs::RealName() sess %x aName %*S" */
-		EFsRealName,
-		/** @SYMTraceFormatString "-RFs::RealName() r %d aResult %*S" */
-		EFsRealNameReturn,
-		/** @SYMTraceFormatString "+RFs::GetMediaSerialNumber() sess %x aDrive %d" */
-		EFsGetMediaSerialNumber,
-		/** @SYMTraceFormatString "-RFs::GetMediaSerialNumber() r %d aSerialNum %*x" */
-		EFsGetMediaSerialNumberReturn,
-		/** @SYMTraceFormatString "+RFs::SessionPath() sess %x" */
-		EFsSessionPath,
-		/** @SYMTraceFormatString "-RFs::SessionPath() r %d aPath %*S" */
-		EFsSessionPathReturn,
-		/** @SYMTraceFormatString "+RFs::SetSessionPath() sess %x aPath %*S" */
-		EFsSetSessionPath,
-		/** @SYMTraceFormatString "-RFs::SetSessionPath() r %d" */
-		EFsSetSessionPathReturn,
-		/** @SYMTraceFormatString "+RFs::MkDir() sess %x aPath %*S" */
-		EFsMkDir,
-		/** @SYMTraceFormatString "-RFs::MkDir() r %d" */
-		EFsMkDirReturn,
-		/** @SYMTraceFormatString "+RFs::MkDirAll() sess %x aPath %*S" */
-		EFsMkDirAll,
-		/** @SYMTraceFormatString "-RFs::MkDirAll() r %d" */
-		EFsMkDirAllReturn,
-		/** @SYMTraceFormatString "+RFs::RmDir() sess %x aPath %*S" */
-		EFsRmDir,
-		/** @SYMTraceFormatString "-RFs::RmDir() r %d" */
-		EFsRmDirReturn,
-		/** @SYMTraceFormatString "+RFs::GetDir1() sess %x aName %*S aUidType0 %x aUidType1 %x aUidType2 %x aKey %x" */
-		EFsGetDir1,
-		/** @SYMTraceFormatString "-RFs::GetDir1() r %d" */
-		EFsGetDir1Return,
-		/** @SYMTraceFormatString "+RFs::GetDir2() sess %x aName %*S anAttMask %x aKey %x" */
-		EFsGetDir2,
-		/** @SYMTraceFormatString "-RFs::GetDir2() r %d" */
-		EFsGetDir2Return,
-		/** @SYMTraceFormatString "+RFs::GetDir3() sess %x aName %*S anAttMask %x aKey %x" */
-		EFsGetDir3,
-		/** @SYMTraceFormatString "-RFs::GetDir3() r %d" */
-		EFsGetDir3Return,
-		/** @SYMTraceFormatString "+RFs::Parse1() sess %x aName %*S" */
-		EFsParse1,
-		/** @SYMTraceFormatString "-RFs::Parse1() r %d" */
-		EFsParse1Return,
-		/** @SYMTraceFormatString "+RFs::Parse2() sess %x aName %*S aRelated %*S" */
-		EFsParse2,
-		/** @SYMTraceFormatString "-RFs::Parse2() r %d" */
-		EFsParse2Return,
-		/** @SYMTraceFormatString "+RFs::Delete() sess %x aName %*S" */
-		EFsDelete,
-		/** @SYMTraceFormatString "-RFs::Delete() r %d" */
-		EFsDeleteReturn,
-		/** @SYMTraceFormatString "+RFs::Rename() sess %x anOldName %*S aNewName %*S" */
-		EFsRename,
-		/** @SYMTraceFormatString "-RFs::Rename() r %d" */
-		EFsRenameReturn,
-		/** @SYMTraceFormatString "+RFs::Replace() sess %x anOldName %*S aNewName %*S" */
-		EFsReplace,
-		/** @SYMTraceFormatString "-RFs::Replace() r %d" */
-		EFsReplaceReturn,
-		/** @SYMTraceFormatString "+RFs::Att() sess %x aName %*S" */
-		EFsAtt,
-		/** @SYMTraceFormatString "-RFs::Att() r %d aVal %x" */
-		EFsAttReturn,
-		/** @SYMTraceFormatString "+RFs::SetAtt() sess %x aName %*S aSetAttMask %x aClearAttMask %x" */
-		EFsSetAtt,
-		/** @SYMTraceFormatString "-RFs::SetAtt() r %d" */
-		EFsSetAttReturn,
-		/** @SYMTraceFormatString "+RFs::Modified() sess %x aName %*S" */
-		EFsModified,
-		/** @SYMTraceFormatString "-RFs::Modified() r %d aTime %lx" */
-		EFsModifiedReturn,
-		/** @SYMTraceFormatString "+RFs::SetModified() sess %x aName %*S aTime %lx" */
-		EFsSetModified,
-		/** @SYMTraceFormatString "-RFs::SetModified() r %d" */
-		EFsSetModifiedReturn,
-		/** @SYMTraceFormatString "+RFs::Entry() sess %x aName %*S" */
-		EFsEntry,
-		/** @SYMTraceFormatString "-RFs::Entry() r %d att %x modified %lx size %d" */
-		EFsEntryReturn,
-		/** @SYMTraceFormatString "+RFs::SetEntry() sess %x aName %*S aTime %lx aSetAttMask %x aClearAttMask %x" */
-		EFsSetEntry,
-		/** @SYMTraceFormatString "-RFs::SetEntry() r %d" */
-		EFsSetEntryReturn,
-		/** @SYMTraceFormatString "+RFs::ReadFileSection() sess %x aName %*S aPos %ld aLength %d" */
-		EFsReadFileSection,
-		/** @SYMTraceFormatString "-RFs::ReadFileSection() r %d" */
-		EFsReadFileSectionReturn,
-		/** @SYMTraceFormatString "+RFs::ResourceCountMarkStart() sess %x" */
-		EFsResourceCountMarkStart,
-		/** @SYMTraceFormatString "-RFs::ResourceCountMarkStart() r %d" */
-		EFsResourceCountMarkStartReturn,
-		/** @SYMTraceFormatString "+RFs::ResourceCountMarkEnd() sess %x" */
-		EFsResourceCountMarkEnd,
-		/** @SYMTraceFormatString "-RFs::ResourceCountMarkEnd() r %d" */
-		EFsResourceCountMarkEndReturn,
-		/** @SYMTraceFormatString "+RFs::ResourceCount() sess %x" */
-		EFsResourceCount,
-		/** @SYMTraceFormatString "-RFs::ResourceCount() r %d" */
-		EFsResourceCountReturn,
-		/** @SYMTraceFormatString "+RFs::CheckDisk() sess %x aDrive %*S" */
-		EFsCheckDisk,
-		/** @SYMTraceFormatString "-RFs::CheckDisk() r %d" */
-		EFsCheckDiskReturn,
-		/** @SYMTraceFormatString "+RFs::ScanDrive() sess %x aDrive %*S" */
-		EFsScanDrive,
-		/** @SYMTraceFormatString "-RFs::ScanDrive() r %d" */
-		EFsScanDriveReturn,
-		/** @SYMTraceFormatString "+RFs::GetShortName() sess %x aLongName %*S" */
-		EFsGetShortName,
-		/** @SYMTraceFormatString "-RFs::GetShortName() r %d aShortName %*S" */
-		EFsGetShortNameReturn,
-		/** @SYMTraceFormatString "+RFs::GetLongName() sess %x aShortName %*S" */
-		EFsGetLongName,
-		/** @SYMTraceFormatString "-RFs::GetLongName() r %d aLongName %*S" */
-		EFsGetLongNameReturn,
-		/** @SYMTraceFormatString "+RFs::IsFileOpen() sess %x aFileName %*S" */
-		EFsIsFileOpen,
-		/** @SYMTraceFormatString "-RFs::IsFileOpen() r %d anAnswer %d" */
-		EFsIsFileOpenReturn,
-		/** @SYMTraceFormatString "+RFs::GetNotifyUser() sess %x" */
-		EFsGetNotifyUser,
-		/** @SYMTraceFormatString "-RFs::GetNotifyUser() r %d" */
-		EFsGetNotifyUserReturn,
-		/** @SYMTraceFormatString "+RFs::SetNotifyUser() sess %x aValue %d" */
-		EFsSetNotifyUser,
-		/** @SYMTraceFormatString "-RFs::SetNotifyUser() r %d" */
-		EFsSetNotifyUserReturn,
-		/** @SYMTraceFormatString "+RFs::IsFileInRom() sess %x aFileName %*S" */
-		EFsIsFileInRom,
-		/** @SYMTraceFormatString "-RFs::IsFileInRom() r %d" */
-		EFsIsFileInRomReturn,
-		/** @SYMTraceFormatString "+RFs::IsValidName1() sess %x aFileName %*S" */
-		EFsIsValidName1,
-		/** @SYMTraceFormatString "-RFs::IsValidName1() r %d" */
-		EFsIsValidName1Return,
-		/** @SYMTraceFormatString "+RFs::IsValidName2() sess %x aFileName %*S" */
-		EFsIsValidName2,
-		/** @SYMTraceFormatString "-RFs::IsValidName2() r %d aBadChar %c" */
-		EFsIsValidName2Return,
-		/** @SYMTraceFormatString "+RFs::IsValidName3() sess %x aFileName %*S" */
-		EFsIsValidName3,
-		/** @SYMTraceFormatString "-RFs::IsValidName3() r %d err %d" */
-		EFsIsValidName3Return,
-		/** @SYMTraceFormatString "+RFs::GetDriveName() sess %x aDrive %d" */
-		EFsGetDriveName,
-		/** @SYMTraceFormatString "-RFs::GetDriveName() r %d aDriveName %*S" */
-		EFsGetDriveNameReturn,
-		/** @SYMTraceFormatString "+RFs::SetDriveName() sess %x aDrive %d aDriveName %*S" */
-		EFsSetDriveName,
-		/** @SYMTraceFormatString "-RFs::SetDriveName() r %d" */
-		EFsSetDriveNameReturn,
-		/** @SYMTraceFormatString "+RFs::LockDrive() sess %x aDrv %d aStore %d" */
-		EFsLockDrive,
-		/** @SYMTraceFormatString "-RFs::LockDrive() r %d" */
-		EFsLockDriveReturn,
-		/** @SYMTraceFormatString "+RFs::UnlockDrive() sess %x aDrv %d aStore %d" */
-		EFsUnlockDrive,
-		/** @SYMTraceFormatString "-RFs::UnlockDrive() r %d" */
-		EFsUnlockDriveReturn,
-		/** @SYMTraceFormatString "+RFs::ClearPassword() sess %x aDrv %d" */
-		EFsClearPassword,
-		/** @SYMTraceFormatString "-RFs::ClearPassword() r %d" */
-		EFsClearPasswordReturn,
-		/** @SYMTraceFormatString "+RFs::ErasePassword() sess %x aDrv %d" */
-		EFsErasePassword,
-		/** @SYMTraceFormatString "-RFs::ErasePassword() r %d" */
-		EFsErasePasswordReturn,
-		/** @SYMTraceFormatString "+RFs::StartupInitComplete() sess %x status %x" */
-		EFsStartupInitComplete,
-		/** @SYMTraceFormatString "-RFs::StartupInitComplete() r %d" */
-		EFsStartupInitCompleteReturn,
-		/** @SYMTraceFormatString "+RFs::SetLocalDriveMapping() sess %x aMapping %*x" */
-		EFsSetLocalDriveMapping,
-		/** @SYMTraceFormatString "-RFs::SetLocalDriveMapping() r %d" */
-		EFsSetLocalDriveMappingReturn,
-		/** @SYMTraceFormatString "+RFs::FinaliseDrive() sess %x aDriveNo %d aMode %d" */
-		EFsFinaliseDrive,
-		/** @SYMTraceFormatString "-RFs::FinaliseDrive() r %d" */
-		EFsFinaliseDriveReturn,
-		/** @SYMTraceFormatString "+RFs::FinaliseDrives() sess %x" */
-		EFsFinaliseDrives,
-		/** @SYMTraceFormatString "-RFs::FinaliseDrives() r %d" */
-		EFsFinaliseDrivesReturn,
-		/** @SYMTraceFormatString "+RFs::SwapFileSystem() sess %x aOldFileSystemName %*S aNewFileSystemName %*S aDrive %d" */
-		EFsSwapFileSystem,
-		/** @SYMTraceFormatString "-RFs::SwapFileSystem() r %d" */
-		EFsSwapFileSystemReturn,
-		/** @SYMTraceFormatString "+RFs::AddCompositeMount() sess %x aFileSystemName %*S aLocalDriveToMount %d aCompositeDrive %d aSync %d" */
-		EFsAddCompositeMount,
-		/** @SYMTraceFormatString "-RFs::AddCompositeMount() r %d" */
-		EFsAddCompositeMountReturn,
-		/** @SYMTraceFormatString "+RFs::ReserveDriveSpace() sess %x aDriveNo %d aSpace %d" */
-		EFsReserveDriveSpace,
-		/** @SYMTraceFormatString "-RFs::ReserveDriveSpace() r %d" */
-		EFsReserveDriveSpaceReturn,
-		/** @SYMTraceFormatString "+RFs::GetReserveAccess() sess %x aDriveNo %d" */
-		EFsGetReserveAccess,
-		/** @SYMTraceFormatString "-RFs::GetReserveAccess() r %d" */
-		EFsGetReserveAccessReturn,
-		/** @SYMTraceFormatString "+RFs::ReleaseReserveAccess() sess %x aDriveNo %d" */
-		EFsReleaseReserveAccess,
-		/** @SYMTraceFormatString "-RFs::ReleaseReserveAccess() r %d" */
-		EFsReleaseReserveAccessReturn,
-		/** @SYMTraceFormatString "+RFs::NotifyDismount() sess %x aDrive %d stauts %x aMode %d" */
-		EFsNotifyDismount,
-		/** @SYMTraceFormatString "-RFs::NotifyDismount() r %d" */
-		EFsNotifyDismountReturn,
-		/** @SYMTraceFormatString "+RFs::NotifyDismountCancel1() sess %x status %x" */
-		EFsNotifyDismountCancel1,
-		/** @SYMTraceFormatString "-RFs::NotifyDismountCancel1() r %d" */
-		EFsNotifyDismountCancel1Return,
-		/** @SYMTraceFormatString "+RFs::NotifyDismountCancel2() sess %x" */
-		EFsNotifyDismountCancel2,
-		/** @SYMTraceFormatString "-RFs::NotifyDismountCancel2() r %d" */
-		EFsNotifyDismountCancel2Return,
-		/** @SYMTraceFormatString "+RFs::AllowDismount() sess %x aDrive %d" */
-		EFsAllowDismount,
-		/** @SYMTraceFormatString "-RFs::AllowDismount() r %d" */
-		EFsAllowDismountReturn,
-		/** @SYMTraceFormatString "+RFs::SetStartupConfiguration() sess %x aCommand %d aParam1 %x aParam2 %x" */
-		EFsSetStartupConfiguration,
-		/** @SYMTraceFormatString "-RFs::SetStartupConfiguration() r %d" */
-		EFsSetStartupConfigurationReturn,
-		/** @SYMTraceFormatString "+RFs::SetNotifyChange() sess %x aNotifyChange %d" */
-		EFsSetNotifyChange,
-		/** @SYMTraceFormatString "-RFs::SetNotifyChange() r %d" */
-		EFsSetNotifyChangeReturn,
-		/** @SYMTraceFormatString "+RFs::InitialisePropertiesFile() sess %x filePtr %x fileLen %d" */
-		EFsInitialisePropertiesFile,
-		/** @SYMTraceFormatString "-RFs::InitialisePropertiesFile() r %d" */
-		EFsInitialisePropertiesFileReturn,
-		/** @SYMTraceFormatString "+RFs::QueryVolumeInfoExt() sess %x aDrive %d aCommand %d" */
-		EFsQueryVolumeInfoExt,
-		/** @SYMTraceFormatString "-RFs::QueryVolumeInfoExt() r %d" */
-		EFsQueryVolumeInfoExtReturn,
-		/** @SYMTraceFormatString "+RFs::VolumeIOParam() sess %x aDrive %d" */
-		EFsVolumeIOParam,
-		/** @SYMTraceFormatString "-RFs::VolumeIOParam() r %d iBlockSize %d iClusterSize %d iRecReadBufSize %d iRecWriteBufSize %d" */
-		EFsVolumeIOParamReturn,
-		/** @SYMTraceFormatString "+RFs::FileSystemSubType() sess %x aDrive %d aName %*S" */
-		EFsFileSystemSubType,
-		/** @SYMTraceFormatString "-RFs::FileSystemSubType() r %d" */
-		EFsFileSystemSubTypeReturn,
-
-		/** @SYMTraceFormatString "+RFs::AddPlugin() sess %x aFileName %*S" */
-        EFsAddPlugin,
-        /** @SYMTraceFormatString "-RFs::AddPlugin() r %d" */
-        EFsAddPluginReturn,
-
-		/** @SYMTraceFormatString "+RFs::RemovePlugin() sess %x aPluginName %*S" */
-        EFsRemovePlugin,
-        /** @SYMTraceFormatString "-RFs::RemovePlugin() r %d" */
-        EFsRemovePluginReturn,
-
-		/** @SYMTraceFormatString "+RFs::MountPlugin1() sess %x aPluginName %*S" */
-        EFsMountPlugin1,
-        /** @SYMTraceFormatString "-RFs::MountPlugin1() r %d" */
-        EFsMountPlugin1Return,
-
-		/** @SYMTraceFormatString "+RFs::MountPlugin2() sess %x aPluginName %*S aDrive %d" */
-        EFsMountPlugin2,
-        /** @SYMTraceFormatString "-RFs::MountPlugin2() r %d" */
-        EFsMountPlugin2Return,
-
-		/** @SYMTraceFormatString "+RFs::MountPlugin3() sess %x aPluginName %*S aDrive %d aPos %d" */
-        EFsMountPlugin3,
-        /** @SYMTraceFormatString "-RFs::MountPlugin3() r %d" */
-        EFsMountPlugin3Return,
-
-		/** @SYMTraceFormatString "+RFs::DismountPlugin() sess %x aPluginName %*S" */
-        EFsDismountPlugin1,
-        /** @SYMTraceFormatString "-RFs::DismountPlugin() r %d" */
-        EFsDismountPlugin1Return,
-
-		/** @SYMTraceFormatString "+RFs::DismountPlugin2() sess %x aPluginName %*S aDrive %d" */
-        EFsDismountPlugin2,
-        /** @SYMTraceFormatString "-RFs::DismountPlugin2() r %d" */
-        EFsDismountPlugin2Return,
-
-		/** @SYMTraceFormatString "+RFs::DismountPlugin3() sess %x aPluginName %*S aDrive %d aPos %d" */
-        EFsDismountPlugin3,
-        /** @SYMTraceFormatString "-RFs::DismountPlugin3() r %d" */
-        EFsDismountPlugin3Return,
-
-		/** @SYMTraceFormatString "+RFs::PluginName() sess %x aDrive %d aPos %d" */
-        EFsPluginName,
-        /** @SYMTraceFormatString "-RFs::PluginName() r %d aName %*S" */
-        EFsPluginNameReturn,
-
-		/** @SYMTraceFormatString "+RFs::Close() sess %x" */
-		EFsClose,
-		/** @SYMTraceFormatString "-RFs::Close() r %d" */
-		EFsCloseReturn,
-
-
-		/** @SYMTraceFormatString "+RDir::Open1() sess %x aName %*S aUidType0 %x aUidType1 %x aUidType2 %x" */
-        EDirOpen1,
-        /** @SYMTraceFormatString "-RDir::Open1() r %d subs %x" */
-        EDirOpen1Return,
-
-		/** @SYMTraceFormatString "+RDir::Open2() sess %x aName %*S anAttMask %x" */
-        EDirOpen2,
-        /** @SYMTraceFormatString "-RDir::Open2() r %d subs %x" */
-        EDirOpen2Return,
-
-		/** @SYMTraceFormatString "+RDir::Close() sess %x subs %x" */
-        EDirClose,
-        /** @SYMTraceFormatString "-RDir::Close()" */
-        EDirCloseReturn,
-
-		/** @SYMTraceFormatString "+RDir::Read1() sess %x subs %x" */
-        EDirRead1,
-        /** @SYMTraceFormatString "-RDir::Read1() r %d count %d" */
-        EDirRead1Return,
-
-		/** @SYMTraceFormatString "+RDir::Read2() sess %x subs %x status %x" */
-        EDirRead2,
-        /** @SYMTraceFormatString "-RDir::Read2()" */
-        EDirRead2Return,
-
-		/** @SYMTraceFormatString "+RDir::Read3() sess %x subs %x" */
-        EDirRead3,
-        /** @SYMTraceFormatString "-RDir::Read3() r %d" */
-        EDirRead3Return,
-
-		/** @SYMTraceFormatString "+RDir::Read4() sess %x subs %x status %x" */
-        EDirRead4,
-        /** @SYMTraceFormatString "-RDir::Read4()" */
-        EDirRead4Return,
-
-
-		/** @SYMTraceFormatString "+RFormat::Open1() sess %x aName %*S aFormatMode %x" */
-        EFormat1Open,
-        /** @SYMTraceFormatString "-RFormat::Open1() r %d subs %x aCount %d" */
-        EFormatOpen1Return,
-
-		/** @SYMTraceFormatString "+RFormat::Open2() sess %x aName %*S aFormatMode %x aInfo %x" */
-        EFormat2Open,
-        /** @SYMTraceFormatString "-RFormat::Open2() r %d subs %x aCount %d" */
-        EFormatOpen2Return,
-
-		/** @SYMTraceFormatString "+RFormat::Close() sess %x subs %x" */
-        EFormatClose,
-        /** @SYMTraceFormatString "-RFormat::Close()" */
-        EFormatCloseReturn,
-
-		/** @SYMTraceFormatString "+RFormat::Next1() sess %x subs %x" */
-        EFormatNext1,
-        /** @SYMTraceFormatString "-RFormat::Next1() r %d aStep %d" */
-        EFormatNext1Return,
-
-		/** @SYMTraceFormatString "+RFormat::Next2() sess %x subs %x status %x" */
-        EFormatNext2,
-        /** @SYMTraceFormatString "-RFormat::Next2()" */
-        EFormatNext2Return,
-
-
-
-		/** @SYMTraceFormatString "+RPlugin::Open() aPos %d" */
-        EPluginOpen,
-        /** @SYMTraceFormatString "-RPlugin::Open() r %d subs %x" */
-        EPluginOpenReturn,
-
-		/** @SYMTraceFormatString "+RPlugin::Close() sess %x subs %x" */
-        EPluginClose,
-        /** @SYMTraceFormatString "-RPlugin::Close() r %d" */
-        EPluginCloseReturn,
-
-		/** @SYMTraceFormatString "+RPlugin::DoRequest1() sess %x subs %x aReqNo %d status %x" */
-        EPluginDoRequest1,
-        /** @SYMTraceFormatString "-RPlugin::DoRequest1()" */
-        EPluginDoRequest1Return,
-
-		/** @SYMTraceFormatString "+RPlugin::DoRequest2() sess %x subs %x aReqNo %d status %x a1 %x" */
-        EPluginDoRequest2,
-        /** @SYMTraceFormatString "-RPlugin::DoRequest2()" */
-        EPluginDoRequest2Return,
-
-		/** @SYMTraceFormatString "+RPlugin::DoRequest3() sess %x subs %x aReqNo %d status %x a1 %x a2 %x" */
-        EPluginDoRequest3,
-        /** @SYMTraceFormatString "-RPlugin::DoRequest3()" */
-        EPluginDoRequest3Return,
-
-		/** @SYMTraceFormatString "+RPlugin::DoControl() sess %x subs %x aFunction %d" */
-        EPluginDoControl1,
-        /** @SYMTraceFormatString "-RPlugin::DoControl() r %d" */
-        EPluginDoControl1Return,
-
-		/** @SYMTraceFormatString "+RPlugin::DoControl2() sess %x subs %x aFunction %d a1 %x" */
-        EPluginDoControl2,
-        /** @SYMTraceFormatString "-RPlugin::DoControl2() r %d" */
-        EPluginDoControl2Return,
-
-		/** @SYMTraceFormatString "+RPlugin::DoControl3() sess %x subs %x aFunction %d a1 %x a2 %x" */
-        EPluginDoControl3,
-        /** @SYMTraceFormatString "-RPlugin::DoControl3() r %d" */
-        EPluginDoControl3Return,
-
-		/** @SYMTraceFormatString "+RPlugin::DoCancel() sess %x subs %x aReqMask %x" */
-        EPluginDoCancel,
-        /** @SYMTraceFormatString "-RPlugin::DoCancel()" */
-        EPluginDoCancelReturn,
-
-
-		/** @SYMTraceFormatString "+CFileMan::NewL1() sess %x" */
-        ECFileManNewL1,
-        /** @SYMTraceFormatString "-CFileMan::NewL1() CFileMan* %x" */
-        ECFileManNewL1Return,
-
-		/** @SYMTraceFormatString "+CFileMan::NewL2() sess %x anObserver %x" */
-        ECFileManNewL2,
-        /** @SYMTraceFormatString "-CFileMan::NewL2() CFileMan* %x" */
-        ECFileManNewL2Return,
-
-		/** @SYMTraceFormatString "+CFileMan::~CFileMan() this %x" */
-        ECFileManDestructor,
-        /** @SYMTraceFormatString "-CFileMan::~CFileMan()" */
-        ECFileManDestructorReturn,
-
-		/** @SYMTraceFormatString "+CFileMan::CurrentAction() this %x" */
-        ECFileManCurrentAction,
-        /** @SYMTraceFormatString "-CFileMan::CurrentAction() action %d" */
-        ECFileManCurrentActionReturn,
-
-		/** @SYMTraceFormatString "+CFileMan::GetCurrentTarget() this %x" */
-        ECFileManGetCurrentTarget,
-        /** @SYMTraceFormatString "-CFileMan::GetCurrentTarget() aTrgName %*S" */
-        ECFileManGetCurrentTargetReturn,
-
-		/** @SYMTraceFormatString "+CFileMan::GetCurrentSource() this %x" */
-        ECFileManGetCurrentSource,
-        /** @SYMTraceFormatString "-CFileMan::GetCurrentSource() aSrcName %*S" */
-        ECFileManGetCurrentSourceReturn,
-
-		/** @SYMTraceFormatString ".CFileMan::BytesTransferredByCopyStep() this %x BytesTransferred %d" */
-        ECFileManBytesTransferredByCopyStep,
-
-		/** @SYMTraceFormatString "+CFileMan::Attribs1() this %x aName %*S aSetMask %x aClearMask %x aTime %lx aSwitches %d, status %x" */
-        ECFileManAttribs1,
-        /** @SYMTraceFormatString "-CFileMan::Attribs1() r %d" */
-        ECFileManAttribs1Return,
-
-		/** @SYMTraceFormatString "+CFileMan::Attribs2() this %x aName %*S aSetMask %x aClearMask %x aTime %lx aSwitches %d" */
-        ECFileManAttribs2,
-        /** @SYMTraceFormatString "-CFileMan::Attribs2() r %d" */
-        ECFileManAttribs2Return,
-
-		/** @SYMTraceFormatString "+CFileMan::Copy1() this %x anOld %*S aNew %*S aSwitches %d status %x" */
-        ECFileManCopy1,
-        /** @SYMTraceFormatString "-CFileMan::Copy1() r %d" */
-        ECFileManCopy1Return,
-
-		/** @SYMTraceFormatString "+CFileMan::Copy2() this %x anOld %*S aNew %*S aSwitches %d" */
-        ECFileManCopy2,
-        /** @SYMTraceFormatString "-CFileMan::Copy2() r %d" */
-        ECFileManCopy2Return,
-
-		/** @SYMTraceFormatString "+CFileMan::Copy3() this %x anOldSubs %x aNew %*S aSwitches %d" */
-        ECFileManCopy3,
-        /** @SYMTraceFormatString "-CFileMan::Copy3() r %d" */
-        ECFileManCopy3Return,
-
-		/** @SYMTraceFormatString "+CFileMan::Copy4() this %x anOldSubs %x aNew %*S aSwitches %dstatus %x" */
-        ECFileManCopy4,
-        /** @SYMTraceFormatString "-CFileMan::Copy4() r %d" */
-        ECFileManCopy4Return,
-		
-		/** @SYMTraceFormatString "+CFileMan::Delete1() this %x aName %*S aSwitches %d status %x" */
-        ECFileManDelete1,
-        /** @SYMTraceFormatString "-CFileMan::Delete1() r %d" */
-        ECFileManDelete1Return,
-
-		/** @SYMTraceFormatString "+CFileMan::Delete2() this %x aName %*S aSwitches %d" */
-        ECFileManDelete2,
-        /** @SYMTraceFormatString "-CFileMan::Delete2() r %d" */
-        ECFileManDelete2Return,
-
-		/** @SYMTraceFormatString "+CFileMan::Move1() this %x anOld %*S aNew %*S aSwitches %d status %x" */
-        ECFileManMove1,
-        /** @SYMTraceFormatString "-CFileMan::Move1() r %d" */
-        ECFileManMove1Return,
-
-		/** @SYMTraceFormatString "+CFileMan::Move2() this %x anOld %*S aNew %*S aSwitches %d" */
-        ECFileManMove2,
-        /** @SYMTraceFormatString "-CFileMan::Move2() r %d" */
-        ECFileManMove2Return,
-
-		/** @SYMTraceFormatString "+CFileMan::Rename1() this %x anOld %*S aNew %*S aSwitches %d status %x" */
-        ECFileManRename1,
-        /** @SYMTraceFormatString "-CFileMan::Rename1() r %d" */
-        ECFileManRename1Return,
-
-		/** @SYMTraceFormatString "+CFileMan::Rename2() this %x anOld %*S aNew %*S aSwitches %d" */
-        ECFileManRename2,
-        /** @SYMTraceFormatString "-CFileMan::Rename2() r %d" */
-        ECFileManRename2Return,
-
-		/** @SYMTraceFormatString "+CFileMan::RmDir1() this %x aDirName %*S status %x" */
-        ECFileManRmDir1,
-        /** @SYMTraceFormatString "-CFileMan::RmDir1() r %d" */
-        ECFileManRmDir1Return,
-
-		/** @SYMTraceFormatString "+CFileMan::RmDir2() this %x aDirName %*S" */
-        ECFileManRmDir2,
-        /** @SYMTraceFormatString "-CFileMan::RmDir2() r %d" */
-        ECFileManRmDir2Return,
-
-
-
-
-
-		/** @SYMTraceFormatString "+CDirScan::NewL() sess %x" */
-        ECDirScanNewL,
-        /** @SYMTraceFormatString "-CDirScan::NewL() CDirScan* %x" */
-        ECDirScanNewLReturn,
-
-		/** @SYMTraceFormatString "+CDirScan::NewLC() sess %x" */
-        ECDirScanNewLC,
-        /** @SYMTraceFormatString "-CDirScan::NewLC() CDirScan* %x" */
-        ECDirScanNewLCReturn,
-
-		/** @SYMTraceFormatString "+CDirScan::~CDirScan() this %x" */
-        ECDirScanDestructor,
-        /** @SYMTraceFormatString "-CDirScan::~CDirScan()" */
-        ECDirScanDestructorReturn,
-
-		/** @SYMTraceFormatString "+CDirScan::SetScanDataL() this %x aMatchName %*S anEntryAttMask %x anEntrySortKey %d aScanDir %d" */
-        ECDirScanSetScanDataL,
-        /** @SYMTraceFormatString "-CDirScan::SetScanDataL() r %d" */
-        ECDirScanSetScanDataLReturn,
-
-		/** @SYMTraceFormatString "+CDirScan::NextL() this %x" */
-        ECDirScanNextL,
-        /** @SYMTraceFormatString "-CDirScan::NextL() r %d DirEntries %d" */
-        ECDirScanNextLReturn,
-
-        /** @SYMTraceFormatString "-CDirScan Leave r %d" */
-        ECDirScanLeave,
-
-
-
-
-
-
-        /** @SYMTraceFormatString "Efsrv.dll Panic r %d" */
-        EPanic,
-
-        
-		/** @SYMTraceFormatString "TimeStamp" */
-        ETimeStamp,
-
-        /**
-        Provided to allow the following compile time assert.
-        */
-        EFormatIdHighWaterMark,
-        };
-    __ASSERT_COMPILE(EFormatIdHighWaterMark <= (UTF::KMaxFormatId + 1));
-
-
-
-    } // end of namespace UTraceModuleEfsrv
-
-	
-#endif // UTRACEEFSRV_H
diff -r 2a0ada0a1bf8 -r 95847726fe57 userlibandfileserver/fileserver/rom/f32.iby
--- a/userlibandfileserver/fileserver/rom/f32.iby	Wed May 12 10:34:10 2010 +0100
+++ b/userlibandfileserver/fileserver/rom/f32.iby	Mon May 24 18:38:55 2010 +0100
@@ -17,8 +17,6 @@
 secondary=\Epoc32\Release\##MAIN##\##BUILD##\efile.exe  sys\bin\efile.exe  FIXED HEAPMAX(0x80000)
 file=\Epoc32\Release\##MAIN##\##BUILD##\efsrv.dll       sys\bin\efsrv.dll
 
-device[VARID]=\Epoc32\Release\##KMAIN##\##BUILD##\d_ftrace.ldd          sys\bin\d_ftrace.ldd
-
 #ifdef WITH_EXFAT
 file=\Epoc32\Release\##MAIN##\##BUILD##\exfat.fsy       sys\bin\exfat.fsy
 #endif
diff -r 2a0ada0a1bf8 -r 95847726fe57 userlibandfileserver/fileserver/sfile/efile.mmh
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/userlibandfileserver/fileserver/sfile/efile.mmh	Mon May 24 18:38:55 2010 +0100
@@ -0,0 +1,109 @@
+// Copyright (c) 1996-2009 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"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+// f32\sfile\efile.mmp
+// efile.exe File Server
+// 
+//
+
+/**
+ @file
+*/
+
+
+SOURCEPATH		../sfsrv
+USERINCLUDE		../sfsrv
+
+USERINCLUDE		../ftrace
+USERINCLUDE		../sfile/traces
+
+SOURCE			 cl_file.cpp
+SOURCE			 cl_cli.cpp
+SOURCE			 cl_dir.cpp
+
+SOURCEPATH		../sfile
+USERINCLUDE		.
+SOURCE			 sf_amh.cpp sf_dat.cpp sf_debug.cpp sf_dir.cpp
+SOURCE			 sf_drv.cpp sf_file.cpp sf_fmt.cpp
+SOURCE			 sf_ldr.cpp sf_main.cpp sf_nbs.cpp sf_ses.cpp
+SOURCE			 sf_svr.cpp sf_sys.cpp sf_utl.cpp sf_mnt.cpp
+SOURCE			 sf_raw.cpp sf_prel.cpp sf_disk.cpp
+SOURCE			 sf_request.cpp sf_ops.cpp sf_notify.cpp
+SOURCE			 sf_thread.cpp sf_local.cpp sf_obj.cpp
+SOURCE			 sf_ext.cpp sf_hash.cpp
+SOURCE			 sf_plugin.cpp sf_plugin_ops.cpp sf_plugin_man.cpp
+SOURCE			 Sf_plugin_util.cpp
+SOURCE			 sf_cache_man.cpp sf_cache_client.cpp
+SOURCE			 sf_file_cache.cpp
+SOURCE			 sf_memory_man.cpp sf_memory_client.cpp
+SOURCE			 sf_plugin_shim.cpp
+SOURCE			 sf_notifier_handlers.cpp
+#ifdef SYMBIAN_F32_ENHANCED_CHANGE_NOTIFICATION
+SOURCE			 sf_pool.cpp sf_notifier.cpp
+#endif
+
+#ifdef WINS
+SOURCE			 sf_lwins.cpp
+
+library			emulator.lib
+#else
+SOURCE			 sf_lepoc.cpp  sf_inflate.cpp sf_cache.cpp sf_decomp.cpp
+SOURCE			 sf_pgcompr.cpp
+
+#ifdef MARM
+SOURCEPATH	../../../kernel/eka/kernel/arm
+SOURCE			 byte_pair.cia
+#else
+SOURCEPATH	../../../kernel/eka/kernel
+SOURCE			 byte_pair.cpp
+#endif
+
+
+SOURCEPATH	../srom
+SOURCE			 sr_rom.cpp
+#endif
+
+STRICTDEPEND
+
+SOURCEPATH	.
+DOCUMENT		 ../group/release.txt
+
+TARGETTYPE		exexp
+
+DEFFILE			efile.def
+
+USERINCLUDE	../inc ../sfsrv/traces
+#ifdef SYMBIAN_OLD_EXPORT_LOCATION
+SYSTEMINCLUDE	../inc
+#endif
+OS_LAYER_SYSTEMINCLUDE_SYMBIAN
+USERINCLUDE	../../../kernel/eka/include
+
+LIBRARY			 efsrv.lib euser.lib hal.lib
+
+EPOCSTACKSIZE	0x6000
+EPOCHEAPSIZE	0x00001000	0x800000
+
+START WINS
+BASEADDRESS		0x62000000
+WIN32_LIBRARY	kernel32.lib
+END
+UID		0x1000008c 0x100039e3
+VENDORID 0x70000001
+
+unpagedcode
+unpageddata
+
+SMPSAFE
+
+
diff -r 2a0ada0a1bf8 -r 95847726fe57 userlibandfileserver/fileserver/sfile/efile.mmp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/userlibandfileserver/fileserver/sfile/efile.mmp	Mon May 24 18:38:55 2010 +0100
@@ -0,0 +1,42 @@
+// Copyright (c) 1996-2009 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"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+// f32/sfile/efile.mmp
+// efile.exe File Server
+// 
+//
+
+/**
+ @file
+*/
+
+
+TARGET			efile.exe
+
+#include "f32caps.mmh"  // Capabilities of File Server process
+#include "f32.mmh"  	// Generic definitions for the whole f32 component
+
+MACRO			SYMBIAN_PRIVATE_EFSRV
+
+// By default, tracepoints are compiled in to UDEB version only
+#ifdef SYMBIAN_TRACE_SYSTEM_INCLUDE
+macro SYMBIAN_FTRACE_ENABLE_UDEB
+//macro SYMBIAN_FTRACE_ENABLE_UREL
+#endif
+
+#include "efile.mmh"
+
+
+
+
+
diff -r 2a0ada0a1bf8 -r 95847726fe57 userlibandfileserver/fileserver/sfile/sf_dat.cpp
--- a/userlibandfileserver/fileserver/sfile/sf_dat.cpp	Wed May 12 10:34:10 2010 +0100
+++ b/userlibandfileserver/fileserver/sfile/sf_dat.cpp	Mon May 24 18:38:55 2010 +0100
@@ -51,7 +51,6 @@
 TBool StartupInitCompleted;
 TBool LocalDriveMappingSet;
 CKernEventNotifier* TheKernEventNotifier;
-RFTrace TheFtrace;
 
 
 GLDEF_D TCodePageUtils TheCodePage;
diff -r 2a0ada0a1bf8 -r 95847726fe57 userlibandfileserver/fileserver/sfile/sf_dir.cpp
--- a/userlibandfileserver/fileserver/sfile/sf_dir.cpp	Wed May 12 10:34:10 2010 +0100
+++ b/userlibandfileserver/fileserver/sfile/sf_dir.cpp	Mon May 24 18:38:55 2010 +0100
@@ -17,6 +17,10 @@
 
 #include "sf_std.h"
 
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "sf_dirTraces.h"
+#endif
+
 LOCAL_C CDirCB* GetDirFromHandle(TInt aHandle,CSessionFs* aSession)
 //
 // Get the dir control block from its handle.
@@ -52,19 +56,18 @@
 		{
 		TEntry e;
 
-		TRACE1(UTF::EBorder, UTraceModuleFileSys::ECDirCBReadL, EF32TraceUidFileSys, &aDir);
+		OstTrace1(TRACE_FILESYSTEM, FSYS_ECDIRCBREADL2, "fsDirReadPacked this %x", &aDir);
 		aDir.ReadL(e);
-		TRACE5(UTF::EBorder, UTraceModuleFileSys::ECDirCBReadLRet, EF32TraceUidFileSys, 
-			KErrNone, e.iAtt, I64LOW(e.iModified.Int64()), I64HIGH(e.iModified.Int64()), e.iSize);
+		OstTraceExt5(TRACE_FILESYSTEM, FSYS_ECDIRCBREADL2RET, "fsDirReadPacked r %d att %x modified %x:%x  size %d", (TUint) KErrNone, (TUint) e.iAtt, (TUint) I64HIGH(e.iModified.Int64()), (TUint) I64LOW(e.iModified.Int64()), (TUint) e.iSize);
 		TInt len=EntrySize(e, EFalse);
 		TInt rLen=EntrySize(e, ETrue);
 		TEntry* pX=PtrAdd(pE,rLen);
 		if (pX>pEnd)
 			{
 
-			TRACE1(UTF::EBorder, UTraceModuleFileSys::ECDirCBStoreLongEntryNameL, EF32TraceUidFileSys, &aDir);
+			OstTrace1(TRACE_FILESYSTEM, FSYS_ECDIRCBSTORELONGENTRYNAMEL, "fsDirReadPacked this %x", &aDir);
 			aDir.StoreLongEntryNameL(e.iName);
-			TRACE1(UTF::EBorder, UTraceModuleFileSys::ECDirCBStoreLongEntryNameLRet, EF32TraceUidFileSys, KErrNone);
+			OstTrace1(TRACE_FILESYSTEM, FSYS_ECDIRCBSTORELONGENTRYNAMELRET, "fsDirReadPacked r %d", KErrNone);
 
 			aDir.SetPending(ETrue);
 			break;
@@ -163,10 +166,10 @@
 		return(r);
 	TEntry e;
 
-	TRACE1(UTF::EBorder, UTraceModuleFileSys::ECDirCBReadL, EF32TraceUidFileSys, &dir);
+	OstTrace1(TRACE_FILESYSTEM, FSYS_ECDIRCBREADL1, "this %x", &dir);
 	TRAP(r,dir->ReadL(e))
-	TRACE5(UTF::EBorder, UTraceModuleFileSys::ECDirCBReadLRet, EF32TraceUidFileSys, 
-		KErrNone, e.iAtt, I64LOW(e.iModified.Int64()), I64HIGH(e.iModified.Int64()), e.iSize);
+	OstTraceExt5(TRACE_FILESYSTEM, FSYS_ECDIRCBREADL1RET, "r %d att %x modified %x:%x  size %d", (TUint) KErrNone, (TUint) e.iAtt, (TUint) I64HIGH(e.iModified.Int64()), (TUint) I64LOW(e.iModified.Int64()), (TUint) e.iSize);
+		
 
 
 	if (r==KErrNone)
diff -r 2a0ada0a1bf8 -r 95847726fe57 userlibandfileserver/fileserver/sfile/sf_drv.cpp
--- a/userlibandfileserver/fileserver/sfile/sf_drv.cpp	Wed May 12 10:34:10 2010 +0100
+++ b/userlibandfileserver/fileserver/sfile/sf_drv.cpp	Mon May 24 18:38:55 2010 +0100
@@ -17,8 +17,9 @@
 
 #include "sf_std.h"
 #include "sf_file_cache.h"
-
-
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "sf_drvTraces.h"
+#endif
 //const TInt KMaxNotifierAttempts=4; // not used anywhere
 
 static TPtrC StripBackSlash(const TDesC& aName)
@@ -286,12 +287,12 @@
 	if (!aMount.IsDismounted() && !aMount.ProxyDriveDismounted())
 		{
 		aMount.SetDrive(this);
-		TRACE1(UTF::EBorder, UTraceModuleFileSys::ECMountCBReMount, EF32TraceUidFileSys, DriveNumber());
+		OstTrace1(TRACE_FILESYSTEM, FSYS_ECMOUNTCBREMOUNT1, "drive %d", DriveNumber());
 		
         //-- actually, this is asking CMountCB to see if it belongs to the current media. 
         iReason = aMount.ReMount();
 
-		TRACE1(UTF::EBorder, UTraceModuleFileSys::ECMountCBReMountRet, EF32TraceUidFileSys, iReason);
+		OstTrace1(TRACE_FILESYSTEM, FSYS_ECMOUNTCBREMOUNT1RET, "success %d", iReason);
 		
         if (iReason == KErrNone)	//	ReMount succeeded
 			{
@@ -327,13 +328,13 @@
     
     apMount = NULL;
 
-    TRACE2(UTF::EBorder, UTraceModuleFileSys::ECFileSystemNewMountL, EF32TraceUidFileSys, &FSys(), DriveNumber());
+    OstTraceExt2(TRACE_FILESYSTEM, FSYS_ECFILESYSTEMNEWMOUNTL, "this %x drive %d", (TUint) &FSys(), (TUint) DriveNumber());
    
     //-- construct a new CmountCB object.
     //-- on return pMountsFs will be the pointer to the factory object of CFileSystem that produced this mount
     apMount = FSys().NewMountExL(this, &pMountsFs, aForceMount, aFsNameHash);
 
-	TRACE2(UTF::EBorder, UTraceModuleFileSys::ECFileSystemNewMountLRet, EF32TraceUidFileSys, KErrNone, apMount);
+	OstTraceExt2(TRACE_FILESYSTEM, FSYS_ECFILESYSTEMNEWMOUNTLRET, "r %d CMountCB %x", (TUint) KErrNone, (TUint) apMount);
 	__PRINT2(_L("TDrive::MountMediaL created mount:0x%x FileSys:0x%x"), apMount, pMountsFs);
 
     ASSERT(pMountsFs && apMount);
@@ -402,10 +403,10 @@
 */
 TInt TDrive::MountControl(TInt aLevel, TInt aOption, TAny* aParam)
     {
-	TRACE4(UTF::EBorder, UTraceModuleFileSys::ECMountCBMountControl, EF32TraceUidFileSys, DriveNumber(), aLevel, aOption, aParam);
+	OstTraceExt4(TRACE_FILESYSTEM, FSYS_ECMOUNTCBMOUNTCONTROL, "drive %d aLevel %d aOption %x aParam %x", (TUint) DriveNumber(), (TUint) aLevel, (TUint) aOption, (TUint) aParam);
     TInt r = CurrentMount().MountControl(aLevel, aOption, aParam);
-	TRACERET1(UTF::EBorder, UTraceModuleFileSys::ECMountCBMountControlRet, EF32TraceUidFileSys, r);
-
+	
+	OstTrace1(TRACE_FILESYSTEM, FSYS_ECMOUNTCBMOUNTCONTROLRET, "r %d", r);
 	return r;
     }
 
@@ -434,9 +435,9 @@
     //-- the caller will be suspended until aFreeSpaceRequired bytes is available or scanning process finishes
     {
         TUint64 freeSpaceReq = aFreeSpaceRequired;
-		TRACE1(UTF::EBorder, UTraceModuleFileSys::ECMountCBFreeSpace, EF32TraceUidFileSys, DriveNumber());
+		OstTrace1(TRACE_FILESYSTEM, FSYS_ECMOUNTCBFREESPACE, "drive %d", DriveNumber());
         nRes = CurrentMount().RequestFreeSpace(freeSpaceReq);
-		TRACERET3(UTF::EBorder, UTraceModuleFileSys::ECMountCBFreeSpaceRet, EF32TraceUidFileSys, nRes, I64LOW(freeSpaceReq), I64HIGH(freeSpaceReq));
+		OstTraceExt3(TRACE_FILESYSTEM, FSYS_ECMOUNTCBFREESPACERET, "r %d FreeSpace %x:%x", (TUint) nRes, (TUint) I64HIGH(freeSpaceReq), (TUint) I64LOW(freeSpaceReq));
         if(nRes == KErrNone)
             {
             return (freeSpaceReq >= aFreeSpaceRequired) ? KErrNone : KErrDiskFull;
@@ -466,11 +467,10 @@
     nRes = CheckMount();
     if(nRes != KErrNone)
         return nRes;
-
     //-- 1. Try mount-specific request first. It won't block this call as CMountCB::VolumeL() can do if some background activity is going on the mount
-	TRACE1(UTF::EBorder, UTraceModuleFileSys::ECMountCBVolumeSize, EF32TraceUidFileSys, DriveNumber());
+	OstTrace1(TRACE_FILESYSTEM, FSYS_ECMOUNTCBVOLUMESIZE, "drive %d", DriveNumber());
     nRes = CurrentMount().MountedVolumeSize(aSize);
-	TRACERET3(UTF::EBorder, UTraceModuleFileSys::ECMountCBVolumeSize, EF32TraceUidFileSys, nRes, I64LOW(aSize), I64HIGH(aSize));
+	OstTraceExt3(TRACE_FILESYSTEM, FSYS_ECMOUNTCBVOLUMESIZERET, "r %d aSize %x:%x", (TUint) nRes, (TUint) I64HIGH(aSize), (TUint) I64LOW(aSize));
     if(nRes == KErrNone)
         return nRes;
 
@@ -503,9 +503,9 @@
         return nRes;
 
     //-- 1. Try mount-specific request first. It won't block this call as CMountCB::VolumeL() can do 
-	TRACE1(UTF::EBorder, UTraceModuleFileSys::ECMountCBCurrentFreeSpace, EF32TraceUidFileSys, DriveNumber());
+	OstTrace1(TRACE_FILESYSTEM, FSYS_ECMOUNTCBCURRENTFREESPACE, "drive %d", DriveNumber());
     nRes = CurrentMount().GetCurrentFreeSpaceAvailable(aFreeDiskSpace);
-	TRACERET3(UTF::EBorder, UTraceModuleFileSys::ECMountCBCurrentFreeSpaceRet, EF32TraceUidFileSys, nRes, I64LOW(aFreeDiskSpace), I64HIGH(aFreeDiskSpace));
+	OstTraceExt3(TRACE_FILESYSTEM, FSYS_ECMOUNTCBCURRENTFREESPACERET, "r %d FreeSpace %x:%x", (TUint) nRes, (TUint) I64HIGH(aFreeDiskSpace), (TUint) I64LOW(aFreeDiskSpace));
     if(nRes == KErrNone)
         return nRes;
 
@@ -543,9 +543,9 @@
 	if(IsWriteProtected())
 		return(KErrAccessDenied);
 
-	TRACE4(UTF::EBorder, UTraceModuleFileSys::ECMountCBFinaliseMount2, EF32TraceUidFileSys, DriveNumber(), aOperation, aParam1, aParam2);
+	OstTraceExt4(TRACE_FILESYSTEM, FSYS_ECMOUNTCBFINALISEMOUNT2, "drive %d aOperation %d aParam1 %x aParam2 %x", (TUint) DriveNumber(), (TUint) aOperation, (TUint) aParam1, (TUint) aParam2);
 	TRAP(r,CurrentMount().FinaliseMountL(aOperation, aParam1, aParam2));
-	TRACERET1(UTF::EBorder, UTraceModuleFileSys::ECMountCBFinaliseMount2Ret, EF32TraceUidFileSys, r);
+	OstTrace1(TRACE_FILESYSTEM, FSYS_ECMOUNTCBFINALISEMOUNT2RET, "r %d", r);
 	
 	// Pass FinaliseDrive notification down to media driver
 	TInt driveNumber = DriveNumber();
@@ -578,9 +578,10 @@
 	if(IsWriteProtected())
 		return(KErrAccessDenied);
 
-	TRACE1(UTF::EBorder, UTraceModuleFileSys::ECMountCBFinaliseMount1, EF32TraceUidFileSys, DriveNumber());
+	OstTrace1(TRACE_FILESYSTEM, FSYS_ECMOUNTCBFINALISEMOUNT1, "drive %d", DriveNumber());
 	TRAP(r,CurrentMount().FinaliseMountL());
-	TRACERET1(UTF::EBorder, UTraceModuleFileSys::ECMountCBFinaliseMount1Ret, EF32TraceUidFileSys, r);
+	
+	OstTrace1(TRACE_FILESYSTEM, FSYS_ECMOUNTCBFINALISEMOUNT1RET, "r %d", r);
 	
     return r;
 	}
@@ -887,7 +888,6 @@
 
 	return KErrNone;
 	}
-
 void TDrive::DriveInfo(TDriveInfo& anInfo)
 //
 // Get the drive info.
@@ -900,10 +900,9 @@
 
 	if(iFSys)
 		{
-		TRACE2(UTF::EBorder, UTraceModuleFileSys::ECFileSystemDriveInfo, EF32TraceUidFileSys, &FSys(), DriveNumber());
+		OstTraceExt2(TRACE_FILESYSTEM, FSYS_ECFILESYSTEMDRIVEINFO, "this %x aDriveNumber %d", (TUint) &FSys(), (TUint) DriveNumber());
 		FSys().DriveInfo(anInfo,DriveNumber());
-		TRACE3(UTF::EBorder, UTraceModuleFileSys::ECFileSystemDriveInfoRet, EF32TraceUidFileSys, 
-			anInfo.iType, anInfo.iDriveAtt, anInfo.iMediaAtt);
+		OstTraceExt3(TRACE_FILESYSTEM, FSYS_ECFILESYSTEMDRIVEINFORET, "type %d driveAtt %x mediaAtt %x", (TUint) anInfo.iType, (TUint) anInfo.iDriveAtt, (TUint) anInfo.iMediaAtt);
 		}
 
 	anInfo.iDriveAtt=Att();
@@ -923,12 +922,10 @@
 		aVolume.iUniqueID=m.iUniqueID;
 		aVolume.iSize=m.iSize;
 
-		TRACE1(UTF::EBorder, UTraceModuleFileSys::ECMountCBVolumeL, EF32TraceUidFileSys, DriveNumber());
+		OstTrace1(TRACE_FILESYSTEM, FSYS_ECMOUNTCBVOLUMEL, "drive %d", DriveNumber());
 		TRAP(r,m.VolumeL(aVolume))
-		TRACE7(UTF::EBorder, UTraceModuleFileSys::ECMountCBVolumeLRet, EF32TraceUidFileSys, 
-			r, aVolume.iUniqueID, I64LOW(aVolume.iSize), I64HIGH(aVolume.iSize),
-			I64LOW(aVolume.iFree), I64HIGH(aVolume.iFree), aVolume.iFileCacheFlags);
-
+		OstTraceExt5(TRACE_FILESYSTEM, FSYS_ECMOUNTCBVOLUMELRETA, "r %d iSize %x:%x iFree %x:%x", (TUint) r, (TUint) I64HIGH(aVolume.iSize), (TUint) I64LOW(aVolume.iSize), (TUint) I64HIGH(aVolume.iFree), (TUint) I64LOW(aVolume.iFree));
+		OstTraceExt2(TRACE_FILESYSTEM, FSYS_ECMOUNTCBVOLUMELRETB, "iUniqueID %x iFileCacheFlags %x", (TUint) aVolume.iUniqueID, (TUint) aVolume.iFileCacheFlags);
 		}
 	return(r);
 	}
@@ -942,12 +939,11 @@
 	__CHECK_DRIVETHREAD(iDriveNumber);
 	aBuf=aName.AllocL();
 	TPtr volumeName=aBuf->Des();
-
-	TRACEMULT2(UTF::EBorder, UTraceModuleFileSys::ECMountCBSetVolumeL, EF32TraceUidFileSys, DriveNumber(), aName);
+	OstTrace1(TRACE_FILESYSTEM, FSYS_ECMOUNTCBSETVOLUMEL, "drive %d", DriveNumber());
+	OstTraceData(TRACE_FILESYSTEM, FSYS_EVOLUMENAME, "VolumeName %S", aName.Ptr(), aName.Length()<<1);
+	
 	CurrentMount().SetVolumeL(volumeName);
-	TRACE1(UTF::EBorder, UTraceModuleFileSys::ECMountCBSetVolumeLRet, EF32TraceUidFileSys, KErrNone);
-
-
+	OstTrace1(TRACE_FILESYSTEM, FSYS_ECMOUNTCBSETVOLUMELRET, "r %d", KErrNone);
 	delete &CurrentMount().VolumeName();
 	CurrentMount().SetVolumeName(aBuf);
 	}
@@ -982,14 +978,12 @@
 		return(KErrAccessDenied);
 	TParse newDirName;
 	newDirName.Set(aName,NULL,NULL);
-
-	TRACEMULT2(UTF::EBorder, UTraceModuleFileSys::ECMountCBMkDirL, EF32TraceUidFileSys, DriveNumber(), aName);
+	OstTrace1(TRACE_FILESYSTEM, FSYS_ECMOUNTCBMKDIRL, "drive %d", DriveNumber());
+	OstTraceData(TRACE_FILESYSTEM, FSYS_ECMOUNTCBMKDIRLYS_EDIRNAME, "Dir %S", aName.Ptr(), aName.Length()<<1);
 	TRAP(r,CurrentMount().MkDirL(newDirName.FullName()))
-	TRACERET1(UTF::EBorder, UTraceModuleFileSys::ECMountCBMkDirLRet, EF32TraceUidFileSys, r);
-
+	OstTrace1(TRACE_FILESYSTEM, FSYS_ECMOUNTCBMKDIRLRET, "r %d", r);
 	return(r);
 	}
-
 TInt TDrive::RmDir(const TDesC& aName)
 //
 // Remove a directory.
@@ -1006,11 +1000,10 @@
 		return(KErrPathNotFound);
 	if ((entry.iAtt&KEntryAttReadOnly) || IsWriteProtected())
 		return(KErrAccessDenied);
-
-	TRACEMULT2(UTF::EBorder, UTraceModuleFileSys::ECMountCBRmDirL, EF32TraceUidFileSys, DriveNumber(), aName);
+	OstTrace1(TRACE_FILESYSTEM, FSYS_ECMOUNTCBRMDIRL, "drive %d", DriveNumber());
+	OstTraceData(TRACE_FILESYSTEM, FSYS_ECMOUNTCBRMDIRLYS_EDIRNAME, "Dir %S", aName.Ptr(), aName.Length()<<1);
 	TRAP(r,CurrentMount().RmDirL(aName))
-	TRACERET1(UTF::EBorder, UTraceModuleFileSys::ECMountCBRmDirLRet, EF32TraceUidFileSys, r);
-
+	OstTrace1(TRACE_FILESYSTEM, FSYS_ECMOUNTCBRMDIRLRET, "r %d", r);
 	return(r);
 	}
 
@@ -1031,12 +1024,10 @@
 
     if (IsWriteProtected())
 		return(KErrAccessDenied);
-
-    //-- filesystems' CMountCB::DeleteL() implementations shall check the entry attributes themeselves. 
-	TRACEMULT2(UTF::EBorder, UTraceModuleFileSys::ECMountCBDeleteL, EF32TraceUidFileSys, DriveNumber(), aName);
+	OstTrace1(TRACE_FILESYSTEM, FSYS_ECMOUNTCBDELETEL1, "drive %d", DriveNumber());
+	OstTraceData(TRACE_FILESYSTEM, FSYS_ECMOUNTCBDELETEL1_EFILENAME, "FileName %S", aName.Ptr(), aName.Length()<<1);
 	TRAP(r,CurrentMount().DeleteL(aName))
-	TRACERET1(UTF::EBorder, UTraceModuleFileSys::ECMountCBDeleteLRet, EF32TraceUidFileSys, r);
-
+	OstTrace1(TRACE_FILESYSTEM, FSYS_ECMOUNTCBDELETEL1_RET, "r %d", r);
 	return r;
 	}
 
@@ -1107,11 +1098,11 @@
 	// remove from closed queue
 	LocateClosedFile(anOldName, EFalse);
 	LocateClosedFile(aNewName, EFalse);
-
-	TRACEMULT3(UTF::EBorder, UTraceModuleFileSys::ECMountCBRenameL, EF32TraceUidFileSys, DriveNumber(), oldEntryName,newEntryName);
+	OstTrace1(TRACE_FILESYSTEM, FSYS_ECMOUNTCBRENAMEL, "drive %d", DriveNumber());
+	OstTraceData(TRACE_FILESYSTEM, FSYS_ECMOUNTCBRENAMELYS_EOLDNAME, "OldName %S", oldEntryName.Ptr(), oldEntryName.Length()<<1);
+	OstTraceData(TRACE_FILESYSTEM, FSYS_ECMOUNTCBRENAMELYS_ENEWNAME, "NewName %S", newEntryName.Ptr(), newEntryName.Length()<<1);
 	TRAP(r,CurrentMount().RenameL(oldEntryName,newEntryName))
-	TRACERET1(UTF::EBorder, UTraceModuleFileSys::ECMountCBRenameLRet, EF32TraceUidFileSys, r);
-
+	OstTrace1(TRACE_FILESYSTEM, FSYS_ECMOUNTCBRENAMELRET, "r %d", r);
 	return(r);
 	}
 
@@ -1145,11 +1136,11 @@
 	// remove from closed queue
 	LocateClosedFile(anOldName, EFalse);
 	LocateClosedFile(aNewName, EFalse);
-
-	TRACEMULT3(UTF::EBorder, UTraceModuleFileSys::ECMountCBReplaceL, EF32TraceUidFileSys, DriveNumber(), anOldName, aNewName);
+	OstTrace1(TRACE_FILESYSTEM, FSYS_ECMOUNTCBREPLACEL, "drive %d", DriveNumber());
+	OstTraceData(TRACE_FILESYSTEM, FSYS_ECMOUNTCBREPLACEL_EOLDNAME, "OldName %S", anOldName.Ptr(), anOldName.Length()<<1);
+	OstTraceData(TRACE_FILESYSTEM, FSYS_ECMOUNTCBREPLACEL_ENEWNAME, "NewName %S", aNewName.Ptr(), aNewName.Length()<<1);
 	TRAP(r,CurrentMount().ReplaceL(anOldName,aNewName))
-	TRACERET1(UTF::EBorder, UTraceModuleFileSys::ECMountCBReplaceLRet, EF32TraceUidFileSys, r);
-
+	OstTrace1(TRACE_FILESYSTEM, FSYS_ECMOUNTCBREPLACELRET, "r %d", r);
 	return(r);
 	}
 
@@ -1179,14 +1170,10 @@
 //
 	{
 	FlushCachedFileInfoL();
-
-	TRACEMULT2(UTF::EBorder, UTraceModuleFileSys::ECMountCBEntryL, EF32TraceUidFileSys, DriveNumber(), aName);
+	OstTrace1(TRACE_FILESYSTEM, FSYS_ECMOUNTCBENTRYL, "drive %d", DriveNumber());
+	OstTraceData(TRACE_FILESYSTEM, FSYS_ECMOUNTCBENTRYL_EFILEPATH, "FilePath %S", aName.Ptr(), aName.Length()<<1);
 	CurrentMount().EntryL(aName,anEntry);
-	TRACE5(UTF::EBorder, UTraceModuleFileSys::ECMountCBEntryLRet, EF32TraceUidFileSys, 
-		KErrNone, anEntry.iAtt, 
-		I64LOW(anEntry.iModified.Int64()), I64HIGH(anEntry.iModified.Int64()), 
-		anEntry.iSize);
-
+	OstTraceExt5(TRACE_FILESYSTEM, FSYS_ECMOUNTCBENTRYLRET, "att %x modified %x:%x  size %x:%x", (TUint) anEntry.iAtt, (TUint) I64HIGH(anEntry.iModified.Int64()), (TUint) I64LOW(anEntry.iModified.Int64()), (TUint) I64HIGH(anEntry.FileSize()), (TUint) anEntry.FileSize());
 	}
 
 TInt TDrive::CheckAttributes(const TDesC& aName,TUint& aSetAttMask,TUint& aClearAttMask)
@@ -1224,12 +1211,10 @@
 	TTime nullTime(0);
 	if (aTime!=nullTime)
 		aSetAttMask|=KEntryAttModified;
-
-	TRACEMULT6(UTF::EBorder, UTraceModuleFileSys::ECMountCBSetEntryL, EF32TraceUidFileSys, 
-		DriveNumber(), aName, I64LOW(aTime.Int64()), I64HIGH(aTime.Int64()), aSetAttMask, aClearAttMask);
+	OstTraceExt5(TRACE_FILESYSTEM, FSYS_ECMOUNTCBSETENTRYL, "drive %d aTime %x:%x  aSetAttMask %x aClearAttMask %x", (TUint) DriveNumber(), (TUint) I64HIGH(aTime.Int64()), (TUint) I64LOW(aTime.Int64()), (TUint) aSetAttMask, (TUint) aClearAttMask);
+	OstTraceData(TRACE_FILESYSTEM, FSYS_ECMOUNTCBSETENTRYL_EFILEPATH, "FilePath %S", aName.Ptr(), aName.Length()<<1);
 	TRAP(r,CurrentMount().SetEntryL(entryName,aTime,aSetAttMask,aClearAttMask))
-	TRACERET1(UTF::EBorder, UTraceModuleFileSys::ECMountCBSetEntryLRet, EF32TraceUidFileSys, r);
-
+	OstTrace1(TRACE_FILESYSTEM, FSYS_ECMOUNTCBSETENTRYLRET, "r %d", r);
 	return(r);
 	}
 
@@ -1365,12 +1350,11 @@
 		}
 	else
 		{
-		TRACE2(UTF::EBorder, UTraceModuleFileSys::ECFileSystemNewFileL, EF32TraceUidFileSys, &FSys(), DriveNumber());
-
+		OstTraceExt2(TRACE_FILESYSTEM, FSYS_ECFILESYSTEMNEWFILEL, "this %x drive %d", (TUint) &FSys(), (TUint) DriveNumber());
         //-- construct CFileCB object, belonging to the corresponding mount
         pFile = aFileCB = CurrentMount().NewFileL();
 
-		TRACERET2(UTF::EBorder, UTraceModuleFileSys::ECFileSystemNewFileLRet, EF32TraceUidFileSys, r, pFile);
+		OstTraceExt2(TRACE_FILESYSTEM, FSYS_ECFILESYSTEMNEWFILELRET, "r %d CFileCB %x", (TUint) r, (TUint) pFile);
 		TDrive* createdDrive=!aRequest->SubstedDrive() ? this : aRequest->SubstedDrive();
 
     	HBufC* fileName = CreateFileNameL(aName);
@@ -1401,10 +1385,10 @@
 
 	if (openFile)
 		{
-		TRACEMULT5(UTF::EBorder, UTraceModuleFileSys::ECMountCBFileOpenL, EF32TraceUidFileSys, DriveNumber(), aName, aMode, (TUint) anOpen, (TUint) pFile);
+		OstTraceExt4(TRACE_FILESYSTEM, FSYS_ECMOUNTCBFILEOPENL, "drive %d aMode %x anOpen %d aFile %x", (TUint) DriveNumber(), (TUint) aMode, (TUint) anOpen, (TUint) pFile);
+		OstTraceData(TRACE_FILESYSTEM, FSYS_ECMOUNTCBFILEOPENL_EFILENAME, "FileName %S", aName.Ptr(), aName.Length()<<1);
 		CurrentMount().FileOpenL(aName,aMode,anOpen,pFile);
-		TRACE1(UTF::EBorder, UTraceModuleFileSys::ECMountCBFileOpenLRet, EF32TraceUidFileSys, KErrNone);
-
+		OstTrace1(TRACE_FILESYSTEM, FSYS_ECMOUNTCBFILEOPENLRET, "r %d", KErrNone);
 		// Delete on close may now be safely flagged if required.
 		// The file did not exist on the media prior to the
 		// CMountCB::FileOpenL() call for the case of a create.
@@ -1475,11 +1459,10 @@
 // Open a directory listing. Leave on error.
 //
 	{
-	TRACE2(UTF::EBorder, UTraceModuleFileSys::ECFileSystemNewDirL, EF32TraceUidFileSys, &FSys(), DriveNumber());
-
+	OstTraceExt2(TRACE_FILESYSTEM, FSYS_ECFILESYSTEMNEWDIRL, "this %x drive %d", (TUint) &FSys(), (TUint) DriveNumber());
     CDirCB* pD = aDir = CurrentMount().NewDirL(); //-- construct CDirCB object, belonging to the corresponding mount
 
-	TRACE2(UTF::EBorder, UTraceModuleFileSys::ECFileSystemNewDirLRet, EF32TraceUidFileSys, KErrNone, pD);
+	OstTraceExt2(TRACE_FILESYSTEM, FSYS_ECFILESYSTEMNEWDIRLRET, "r %d CDirCB %x", (TUint) KErrNone, (TUint) pD);
 	pD->InitL(this);
 	// modify resource counter after initialisation to ensure correct cleanup
 	AddResource(CurrentMount());
@@ -1487,10 +1470,10 @@
 	pD->iUidType=aUidType;
 	Dirs->AddL(pD,ETrue);
 	aHandle=aSession->Handles().AddL(pD,ETrue);
-
-	TRACEMULT3(UTF::EBorder, UTraceModuleFileSys::ECMountCBDirOpenL, EF32TraceUidFileSys, DriveNumber(), aName, (TUint) pD);
+	OstTraceExt2(TRACE_FILESYSTEM, FSYS_ECMOUNTCBDIROPENL, "drive %d aDir %x", (TUint) DriveNumber(), (TUint) pD);
+	OstTraceData(TRACE_FILESYSTEM, FSYS_ECMOUNTCBDIROPENL_EDIRNAME, "Dir %S", aName.Ptr(), aName.Length()<<1);
 	CurrentMount().DirOpenL(aName,pD);
-	TRACE1(UTF::EBorder, UTraceModuleFileSys::ECMountCBDirOpenLRet, EF32TraceUidFileSys, KErrNone);
+	OstTrace1(TRACE_FILESYSTEM, FSYS_ECMOUNTCBDIROPENLRET, "r %d", KErrNone);
 	}
 
 TInt TDrive::DirOpen(CSessionFs* aSession,TInt& aHandle,const TDesC& aName,TUint anAtt,const TUidType& aUidType)
@@ -1549,13 +1532,11 @@
 	if (r!=KErrNone)
 		return(r);
 	TPtrC entryName(StripBackSlash(aName));
-
 	TRACETHREADID(aMessage);
-	TRACEMULT7(UTF::EBorder, UTraceModuleFileSys::ECMountCBReadFileSectionL, EF32TraceUidFileSys, 
-		DriveNumber(), aName, I64LOW(aPos), I64HIGH(aPos), (TUint) aTrg, aLength, I64LOW(threadId));
+	OstTraceExt5(TRACE_FILESYSTEM, FSYS_ECMOUNTCBREADFILESECTIONL, "drive %d clientThreadId %x aPos %x:%x aLength %d", (TUint) DriveNumber(), (TUint) threadId, (TUint) I64HIGH(aPos), (TUint) I64LOW(aPos), (TUint) aLength);
+	OstTraceData(TRACE_FILESYSTEM, FSYS_ECMOUNTCBREADFILESECTIONL_EFILENAME, "FileName %S", aName.Ptr(), aName.Length()<<1);
 	TRAP(r,ReadSectionL(entryName,aPos,aTrg,aLength,aMessage));
-	TRACERET1(UTF::EBorder, UTraceModuleFileSys::ECMountCBReadFileSectionLRet, EF32TraceUidFileSys, r);
-
+	OstTrace1(TRACE_FILESYSTEM, FSYS_ECMOUNTCBREADFILESECTIONLRET, "r %d", r);
 	if (r==KErrHidden)
 		r=KErrNotFound;	
 	else if (r==KErrPathHidden)
@@ -1587,9 +1568,9 @@
 		TRAP(r,FlushCachedFileInfoL());
 	if (r==KErrNone)
 		{
-		TRACE1(UTF::EBorder, UTraceModuleFileSys::ECMountCBCheckDisk1, EF32TraceUidFileSys, DriveNumber());
+		OstTrace1(TRACE_FILESYSTEM, FSYS_ECMOUNTCBCHECKDISK1, "drive %d", DriveNumber());
 		r=CurrentMount().CheckDisk();
-		TRACERET1(UTF::EBorder, UTraceModuleFileSys::ECMountCBCheckDisk1Ret, EF32TraceUidFileSys, r);
+		OstTrace1(TRACE_FILESYSTEM, FSYS_ECMOUNTCBCHECKDISK1RET, "r %d", r);
 		}
 	return(r);
 	}
@@ -1604,9 +1585,9 @@
 		TRAP(r,FlushCachedFileInfoL());
 	if (r==KErrNone)
 		{
-		TRACE4(UTF::EBorder, UTraceModuleFileSys::ECMountCBCheckDisk2, EF32TraceUidFileSys, DriveNumber(), aOperation, aParam1, aParam2);
+		OstTraceExt4(TRACE_FILESYSTEM, FSYS_ECMOUNTCBCHECKDISK2, "drive %d aOperation %d aParam1 %x aParam2 %x", (TUint) DriveNumber(), (TUint) aOperation, (TUint) aParam1, (TUint) aParam2);
 		r=CurrentMount().CheckDisk(aOperation, aParam1, aParam2);
-		TRACERET1(UTF::EBorder, UTraceModuleFileSys::ECMountCBCheckDisk2Ret, EF32TraceUidFileSys, r);
+		OstTrace1(TRACE_FILESYSTEM, FSYS_ECMOUNTCBCHECKDISK2RET, "r %d", r);
 		}
 
 	return(r);
@@ -1628,10 +1609,9 @@
 	// Empty closed file queue
 	TClosedFileUtils::Remove(DriveNumber());
 
-	TRACE1(UTF::EBorder, UTraceModuleFileSys::ECMountCBScanDrive1, EF32TraceUidFileSys, DriveNumber());
+	OstTrace1(TRACE_FILESYSTEM, FSYS_ECMOUNTCBSCANDRIVE1, "drive %d", DriveNumber());
 	r = CurrentMount().ScanDrive();
-	TRACERET1(UTF::EBorder, UTraceModuleFileSys::ECMountCBScanDrive1Ret, EF32TraceUidFileSys, r);
-
+	OstTrace1(TRACE_FILESYSTEM, FSYS_ECMOUNTCBSCANDRIVE1RET, "r %d", r);
 	return r;
 	}
 
@@ -1655,10 +1635,9 @@
 	// Empty closed file queue
 	TClosedFileUtils::Remove(DriveNumber());
 
-	TRACE4(UTF::EBorder, UTraceModuleFileSys::ECMountCBScanDrive2, EF32TraceUidFileSys, DriveNumber(), aOperation, aParam1, aParam2);
+	OstTraceExt4(TRACE_FILESYSTEM, FSYS_ECMOUNTCBSCANDRIVE2, "drive %d aOperation %d aParam1 %x aParam2 %x", (TUint) DriveNumber(), (TUint) aOperation, (TUint) aParam1, (TUint) aParam2);
 	r = CurrentMount().ScanDrive(aOperation, aParam1, aParam2);
-	TRACERET1(UTF::EBorder, UTraceModuleFileSys::ECMountCBScanDrive2Ret, EF32TraceUidFileSys, r);
-
+	OstTrace1(TRACE_FILESYSTEM, FSYS_ECMOUNTCBSCANDRIVE2RET, "r %d", r);
 	return r;
 	}
 
@@ -1672,11 +1651,11 @@
 	if (r!=KErrNone)
 		return(r);
 	TPtrC entryName(StripBackSlash(aName));
-
-	TRACEMULT2(UTF::EBorder, UTraceModuleFileSys::ECMountCBGetShortNameL, EF32TraceUidFileSys, DriveNumber(), entryName);
+	OstTrace1(TRACE_FILESYSTEM, FSYS_ECMOUNTCBGETSHORTNAMEL, "drive %d", DriveNumber());
+	OstTraceData(TRACE_FILESYSTEM, FSYS_ECMOUNTCBGETSHORTNAMEL_ELONGNAME, "LongName %S", entryName.Ptr(), entryName.Length()<<1);
 	TRAP(r,CurrentMount().GetShortNameL(entryName,aShortName));
-	TRACERETMULT2(UTF::EBorder, UTraceModuleFileSys::ECMountCBGetShortNameLRet, EF32TraceUidFileSys, r, aShortName);
-
+	OstTraceData(TRACE_FILESYSTEM, FSYS_ECMOUNTCBGETSHORTNAMEL_ESHORTNAME, "ShortName %S", aShortName.Ptr(), aShortName.Length()<<1);
+	OstTrace1(TRACE_FILESYSTEM, FSYS_ECMOUNTCBGETSHORTNAMEL_ECMOUNTCBGETSHORTNAMELRET, "r %d", r);
 	return(r);
 	}
 
@@ -1689,11 +1668,11 @@
 	if (r!=KErrNone)
 		return(r);
 	TPtrC entryName(StripBackSlash(aShortName));
-
-	TRACEMULT2(UTF::EBorder, UTraceModuleFileSys::ECMountCBGetLongNameL, EF32TraceUidFileSys, DriveNumber(), entryName);
+	OstTrace1(TRACE_FILESYSTEM, FSYS_ECMOUNTCBGETLONGNAMEL, "drive %d", DriveNumber());
+	OstTraceData(TRACE_FILESYSTEM, FSYS_ECMOUNTCBGETLONGNAMEL_ESHORTNAME, "ShortName %S", entryName.Ptr(), entryName.Length()<<1);
 	TRAP(r,CurrentMount().GetLongNameL(entryName,aLongName));
-	TRACERETMULT2(UTF::EBorder, UTraceModuleFileSys::ECMountCBGetLongNameLRet, EF32TraceUidFileSys, r, aLongName);
-
+	OstTraceData(TRACE_FILESYSTEM, FSYS_ECMOUNTCBGETLONGNAMEL_ELONGNAME, "LongName %S", aLongName.Ptr(), aLongName.Length()<<1);
+	OstTrace1(TRACE_FILESYSTEM, FSYS_ECMOUNTCBGETLONGNAMELRET, "r %d", r);
 	return(r);
 	}
 
@@ -1857,22 +1836,18 @@
 		return(KErrNotReady);
 	TInt r;
 	CMountCB* pM=NULL;
-	TRACE2(UTF::EBorder, UTraceModuleFileSys::ECFileSystemNewMountL, EF32TraceUidFileSys, &FSys(), DriveNumber());
+	OstTraceExt2(TRACE_FILESYSTEM, FSYS_ECFILESYSTEMNEWMOUNTL1, "this %x drive %d", (TUint) &FSys(), (TUint) DriveNumber());
 	TRAP(r,pM=FSys().NewMountL());
-	TRACERET2(UTF::EBorder, UTraceModuleFileSys::ECFileSystemNewMountLRet, EF32TraceUidFileSys, r, pM);
+	OstTraceExt2(TRACE_FILESYSTEM, FSYS_ECFILESYSTEMNEWMOUNTL1RET, "r %d CMountCB %x", (TUint) r, (TUint) pM);
 	if(r!=KErrNone)
 		return(r);
 	pM->SetDrive(this);
-
-	TRACE4(UTF::EBorder, UTraceModuleFileSys::ECMountCBForceRemountDrive, EF32TraceUidFileSys, 
-		DriveNumber(), aMountInfo, aMountInfoMessageHandle, aFlags);
+	OstTraceExt4(TRACE_FILESYSTEM, FSYS_ECMOUNTCBFORCEREMOUNTDRIVE, "drive %d aMountInfo %x aMountInfoMessageHandle %x aFlags %x", (TUint) DriveNumber(), (TUint) aMountInfo, (TUint) aMountInfoMessageHandle, (TUint) aFlags);
 	r=pM->ForceRemountDrive(aMountInfo,aMountInfoMessageHandle,aFlags);
-	TRACERET1(UTF::EBorder, UTraceModuleFileSys::ECMountCBForceRemountDriveRet, EF32TraceUidFileSys, r);
-
+	OstTrace1(TRACE_FILESYSTEM, FSYS_ECMOUNTCBFORCEREMOUNTDRIVERET, "r %d", r);
 	pM->Close();
 	return(r);
 	}
-
 TBool TDrive::IsExtensionMounted(CProxyDriveFactory* aFactory)
 //
 // return ETrue if extension mounted on the drive
@@ -1885,7 +1860,6 @@
 		}
 	return(EFalse);
 	}
-
 TInt TDrive::MountExtension(CProxyDriveFactory* aFactory,TBool aIsPrimary)
 //
 // Mount an extension
@@ -1909,7 +1883,7 @@
 	if(iFSys==NULL)
 		return(KErrNotReady);
 	TBool extSupported = iFSys->IsExtensionSupported();
-	TRACE1(UTF::EBorder, UTraceModuleFileSys::ECFileSystemIsExtensionSupported, EF32TraceUidFileSys, extSupported);
+	OstTraceExt2(TRACE_FILESYSTEM, FSYS_ECFILESYSTEMISEXTENSIONSUPPORTED1, "%x r %d", (TUint) iFSys, (TUint) extSupported);
 	if(!extSupported)
 		return(KErrNotSupported);
 	if(IsExtensionMounted(aFactory))
@@ -1997,17 +1971,16 @@
 		return(KErrNotReady);
 	TInt r;
 	CMountCB* pM=NULL;
-	TRACE2(UTF::EBorder, UTraceModuleFileSys::ECFileSystemNewMountL, EF32TraceUidFileSys, &FSys(), DriveNumber());
+	OstTraceExt2(TRACE_FILESYSTEM, FSYS_ECFILESYSTEMNEWMOUNTL2, "this %x drive %d", (TUint) &FSys(), (TUint) DriveNumber());
 	TRAP(r,pM=FSys().NewMountL());
-	TRACERET2(UTF::EBorder, UTraceModuleFileSys::ECFileSystemNewMountLRet, EF32TraceUidFileSys, r, pM);
+	OstTraceExt2(TRACE_FILESYSTEM, FSYS_ECFILESYSTEMNEWMOUNTL2RET, "r %d CMountCB %x", (TUint) r, (TUint) pM);
 	if(r!=KErrNone)
 		return(r);
 	pM->SetDrive(this);
 
-	TRACE2(UTF::EBorder, UTraceModuleFileSys::ECMountCBLock, EF32TraceUidFileSys, DriveNumber(), aStore);
+	OstTraceExt2(TRACE_FILESYSTEM, FSYS_ECMOUNTCBLOCK, "drive %d aStore %d", (TUint) DriveNumber(), (TUint) aStore);
 	r=pM->Lock(aOld,aNew,aStore);
-	TRACERET1(UTF::EBorder, UTraceModuleFileSys::ECMountCBLockRet, EF32TraceUidFileSys, r);
-
+	OstTrace1(TRACE_FILESYSTEM, FSYS_ECMOUNTCBLOCKRET, "r %d", r);
 	pM->Close();
 	return(r);
 	}
@@ -2023,9 +1996,9 @@
 		return(KErrNotReady);
 	TInt r;
 	CMountCB* pM=NULL;
-	TRACE2(UTF::EBorder, UTraceModuleFileSys::ECFileSystemNewMountL, EF32TraceUidFileSys, &FSys(), DriveNumber());
+	OstTraceExt2(TRACE_FILESYSTEM, FSYS_ECFILESYSTEMNEWMOUNTL3, "this %x drive %d", (TUint) &FSys(), (TUint) DriveNumber());
 	TRAP(r,pM=FSys().NewMountL());
-	TRACERET2(UTF::EBorder, UTraceModuleFileSys::ECFileSystemNewMountLRet, EF32TraceUidFileSys, r, pM);
+	OstTraceExt2(TRACE_FILESYSTEM, FSYS_ECFILESYSTEMNEWMOUNTL3RET, "r %d CMountCB %x", (TUint) r, (TUint) pM);
 	if(r!=KErrNone)
 		return(r);
 
@@ -2034,10 +2007,9 @@
 
 	pM->SetDrive(this);
 
-	TRACE2(UTF::EBorder, UTraceModuleFileSys::ECMountCBUnlock, EF32TraceUidFileSys, DriveNumber(), aStore);
+	OstTraceExt2(TRACE_FILESYSTEM, FSYS_ECMOUNTCBUNLOCK, "drive %d aStore %d", (TUint) DriveNumber(), (TUint) aStore);
 	r=pM->Unlock(aPassword,aStore);
-	TRACERET1(UTF::EBorder, UTraceModuleFileSys::ECMountCBUnlockRet, EF32TraceUidFileSys, r);
-
+	OstTrace1(TRACE_FILESYSTEM, FSYS_ECMOUNTCBUNLOCKRET, "r %d", r);
 	pM->Close();
 	return(r);
 	}
@@ -2053,9 +2025,9 @@
 		return(KErrNotReady);
 	TInt r;
 	CMountCB* pM=NULL;
-	TRACE2(UTF::EBorder, UTraceModuleFileSys::ECFileSystemNewMountL, EF32TraceUidFileSys, &FSys(), DriveNumber());
+	OstTraceExt2(TRACE_FILESYSTEM, FSYS_ECFILESYSTEMNEWMOUNTL4, "this %x drive %d", (TUint) &FSys(), (TUint) DriveNumber());
 	TRAP(r,pM=FSys().NewMountL());
-	TRACERET2(UTF::EBorder, UTraceModuleFileSys::ECFileSystemNewMountLRet, EF32TraceUidFileSys, r, pM);
+	OstTraceExt2(TRACE_FILESYSTEM, FSYS_ECFILESYSTEMNEWMOUNTL4RET, "r %d CMountCB %x", (TUint) r, (TUint) pM);
 	if(r!=KErrNone)
 		return(r);
 	pM->SetDrive(this);
@@ -2069,10 +2041,9 @@
 	if (info.iMediaAtt & KMediaAttLocked)
 		UnlockDevice(aPassword, EFalse);
 
-	TRACE1(UTF::EBorder, UTraceModuleFileSys::ECMountCBClearPassword, EF32TraceUidFileSys, DriveNumber());
+	OstTrace1(TRACE_FILESYSTEM, FSYS_ECMOUNTCBCLEARPASSWORD, "drive %d", DriveNumber());
 	r=pM->ClearPassword(aPassword);
-	TRACERET1(UTF::EBorder, UTraceModuleFileSys::ECMountCBClearPasswordRet, EF32TraceUidFileSys, r);
-
+	OstTrace1(TRACE_FILESYSTEM, FSYS_ECMOUNTCBCLEARPASSWORDRET, "r %d", r);
 	pM->Close();
 	return(r);
 	}
@@ -2088,17 +2059,16 @@
 		return(KErrNotReady);
 	TInt r;
 	CMountCB* pM=NULL;
-	TRACE2(UTF::EBorder, UTraceModuleFileSys::ECFileSystemNewMountL, EF32TraceUidFileSys, &FSys(), DriveNumber());
+	OstTraceExt2(TRACE_FILESYSTEM, FSYS_ECFILESYSTEMNEWMOUNTL5, "this %x drive %d", (TUint) &FSys(), (TUint) DriveNumber());
 	TRAP(r,pM=FSys().NewMountL());
-	TRACERET2(UTF::EBorder, UTraceModuleFileSys::ECFileSystemNewMountLRet, EF32TraceUidFileSys, r, pM);
+	OstTraceExt2(TRACE_FILESYSTEM, FSYS_ECFILESYSTEMNEWMOUNTL5RET, "r %d CMountCB %x", (TUint) r, (TUint) pM);
 	if(r!=KErrNone)
 		return(r);
 	pM->SetDrive(this);
 
-	TRACE1(UTF::EBorder, UTraceModuleFileSys::ECMountCBErasePassword, EF32TraceUidFileSys, DriveNumber());
+	OstTrace1(TRACE_FILESYSTEM, FSYS_ECMOUNTCBERASEPASSWORD, "drive %d", DriveNumber());
 	r=pM->ErasePassword();
-	TRACERET1(UTF::EBorder, UTraceModuleFileSys::ECMountCBErasePasswordRet, EF32TraceUidFileSys, r);
-
+	OstTrace1(TRACE_FILESYSTEM, FSYS_ECMOUNTCBERASEPASSWORDRET, "r %d", r);
 	pM->Close();
 	return(r);
 	}
@@ -2237,10 +2207,9 @@
 	if (!iCurrentMount)
 		return;
 
-	TRACE1(UTF::EBorder, UTraceModuleFileSys::ECMountCBDismounted, EF32TraceUidFileSys, DriveNumber());
+	OstTrace1(TRACE_FILESYSTEM, FSYS_ECMOUNTCBDISMOUNTED, "drive %d", DriveNumber());
     iCurrentMount->Dismounted();
-	TRACE0(UTF::EBorder, UTraceModuleFileSys::ECMountCBDismountedRet, EF32TraceUidFileSys);
-
+	OstTrace0(TRACE_FILESYSTEM, FSYS_ECMOUNTCBDISMOUNTEDRET, "");
 	iCurrentMount->Close();
 	iCurrentMount=NULL;
     }
@@ -2337,7 +2306,6 @@
 	}
 
 
-
 TInt TDrive::ControlIO(const RMessagePtr2& aMessage,TInt aCommand,TAny* aParam1,TAny* aParam2)
 //
 // General purpose test interface - .FSY specific.
@@ -2347,10 +2315,9 @@
 	if(r==KErrNone || (r==KErrInUse && iReason==KErrNone))
 		{
 		TRACETHREADID(aMessage);
-		TRACE5(UTF::EBorder, UTraceModuleFileSys::ECMountCBControlIO, EF32TraceUidFileSys, 
-			DriveNumber(), aCommand, aParam1, aParam2, I64LOW(threadId));
+		OstTraceExt5(TRACE_FILESYSTEM, FSYS_ECMOUNTCBCONTROLIO, "drive %d aCommand %d aParam1 %x aParam2 %x clientThreadId %x", (TUint) DriveNumber(), (TUint) aCommand, (TUint) aParam1, (TUint) aParam2, (TUint) threadId);
 		r=CurrentMount().ControlIO(aMessage,aCommand,aParam1,aParam2);
-		TRACERET1(UTF::EBorder, UTraceModuleFileSys::ECMountCBControlIORet, EF32TraceUidFileSys, r);
+		OstTrace1(TRACE_FILESYSTEM, FSYS_ECMOUNTCBCONTROLIORET, "r %d", r);
 		}
 	return(r);
 	}
@@ -2567,11 +2534,10 @@
     {
     ASSERT(!(apLDFormatInfo && apVolFormatParam));  //-- these parameters are mutually exclusive
     
-    TRACE2(UTF::EBorder, UTraceModuleFileSys::ECFileSystemNewFormatL, EF32TraceUidFileSys, &FSys(), DriveNumber()); 
-
+    OstTraceExt2(TRACE_FILESYSTEM, FSYS_ECFILESYSTEMNEWFORMATL, "this %x drive %d", (TUint) &FSys(), (TUint) DriveNumber()); 
     CFormatCB* pFormat = CurrentMount().NewFormatL(); 
 
-	TRACE2(UTF::EBorder, UTraceModuleFileSys::ECFileSystemNewFormatLRet, EF32TraceUidFileSys, KErrNone, pFormat); 
+	OstTraceExt2(TRACE_FILESYSTEM, FSYS_ECFILESYSTEMNEWFORMATLRET, "r %d CFormatCB %x", (TUint) KErrNone, (TUint) pFormat); 
 	
     Formats->AddL(pFormat, ETrue); 
 	pFormat->InitL(this, aFmtMode); 
diff -r 2a0ada0a1bf8 -r 95847726fe57 userlibandfileserver/fileserver/sfile/sf_ext.cpp
--- a/userlibandfileserver/fileserver/sfile/sf_ext.cpp	Wed May 12 10:34:10 2010 +0100
+++ b/userlibandfileserver/fileserver/sfile/sf_ext.cpp	Mon May 24 18:38:55 2010 +0100
@@ -15,9 +15,10 @@
 // 
 //
 
-
 #include "sf_std.h"
-
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "sf_extTraces.h"
+#endif
 typedef CProxyDriveFactory*(*TExtensionNew)();
 typedef CExtProxyDriveFactory*(*TProxyDriveNew)();
 
@@ -297,12 +298,10 @@
 */
 CLocalProxyDrive* CLocalProxyDrive::New(CMountCB* aMount,TBusLocalDrive& aLocDrv)
 	{
-	TRACE2(UTF::EBorder, UTraceModuleProxyDrive::ECLocalProxyDriveNew, EF32TraceUidProxyDrive, 
-		aMount, aMount->DriveNumber());
-
+	OstTraceExt2(TRACE_DRIVE, PROXYDRIVE_ECLOCALPROXYDRIVENEW, "aMount %x drive %d", (TUint) aMount, (TUint) aMount->DriveNumber());
 	CLocalProxyDrive* proxyDrive = new CLocalProxyDrive(aMount,aLocDrv);
 	
-	TRACE1(UTF::EBorder, UTraceModuleProxyDrive::ECLocalProxyDriveNewRet, EF32TraceUidProxyDrive, proxyDrive);
+	OstTrace1(TRACE_DRIVE, PROXYDRIVE_ECLOCALPROXYDRIVENEWRET, "proxyDrive %x", proxyDrive);
 	return proxyDrive;
 	}
 
@@ -328,9 +327,8 @@
 */
 TInt CLocalProxyDrive::Initialise()
 	{
-	TRACE1(UTF::EBorder, UTraceModuleProxyDrive::ECLocalProxyDriveInitialise, EF32TraceUidProxyDrive, this);
-	TRACE1(UTF::EBorder, UTraceModuleProxyDrive::ECLocalProxyDriveInitialiseRet, EF32TraceUidProxyDrive, KErrNone);
-
+	OstTrace1(TRACE_DRIVE, PROXYDRIVE_ECLOCALPROXYDRIVEINITIALISE, "this %x", this);
+	OstTrace1(TRACE_DRIVE, PROXYDRIVE_ECLOCALPROXYDRIVEINITIALISERET, "r %d", KErrNone);
 	return(KErrNone);
 	}
 
@@ -344,9 +342,8 @@
 */
 TInt CLocalProxyDrive::Dismounted()
 	{
-	TRACE1(UTF::EBorder, UTraceModuleProxyDrive::ECLocalProxyDriveDismounted, EF32TraceUidProxyDrive, this);
-	TRACE1(UTF::EBorder, UTraceModuleProxyDrive::ECLocalProxyDriveDismountedRet, EF32TraceUidProxyDrive, KErrNone);
-
+	OstTrace1(TRACE_DRIVE, PROXYDRIVE_ECLOCALPROXYDRIVEDISMOUNTED, "this %x", this);
+	OstTrace1(TRACE_DRIVE, PROXYDRIVE_ECLOCALPROXYDRIVEDISMOUNTEDRET, "r %d", KErrNone);
 	return(KErrNone);
 	}
 
@@ -360,11 +357,9 @@
 */
 TInt CLocalProxyDrive::Enlarge(TInt aLength)
 	{
-	TRACE2(UTF::EBorder, UTraceModuleProxyDrive::ECLocalProxyDriveEnlarge, EF32TraceUidProxyDrive, this, aLength);
-
+	OstTraceExt2(TRACE_DRIVE, PROXYDRIVE_ECLOCALPROXYDRIVEENLARGE, "this %x aLength %d", (TUint) this, (TUint) aLength);
 	TInt r = iLocDrv.Enlarge(aLength);
-
-	TRACERET1(UTF::EBorder, UTraceModuleProxyDrive::ECLocalProxyDriveEnlargeRet, EF32TraceUidProxyDrive, r);
+	OstTrace1(TRACE_DRIVE, PROXYDRIVE_ECLOCALPROXYDRIVEENLARGERET, "r %d", r);
 	return r;
 	}
 
@@ -382,11 +377,9 @@
 */
 TInt CLocalProxyDrive::ReduceSize(TInt aPos, TInt aLength)
 	{
-	TRACE3(UTF::EBorder, UTraceModuleProxyDrive::ECLocalProxyDriveReduceSize, EF32TraceUidProxyDrive, this, aPos, aLength);
-
+	OstTraceExt3(TRACE_DRIVE, PROXYDRIVE_ECLOCALPROXYDRIVEREDUCESIZE, "this %x aPos %x aLength %d", (TUint) this, (TUint) aPos, (TUint) aLength);
 	TInt r = iLocDrv.ReduceSize(aPos,aLength);
-
-	TRACERET1(UTF::EBorder, UTraceModuleProxyDrive::ECLocalProxyDriveReduceSizeRet, EF32TraceUidProxyDrive, r);
+	OstTrace1(TRACE_DRIVE, PROXYDRIVE_ECLOCALPROXYDRIVEREDUCESIZERET, "r %d", r);
 	return r;
 	}
 
@@ -406,12 +399,9 @@
 TInt CLocalProxyDrive::Read(TInt64 aPos,TInt aLength,const TAny* aTrg,TInt aThreadHandle,TInt aOffset, TInt aFlags)
 	{
 	TRACETHREADIDH(aThreadHandle);
-	TRACE8(UTF::EBorder, UTraceModuleProxyDrive::ECLocalProxyDriveRead1, EF32TraceUidProxyDrive, 
-		this, I64LOW(aPos), I64HIGH(aPos), aLength, aTrg, threadId, aOffset, aFlags);
-
+	OstTraceExt5(TRACE_DRIVE, PROXYDRIVE_ECLOCALPROXYDRIVEREAD1, "this %x clientThreadId %x aPos %x:%x aLength %d", (TUint) this, (TUint) threadId, (TUint) I64HIGH(aPos), (TUint) I64LOW(aPos), aLength);
 	TInt r = iLocDrv.Read(aPos,aLength,aTrg,aThreadHandle,aOffset,aFlags);
-
-	TRACERET1(UTF::EBorder, UTraceModuleProxyDrive::ECLocalProxyDriveRead1Ret, EF32TraceUidProxyDrive, r);
+	OstTrace1(TRACE_DRIVE, PROXYDRIVE_ECLOCALPROXYDRIVEREAD1RET, "r %d", r);
 	return r;
 	}
 
@@ -429,12 +419,9 @@
 TInt CLocalProxyDrive::Read(TInt64 aPos,TInt aLength,const TAny* aTrg,TInt aThreadHandle,TInt anOffset)
 	{
 	TRACETHREADIDH(aThreadHandle);
-	TRACE7(UTF::EBorder, UTraceModuleProxyDrive::ECLocalProxyDriveRead2, EF32TraceUidProxyDrive, 
-		this, I64LOW(aPos), I64HIGH(aPos), aLength, aTrg, threadId, anOffset);
-
+	OstTraceExt5(TRACE_DRIVE, PROXYDRIVE_ECLOCALPROXYDRIVEREAD2, "this %x clientThreadId %x aPos %x:%x aLength %d", (TUint) this, (TUint) threadId, (TUint) I64HIGH(aPos), (TUint) I64LOW(aPos), aLength);
 	TInt r = iLocDrv.Read(aPos,aLength,aTrg,aThreadHandle,anOffset);
-
-	TRACERET1(UTF::EBorder, UTraceModuleProxyDrive::ECLocalProxyDriveRead2Ret, EF32TraceUidProxyDrive, r);
+	OstTrace1(TRACE_DRIVE, PROXYDRIVE_ECLOCALPROXYDRIVEREAD2RET, "r %d", r);
 	return r;
 	}
 
@@ -449,12 +436,9 @@
 */
 TInt CLocalProxyDrive::Read(TInt64 aPos,TInt aLength,TDes8& aTrg)
 	{
-	TRACE5(UTF::EBorder, UTraceModuleProxyDrive::ECLocalProxyDriveRead3, EF32TraceUidProxyDrive, 
-		this, I64LOW(aPos), I64HIGH(aPos), aLength, &aTrg);
-
+	OstTraceExt5(TRACE_DRIVE, PROXYDRIVE_ECLOCALPROXYDRIVEREAD3, "this %x aPos %x:%x aLength %d aTrg %x", (TUint) this, (TUint) I64HIGH(aPos), (TUint) I64LOW(aPos), aLength, (TUint) &aTrg);
 	TInt r = iLocDrv.Read(aPos,aLength,aTrg);
-
-	TRACERET1(UTF::EBorder, UTraceModuleProxyDrive::ECLocalProxyDriveRead3Ret, EF32TraceUidProxyDrive, r);
+	OstTrace1(TRACE_DRIVE, PROXYDRIVE_ECLOCALPROXYDRIVEREAD3RET, "r %d", r);
 	return r;
 	}
 
@@ -474,13 +458,9 @@
 TInt CLocalProxyDrive::Write(TInt64 aPos,TInt aLength,const TAny* aSrc,TInt aThreadHandle,TInt aOffset,TInt aFlags)
 	{
 	TRACETHREADIDH(aThreadHandle);
-	TRACE8(UTF::EBorder, UTraceModuleProxyDrive::ECLocalProxyDriveWrite1, EF32TraceUidProxyDrive, 
-		this, I64LOW(aPos), I64HIGH(aPos), aLength, aSrc, threadId, aOffset, aFlags);
-
+	OstTraceExt5(TRACE_DRIVE, PROXYDRIVE_ECLOCALPROXYDRIVEWRITE1, "this %x clientThreadId %x aPos %x:%x aLength %d", (TUint) this, (TUint) threadId, (TUint) I64HIGH(aPos), (TUint) I64LOW(aPos), aLength);
 	TInt r = iLocDrv.Write(aPos,aLength,aSrc,aThreadHandle,aOffset,aFlags);
-
-	TRACERET1(UTF::EBorder, UTraceModuleProxyDrive::ECLocalProxyDriveWrite1Ret, EF32TraceUidProxyDrive, r);
-
+	OstTrace1(TRACE_DRIVE, PROXYDRIVE_ECLOCALPROXYDRIVEWRITE1RET, "r %d", r);
 	return r;
 	}
 
@@ -499,12 +479,9 @@
 TInt CLocalProxyDrive::Write(TInt64 aPos,TInt aLength,const TAny* aSrc,TInt aThreadHandle,TInt anOffset)
 	{
 	TRACETHREADIDH(aThreadHandle);
-	TRACE7(UTF::EBorder, UTraceModuleProxyDrive::ECLocalProxyDriveWrite2, EF32TraceUidProxyDrive, 
-		this, I64LOW(aPos), I64HIGH(aPos), aLength, aSrc, threadId, anOffset);
-
+	OstTraceExt5(TRACE_DRIVE, PROXYDRIVE_ECLOCALPROXYDRIVEWRITE2, "this %x clientThreadId %x aPos %x:%x aLength %d", (TUint) this, (TUint) threadId, (TUint) I64HIGH(aPos), (TUint) I64LOW(aPos), aLength);
 	TInt r = iLocDrv.Write(aPos,aLength,aSrc,aThreadHandle,anOffset);
-
-	TRACERET1(UTF::EBorder, UTraceModuleProxyDrive::ECLocalProxyDriveWrite2Ret, EF32TraceUidProxyDrive, r);
+	OstTrace1(TRACE_DRIVE, PROXYDRIVE_ECLOCALPROXYDRIVEWRITE2RET, "r %d", r);
 	return r;
 	}
 
@@ -519,12 +496,9 @@
 */
 TInt CLocalProxyDrive::Write(TInt64 aPos,const TDesC8& aSrc)
 	{
-	TRACE5(UTF::EBorder, UTraceModuleProxyDrive::ECLocalProxyDriveWrite3, EF32TraceUidProxyDrive, 
-		this, I64LOW(aPos), I64HIGH(aPos), aSrc.Length(), &aSrc);
-
+	OstTraceExt5(TRACE_DRIVE, PROXYDRIVE_ECLOCALPROXYDRIVEWRITE3, "this %x aPos %x:%x aLength %d aSrc %x", (TUint) this, (TUint) I64HIGH(aPos), (TUint) I64LOW(aPos), aSrc.Length(), (TUint) &aSrc);
 	TInt r = iLocDrv.Write(aPos,aSrc);
-
-	TRACERET1(UTF::EBorder, UTraceModuleProxyDrive::ECLocalProxyDriveWrite3Ret, EF32TraceUidProxyDrive, r);
+	OstTrace1(TRACE_DRIVE, PROXYDRIVE_ECLOCALPROXYDRIVEWRITE3RET, "r %d", r);
 	return r;
 	}
 	
@@ -538,11 +512,9 @@
 */
 TInt CLocalProxyDrive::Caps(TDes8& anInfo)
 	{
-	TRACE1(UTF::EBorder, UTraceModuleProxyDrive::ECLocalProxyDriveCaps, EF32TraceUidProxyDrive, this);
-
+	OstTrace1(TRACE_DRIVE, PROXYDRIVE_ECLOCALPROXYDRIVECAPS, "this %x", this);
 	TInt r = iLocDrv.Caps(anInfo);
-
-	TRACERET1(UTF::EBorder, UTraceModuleProxyDrive::ECLocalProxyDriveCapsRet, EF32TraceUidProxyDrive, r);
+	OstTrace1(TRACE_DRIVE, PROXYDRIVE_ECLOCALPROXYDRIVECAPSRET, "r %d", r);
 	return r;
 	}
 
@@ -556,12 +528,9 @@
 */
 TInt CLocalProxyDrive::Format(TFormatInfo& anInfo)
 	{
-	TRACE1(UTF::EBorder, UTraceModuleProxyDrive::ECLocalProxyDriveFormat1, EF32TraceUidProxyDrive, this);
-
+	OstTrace1(TRACE_DRIVE, PROXYDRIVE_ECLOCALPROXYDRIVEFORMAT1, "this %x", this);
 	TInt r = iLocDrv.Format(anInfo);
-
-	TRACE4(UTF::EBorder, UTraceModuleProxyDrive::ECLocalProxyDriveFormat1Ret, EF32TraceUidProxyDrive, 
-		r, anInfo.iFormatIsCurrent, anInfo.i512ByteSectorsFormatted, anInfo.iMaxBytesPerFormat);
+	OstTraceExt4(TRACE_DRIVE, PROXYDRIVE_ECLOCALPROXYDRIVEFORMAT1RET, "r %d iFormatIsCurrent %d i512ByteSectorsFormatted %d iMaxBytesPerFormat %d", (TUint) r, (TUint) anInfo.iFormatIsCurrent, (TUint) anInfo.i512ByteSectorsFormatted, (TUint) anInfo.iMaxBytesPerFormat);
 	return r;
 	}
 
@@ -576,12 +545,9 @@
 */
 TInt CLocalProxyDrive::Format(TInt64 aPos,TInt aLength)
 	{
-	TRACE4(UTF::EBorder, UTraceModuleProxyDrive::ECLocalProxyDriveFormat2, EF32TraceUidProxyDrive, 
-		this, I64LOW(aPos), I64HIGH(aPos), aLength);
-
+	OstTraceExt4(TRACE_DRIVE, PROXYDRIVE_ECLOCALPROXYDRIVEFORMAT2, "this %x aPos %x:%x aLength %d", (TUint) this, (TUint) I64HIGH(aPos), (TUint) I64LOW(aPos), (TUint) aLength);
 	TInt r = iLocDrv.Format(aPos,aLength);
-
-	TRACERET1(UTF::EBorder, UTraceModuleProxyDrive::ECLocalProxyDriveFormat2Ret, EF32TraceUidProxyDrive, r);
+	OstTrace1(TRACE_DRIVE, PROXYDRIVE_ECLOCALPROXYDRIVEFORMAT2RET, "r %d", r);
 	return r;
 	}
 
@@ -596,11 +562,9 @@
 */
 TInt CLocalProxyDrive::SetMountInfo(const TDesC8* aMountInfo,TInt aMountInfoThreadHandle)
 	{
-	TRACE3(UTF::EBorder, UTraceModuleProxyDrive::ECLocalProxyDriveSetMountInfo, EF32TraceUidProxyDrive, this, aMountInfo, aMountInfoThreadHandle);
-
+	OstTraceExt3(TRACE_DRIVE, PROXYDRIVE_ECLOCALPROXYDRIVESETMOUNTINFO, "this %x aMountInfo %x aMountInfoThreadHandle %d", (TUint) this, (TUint) aMountInfo, (TUint) aMountInfoThreadHandle);
 	TInt r = iLocDrv.SetMountInfo(aMountInfo,aMountInfoThreadHandle);
-
-	TRACERET1(UTF::EBorder, UTraceModuleProxyDrive::ECLocalProxyDriveSetMountInfoRet, EF32TraceUidProxyDrive, r);
+	OstTrace1(TRACE_DRIVE, PROXYDRIVE_ECLOCALPROXYDRIVESETMOUNTINFORET, "r %d", r);
 	return r;
 	}
 
@@ -614,11 +578,9 @@
 */
 TInt CLocalProxyDrive::ForceRemount(TUint aFlags)
 	{
-	TRACE2(UTF::EBorder, UTraceModuleProxyDrive::ECLocalProxyDriveForceRemount, EF32TraceUidProxyDrive, this, aFlags);
-
+	OstTraceExt2(TRACE_DRIVE, PROXYDRIVE_ECLOCALPROXYDRIVEFORCEREMOUNT, "this %x aFlags %x", (TUint) this, (TUint) aFlags);
 	TInt r = iLocDrv.ForceRemount(aFlags);
-
-	TRACERET1(UTF::EBorder, UTraceModuleProxyDrive::ECLocalProxyDriveForceRemountRet, EF32TraceUidProxyDrive, r);
+	OstTrace1(TRACE_DRIVE, PROXYDRIVE_ECLOCALPROXYDRIVEFORCEREMOUNTRET, "r %d", r);
 	return r;
 	}
 
@@ -635,11 +597,9 @@
 */
 TInt CLocalProxyDrive::ControlIO(const RMessagePtr2& /*aMessage*/,TInt aCommand,TAny* aParam1,TAny* aParam2)
 	{
-	TRACE1(UTF::EBorder, UTraceModuleProxyDrive::ECLocalProxyDriveControlIO, EF32TraceUidProxyDrive, this);
-
+	OstTrace1(TRACE_DRIVE, PROXYDRIVE_ECLOCALPROXYDRIVECONTROLIO, "this %x", this);
 	TInt r = iLocDrv.ControlIO(aCommand,aParam1,aParam2);
-
-	TRACERET1(UTF::EBorder, UTraceModuleProxyDrive::ECLocalProxyDriveControlIORet, EF32TraceUidProxyDrive, r);
+	OstTrace1(TRACE_DRIVE, PROXYDRIVE_ECLOCALPROXYDRIVECONTROLIORET, "r %d", r);
 	return r;
 	}
 	
@@ -654,11 +614,9 @@
 */
 TInt CLocalProxyDrive::Unlock(TMediaPassword &aPassword, TBool aStorePassword)
 	{
-	TRACE2(UTF::EBorder, UTraceModuleProxyDrive::ECLocalProxyDriveUnlock, EF32TraceUidProxyDrive, this, aStorePassword);
-
+	OstTraceExt2(TRACE_DRIVE, PROXYDRIVE_ECLOCALPROXYDRIVEUNLOCK, "this %x aPassword %d", (TUint) this, (TUint) aStorePassword);
 	TInt r = iLocDrv.Unlock(aPassword,aStorePassword);
-
-	TRACERET1(UTF::EBorder, UTraceModuleProxyDrive::ECLocalProxyDriveUnlockRet, EF32TraceUidProxyDrive, r);
+	OstTrace1(TRACE_DRIVE, PROXYDRIVE_ECLOCALPROXYDRIVEUNLOCKRET, "r %d", r);
 	return r;
 	}
 
@@ -674,11 +632,9 @@
 */
 TInt CLocalProxyDrive::Lock(TMediaPassword &aOldPassword, TMediaPassword &aNewPassword, TBool aStorePassword)
 	{
-	TRACE2(UTF::EBorder, UTraceModuleProxyDrive::ECLocalProxyDriveLock, EF32TraceUidProxyDrive, this, aStorePassword);
-
+	OstTraceExt2(TRACE_DRIVE, PROXYDRIVE_ECLOCALPROXYDRIVELOCK, "this %x aPassword %d", (TUint) this, (TUint) aStorePassword);
 	TInt r = iLocDrv.SetPassword(aOldPassword,aNewPassword,aStorePassword);
-
-	TRACERET1(UTF::EBorder, UTraceModuleProxyDrive::ECLocalProxyDriveLockRet, EF32TraceUidProxyDrive, r);
+	OstTrace1(TRACE_DRIVE, PROXYDRIVE_ECLOCALPROXYDRIVELOCKRET, "r %d", r);
 	return r;
 	}
 
@@ -692,11 +648,9 @@
 */
 TInt CLocalProxyDrive::Clear(TMediaPassword &aPassword)
 	{
-	TRACE1(UTF::EBorder, UTraceModuleProxyDrive::ECLocalProxyDriveClear, EF32TraceUidProxyDrive, this);
-
+	OstTrace1(TRACE_DRIVE, PROXYDRIVE_ECLOCALPROXYDRIVECLEAR, "this %x", this);
 	TInt r = iLocDrv.Clear(aPassword);
-
-	TRACERET1(UTF::EBorder, UTraceModuleProxyDrive::ECLocalProxyDriveClearRet, EF32TraceUidProxyDrive, r);
+	OstTrace1(TRACE_DRIVE, PROXYDRIVE_ECLOCALPROXYDRIVECLEARRET, "r %d", r);
 	return r;
 	}
 
@@ -707,11 +661,9 @@
 */
 TInt CLocalProxyDrive::ErasePassword()
 	{
-	TRACE1(UTF::EBorder, UTraceModuleProxyDrive::ECLocalProxyDriveErasePassword, EF32TraceUidProxyDrive, this);
-
+	OstTrace1(TRACE_DRIVE, PROXYDRIVE_ECLOCALPROXYDRIVEERASEPASSWORD, "this %x", this);
 	TInt r = iLocDrv.ErasePassword();
-
-	TRACERET1(UTF::EBorder, UTraceModuleProxyDrive::ECLocalProxyDriveErasePasswordRet, EF32TraceUidProxyDrive, r);
+	OstTrace1(TRACE_DRIVE, PROXYDRIVE_ECLOCALPROXYDRIVEERASEPASSWORDRET, "r %d", r);
 	return r;
 	}
 
@@ -721,17 +673,13 @@
 
 @param aPos    The position of the data which is being deleted.
 @param aLength The length of the data which is being deleted.
-
 @return System wide error code.
 */
 TInt CLocalProxyDrive::DeleteNotify(TInt64 aPos, TInt aLength)
 	{
-	TRACE4(UTF::EBorder, UTraceModuleProxyDrive::ECLocalProxyDriveDeleteNotify, EF32TraceUidProxyDrive, 
-		this, I64LOW(aPos), I64HIGH(aPos), aLength);
-
+	OstTraceExt4(TRACE_DRIVE, PROXYDRIVE_ECLOCALPROXYDRIVEDELETENOTIFY, "this %x aPos %x:%x aLength %d", (TUint) this, (TUint) I64HIGH(aPos), (TUint) I64LOW(aPos), (TUint) aLength);
 	TInt r = iLocDrv.DeleteNotify(aPos, aLength);
-
-	TRACERET1(UTF::EBorder, UTraceModuleProxyDrive::ECLocalProxyDriveDeleteNotifyRet, EF32TraceUidProxyDrive, r);
+	OstTrace1(TRACE_DRIVE, PROXYDRIVE_ECLOCALPROXYDRIVEDELETENOTIFYRET, "r %d", r);
 	return r;
 	}
 
@@ -745,20 +693,16 @@
 */	
 TInt CLocalProxyDrive::GetLastErrorInfo(TDes8 &aErrorInfo)
 	{
-	TRACE1(UTF::EBorder, UTraceModuleProxyDrive::ECLocalProxyDriveGetLastErrorInfo, EF32TraceUidProxyDrive, this);
-
+	OstTrace1(TRACE_DRIVE, PROXYDRIVE_ECLOCALPROXYDRIVEGETLASTERRORINFO, "this %x", this);
 	TInt r = iLocDrv.GetLastErrorInfo(aErrorInfo);
-
-	TRACERET1(UTF::EBorder, UTraceModuleProxyDrive::ECLocalProxyDriveGetLastErrorInfoRet, EF32TraceUidProxyDrive, r);
+	OstTrace1(TRACE_DRIVE, PROXYDRIVE_ECLOCALPROXYDRIVEGETLASTERRORINFORET, "r %d", r);
 	return r;
 	}
 
 
 TInt CLocalProxyDrive::GetInterface(TInt aInterfaceId,TAny*& aInterface,TAny* aInput)
 	{
-	TRACE3(UTF::EBorder, UTraceModuleProxyDrive::ECLocalProxyDriveGetInterface, EF32TraceUidProxyDrive, 
-		this, aInterfaceId, aInput);
-
+	OstTraceExt3(TRACE_DRIVE, PROXYDRIVE_ECLOCALPROXYDRIVEGETINTERFACE, "this %x aInterfaceId %d aInput %x", (TUint) this, (TUint) aInterfaceId, (TUint) aInput);
 	TInt r;
 	switch(aInterfaceId)
 		{
@@ -776,8 +720,7 @@
 		default:
 			r= CProxyDrive::GetInterface(aInterfaceId,aInterface,aInput);
 		}
-
-	TRACERET2(UTF::EBorder, UTraceModuleProxyDrive::ECLocalProxyDriveGetInterfaceRet, EF32TraceUidProxyDrive, r, aInterface);
+	OstTraceExt2(TRACE_DRIVE, PROXYDRIVE_ECLOCALPROXYDRIVEGETINTERFACERET, "r %d aInterface %x", (TUint) r, (TUint) aInterface);
 	return r;
 	}
 
@@ -814,11 +757,9 @@
 */
 EXPORT_C TInt CBaseExtProxyDrive::Initialise()
 	{
-	TRACE1(UTF::EBorder, UTraceModuleProxyDrive::ECBaseExtProxyDriveInitialise, EF32TraceUidProxyDrive, this);
-
+	OstTrace1(TRACE_DRIVE, PROXYDRIVE_ECBASEEXTPROXYDRIVEINITIALISE, "this %x", this);
 	TInt r = iProxy->Initialise();
-
-	TRACERET1(UTF::EBorder, UTraceModuleProxyDrive::ECBaseExtProxyDriveInitialiseRet, EF32TraceUidProxyDrive, r);
+	OstTrace1(TRACE_DRIVE, PROXYDRIVE_ECBASEEXTPROXYDRIVEINITIALISERET, "r %d", r);
 	return r;
 	}
 
@@ -830,11 +771,9 @@
 */
 EXPORT_C TInt CBaseExtProxyDrive::Dismounted()
 	{
-	TRACE1(UTF::EBorder, UTraceModuleProxyDrive::ECBaseExtProxyDriveDismounted, EF32TraceUidProxyDrive, this);
-
+	OstTrace1(TRACE_DRIVE, PROXYDRIVE_ECBASEEXTPROXYDRIVEDISMOUNTED, "this %x", this);
 	TInt r = iProxy->Dismounted();
-
-	TRACERET1(UTF::EBorder, UTraceModuleProxyDrive::ECBaseExtProxyDriveDismountedRet, EF32TraceUidProxyDrive, r);
+	OstTrace1(TRACE_DRIVE, PROXYDRIVE_ECBASEEXTPROXYDRIVEDISMOUNTEDRET, "r %d", r);
 	return r;
 	}
 
@@ -847,11 +786,9 @@
 */
 EXPORT_C TInt CBaseExtProxyDrive::Enlarge(TInt aLength)
 	{
-	TRACE2(UTF::EBorder, UTraceModuleProxyDrive::ECBaseExtProxyDriveEnlarge, EF32TraceUidProxyDrive, this, aLength);
-
+	OstTraceExt2(TRACE_DRIVE, PROXYDRIVE_ECBASEEXTPROXYDRIVEENLARGE, "this %x aLength %d", (TUint) this, (TUint) aLength);
 	TInt r = iProxy->Enlarge(aLength);
-
-	TRACERET1(UTF::EBorder, UTraceModuleProxyDrive::ECBaseExtProxyDriveEnlargeRet, EF32TraceUidProxyDrive, r);
+	OstTrace1(TRACE_DRIVE, PROXYDRIVE_ECBASEEXTPROXYDRIVEENLARGERET, "r %d", r);
 	return r;
 	}
 
@@ -869,11 +806,9 @@
 */
 EXPORT_C TInt CBaseExtProxyDrive::ReduceSize(TInt aPos, TInt aLength)
 	{
-	TRACE3(UTF::EBorder, UTraceModuleProxyDrive::ECBaseExtProxyDriveReduceSize, EF32TraceUidProxyDrive, this, aPos, aLength);
-
+	OstTraceExt3(TRACE_DRIVE, PROXYDRIVE_ECBASEEXTPROXYDRIVEREDUCESIZE, "this %x aPos %x aLength %d", (TUint) this, (TUint) aPos, (TUint) aLength);
 	TInt r = iProxy->ReduceSize(aPos,aLength);
-
-	TRACERET1(UTF::EBorder, UTraceModuleProxyDrive::ECBaseExtProxyDriveReduceSizeRet, EF32TraceUidProxyDrive, r);
+	OstTrace1(TRACE_DRIVE, PROXYDRIVE_ECBASEEXTPROXYDRIVEREDUCESIZERET, "r %d", r);
 	return r;
 	}
 
@@ -893,13 +828,9 @@
 EXPORT_C TInt CBaseExtProxyDrive::Read(TInt64 aPos,TInt aLength,const TAny* aTrg,TInt aThreadHandle,TInt aOffset,TInt aFlags)
 	{
 	TRACETHREADIDH(aThreadHandle);
-	TRACE8(UTF::EBorder, UTraceModuleProxyDrive::ECBaseExtProxyDriveRead1, EF32TraceUidProxyDrive, 
-		this, I64LOW(aPos), I64HIGH(aPos), aLength, aTrg, threadId, aOffset, aFlags);
-
+	OstTraceExt5(TRACE_DRIVE, PROXYDRIVE_ECBASEEXTPROXYDRIVEREAD1, "this %x clientThreadId %x aPos %x:%x aLength %d", (TUint) this, (TUint) threadId, (TUint) I64HIGH(aPos), (TUint) I64LOW(aPos), aLength);
 	TInt r = iProxy->Read(aPos,aLength,aTrg,aThreadHandle,aOffset,aFlags);
-
-	TRACERET1(UTF::EBorder, UTraceModuleProxyDrive::ECBaseExtProxyDriveRead1Ret, EF32TraceUidProxyDrive, r);
-
+	OstTrace1(TRACE_DRIVE, PROXYDRIVE_ECBASEEXTPROXYDRIVEREAD1RET, "r %d", r);
 	return r;
 	}
 
@@ -918,12 +849,9 @@
 EXPORT_C TInt CBaseExtProxyDrive::Read(TInt64 aPos,TInt aLength,const TAny* aTrg,TInt aThreadHandle,TInt anOffset)
 	{
 	TRACETHREADIDH(aThreadHandle);
-	TRACE7(UTF::EBorder, UTraceModuleProxyDrive::ECBaseExtProxyDriveRead2, EF32TraceUidProxyDrive, 
-		this, I64LOW(aPos), I64HIGH(aPos), aLength, aTrg, threadId, anOffset);
-
+	OstTraceExt5(TRACE_DRIVE, PROXYDRIVE_ECBASEEXTPROXYDRIVEREAD2, "this %x clientThreadId %x aPos %x:%x aLength %d", (TUint) this, (TUint) threadId, (TUint) I64HIGH(aPos), (TUint) I64LOW(aPos), aLength);
 	TInt r = iProxy->Read(aPos,aLength,aTrg,aThreadHandle,anOffset);
-
-	TRACERET1(UTF::EBorder, UTraceModuleProxyDrive::ECBaseExtProxyDriveRead2Ret, EF32TraceUidProxyDrive, r);
+	OstTrace1(TRACE_DRIVE, PROXYDRIVE_ECBASEEXTPROXYDRIVEREAD2RET, "r %d", r);
 	return r;
 	}
 
@@ -939,12 +867,10 @@
 */
 EXPORT_C TInt CBaseExtProxyDrive::Read(TInt64 aPos,TInt aLength,TDes8& aTrg)
 	{
-	TRACE5(UTF::EBorder, UTraceModuleProxyDrive::ECBaseExtProxyDriveRead3, EF32TraceUidProxyDrive, 
-		this, I64LOW(aPos), I64HIGH(aPos), aLength, &aTrg);
-
+	OstTraceExt5(TRACE_DRIVE, PROXYDRIVE_ECBASEEXTPROXYDRIVEREAD3, "this %x aPos %x:%x aLength %d aTrg %x", (TUint) this, (TUint) I64HIGH(aPos), (TUint) I64LOW(aPos), aLength, (TUint) &aTrg);
+		
 	TInt r = iProxy->Read(aPos,aLength,aTrg);
-
-	TRACERET1(UTF::EBorder, UTraceModuleProxyDrive::ECBaseExtProxyDriveRead3Ret, EF32TraceUidProxyDrive, r);
+	OstTrace1(TRACE_DRIVE, PROXYDRIVE_ECBASEEXTPROXYDRIVEREAD3RET, "r %d", r);
 	return r;
 	}
 
@@ -964,12 +890,9 @@
 EXPORT_C TInt CBaseExtProxyDrive::Write(TInt64 aPos,TInt aLength,const TAny* aSrc,TInt aThreadHandle,TInt aOffset,TInt aFlags)
 	{
 	TRACETHREADIDH(aThreadHandle);
-	TRACE8(UTF::EBorder, UTraceModuleProxyDrive::ECBaseExtProxyDriveWrite1, EF32TraceUidProxyDrive, 
-		this, I64LOW(aPos), I64HIGH(aPos), aLength, aSrc, threadId, aOffset, aFlags);
-
+	OstTraceExt5(TRACE_DRIVE, PROXYDRIVE_ECBASEEXTPROXYDRIVEWRITE1, "this %x clientThreadId %x aPos %x:%x aLength %d", (TUint) this, (TUint) threadId, (TUint) I64HIGH(aPos), (TUint) I64LOW(aPos), aLength);
 	TInt r = iProxy->Write(aPos,aLength,aSrc,aThreadHandle,aOffset,aFlags);
-
-	TRACERET1(UTF::EBorder, UTraceModuleProxyDrive::ECBaseExtProxyDriveWrite1Ret, EF32TraceUidProxyDrive, r);
+	OstTrace1(TRACE_DRIVE, PROXYDRIVE_ECBASEEXTPROXYDRIVEWRITE1RET, "r %d", r);
 	return r;
 	}
 
@@ -988,12 +911,9 @@
 EXPORT_C TInt CBaseExtProxyDrive::Write(TInt64 aPos,TInt aLength,const TAny* aSrc,TInt aThreadHandle,TInt anOffset)
 	{
 	TRACETHREADIDH(aThreadHandle);
-	TRACE7(UTF::EBorder, UTraceModuleProxyDrive::ECBaseExtProxyDriveWrite2, EF32TraceUidProxyDrive, 
-		this, I64LOW(aPos), I64HIGH(aPos), aLength, aSrc, threadId, anOffset);
-
+	OstTraceExt5(TRACE_DRIVE, PROXYDRIVE_ECBASEEXTPROXYDRIVEWRITE2, "this %x clientThreadId %x aPos %x:%x aLength %d", (TUint) this, (TUint) threadId, (TUint) I64HIGH(aPos), (TUint) I64LOW(aPos), aLength);
 	TInt r = iProxy->Write(aPos,aLength,aSrc,aThreadHandle,anOffset);
-
-	TRACERET1(UTF::EBorder, UTraceModuleProxyDrive::ECBaseExtProxyDriveWrite2Ret, EF32TraceUidProxyDrive, r);
+	OstTrace1(TRACE_DRIVE, PROXYDRIVE_ECBASEEXTPROXYDRIVEWRITE2RET, "r %d", r);
 	return r;
 	}
 
@@ -1008,12 +928,9 @@
 */
 EXPORT_C TInt CBaseExtProxyDrive::Write(TInt64 aPos,const TDesC8& aSrc)
 	{
-	TRACE5(UTF::EBorder, UTraceModuleProxyDrive::ECBaseExtProxyDriveWrite3, EF32TraceUidProxyDrive, 
-		this, I64LOW(aPos), I64HIGH(aPos), aSrc.Length(), &aSrc);
-
+	OstTraceExt5(TRACE_DRIVE, PROXYDRIVE_ECBASEEXTPROXYDRIVEWRITE3, "this %x aPos %x:%x aLength %d aSrc %x", (TUint) this, (TUint) I64HIGH(aPos), (TUint) I64LOW(aPos), aSrc.Length(), (TUint) &aSrc);
 	TInt r = iProxy->Write(aPos,aSrc);
-
-	TRACERET1(UTF::EBorder, UTraceModuleProxyDrive::ECBaseExtProxyDriveWrite3Ret, EF32TraceUidProxyDrive, r);
+	OstTrace1(TRACE_DRIVE, PROXYDRIVE_ECBASEEXTPROXYDRIVEWRITE3RET, "r %d", r);
 	return r;
 	}
 
@@ -1027,11 +944,9 @@
 */
 EXPORT_C TInt CBaseExtProxyDrive::Caps(TDes8& anInfo)
 	{
-	TRACE1(UTF::EBorder, UTraceModuleProxyDrive::ECBaseExtProxyDriveCaps, EF32TraceUidProxyDrive, this);
-
+	OstTrace1(TRACE_DRIVE, PROXYDRIVE_ECBASEEXTPROXYDRIVECAPS, "this %x", this);
 	TInt r = iProxy->Caps(anInfo);
-
-	TRACERET1(UTF::EBorder, UTraceModuleProxyDrive::ECBaseExtProxyDriveCapsRet, EF32TraceUidProxyDrive, r);
+	OstTrace1(TRACE_DRIVE, PROXYDRIVE_ECBASEEXTPROXYDRIVECAPSRET, "r %d", r);
 	return r;
 	}
 
@@ -1045,12 +960,9 @@
 */
 EXPORT_C TInt CBaseExtProxyDrive::Format(TFormatInfo& anInfo)
 	{
-	TRACE1(UTF::EBorder, UTraceModuleProxyDrive::ECBaseExtProxyDriveFormat1, EF32TraceUidProxyDrive, this);
-
+	OstTrace1(TRACE_DRIVE, PROXYDRIVE_ECBASEEXTPROXYDRIVEFORMAT1, "this %x", this);
 	TInt r = iProxy->Format(anInfo);
-
-	TRACE4(UTF::EBorder, UTraceModuleProxyDrive::ECBaseExtProxyDriveFormat1Ret, EF32TraceUidProxyDrive, 
-		r, anInfo.iFormatIsCurrent, anInfo.i512ByteSectorsFormatted, anInfo.iMaxBytesPerFormat);
+	OstTraceExt4(TRACE_DRIVE, PROXYDRIVE_ECBASEEXTPROXYDRIVEFORMAT1RET, "r %d iFormatIsCurrent %d i512ByteSectorsFormatted %d iMaxBytesPerFormat %d", (TUint) r, (TUint) anInfo.iFormatIsCurrent, (TUint) anInfo.i512ByteSectorsFormatted, (TUint) anInfo.iMaxBytesPerFormat);
 	return r;
 	}
 
@@ -1065,12 +977,9 @@
 */
 EXPORT_C TInt CBaseExtProxyDrive::Format(TInt64 aPos,TInt aLength)
 	{
-	TRACE4(UTF::EBorder, UTraceModuleProxyDrive::ECBaseExtProxyDriveFormat2, EF32TraceUidProxyDrive, 
-		this, I64LOW(aPos), I64HIGH(aPos), aLength);
-
+	OstTraceExt4(TRACE_DRIVE, PROXYDRIVE_ECBASEEXTPROXYDRIVEFORMAT2, "this %x aPos %x:%x aLength %d", (TUint) this, (TUint) I64HIGH(aPos), (TUint) I64LOW(aPos), (TUint) aLength);
 	TInt r = iProxy->Format(aPos,aLength);
-
-	TRACERET1(UTF::EBorder, UTraceModuleProxyDrive::ECBaseExtProxyDriveFormat2Ret, EF32TraceUidProxyDrive, r);
+	OstTrace1(TRACE_DRIVE, PROXYDRIVE_ECBASEEXTPROXYDRIVEFORMAT2RET, "r %d", r);
 	return r;
 	}
 
@@ -1085,11 +994,9 @@
 */
 EXPORT_C TInt CBaseExtProxyDrive::SetMountInfo(const TDesC8* aMountInfo,TInt aMountInfoThreadHandle)
 	{
-	TRACE3(UTF::EBorder, UTraceModuleProxyDrive::ECBaseExtProxyDriveSetMountInfo, EF32TraceUidProxyDrive, this, aMountInfo, aMountInfoThreadHandle);
-
+	OstTraceExt3(TRACE_DRIVE, PROXYDRIVE_ECBASEEXTPROXYDRIVESETMOUNTINFO, "this %x aMountInfo %x aMountInfoThreadHandle %x", (TUint) this, (TUint) aMountInfo, (TUint) aMountInfoThreadHandle);
 	TInt r = iProxy->SetMountInfo(aMountInfo,aMountInfoThreadHandle);
-
-	TRACERET1(UTF::EBorder, UTraceModuleProxyDrive::ECBaseExtProxyDriveSetMountInfoRet, EF32TraceUidProxyDrive, r);
+	OstTrace1(TRACE_DRIVE, PROXYDRIVE_ECBASEEXTPROXYDRIVESETMOUNTINFORET, "r %d", r);
 	return r;
 	}
 
@@ -1103,11 +1010,9 @@
 */
 EXPORT_C TInt CBaseExtProxyDrive::ForceRemount(TUint aFlags)
 	{
-	TRACE2(UTF::EBorder, UTraceModuleProxyDrive::ECBaseExtProxyDriveForceRemount, EF32TraceUidProxyDrive, this, aFlags);
-
+	OstTraceExt2(TRACE_DRIVE, PROXYDRIVE_ECBASEEXTPROXYDRIVEFORCEREMOUNT, "this %x aFlags%x", (TUint) this, (TUint) aFlags);
 	TInt r = iProxy->ForceRemount(aFlags);
-
-	TRACERET1(UTF::EBorder, UTraceModuleProxyDrive::ECBaseExtProxyDriveForceRemountRet, EF32TraceUidProxyDrive, r);
+	OstTrace1(TRACE_DRIVE, PROXYDRIVE_ECBASEEXTPROXYDRIVEFORCEREMOUNTRET, "r %d", r);
 	return r;
 	}
 
@@ -1122,11 +1027,9 @@
 */
 EXPORT_C TInt CBaseExtProxyDrive::Unlock(TMediaPassword &aPassword, TBool aStorePassword)
 	{
-	TRACE2(UTF::EBorder, UTraceModuleProxyDrive::ECBaseExtProxyDriveUnlock, EF32TraceUidProxyDrive, this, aStorePassword);
-
+	OstTraceExt2(TRACE_DRIVE, PROXYDRIVE_ECBASEEXTPROXYDRIVEUNLOCK, "this %x aPassword %d", (TUint) this, (TUint) aStorePassword);
 	TInt r = iProxy->Unlock(aPassword,aStorePassword);
-
-	TRACERET1(UTF::EBorder, UTraceModuleProxyDrive::ECBaseExtProxyDriveUnlockRet, EF32TraceUidProxyDrive, r);
+	OstTrace1(TRACE_DRIVE, PROXYDRIVE_ECBASEEXTPROXYDRIVEUNLOCKRET, "r %d", r);
 	return r;
 	}
 
@@ -1142,11 +1045,9 @@
 */
 EXPORT_C TInt CBaseExtProxyDrive::Lock(TMediaPassword &aOldPassword, TMediaPassword &aNewPassword, TBool aStorePassword)
 	{
-	TRACE2(UTF::EBorder, UTraceModuleProxyDrive::ECBaseExtProxyDriveLock, EF32TraceUidProxyDrive, this, aStorePassword);
-
+	OstTraceExt2(TRACE_DRIVE, PROXYDRIVE_ECBASEEXTPROXYDRIVELOCK, "this %x aPassword %d", (TUint) this, (TUint) aStorePassword);
 	TInt r = iProxy->Lock(aOldPassword,aNewPassword,aStorePassword);
-
-	TRACERET1(UTF::EBorder, UTraceModuleProxyDrive::ECBaseExtProxyDriveLockRet, EF32TraceUidProxyDrive, r);
+	OstTrace1(TRACE_DRIVE, PROXYDRIVE_ECBASEEXTPROXYDRIVELOCKRET, "r %d", r);
 	return r;
 	}
 
@@ -1160,11 +1061,9 @@
 */
 EXPORT_C TInt CBaseExtProxyDrive::Clear(TMediaPassword &aPassword)
 	{
-	TRACE1(UTF::EBorder, UTraceModuleProxyDrive::ECBaseExtProxyDriveClear, EF32TraceUidProxyDrive, this);
-
+	OstTrace1(TRACE_DRIVE, PROXYDRIVE_ECBASEEXTPROXYDRIVECLEAR, "this %x", this);
 	TInt r = iProxy->Clear(aPassword);
-
-	TRACERET1(UTF::EBorder, UTraceModuleProxyDrive::ECBaseExtProxyDriveClearRet, EF32TraceUidProxyDrive, r);
+	OstTrace1(TRACE_DRIVE, PROXYDRIVE_ECBASEEXTPROXYDRIVECLEARRET, "r %d", r);
 	return r;
 	}
 
@@ -1175,11 +1074,9 @@
 */
 EXPORT_C TInt CBaseExtProxyDrive::ErasePassword()
 	{
-	TRACE1(UTF::EBorder, UTraceModuleProxyDrive::ECBaseExtProxyDriveErasePassword, EF32TraceUidProxyDrive, this);
-
+	OstTrace1(TRACE_DRIVE, PROXYDRIVE_ECBASEEXTPROXYDRIVEERASEPASSWORD, "this %x", this);
 	TInt r = iProxy->ErasePassword();
-
-	TRACERET1(UTF::EBorder, UTraceModuleProxyDrive::ECBaseExtProxyDriveErasePasswordRet, EF32TraceUidProxyDrive, r);
+	OstTrace1(TRACE_DRIVE, PROXYDRIVE_ECBASEEXTPROXYDRIVEERASEPASSWORDRET, "r %d", r);
 	return r;
 	}
 
@@ -1196,11 +1093,9 @@
 */
 EXPORT_C TInt CBaseExtProxyDrive::ControlIO(const RMessagePtr2& aMessage,TInt aCommand,TAny* aParam1,TAny* aParam2)
 	{
-	TRACE1(UTF::EBorder, UTraceModuleProxyDrive::ECBaseExtProxyDriveControlIO, EF32TraceUidProxyDrive, this);
-
+	OstTrace1(TRACE_DRIVE, PROXYDRIVE_ECBASEEXTPROXYDRIVECONTROLIO, "this %x", this);
 	TInt r = iProxy->ControlIO(aMessage,aCommand,aParam1,aParam2);
-
-	TRACERET1(UTF::EBorder, UTraceModuleProxyDrive::ECBaseExtProxyDriveControlIORet, EF32TraceUidProxyDrive, r);
+	OstTrace1(TRACE_DRIVE, PROXYDRIVE_ECBASEEXTPROXYDRIVECONTROLIORET, "r %d", r);
 	return r;
 	}
 
@@ -1216,9 +1111,8 @@
 */	
 EXPORT_C TInt CBaseExtProxyDrive::GetInterface(TInt aInterfaceId,TAny*& aInterface,TAny* aInput)
 	{
-	TRACE3(UTF::EBorder, UTraceModuleProxyDrive::ECBaseExtProxyDriveGetInterface, EF32TraceUidProxyDrive, 
-		this, aInterfaceId, aInput);
-
+	OstTraceExt3(TRACE_DRIVE, PROXYDRIVE_ECBASEEXTPROXYDRIVEGETINTERFACE, "this %x aInterfaceId %d aInput %x", (TUint) this, (TUint) aInterfaceId, (TUint) aInput);
+		
 	TInt r;
 	if (aInterfaceId==EGetLocalDrive)
 		{
@@ -1226,8 +1120,7 @@
 		}
 	else	
 		r = CProxyDrive::GetInterface(aInterfaceId,aInterface,aInput);
-
-	TRACERET2(UTF::EBorder, UTraceModuleProxyDrive::ECBaseExtProxyDriveGetInterfaceRet, EF32TraceUidProxyDrive, r, aInterface);
+	OstTraceExt2(TRACE_DRIVE, PROXYDRIVE_ECBASEEXTPROXYDRIVEGETINTERFACERET, "r %d aInterface %x", (TUint) r, (TUint) aInterface);
 	return r;
 	}	
 
@@ -1241,11 +1134,9 @@
 */
 EXPORT_C TInt CBaseExtProxyDrive::GetLastErrorInfo(TDes8 &aErrorInfo)
 	{
-	TRACE1(UTF::EBorder, UTraceModuleProxyDrive::ECBaseExtProxyDriveGetLastErrorInfo, EF32TraceUidProxyDrive, this);
-
+	OstTrace1(TRACE_DRIVE, PROXYDRIVE_ECBASEEXTPROXYDRIVEGETLASTERRORINFO, "this %x", this);
 	TInt r = iProxy->GetLastErrorInfo(aErrorInfo);
-
-	TRACERET1(UTF::EBorder, UTraceModuleProxyDrive::ECBaseExtProxyDriveGetLastErrorInfoRet, EF32TraceUidProxyDrive, r);
+	OstTrace1(TRACE_DRIVE, PROXYDRIVE_ECBASEEXTPROXYDRIVEGETLASTERRORINFORET, "r %d", r);
 	return r;
 	}
 
@@ -1261,12 +1152,9 @@
 */
 EXPORT_C TInt CBaseExtProxyDrive::DeleteNotify(TInt64 aPos, TInt aLength)
     {
-	TRACE4(UTF::EBorder, UTraceModuleProxyDrive::ECBaseExtProxyDriveDeleteNotify, EF32TraceUidProxyDrive, 
-		this, I64LOW(aPos), I64HIGH(aPos), aLength);
-
+	OstTraceExt4(TRACE_DRIVE, PROXYDRIVE_ECBASEEXTPROXYDRIVEDELETENOTIFY, "this %x aPos %x:%x aLength %d", (TUint) this, (TUint) I64HIGH(aPos), (TUint) I64LOW(aPos), (TUint) aLength);
     TInt r = iProxy->DeleteNotify(aPos, aLength);
-
-	TRACERET1(UTF::EBorder, UTraceModuleProxyDrive::ECBaseExtProxyDriveDeleteNotifyRet, EF32TraceUidProxyDrive, r);
+	OstTrace1(TRACE_DRIVE, PROXYDRIVE_ECBASEEXTPROXYDRIVEDELETENOTIFYRET, "r %d", r);
 	return r;
     }
 
@@ -1339,7 +1227,7 @@
 		return(aConcreteDrive);
 
 	TBool extSupported = drive.FSys().IsExtensionSupported();
-	TRACE1(UTF::EBorder, UTraceModuleFileSys::ECFileSystemIsExtensionSupported, EF32TraceUidProxyDrive, extSupported);
+	OstTraceExt2(TRACE_DRIVE, FSYS_ECFILESYSTEMISEXTENSIONSUPPORTED2, "%x r %d", (TUint) &drive.FSys(), (TUint) extSupported);
 	if(!extSupported)
 		{
 		delete(aConcreteDrive);
diff -r 2a0ada0a1bf8 -r 95847726fe57 userlibandfileserver/fileserver/sfile/sf_file.cpp
--- a/userlibandfileserver/fileserver/sfile/sf_file.cpp	Wed May 12 10:34:10 2010 +0100
+++ b/userlibandfileserver/fileserver/sfile/sf_file.cpp	Mon May 24 18:38:55 2010 +0100
@@ -16,7 +16,9 @@
 #include "sf_std.h"
 #include "sf_file_cache.h"
 #include "cl_std.h"
-
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "sf_fileTraces.h"
+#endif
 #if defined(_DEBUG) || defined(_DEBUG_RELEASE)
 
 TInt OutputTraceInfo(CFsRequest* aRequest,TCorruptNameRec* aNameRec)
@@ -1494,11 +1496,9 @@
 	r=share->CheckMount();
 	if (r!=KErrNone)
 		return(r);
-
-	TRACE1(UTF::EBorder, UTraceModuleFileSys::ECFileCBFlushDataL, EF32TraceUidFileSys, &share->File());
+	OstTrace1(TRACE_FILESYSTEM, FSYS_ECFILECBFLUSHDATAL1, "this %x", &share->File());
 	TRAP(r,share->File().FlushDataL());
-	TRACERET1(UTF::EBorder, UTraceModuleFileSys::ECFileCBFlushDataLRet, EF32TraceUidFileSys, r);
-
+	OstTrace1(TRACE_FILESYSTEM, FSYS_ECFILECBFLUSHDATAL1RET, "r %d", r);
 	return(r);
 	}
 
@@ -1667,11 +1667,9 @@
     TUint setAttMask=(TUint)(aRequest->Message().Int0());
 	TUint clearAttMask=(TUint)aRequest->Message().Int1();
 	ValidateAtts(share->File().Att(),setAttMask,clearAttMask);
-
-	TRACE5(UTF::EBorder, UTraceModuleFileSys::ECFileCBSetEntryL, EF32TraceUidFileSys, &share->File(), 0, 0, setAttMask,clearAttMask);
+	OstTraceExt3(TRACE_FILESYSTEM, FSYS_ECFILECBSETENTRYL1, "this %x aSetAttMask %x aClearAttMask %x", (TUint) &share->File(), (TUint) setAttMask, (TUint) clearAttMask);
 	TRAP(r,share->File().SetEntryL(TTime(0),setAttMask,clearAttMask))
-	TRACERET1(UTF::EBorder, UTraceModuleFileSys::ECFileCBSetEntryLRet, EF32TraceUidFileSys, r);
-
+	OstTrace1(TRACE_FILESYSTEM, FSYS_ECFILECBSETENTRYL1RET, "r %d", r);
 	return(r);
 	}
 
@@ -1733,11 +1731,9 @@
 	TTime time;
 	TPtr8 t((TUint8*)&time,sizeof(TTime));
 	aRequest->ReadL(KMsgPtr0,t);
-
-	TRACE5(UTF::EBorder, UTraceModuleFileSys::ECFileCBSetEntryL, EF32TraceUidFileSys, &share->File(), 0, 0, KEntryAttModified,0);
+	OstTraceExt3(TRACE_FILESYSTEM, FSYS_ECFILECBSETENTRYL2, "this %x aSetAttMask %x aClearAttMask %x", (TUint) &share->File(), (TUint) KEntryAttModified, (TUint) 0);
 	TRAP(r,share->File().SetEntryL(time,KEntryAttModified,0))
-	TRACERET1(UTF::EBorder, UTraceModuleFileSys::ECFileCBSetEntryLRet, EF32TraceUidFileSys, r);
-
+	OstTrace1(TRACE_FILESYSTEM, FSYS_ECFILECBSETENTRYL2RET, "r %d", r);
 	return(r);
 	}
 
@@ -1782,10 +1778,9 @@
 	TUint clearAttMask=(TUint)aRequest->Message().Int2();
 	ValidateAtts(share->File().Att(),setAttMask,clearAttMask);//	Validate attributes
 
-	TRACE5(UTF::EBorder, UTraceModuleFileSys::ECFileCBSetEntryL, EF32TraceUidFileSys, &share->File(), 0, 0, setAttMask,clearAttMask);
+	OstTraceExt3(TRACE_FILESYSTEM, FSYS_ECFILECBSETENTRYL3, "this %x aSetAttMask %x aClearAttMask %x", (TUint) &share->File(), (TUint) setAttMask, (TUint) clearAttMask);
 	TRAP(r,share->File().SetEntryL(time,setAttMask,clearAttMask))
-	TRACERET1(UTF::EBorder, UTraceModuleFileSys::ECFileCBSetEntryLRet, EF32TraceUidFileSys, r);
-
+	OstTrace1(TRACE_FILESYSTEM, FSYS_ECFILECBSETENTRYL3RET, "r %d", r);
 	return(r);
 	}
 
@@ -1887,12 +1882,10 @@
 
 	TPtrC filePath = aRequest->Dest().FullName().Mid(2);
 	CFileCB& file = share->File();
-
-	TRACEMULT2(UTF::EBorder, UTraceModuleFileSys::ECFileCBRenameL, EF32TraceUidFileSys, 
-		(TUint) &file, filePath);
+	OstTrace1(TRACE_FILESYSTEM, FSYS_ECFILECBRENAMEL, "this %x", (TUint) &file);
+	OstTraceData(TRACE_FILESYSTEM, FSYS_ECFILECBRENAMELYS_EFILENAME, "FileName %S", filePath.Ptr(), filePath.Length()<<1);
 	TRAP(r,file.RenameL(filePath));
-	TRACERETMULT1(UTF::EBorder, UTraceModuleFileSys::ECFileCBRenameLRet, EF32TraceUidFileSys, r);
-
+	OstTrace1(TRACE_FILESYSTEM, FSYS_ECFILECBRENAMELRET, "r %d", r);
 	// Re-write the file's folded name & re-calculate the hash
 	if (r == KErrNone)
 		{
@@ -2337,10 +2330,11 @@
 		FileCache()->Close();
 	if (iBody && iBody->iDeleteOnClose)
 		{
-		TRACEMULT2(UTF::EBorder, UTraceModuleFileSys::ECMountCBDeleteL, EF32TraceUidFileSys, DriveNumber(), FileName());
+		OstTrace1(TRACE_FILESYSTEM, FSYS_ECMOUNTCBDELETEL2, "drive %d", DriveNumber());
+		OstTraceData(TRACE_FILESYSTEM, FSYS_ECMOUNTCBDELETEL2_EFILENAME, "FileName %S", FileName().Ptr(), FileName().Length()<<1);
 		TInt r;
 		TRAP(r, iMount->DeleteL(FileName()));
-		TRACERET1(UTF::EBorder, UTraceModuleFileSys::ECMountCBDeleteLRet, EF32TraceUidFileSys, r);
+		OstTrace1(TRACE_FILESYSTEM, FSYS_ECMOUNTCBDELETEL2RET, "r %d", r);
 		}
 
 	if(iMount)
@@ -2958,32 +2952,25 @@
 void CFileCB::ReadL(TInt64 aPos,TInt& aLength,TDes8* aDes,const RMessagePtr2& aMessage, TInt aOffset)
 	{
 	TRACETHREADID(aMessage);
-	TRACE7(UTF::EBorder, UTraceModuleFileSys::ECFileCBReadL, EF32TraceUidFileSys, 
-		this, I64LOW(aPos), I64HIGH(aPos), aLength, aDes, threadId, aOffset);
-
+	OstTraceExt5(TRACE_FILESYSTEM, FSYS_ECFILECBREADLA, "this %x clientThreadId %x aPos %x:%x aLength %d", (TUint) this, (TUint) threadId, (TUint) I64HIGH(aPos), (TUint) I64LOW(aPos), (TUint) aLength);
 	iBody->iExtendedFileInterface->ReadL(aPos,aLength,aDes,aMessage,aOffset);
 
-	TRACE1(UTF::EBorder, UTraceModuleFileSys::ECFileCBReadLRet, EF32TraceUidFileSys, KErrNone);
+	OstTrace1(TRACE_FILESYSTEM, FSYS_ECFILECBREADLRET, "r %d", KErrNone);
 	}
 
 void CFileCB::WriteL(TInt64 aPos,TInt& aLength,const TDesC8* aDes,const RMessagePtr2& aMessage, TInt aOffset)
 	{
 	TRACETHREADID(aMessage);
-	TRACE7(UTF::EBorder, UTraceModuleFileSys::ECFileCBWriteL, EF32TraceUidFileSys, 
-		this, I64LOW(aPos), I64HIGH(aPos), aLength, aDes, threadId, aOffset);
-
+	OstTraceExt5(TRACE_FILESYSTEM, FSYS_ECFILECBWRITEL, "this %x clientThreadId %x aPos %x:%x aLength %d", (TUint) this, (TUint) threadId, (TUint) I64HIGH(aPos), (TUint) I64LOW(aPos), (TUint) aLength);
 	iBody->iExtendedFileInterface->WriteL(aPos,aLength,aDes,aMessage,aOffset);
-
-	TRACE1(UTF::EBorder, UTraceModuleFileSys::ECFileCBWriteLRet, EF32TraceUidFileSys, KErrNone);
+	OstTrace1(TRACE_FILESYSTEM, FSYS_ECFILECBWRITELRET, "r %d", KErrNone);
 	}
 
 void CFileCB::SetSizeL(TInt64 aSize)
 	{
-	TRACE3(UTF::EBorder, UTraceModuleFileSys::ECFileCBSetSizeL, EF32TraceUidFileSys, this, I64LOW(aSize), I64HIGH(aSize));
-
+	OstTraceExt3(TRACE_FILESYSTEM, FSYS_ECFILECBSETSIZEL, "this %x aSize %x:%x", (TUint) this, (TUint) I64HIGH(aSize), (TUint) I64LOW(aSize));
 	iBody->iExtendedFileInterface->SetSizeL(aSize);
-
-	TRACE1(UTF::EBorder, UTraceModuleFileSys::ECFileCBSetSizeLRet, EF32TraceUidFileSys, KErrNone);
+	OstTrace1(TRACE_FILESYSTEM, FSYS_ECFILECBSETSIZELRET, "r %d", KErrNone);
 	}
 
 TBool CFileCB::ExtendedFileInterfaceSupported()
@@ -3029,12 +3016,9 @@
 
 TInt CFileCB::GetInterfaceTraced(TInt aInterfaceId, TAny*& aInterface, TAny* aInput)
 	{
-	TRACE2(UTF::EBorder, UTraceModuleFileSys::ECFileCBGetInterface, EF32TraceUidFileSys, aInterfaceId, aInput);
-
+	OstTraceExt2(TRACE_FILESYSTEM, FSYS_ECFILECBGETINTERFACE, "aInterfaceId %d aInput %x", (TUint) aInterfaceId, (TUint) aInput);
 	TInt r = GetInterface(aInterfaceId, aInterface, aInput);
-
-	TRACERET2(UTF::EBorder, UTraceModuleFileSys::ECFileCBGetInterfaceRet, EF32TraceUidFileSys, r, aInterface);
-
+	OstTraceExt2(TRACE_FILESYSTEM, FSYS_ECFILECBGETINTERFACERET, "r %d aInterface %x", (TUint) r, (TUint) aInterface);
 	return r;
 	}
 
@@ -3115,11 +3099,9 @@
 		r=share->CheckMount();
 		if (r!=KErrNone)
 			return(r);
-
-		TRACE1(UTF::EBorder, UTraceModuleFileSys::ECFileCBFlushDataL, EF32TraceUidFileSys, &share->File());
+		OstTrace1(TRACE_FILESYSTEM, FSYS_ECFILECBFLUSHDATAL2, "this %x", &share->File());
 		TRAP(r,share->File().FlushDataL());
-		TRACERET1(UTF::EBorder, UTraceModuleFileSys::ECFileCBFlushDataLRet, EF32TraceUidFileSys, r);
-
+		OstTrace1(TRACE_FILESYSTEM, FSYS_ECFILECBFLUSHDATAL2RET, "r %d", r);
 		if(r!=KErrNone)
 			return(r);
 		}
@@ -3698,4 +3680,3 @@
 
 
 
-
diff -r 2a0ada0a1bf8 -r 95847726fe57 userlibandfileserver/fileserver/sfile/sf_file_cache.cpp
--- a/userlibandfileserver/fileserver/sfile/sf_file_cache.cpp	Wed May 12 10:34:10 2010 +0100
+++ b/userlibandfileserver/fileserver/sfile/sf_file_cache.cpp	Mon May 24 18:38:55 2010 +0100
@@ -32,6 +32,10 @@
 #include "sf_cache_client.h"
 #include "sf_file_cache_defs.h"
 
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "sf_file_cacheTraces.h"
+#endif
+
 
 // disables flushing of stale cachelines before each write
 #define LAZY_WRITE
@@ -1996,11 +2000,11 @@
 			// However if the write error is to the bootsector remounting will always fail because the boot
 			// sector will have changed and hence the disk is useless.
 			// 
-			TRACE1(UTF::EBorder, UTraceModuleFileSys::ECMountCBReMount, EF32TraceUidFileSys, DriveNumber());
+			OstTrace1(TRACE_FILESYSTEM, FSYS_ECMOUNTCBREMOUNT2, "drive %d", DriveNumber());
 
 			TInt remountSuccess = iDrive->ReMount(*iMount);
 
-			TRACE1(UTF::EBorder, UTraceModuleFileSys::ECMountCBReMountRet, EF32TraceUidFileSys, remountSuccess);
+			OstTrace1(TRACE_FILESYSTEM, FSYS_ECMOUNTCBREMOUNT2RET, "success %d", remountSuccess);
 			if (!remountSuccess)
 				continue;
 			
diff -r 2a0ada0a1bf8 -r 95847726fe57 userlibandfileserver/fileserver/sfile/sf_fmt.cpp
--- a/userlibandfileserver/fileserver/sfile/sf_fmt.cpp	Wed May 12 10:34:10 2010 +0100
+++ b/userlibandfileserver/fileserver/sfile/sf_fmt.cpp	Mon May 24 18:38:55 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);
diff -r 2a0ada0a1bf8 -r 95847726fe57 userlibandfileserver/fileserver/sfile/sf_main.cpp
--- a/userlibandfileserver/fileserver/sfile/sf_main.cpp	Wed May 12 10:34:10 2010 +0100
+++ b/userlibandfileserver/fileserver/sfile/sf_main.cpp	Mon May 24 18:38:55 2010 +0100
@@ -26,9 +26,6 @@
 #endif
 #include "d32btrace.h"
 
-// define this macro to enable tracing very early on in the boot sequence
-//#define __ENABLE_TRACE__
-
 #ifdef __EPOC32__
 _LIT(KStartupExeSysBinName,"Z:\\Sys\\Bin\\ESTART.EXE");
 #else
@@ -286,35 +283,6 @@
 	User::SetCritical(User::ESystemCritical);
 
 	TInt r;
-#ifdef SYMBIAN_FTRACE_ENABLE
-	r = User::LoadLogicalDevice(_L("D_FTRACE"));	
-	__PRINT1(_L("User::LoadLogicalDevice(D_FTRACE) returns %d"),r);
-	__ASSERT_ALWAYS(r==KErrNone || r==KErrAlreadyExists,Fault(ETraceLddLoadFailure));
-
-	r = TheFtrace.Open(EOwnerProcess);
-	__ASSERT_ALWAYS(r==KErrNone || r==KErrAlreadyExists,Fault(ETraceLddLoadFailure));
-#endif
-
-#if defined (__ENABLE_TRACE__)
-		{
-		RBTrace trace;
-		
-		trace.Open();
-		
-//		trace.SetMode(RBTrace::EEnable + RBTrace::EFreeRunning);
-		trace.SetFilter(BTrace::EThreadIdentification,1);
-
-		trace.SetFilter(UTF::EBorder,1);
-		trace.SetFilter(UTF::EError,1);
-
-		trace.SetFilter2(EF32TraceUidEfsrv,1);
-//		trace.SetFilter2(EF32TraceUidFileSys,1);
-//		trace.SetFilter2(EF32TraceUidProxyDrive,1);
-
-		trace.Close();	
-		}
-
-#endif
 
 //
 // Load the file system's device driver
diff -r 2a0ada0a1bf8 -r 95847726fe57 userlibandfileserver/fileserver/sfile/sf_mnt.cpp
--- a/userlibandfileserver/fileserver/sfile/sf_mnt.cpp	Wed May 12 10:34:10 2010 +0100
+++ b/userlibandfileserver/fileserver/sfile/sf_mnt.cpp	Mon May 24 18:38:55 2010 +0100
@@ -15,6 +15,10 @@
 
 #include "sf_std.h"
 
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "sf_mntTraces.h"
+#endif
+
 
 
 
@@ -369,12 +373,11 @@
 
 TInt CMountCB::GetInterfaceTraced(TInt aInterfaceId, TAny*& aInterface, TAny* aInput)
 	{
-	TRACE3(UTF::EBorder, UTraceModuleFileSys::ECMountCBGetInterface, EF32TraceUidFileSys, 
-		DriveNumber(), aInterfaceId, aInput);
+	OstTraceExt3(TRACE_FILESYSTEM, FSYS_ECMOUNTCBGETINTERFACE, "drive %d aInterfaceId %d aInput %x", (TUint) DriveNumber(), (TUint) aInterfaceId, (TUint) aInput);
 
 	TInt r = GetInterface(aInterfaceId, aInterface, aInput);
 
-	TRACERET2(UTF::EBorder, UTraceModuleFileSys::ECMountCBGetInterfaceRet, EF32TraceUidFileSys, r, aInterface);
+	OstTraceExt2(TRACE_FILESYSTEM, FSYS_ECMOUNTCBGETINTERFACERET, "r %d aInterface %x", (TUint) r, (TUint) aInterface);
 
 	return r;
 	}
diff -r 2a0ada0a1bf8 -r 95847726fe57 userlibandfileserver/fileserver/sfile/sf_plugin_shim.cpp
--- a/userlibandfileserver/fileserver/sfile/sf_plugin_shim.cpp	Wed May 12 10:34:10 2010 +0100
+++ b/userlibandfileserver/fileserver/sfile/sf_plugin_shim.cpp	Mon May 24 18:38:55 2010 +0100
@@ -703,11 +703,6 @@
 	TPckgBuf<TInt> reply;
 	args.Set(3,&reply);
 
-	// copy session pointer
-	RLocalMessage message = iMessage;
-	message.SetFunction(aFunction);
-	message.SetArgs(args);
-
 	TInt err = Dispatch(aFunction, args);
 	if (err == KErrNone)
 		*aReply = reply();
diff -r 2a0ada0a1bf8 -r 95847726fe57 userlibandfileserver/fileserver/sfile/sf_raw.cpp
--- a/userlibandfileserver/fileserver/sfile/sf_raw.cpp	Wed May 12 10:34:10 2010 +0100
+++ b/userlibandfileserver/fileserver/sfile/sf_raw.cpp	Mon May 24 18:38:55 2010 +0100
@@ -18,6 +18,10 @@
 #include "sf_std.h"
 #include "sf_file_cache.h"
 
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "sf_rawTraces.h"
+#endif
+
 LOCAL_C CRawDiskCB* GetRawDiskFromHandle(TInt aHandle, CSessionFs* aSession)
 //
 // Get the rawdisk control block from aHandle
@@ -112,10 +116,11 @@
 	const TAny* pDes=aRequest->Message().Ptr0();
 
 	TRACETHREADID(aRequest->Message());
-	TRACE7(UTF::EBorder, UTraceModuleFileSys::ECMountCBRawReadL, EF32TraceUidFileSys, 
-		aRequest->DriveNumber(), I64LOW(pos), I64HIGH(pos), length, pDes, 0, I64LOW(threadId));
+	OstTraceExt5(TRACE_FILESYSTEM, FSYS_ECMOUNTCBRAWREADL, "drive %d clientThreadId %x aPos %x:%x aLength %d", (TUint) aRequest->DriveNumber(), (TUint) threadId, (TUint) I64HIGH(pos), (TUint) I64LOW(pos), (TUint) length);
+
 	TRAP(r,rawDisk->Mount().RawReadL(pos,length,pDes,0,aRequest->Message()));
-	TRACERET1(UTF::EBorder, UTraceModuleFileSys::ECMountCBRawReadLRet, EF32TraceUidFileSys, r);
+
+	OstTrace1(TRACE_FILESYSTEM, FSYS_ECMOUNTCBRAWREADLRET, "r %d", r);
 
 	return(r);
 	}
@@ -159,10 +164,11 @@
 	const TAny* pDes=aRequest->Message().Ptr0();
 
 	TRACETHREADID(aRequest->Message());
-	TRACE7(UTF::EBorder, UTraceModuleFileSys::ECMountCBRawWriteL, EF32TraceUidFileSys, 
-		aRequest->DriveNumber(), I64LOW(pos), I64HIGH(pos), length, pDes, 0, I64LOW(threadId));
+	OstTraceExt5(TRACE_FILESYSTEM, FSYS_ECMOUNTCBRAWWRITEL, "drive %d clientThreadId %x aPos %x:%x aLength %d", (TUint) aRequest->DriveNumber(), (TUint) threadId, (TUint) I64HIGH(pos), (TUint) I64LOW(pos), (TUint) length);
+
 	TRAP(r,rawDisk->Mount().RawWriteL(pos,length,pDes,0,aRequest->Message()));
-	TRACERET1(UTF::EBorder, UTraceModuleFileSys::ECMountCBRawWriteLRet, EF32TraceUidFileSys, r);
+
+	OstTrace1(TRACE_FILESYSTEM, FSYS_ECMOUNTCBRAWWRITELRET, "r %d", r);
 
 	rawDisk->SetChanged();
 	return(r);
diff -r 2a0ada0a1bf8 -r 95847726fe57 userlibandfileserver/fileserver/sfile/sf_std.h
--- a/userlibandfileserver/fileserver/sfile/sf_std.h	Wed May 12 10:34:10 2010 +0100
+++ b/userlibandfileserver/fileserver/sfile/sf_std.h	Mon May 24 18:38:55 2010 +0100
@@ -34,7 +34,6 @@
 #include "sf_func.h"
 #include <F32plugin.h>
 #include "f32trace.h"
-#include <utraceefile.h>
 
 #define __PRINT1TEMP_ALWAYS(t,a) {{TBuf<KMaxFileName>temp(a);RDebug::Print(t,&temp);}}
 #define __PRINT2TEMP_ALWAYS(t,a,b) {{TBuf<KMaxFileName>temp(b);RDebug::Print(t,a,&temp);}}
@@ -1712,7 +1711,6 @@
 extern HBufC* TheDriveNames[];
 extern TDrive TheDrives[KMaxDrives];
 extern TFileName TheDefaultPath;
-extern RFTrace TheFtrace;
 
 extern SCapabilitySet AllCapabilities;
 extern SCapabilitySet DisabledCapabilities;
diff -r 2a0ada0a1bf8 -r 95847726fe57 userlibandfileserver/fileserver/sfile/sf_sys.cpp
--- a/userlibandfileserver/fileserver/sfile/sf_sys.cpp	Wed May 12 10:34:10 2010 +0100
+++ b/userlibandfileserver/fileserver/sfile/sf_sys.cpp	Mon May 24 18:38:55 2010 +0100
@@ -18,9 +18,13 @@
 #include "sf_std.h"
 #include <e32uid.h>
 #include "sf_file_cache.h"
-#include <kernel\localise.h>
+#include <kernel/localise.h>
 #include <f32file.h>
 
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "sf_sysTraces.h"
+#endif
+
 typedef CFileSystem*(*TFileSystemNew)();
 extern CProxyDriveFactory* GetExtension(const TDesC& aName);
 
@@ -39,8 +43,8 @@
 */
 EXPORT_C CFileSystem::CFileSystem()
 	{
-	TRACE0(UTF::EBorder, UTraceModuleFileSys::ECFileSystemConstructor, EF32TraceUidFileSys);
-	TRACE0(UTF::EBorder, UTraceModuleFileSys::ECFileSystemConstructorReturn, EF32TraceUidFileSys);
+	OstTrace0(TRACE_FILESYSTEM, FSYS_ECFILESYSTEMCONSTRUCTOR, "");
+	OstTrace0(TRACE_FILESYSTEM,FILESYS_ECFILESYSTEMCONSTRUCTORRETURN, "");
 	}
 
 /**
@@ -48,8 +52,8 @@
 */
 EXPORT_C CFileSystem::~CFileSystem()
 	{
-	TRACE0(UTF::EBorder, UTraceModuleFileSys::ECFileSystemDestructor, EF32TraceUidFileSys);
-	TRACE0(UTF::EBorder, UTraceModuleFileSys::ECFileSystemDestructorReturn, EF32TraceUidFileSys);
+	OstTrace0(TRACE_FILESYSTEM, FSYS_ECFILESYSTEMDESTRUCTOR, "");
+	OstTrace0(TRACE_FILESYSTEM, FSYS_ECFILESYSTEMDESTRUCTORRETURN, "");
 	}
 
 /**
@@ -266,22 +270,25 @@
 //
 	{
 
-	TRACE1(UTF::EBorder, UTraceModuleFileSys::ECFileSystemInstall, EF32TraceUidFileSys, aSys);
+	OstTrace1(TRACE_FILESYSTEM, FSYS_ECFILESYSTEMINSTALL, "this %x", aSys);
+
 	TInt r=aSys->Install();
-	TRACERETMULT2(UTF::EBorder, UTraceModuleFileSys::ECFileSystemInstallRet, EF32TraceUidFileSys, r, aSys->Name());
+
+	OstTraceData(TRACE_FILESYSTEM, FSYS_ECFILESYSTEMINSTALLYS_EFILESYSTEMNAME, "FileSystemName %S", aSys->Name().Ptr(), aSys->Name().Length()<<1);
+	OstTrace1(TRACE_FILESYSTEM, FSYS_ECFILESYSTEMINSTALLRET, "r %d", r);
 
 	__PRINT1TEMP(_L("InstallFileSystem %S"),aSys->Name());
 	if (r==KErrNone)
 		{TRAP(r,FileSystems->AddL(aSys,ETrue))}
 	if (r!=KErrNone)
 		{
-		TRACE1(UTF::EBorder, UTraceModuleFileSys::ECFileSystemRemove, EF32TraceUidFileSys, aSys);
-#ifdef SYMBIAN_FTRACE_ENABLE
+		OstTrace1(TRACE_FILESYSTEM, FSYS_ECFILESYSTEMREMOVE1, "this %x", aSys);
+#ifdef OST_TRACE_COMPILER_IN_USE
 		TInt r = 
 #endif
 			aSys->Remove();
 		
-		TRACERET1(UTF::EBorder, UTraceModuleFileSys::ECFileSystemRemoveRet, EF32TraceUidFileSys, r);
+		OstTrace1(TRACE_FILESYSTEM, FSYS_ECFILESYSTEMREMOVE1RET, "r %d", r);
 		}
 	if (r==KErrNone)
 		aSys->SetLibrary(aLib);
@@ -320,9 +327,9 @@
 	if (!f)
 		return KErrCorrupt;
 	
-	TRACE1(UTF::EBorder, UTraceModuleFileSys::ECFileSystemNew, EF32TraceUidFileSys, lib.Handle());
+	OstTrace1(TRACE_FILESYSTEM, FSYS_ECFILESYSTEMNEW, "handle %x", lib.Handle());
 	CFileSystem* pS=(*f)();
-	TRACE1(UTF::EBorder, UTraceModuleFileSys::ECFileSystemNewRet, EF32TraceUidFileSys, pS);
+	OstTrace1(TRACE_FILESYSTEM, FSYS_ECFILESYSTEMNEWRET, "fileSystem %x", pS);
 	if (!pS)
 		return KErrNoMemory;
 	TInt r=InstallFileSystem(pS,lib);
@@ -374,9 +381,12 @@
 			return KErrInUse;
 		}
 	
-    TRACE1(UTF::EBorder, UTraceModuleFileSys::ECFileSystemRemove, EF32TraceUidFileSys, pF);
+    OstTrace1(TRACE_FILESYSTEM, FSYS_ECFILESYSTEMREMOVE2, "this %x", pF);
+
 	TInt r=pF->Remove();
-	TRACERET1(UTF::EBorder, UTraceModuleFileSys::ECFileSystemRemoveRet, EF32TraceUidFileSys, r);
+
+	OstTrace1(TRACE_FILESYSTEM, FSYS_ECFILESYSTEMREMOVE2RET, "r %d", r);
+
 	if (r!=KErrNone)
 		return(r);
 	
diff -r 2a0ada0a1bf8 -r 95847726fe57 userlibandfileserver/fileserver/sfile/traces/OstTraceDefinitions.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/userlibandfileserver/fileserver/sfile/traces/OstTraceDefinitions.h	Mon May 24 18:38:55 2010 +0100
@@ -0,0 +1,21 @@
+// Copyright (c) 2009 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"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+
+#ifndef __OSTTRACEDEFINITIONS_H__
+#define __OSTTRACEDEFINITIONS_H__
+// OST_TRACE_COMPILER_IN_USE flag has been added by Trace Compiler
+// REMOVE BEFORE CHECK-IN TO VERSION CONTROL
+//#define OST_TRACE_COMPILER_IN_USE
+#include <OpenSystemTrace.h>
+#endif
diff -r 2a0ada0a1bf8 -r 95847726fe57 userlibandfileserver/fileserver/sfile/traces/fixed_id.definitions
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/userlibandfileserver/fileserver/sfile/traces/fixed_id.definitions	Mon May 24 18:38:55 2010 +0100
@@ -0,0 +1,740 @@
+#Fixed group and trace id definitions. If this file is removed, the identifiers are rebuilt.
+[GROUP]TRACE_BORDER=0x42
+[GROUP]TRACE_DRIVE=0x41
+[GROUP]TRACE_FILESYSTEM=0x40
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EDIRCLOSE=0x124
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EDIRCLOSERETURN=0x125
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EDIROPEN1=0x11e
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EDIROPEN1RETURN=0x120
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EDIROPEN1_EDIRNAME=0x11f
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EDIROPEN2=0x121
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EDIROPEN2RETURN=0x123
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EDIROPEN2_EDIRNAME=0x122
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EDIRREAD1=0x126
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EDIRREAD1RETURN=0x127
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EDIRREAD2=0x128
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EDIRREAD2RETURN=0x129
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EDIRREAD3=0x12a
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EDIRREAD3RETURN=0x12b
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EDIRREAD4=0x12c
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EDIRREAD4RETURN=0x12d
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFILE64ADOPTFROMCLIENT=0x1b1
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFILE64ADOPTFROMCLIENTRETURN1=0x1b2
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFILE64ADOPTFROMCLIENTRETURN2=0x1b3
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFILE64ADOPTFROMCLIENTRETURN3=0x1b4
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFILE64ADOPTFROMCREATOR=0x1b8
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFILE64ADOPTFROMCREATORRETURN1=0x1b9
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFILE64ADOPTFROMCREATORRETURN2=0x1ba
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFILE64ADOPTFROMCREATORRETURN3=0x1bb
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFILE64ADOPTFROMSERVER=0x1b5
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFILE64ADOPTFROMSERVERRETURN1=0x1b6
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFILE64ADOPTFROMSERVERRETURN2=0x1b7
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFILE64CREATE=0x1a7
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFILE64CREATERETURN=0x1a9
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFILE64CREATE_EFILENAME=0x1a8
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFILE64LOCK=0x1d2
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFILE64LOCKRETURN=0x1d3
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFILE64OPEN=0x1a4
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFILE64OPENRETURN=0x1a6
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFILE64OPEN_EFILENAME=0x1a5
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFILE64READ10=0x1be
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFILE64READ10RETURN=0x1bf
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFILE64READ11=0x1c2
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFILE64READ11RETURN=0x1c3
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFILE64READ12=0x1d8
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFILE64READ12RETURN=0x1d9
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFILE64READ13=0x1dc
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFILE64READ13RETURN=0x1dd
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFILE64READ14=0x1d6
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFILE64READ14RETURN=0x1d7
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFILE64READ15=0x1c0
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFILE64READ15RETURN=0x1c1
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFILE64READ16=0x1da
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFILE64READ16RETURN=0x1db
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFILE64READ8=0x1bc
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFILE64READ8RETURN=0x1bd
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFILE64REPLACE=0x1aa
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFILE64REPLACERETURN=0x1ac
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFILE64REPLACE_EFILENAME=0x1ab
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFILE64SEEK2=0x1cc
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFILE64SEEK2RETURN=0x1cd
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFILE64SETSIZE2=0x1d0
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFILE64SETSIZE2RETURN=0x1d1
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFILE64SIZE2=0x1ce
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFILE64SIZE2RETURN=0x1cf
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFILE64TEMP=0x1ad
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFILE64TEMPRETURN=0x1b0
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFILE64TEMP_EDIRNAME=0x1ae
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFILE64TEMP_EFILENAME=0x1af
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFILE64UNLOCK=0x1d4
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFILE64UNLOCKRETURN=0x1d5
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFILE64WRITE11=0x1ca
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFILE64WRITE11RETURN=0x1cb
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFILE64WRITE12=0x1e4
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFILE64WRITE12RETURN=0x1e5
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFILE64WRITE13=0x1c4
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFILE64WRITE13RETURN=0x1c5
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFILE64WRITE14=0x1de
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFILE64WRITE14RETURN=0x1df
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFILE64WRITE15=0x1c6
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFILE64WRITE15RETURN=0x1c7
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFILE64WRITE16=0x1e0
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFILE64WRITE16RETURN=0x1e1
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFILE64WRITE7=0x1c8
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFILE64WRITE7RETURN=0x1c9
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFILE64WRITE8=0x1e2
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFILE64WRITE8RETURN=0x1e3
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFILEADOPT=0x12e
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFILEADOPTFROMCLIENT=0x135
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFILEADOPTFROMCLIENTRETURN1=0x136
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFILEADOPTFROMCLIENTRETURN2=0x137
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFILEADOPTFROMCLIENTRETURN3=0x138
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFILEADOPTFROMCREATOR=0x139
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFILEADOPTFROMCREATORRETURN1=0x13a
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFILEADOPTFROMCREATORRETURN2=0x13b
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFILEADOPTFROMCREATORRETURN3=0x13c
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFILEADOPTFROMSERVER=0x132
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFILEADOPTFROMSERVERRETURN1=0x133
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFILEADOPTFROMSERVERRETURN2=0x134
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFILEADOPTRETURN1=0x12f
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFILEADOPTRETURN2=0x130
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFILEADOPTRETURN3=0x131
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFILEATT=0x18d
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFILEATTRETURN=0x18e
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFILEBLOCKMAPA=0x1a1
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFILEBLOCKMAPB=0x1a2
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFILEBLOCKMAPRETURN=0x1a3
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFILECHANGEMODE=0x198
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFILECHANGEMODERETURN=0x199
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFILECLAMP=0x19f
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFILECLAMPRETURN=0x1a0
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFILECLOSE=0x153
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFILECLOSERETURN=0x154
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFILECREATE=0x155
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFILECREATERETURN=0x157
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFILECREATE_EFILENAME=0x156
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFILEDRIVE=0x19d
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFILEDRIVERETURN=0x19e
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFILEDUPLICATE=0x13d
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFILEDUPLICATERETURN1=0x13e
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFILEDUPLICATERETURN2=0x13f
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFILEDUPLICATERETURN3=0x140
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFILEFLUSH1=0x185
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFILEFLUSH1RETURN=0x186
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFILEFLUSH2=0x187
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFILEFLUSH2RETURN=0x188
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFILEFULLNAME=0x14d
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFILEFULLNAMERETURN=0x14f
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFILEFULLNAME_EFILENAME=0x14e
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFILEGETNAME=0x14a
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFILEGETNAMERETURN=0x14c
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFILEGETNAME_EFILENAME=0x14b
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFILELOCK=0x17f
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFILELOCKRETURN=0x180
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFILEMODIFIED=0x191
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFILEMODIFIEDRETURN=0x192
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFILEOPEN=0x150
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFILEOPENRETURN=0x152
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFILEOPEN_EFILENAME=0x151
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFILEREAD1=0x15f
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFILEREAD1RETURN=0x160
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFILEREAD2=0x161
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFILEREAD2RETURN=0x162
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFILEREAD3=0x167
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFILEREAD3RETURN=0x168
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFILEREAD4=0x169
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFILEREAD4RETURN=0x16a
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFILEREAD5=0x163
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFILEREAD5RETURN=0x164
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFILEREAD6=0x165
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFILEREAD6RETURN=0x166
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFILEREAD7=0x16b
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFILEREAD7RETURN=0x16c
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFILEREAD9=0x16d
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFILEREAD9RETURN=0x16e
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFILERENAME=0x19a
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFILERENAMERETURN=0x19c
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFILERENAME_ENEWNAME=0x19b
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFILEREPLACE=0x158
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFILEREPLACERETURN=0x15a
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFILEREPLACE_EFILENAME=0x159
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFILESEEK1=0x183
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFILESEEK1RETURN=0x184
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFILESETA=0x195
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFILESETATT=0x18f
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFILESETATTRETURN=0x190
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFILESETB=0x196
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFILESETMODIFIED=0x193
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFILESETMODIFIEDRETURN=0x194
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFILESETRETURN=0x197
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFILESETSIZE1=0x18b
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFILESETSIZE1RETURN=0x18c
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFILESIZE=0x189
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFILESIZERETURN=0x18a
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFILETEMP=0x15b
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFILETEMPRETURN=0x15e
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFILETEMP_EDIRNAME=0x15c
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFILETEMP_EFILENAME=0x15d
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFILETRANSFERTOCLIENT=0x144
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFILETRANSFERTOCLIENTRETURN1=0x145
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFILETRANSFERTOCLIENTRETURN2=0x146
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFILETRANSFERTOCLIENTRETURN3=0x147
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFILETRANSFERTOPROCESS=0x148
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFILETRANSFERTOPROCESSRETURN=0x149
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFILETRANSFERTOSERVER=0x141
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFILETRANSFERTOSERVERRETURN1=0x142
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFILETRANSFERTOSERVERRETURN2=0x143
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFILEUNLOCK=0x181
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFILEUNLOCKRETURN=0x182
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFILEWRITE1=0x16f
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFILEWRITE10=0x17d
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFILEWRITE10RETURN=0x17e
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFILEWRITE1RETURN=0x170
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFILEWRITE2=0x171
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFILEWRITE2RETURN=0x172
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFILEWRITE3=0x177
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFILEWRITE3RETURN=0x178
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFILEWRITE4=0x179
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFILEWRITE4RETURN=0x17a
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFILEWRITE5=0x173
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFILEWRITE5RETURN=0x174
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFILEWRITE6=0x17b
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFILEWRITE6RETURN=0x17c
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFILEWRITE9=0x175
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFILEWRITE9RETURN=0x176
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSADDCOMPOSITEMOUNT=0xfe
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSADDCOMPOSITEMOUNTRETURN=0x100
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSADDCOMPOSITEMOUNT_EFILESYSTEMNAME=0xff
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSADDEXTENSION=0x3b
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSADDEXTENSIONRETURN=0x3d
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSADDEXTENSION_EEXTENSIONNAME=0x3c
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSADDFILESYSTEM=0x17
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSADDFILESYSTEMRETURN=0x19
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSADDFILESYSTEM_EFILENAME=0x18
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSALLOWDISMOUNT=0x10d
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSALLOWDISMOUNTRETURN=0x10e
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSATT=0xa0
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSATTRETURN=0xa2
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSATT_EFILENAME=0xa1
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSCHECKDISK=0xc1
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSCHECKDISKRETURN=0xc3
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSCHECKDISK_EDIRNAME=0xc2
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSCLEARPASSWORD=0xec
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSCLEARPASSWORDRETURN=0xed
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSCLOSE=0x11c
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSCLOSERETURN=0x11d
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSCONNECT=0xc
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSCONNECTRETURN=0xd
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSCREATEPRIVATEPATH=0x13
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSCREATEPRIVATEPATHRETURN=0x14
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSDELETE=0x95
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSDELETERETURN=0x97
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSDELETE_EFILENAME=0x96
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSDISMOUNTEXTENSION=0x41
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSDISMOUNTEXTENSIONRETURN=0x43
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSDISMOUNTEXTENSION_EEXTENSIONNAME=0x42
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSDISMOUNTFILESYSTEM=0x32
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSDISMOUNTFILESYSTEMRETURN=0x34
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSDISMOUNTFILESYSTEM_EFILESYSTEMNAME=0x33
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSDRIVE=0x5f
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSDRIVELIST1=0x5b
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSDRIVELIST1RETURN=0x5c
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSDRIVELIST2=0x5d
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSDRIVELIST2RETURN=0x5e
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSDRIVERETURN=0x60
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSDRIVETOCHAR=0x1
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSDRIVETOCHARRETURN=0x2
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSENTRY=0xac
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSENTRYRETURN=0xae
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSENTRY_EFILENAME=0xad
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSERASEPASSWORD=0xee
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSERASEPASSWORDRETURN=0xef
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSEXTENSIONNAME=0x47
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSEXTENSIONNAMERETURN=0x49
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSEXTENSIONNAME_EEXTENSIONNAME=0x48
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSFILESYSTEMNAME=0x35
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSFILESYSTEMNAMERETURN=0x37
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSFILESYSTEMNAME_EFILESYSTEMNAME=0x36
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSFILESYSTEMNAME_ESUPPORTEDFILESYSTEMNAME=0x39
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSFILESYSTEMSUBTYPE=0x119
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSFILESYSTEMSUBTYPERETURN=0x11b
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSFILESYSTEMSUBTYPE_EFILESYSTEMNAME=0x11a
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSFINALISEDRIVE=0xf5
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSFINALISEDRIVERETURN=0xf6
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSFINALISEDRIVES=0xf7
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSFINALISEDRIVESRETURN1=0xf8
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSFINALISEDRIVESRETURN2=0xf9
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSGETDIR1=0x85
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSGETDIR1RETURN=0x87
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSGETDIR1_EDIRNAME=0x86
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSGETDIR2=0x88
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSGETDIR2RETURN=0x8a
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSGETDIR2_EDIRNAME=0x89
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSGETDIR3=0x8b
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSGETDIR3RETURN=0x8d
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSGETDIR3_EDIRNAME=0x8c
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSGETDRIVENAME=0xe2
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSGETDRIVENAMERETURN=0xe4
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSGETDRIVENAME_EDRIVENAME=0xe3
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSGETLONGNAME=0xcb
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSGETLONGNAMERETURN=0xce
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSGETLONGNAME_ELONGNAME=0xcd
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSGETLONGNAME_ESHORTNAME=0xcc
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSGETMEDIASERIALNUMBER=0x73
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSGETMEDIASERIALNUMBERRETURN=0x74
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSGETMEDIASERIALNUMBER_ESERIALNUMBER=0x75
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSGETNOTIFYUSER=0xd2
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSGETNOTIFYUSERRETURN=0xd3
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSGETRESERVEACCESS=0x103
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSGETRESERVEACCESSRETURN=0x104
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSGETSHORTNAME=0xc7
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSGETSHORTNAMERETURN=0xca
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSGETSHORTNAME_ELONGNAME=0xc8
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSGETSHORTNAME_ESHORTNAME=0xc9
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSGETSYSTEMDRIVE=0x5
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSGETSYSTEMDRIVECHAR=0x8
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSGETSYSTEMDRIVECHARRETURN=0x9
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSGETSYSTEMDRIVERETURN1=0x6
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSGETSYSTEMDRIVERETURN2=0x7
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSINITIALISEPROPERTIESFILE=0x113
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSINITIALISEPROPERTIESFILERETURN=0x114
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSISFILEINROM=0xd6
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSISFILEINROMRETURN=0xd8
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSISFILEINROM_EFILENAME=0xd7
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSISFILEOPEN=0xcf
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSISFILEOPENRETURN=0xd1
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSISFILEOPEN_EFILENAME=0xd0
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSISROMADDRESS=0x3
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSISROMADDRESSRETURN=0x4
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSISVALIDNAME1=0xd9
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSISVALIDNAME1RETURN=0xdb
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSISVALIDNAME1_EFILENAME=0xda
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSISVALIDNAME2=0xdc
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSISVALIDNAME2RETURN=0xde
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSISVALIDNAME2_EFILENAME=0xdd
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSISVALIDNAME3=0xdf
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSISVALIDNAME3RETURN=0xe1
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSISVALIDNAME3_EFILENAME=0xe0
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSLOCKDRIVE=0xe8
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSLOCKDRIVERETURN=0xe9
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSMKDIR=0x7c
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSMKDIRALL=0x7f
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSMKDIRALLRETURN=0x81
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSMKDIRALL_EDIRNAME=0x80
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSMKDIRRETURN=0x7e
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSMKDIR_EDIRNAME=0x7d
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSMODIFIED=0xa6
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSMODIFIEDRETURN=0xa8
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSMODIFIED_EFILENAME=0xa7
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSMOUNTEXTENSION=0x3e
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSMOUNTEXTENSIONRETURN=0x40
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSMOUNTEXTENSION_EEXTENSIONNAME=0x3f
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSMOUNTFILESYSTEM1=0x1d
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSMOUNTFILESYSTEM1RETURN=0x1f
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSMOUNTFILESYSTEM1_EFILESYSTEMNAME=0x1e
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSMOUNTFILESYSTEM2=0x20
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSMOUNTFILESYSTEM2RETURN=0x22
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSMOUNTFILESYSTEM2_EFILESYSTEMNAME=0x21
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSMOUNTFILESYSTEM3=0x23
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSMOUNTFILESYSTEM3RETURN=0x26
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSMOUNTFILESYSTEM3_EEXTENSIONNAME=0x24
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSMOUNTFILESYSTEM3_EFILESYSTEMNAME=0x25
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSMOUNTFILESYSTEM4=0x27
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSMOUNTFILESYSTEM4RETURN=0x2a
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSMOUNTFILESYSTEM4_EEXTENSIONNAME=0x29
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSMOUNTFILESYSTEM4_EFILESYSTEMNAME=0x28
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSMOUNTFILESYSTEMANDSCAN1=0x2b
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSMOUNTFILESYSTEMANDSCAN1RETURN=0x2d
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSMOUNTFILESYSTEMANDSCAN1_EFILESYSTEMNAME=0x2c
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSMOUNTFILESYSTEMANDSCAN2=0x2e
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSMOUNTFILESYSTEMANDSCAN2RETURN=0x31
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSMOUNTFILESYSTEMANDSCAN2_EEXTENSIONNAME=0x30
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSMOUNTFILESYSTEMANDSCAN2_EFILESYSTEMNAME=0x2f
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSNOTIFYCHANGE1=0x4c
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSNOTIFYCHANGE1RETURN=0x4d
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSNOTIFYCHANGE2=0x4e
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSNOTIFYCHANGE2RETURN=0x50
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSNOTIFYCHANGE2_EDIRNAME=0x4f
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSNOTIFYCHANGECANCEL1=0x51
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSNOTIFYCHANGECANCEL1RETURN=0x52
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSNOTIFYCHANGECANCEL2=0x53
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSNOTIFYCHANGECANCEL2RETURN=0x54
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSNOTIFYDISKSPACE=0x55
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSNOTIFYDISKSPACECANCEL1=0x57
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSNOTIFYDISKSPACECANCEL1RETURN=0x58
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSNOTIFYDISKSPACECANCEL2=0x59
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSNOTIFYDISKSPACECANCEL2RETURN=0x5a
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSNOTIFYDISKSPACERETURN=0x56
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSNOTIFYDISMOUNT=0x107
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSNOTIFYDISMOUNTCANCEL1=0x109
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSNOTIFYDISMOUNTCANCEL1RETURN=0x10a
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSNOTIFYDISMOUNTCANCEL2=0x10b
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSNOTIFYDISMOUNTCANCEL2RETURN=0x10c
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSNOTIFYDISMOUNTRETURN=0x108
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSPARSE1=0x8e
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSPARSE1RETURN=0x90
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSPARSE1_EFILEPATH=0x8f
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSPARSE2=0x91
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSPARSE2RETURN=0x94
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSPARSE2_EFILENAME=0x92
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSPARSE2_ERELATED=0x93
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSPRIVATEPATH=0x10
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSPRIVATEPATHRETURN=0x12
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSPRIVATEPATH_EDIRNAME=0x11
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSQUERYVOLUMEINFOEXT=0x115
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSQUERYVOLUMEINFOEXTRETURN=0x116
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSREADFILESECTION=0xb2
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSREADFILESECTIONRETURN1=0xb4
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSREADFILESECTIONRETURN2=0xb5
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSREADFILESECTIONRETURN3=0xb6
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSREADFILESECTION_EFILENAME=0xb3
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSREADFILESECTION_RESERVED=0xb7
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSREADFILESECTION_RESERVED_EFILENAME=0xb8
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSREADFILESECTION_RESERVED_RETURN1=0xb9
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSREADFILESECTION_RESERVED_RETURN2=0xba
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSREALNAME=0x6f
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSREALNAMERETURN=0x72
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSREALNAME_EFILENAME1=0x70
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSREALNAME_EFILENAME2=0x71
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSRELEASERESERVEACCESS=0x105
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSRELEASERESERVEACCESSRETURN=0x106
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSREMOUNTDRIVE=0x4a
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSREMOUNTDRIVERETURN=0x4b
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSREMOVEEXTENSION=0x44
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSREMOVEEXTENSIONRETURN=0x46
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSREMOVEEXTENSION_EEXTENSIONNAME=0x45
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSREMOVEFILESYSTEM=0x1a
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSREMOVEFILESYSTEMRETURN=0x1c
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSREMOVEFILESYSTEM_EFILESYSTEMNAME=0x1b
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSRENAME=0x98
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSRENAMERETURN=0x9b
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSRENAME_ENEWNAME=0x9a
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSRENAME_EOLDNAME=0x99
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSREPLACE=0x9c
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSREPLACERETURN=0x9f
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSREPLACE_ENEWNAME=0x9e
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSREPLACE_EOLDNAME=0x9d
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSRESERVEDRIVESPACE=0x101
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSRESERVEDRIVESPACERETURN=0x102
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSRESOURCECOUNT=0xbf
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSRESOURCECOUNTMARKEND=0xbd
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSRESOURCECOUNTMARKENDRETURN=0xbe
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSRESOURCECOUNTMARKSTART=0xbb
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSRESOURCECOUNTMARKSTARTRETURN=0xbc
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSRESOURCECOUNTRETURN=0xc0
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSRMDIR=0x82
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSRMDIRRETURN=0x84
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSRMDIR_EDIRNAME=0x83
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSSCANDRIVE=0xc4
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSSCANDRIVERETURN=0xc6
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSSCANDRIVE_EDIRNAME=0xc5
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSSESSIONPATH=0x76
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSSESSIONPATHRETURN=0x77
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSSESSIONPATH_EDIRNAME=0x78
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSSETATT=0xa3
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSSETATTRETURN=0xa5
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSSETATT_EFILENAME=0xa4
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSSETDRIVENAME=0xe5
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSSETDRIVENAMERETURN=0xe7
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSSETDRIVENAME_EDRIVENAME=0xe6
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSSETENTRY=0xaf
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSSETENTRYRETURN=0xb1
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSSETENTRY_EFILENAME=0xb0
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSSETLOCALDRIVEMAPPING=0xf2
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSSETLOCALDRIVEMAPPINGRETURN=0xf4
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSSETLOCALDRIVEMAPPING_ELOCALDRIVEMAPPING=0xf3
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSSETMODIFIED=0xa9
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSSETMODIFIEDRETURN=0xab
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSSETMODIFIED_EFILENAME=0xaa
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSSETNOTIFYCHANGE=0x111
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSSETNOTIFYCHANGERETURN=0x112
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSSETNOTIFYUSER=0xd4
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSSETNOTIFYUSERRETURN=0xd5
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSSETSESSIONPATH=0x79
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSSETSESSIONPATHRETURN=0x7b
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSSETSESSIONPATH_EDIRNAME=0x7a
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSSETSESSIONTOPRIVATE=0xe
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSSETSESSIONTOPRIVATERETURN=0xf
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSSETSTARTUPCONFIGURATION=0x10f
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSSETSTARTUPCONFIGURATIONRETURN=0x110
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSSETSUBST=0x6c
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSSETSUBSTRETURN=0x6e
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSSETSUBST_EDIRNAME=0x6d
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSSETSYSTEMDRIVE=0xa
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSSETSYSTEMDRIVERETURN=0xb
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSSETVOLUMELABEL=0x66
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSSETVOLUMELABELRETURN=0x68
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSSETVOLUMELABEL_EVOLUMENAME=0x67
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSSTARTUPINITCOMPLETE=0xf0
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSSTARTUPINITCOMPLETERETURN=0xf1
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSSUBST=0x69
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSSUBSTRETURN=0x6b
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSSUBST_EDIRNAME=0x6a
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSSUPPORTEDFILESYSTEMNAME=0x38
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSSUPPORTEDFILESYSTEMNAMERETURN=0x3a
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSSWAPFILESYSTEM=0xfa
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSSWAPFILESYSTEMRETURN=0xfd
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSSWAPFILESYSTEM_ENEWNAME=0xfc
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSSWAPFILESYSTEM_EOLDNAME=0xfb
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSUNLOCKDRIVE=0xea
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSUNLOCKDRIVERETURN=0xeb
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSVERSION=0x15
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSVERSIONRETURN=0x16
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSVOLUME1=0x61
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSVOLUME1RETURNA=0x62
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSVOLUME1RETURNB=0x63
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSVOLUME2=0x64
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSVOLUME2RETURN=0x65
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSVOLUMEIOPARAM=0x117
+[TRACE]TRACE_BORDER[0x42]_EFSRV_EFSVOLUMEIOPARAMRETURN=0x118
+[TRACE]TRACE_DRIVE[0x41]_FSYS_ECFILESYSTEMISEXTENSIONSUPPORTED2=0x5f
+[TRACE]TRACE_DRIVE[0x41]_PROXYDRIVE_ECBASEEXTPROXYDRIVECAPS=0x45
+[TRACE]TRACE_DRIVE[0x41]_PROXYDRIVE_ECBASEEXTPROXYDRIVECAPSRET=0x46
+[TRACE]TRACE_DRIVE[0x41]_PROXYDRIVE_ECBASEEXTPROXYDRIVECLEAR=0x53
+[TRACE]TRACE_DRIVE[0x41]_PROXYDRIVE_ECBASEEXTPROXYDRIVECLEARRET=0x54
+[TRACE]TRACE_DRIVE[0x41]_PROXYDRIVE_ECBASEEXTPROXYDRIVECONTROLIO=0x57
+[TRACE]TRACE_DRIVE[0x41]_PROXYDRIVE_ECBASEEXTPROXYDRIVECONTROLIORET=0x58
+[TRACE]TRACE_DRIVE[0x41]_PROXYDRIVE_ECBASEEXTPROXYDRIVEDELETENOTIFY=0x5d
+[TRACE]TRACE_DRIVE[0x41]_PROXYDRIVE_ECBASEEXTPROXYDRIVEDELETENOTIFYRET=0x5e
+[TRACE]TRACE_DRIVE[0x41]_PROXYDRIVE_ECBASEEXTPROXYDRIVEDISMOUNTED=0x33
+[TRACE]TRACE_DRIVE[0x41]_PROXYDRIVE_ECBASEEXTPROXYDRIVEDISMOUNTEDRET=0x34
+[TRACE]TRACE_DRIVE[0x41]_PROXYDRIVE_ECBASEEXTPROXYDRIVEENLARGE=0x35
+[TRACE]TRACE_DRIVE[0x41]_PROXYDRIVE_ECBASEEXTPROXYDRIVEENLARGERET=0x36
+[TRACE]TRACE_DRIVE[0x41]_PROXYDRIVE_ECBASEEXTPROXYDRIVEERASEPASSWORD=0x55
+[TRACE]TRACE_DRIVE[0x41]_PROXYDRIVE_ECBASEEXTPROXYDRIVEERASEPASSWORDRET=0x56
+[TRACE]TRACE_DRIVE[0x41]_PROXYDRIVE_ECBASEEXTPROXYDRIVEFORCEREMOUNT=0x4d
+[TRACE]TRACE_DRIVE[0x41]_PROXYDRIVE_ECBASEEXTPROXYDRIVEFORCEREMOUNTRET=0x4e
+[TRACE]TRACE_DRIVE[0x41]_PROXYDRIVE_ECBASEEXTPROXYDRIVEFORMAT1=0x47
+[TRACE]TRACE_DRIVE[0x41]_PROXYDRIVE_ECBASEEXTPROXYDRIVEFORMAT1RET=0x48
+[TRACE]TRACE_DRIVE[0x41]_PROXYDRIVE_ECBASEEXTPROXYDRIVEFORMAT2=0x49
+[TRACE]TRACE_DRIVE[0x41]_PROXYDRIVE_ECBASEEXTPROXYDRIVEFORMAT2RET=0x4a
+[TRACE]TRACE_DRIVE[0x41]_PROXYDRIVE_ECBASEEXTPROXYDRIVEGETINTERFACE=0x59
+[TRACE]TRACE_DRIVE[0x41]_PROXYDRIVE_ECBASEEXTPROXYDRIVEGETINTERFACERET=0x5a
+[TRACE]TRACE_DRIVE[0x41]_PROXYDRIVE_ECBASEEXTPROXYDRIVEGETLASTERRORINFO=0x5b
+[TRACE]TRACE_DRIVE[0x41]_PROXYDRIVE_ECBASEEXTPROXYDRIVEGETLASTERRORINFORET=0x5c
+[TRACE]TRACE_DRIVE[0x41]_PROXYDRIVE_ECBASEEXTPROXYDRIVEINITIALISE=0x31
+[TRACE]TRACE_DRIVE[0x41]_PROXYDRIVE_ECBASEEXTPROXYDRIVEINITIALISERET=0x32
+[TRACE]TRACE_DRIVE[0x41]_PROXYDRIVE_ECBASEEXTPROXYDRIVELOCK=0x51
+[TRACE]TRACE_DRIVE[0x41]_PROXYDRIVE_ECBASEEXTPROXYDRIVELOCKRET=0x52
+[TRACE]TRACE_DRIVE[0x41]_PROXYDRIVE_ECBASEEXTPROXYDRIVEREAD1=0x39
+[TRACE]TRACE_DRIVE[0x41]_PROXYDRIVE_ECBASEEXTPROXYDRIVEREAD1RET=0x3a
+[TRACE]TRACE_DRIVE[0x41]_PROXYDRIVE_ECBASEEXTPROXYDRIVEREAD2=0x3b
+[TRACE]TRACE_DRIVE[0x41]_PROXYDRIVE_ECBASEEXTPROXYDRIVEREAD2RET=0x3c
+[TRACE]TRACE_DRIVE[0x41]_PROXYDRIVE_ECBASEEXTPROXYDRIVEREAD3=0x3d
+[TRACE]TRACE_DRIVE[0x41]_PROXYDRIVE_ECBASEEXTPROXYDRIVEREAD3RET=0x3e
+[TRACE]TRACE_DRIVE[0x41]_PROXYDRIVE_ECBASEEXTPROXYDRIVEREDUCESIZE=0x37
+[TRACE]TRACE_DRIVE[0x41]_PROXYDRIVE_ECBASEEXTPROXYDRIVEREDUCESIZERET=0x38
+[TRACE]TRACE_DRIVE[0x41]_PROXYDRIVE_ECBASEEXTPROXYDRIVESETMOUNTINFO=0x4b
+[TRACE]TRACE_DRIVE[0x41]_PROXYDRIVE_ECBASEEXTPROXYDRIVESETMOUNTINFORET=0x4c
+[TRACE]TRACE_DRIVE[0x41]_PROXYDRIVE_ECBASEEXTPROXYDRIVEUNLOCK=0x4f
+[TRACE]TRACE_DRIVE[0x41]_PROXYDRIVE_ECBASEEXTPROXYDRIVEUNLOCKRET=0x50
+[TRACE]TRACE_DRIVE[0x41]_PROXYDRIVE_ECBASEEXTPROXYDRIVEWRITE1=0x3f
+[TRACE]TRACE_DRIVE[0x41]_PROXYDRIVE_ECBASEEXTPROXYDRIVEWRITE1RET=0x40
+[TRACE]TRACE_DRIVE[0x41]_PROXYDRIVE_ECBASEEXTPROXYDRIVEWRITE2=0x41
+[TRACE]TRACE_DRIVE[0x41]_PROXYDRIVE_ECBASEEXTPROXYDRIVEWRITE2RET=0x42
+[TRACE]TRACE_DRIVE[0x41]_PROXYDRIVE_ECBASEEXTPROXYDRIVEWRITE3=0x43
+[TRACE]TRACE_DRIVE[0x41]_PROXYDRIVE_ECBASEEXTPROXYDRIVEWRITE3RET=0x44
+[TRACE]TRACE_DRIVE[0x41]_PROXYDRIVE_ECLOCALPROXYDRIVECAPS=0x17
+[TRACE]TRACE_DRIVE[0x41]_PROXYDRIVE_ECLOCALPROXYDRIVECAPSRET=0x18
+[TRACE]TRACE_DRIVE[0x41]_PROXYDRIVE_ECLOCALPROXYDRIVECLEAR=0x27
+[TRACE]TRACE_DRIVE[0x41]_PROXYDRIVE_ECLOCALPROXYDRIVECLEARRET=0x28
+[TRACE]TRACE_DRIVE[0x41]_PROXYDRIVE_ECLOCALPROXYDRIVECONTROLIO=0x21
+[TRACE]TRACE_DRIVE[0x41]_PROXYDRIVE_ECLOCALPROXYDRIVECONTROLIORET=0x22
+[TRACE]TRACE_DRIVE[0x41]_PROXYDRIVE_ECLOCALPROXYDRIVEDELETENOTIFY=0x2b
+[TRACE]TRACE_DRIVE[0x41]_PROXYDRIVE_ECLOCALPROXYDRIVEDELETENOTIFYRET=0x2c
+[TRACE]TRACE_DRIVE[0x41]_PROXYDRIVE_ECLOCALPROXYDRIVEDISMOUNTED=0x5
+[TRACE]TRACE_DRIVE[0x41]_PROXYDRIVE_ECLOCALPROXYDRIVEDISMOUNTEDRET=0x6
+[TRACE]TRACE_DRIVE[0x41]_PROXYDRIVE_ECLOCALPROXYDRIVEENLARGE=0x7
+[TRACE]TRACE_DRIVE[0x41]_PROXYDRIVE_ECLOCALPROXYDRIVEENLARGERET=0x8
+[TRACE]TRACE_DRIVE[0x41]_PROXYDRIVE_ECLOCALPROXYDRIVEERASEPASSWORD=0x29
+[TRACE]TRACE_DRIVE[0x41]_PROXYDRIVE_ECLOCALPROXYDRIVEERASEPASSWORDRET=0x2a
+[TRACE]TRACE_DRIVE[0x41]_PROXYDRIVE_ECLOCALPROXYDRIVEFORCEREMOUNT=0x1f
+[TRACE]TRACE_DRIVE[0x41]_PROXYDRIVE_ECLOCALPROXYDRIVEFORCEREMOUNTRET=0x20
+[TRACE]TRACE_DRIVE[0x41]_PROXYDRIVE_ECLOCALPROXYDRIVEFORMAT1=0x19
+[TRACE]TRACE_DRIVE[0x41]_PROXYDRIVE_ECLOCALPROXYDRIVEFORMAT1RET=0x1a
+[TRACE]TRACE_DRIVE[0x41]_PROXYDRIVE_ECLOCALPROXYDRIVEFORMAT2=0x1b
+[TRACE]TRACE_DRIVE[0x41]_PROXYDRIVE_ECLOCALPROXYDRIVEFORMAT2RET=0x1c
+[TRACE]TRACE_DRIVE[0x41]_PROXYDRIVE_ECLOCALPROXYDRIVEGETINTERFACE=0x2f
+[TRACE]TRACE_DRIVE[0x41]_PROXYDRIVE_ECLOCALPROXYDRIVEGETINTERFACERET=0x30
+[TRACE]TRACE_DRIVE[0x41]_PROXYDRIVE_ECLOCALPROXYDRIVEGETLASTERRORINFO=0x2d
+[TRACE]TRACE_DRIVE[0x41]_PROXYDRIVE_ECLOCALPROXYDRIVEGETLASTERRORINFORET=0x2e
+[TRACE]TRACE_DRIVE[0x41]_PROXYDRIVE_ECLOCALPROXYDRIVEINITIALISE=0x3
+[TRACE]TRACE_DRIVE[0x41]_PROXYDRIVE_ECLOCALPROXYDRIVEINITIALISERET=0x4
+[TRACE]TRACE_DRIVE[0x41]_PROXYDRIVE_ECLOCALPROXYDRIVELOCK=0x25
+[TRACE]TRACE_DRIVE[0x41]_PROXYDRIVE_ECLOCALPROXYDRIVELOCKRET=0x26
+[TRACE]TRACE_DRIVE[0x41]_PROXYDRIVE_ECLOCALPROXYDRIVENEW=0x1
+[TRACE]TRACE_DRIVE[0x41]_PROXYDRIVE_ECLOCALPROXYDRIVENEWRET=0x2
+[TRACE]TRACE_DRIVE[0x41]_PROXYDRIVE_ECLOCALPROXYDRIVEREAD1=0xb
+[TRACE]TRACE_DRIVE[0x41]_PROXYDRIVE_ECLOCALPROXYDRIVEREAD1RET=0xc
+[TRACE]TRACE_DRIVE[0x41]_PROXYDRIVE_ECLOCALPROXYDRIVEREAD2=0xd
+[TRACE]TRACE_DRIVE[0x41]_PROXYDRIVE_ECLOCALPROXYDRIVEREAD2RET=0xe
+[TRACE]TRACE_DRIVE[0x41]_PROXYDRIVE_ECLOCALPROXYDRIVEREAD3=0xf
+[TRACE]TRACE_DRIVE[0x41]_PROXYDRIVE_ECLOCALPROXYDRIVEREAD3RET=0x10
+[TRACE]TRACE_DRIVE[0x41]_PROXYDRIVE_ECLOCALPROXYDRIVEREDUCESIZE=0x9
+[TRACE]TRACE_DRIVE[0x41]_PROXYDRIVE_ECLOCALPROXYDRIVEREDUCESIZERET=0xa
+[TRACE]TRACE_DRIVE[0x41]_PROXYDRIVE_ECLOCALPROXYDRIVESETMOUNTINFO=0x1d
+[TRACE]TRACE_DRIVE[0x41]_PROXYDRIVE_ECLOCALPROXYDRIVESETMOUNTINFORET=0x1e
+[TRACE]TRACE_DRIVE[0x41]_PROXYDRIVE_ECLOCALPROXYDRIVEUNLOCK=0x23
+[TRACE]TRACE_DRIVE[0x41]_PROXYDRIVE_ECLOCALPROXYDRIVEUNLOCKRET=0x24
+[TRACE]TRACE_DRIVE[0x41]_PROXYDRIVE_ECLOCALPROXYDRIVEWRITE1=0x11
+[TRACE]TRACE_DRIVE[0x41]_PROXYDRIVE_ECLOCALPROXYDRIVEWRITE1RET=0x12
+[TRACE]TRACE_DRIVE[0x41]_PROXYDRIVE_ECLOCALPROXYDRIVEWRITE2=0x13
+[TRACE]TRACE_DRIVE[0x41]_PROXYDRIVE_ECLOCALPROXYDRIVEWRITE2RET=0x14
+[TRACE]TRACE_DRIVE[0x41]_PROXYDRIVE_ECLOCALPROXYDRIVEWRITE3=0x15
+[TRACE]TRACE_DRIVE[0x41]_PROXYDRIVE_ECLOCALPROXYDRIVEWRITE3RET=0x16
+[TRACE]TRACE_FILESYSTEM[0x40]_FILESYS_ECFILESYSTEMCONSTRUCTORRETURN=0x91
+[TRACE]TRACE_FILESYSTEM[0x40]_FSYS_ECDIRCBREADL1=0x5
+[TRACE]TRACE_FILESYSTEM[0x40]_FSYS_ECDIRCBREADL1RET=0x6
+[TRACE]TRACE_FILESYSTEM[0x40]_FSYS_ECDIRCBREADL2=0x1
+[TRACE]TRACE_FILESYSTEM[0x40]_FSYS_ECDIRCBREADL2RET=0x2
+[TRACE]TRACE_FILESYSTEM[0x40]_FSYS_ECDIRCBSTORELONGENTRYNAMEL=0x3
+[TRACE]TRACE_FILESYSTEM[0x40]_FSYS_ECDIRCBSTORELONGENTRYNAMELRET=0x4
+[TRACE]TRACE_FILESYSTEM[0x40]_FSYS_ECFILECBFLUSHDATAL1=0x6e
+[TRACE]TRACE_FILESYSTEM[0x40]_FSYS_ECFILECBFLUSHDATAL1RET=0x6f
+[TRACE]TRACE_FILESYSTEM[0x40]_FSYS_ECFILECBFLUSHDATAL2=0x84
+[TRACE]TRACE_FILESYSTEM[0x40]_FSYS_ECFILECBFLUSHDATAL2RET=0x85
+[TRACE]TRACE_FILESYSTEM[0x40]_FSYS_ECFILECBGETINTERFACE=0x82
+[TRACE]TRACE_FILESYSTEM[0x40]_FSYS_ECFILECBGETINTERFACERET=0x83
+[TRACE]TRACE_FILESYSTEM[0x40]_FSYS_ECFILECBREADLA=0x7c
+[TRACE]TRACE_FILESYSTEM[0x40]_FSYS_ECFILECBREADLRET=0x7d
+[TRACE]TRACE_FILESYSTEM[0x40]_FSYS_ECFILECBRENAMEL=0x76
+[TRACE]TRACE_FILESYSTEM[0x40]_FSYS_ECFILECBRENAMELRET=0x78
+[TRACE]TRACE_FILESYSTEM[0x40]_FSYS_ECFILECBRENAMELYS_EFILENAME=0x77
+[TRACE]TRACE_FILESYSTEM[0x40]_FSYS_ECFILECBSETENTRYL1=0x70
+[TRACE]TRACE_FILESYSTEM[0x40]_FSYS_ECFILECBSETENTRYL1RET=0x71
+[TRACE]TRACE_FILESYSTEM[0x40]_FSYS_ECFILECBSETENTRYL2=0x72
+[TRACE]TRACE_FILESYSTEM[0x40]_FSYS_ECFILECBSETENTRYL2RET=0x73
+[TRACE]TRACE_FILESYSTEM[0x40]_FSYS_ECFILECBSETENTRYL3=0x74
+[TRACE]TRACE_FILESYSTEM[0x40]_FSYS_ECFILECBSETENTRYL3RET=0x75
+[TRACE]TRACE_FILESYSTEM[0x40]_FSYS_ECFILECBSETSIZEL=0x80
+[TRACE]TRACE_FILESYSTEM[0x40]_FSYS_ECFILECBSETSIZELRET=0x81
+[TRACE]TRACE_FILESYSTEM[0x40]_FSYS_ECFILECBWRITEL=0x7e
+[TRACE]TRACE_FILESYSTEM[0x40]_FSYS_ECFILECBWRITELRET=0x7f
+[TRACE]TRACE_FILESYSTEM[0x40]_FSYS_ECFILESYSTEMCONSTRUCTOR=0x90
+[TRACE]TRACE_FILESYSTEM[0x40]_FSYS_ECFILESYSTEMDESTRUCTOR=0x92
+[TRACE]TRACE_FILESYSTEM[0x40]_FSYS_ECFILESYSTEMDESTRUCTORRETURN=0x93
+[TRACE]TRACE_FILESYSTEM[0x40]_FSYS_ECFILESYSTEMDRIVEINFO=0x17
+[TRACE]TRACE_FILESYSTEM[0x40]_FSYS_ECFILESYSTEMDRIVEINFORET=0x18
+[TRACE]TRACE_FILESYSTEM[0x40]_FSYS_ECFILESYSTEMINSTALL=0x94
+[TRACE]TRACE_FILESYSTEM[0x40]_FSYS_ECFILESYSTEMINSTALLRET=0x96
+[TRACE]TRACE_FILESYSTEM[0x40]_FSYS_ECFILESYSTEMINSTALLYS_EFILESYSTEMNAME=0x95
+[TRACE]TRACE_FILESYSTEM[0x40]_FSYS_ECFILESYSTEMISEXTENSIONSUPPORTED1=0x57
+[TRACE]TRACE_FILESYSTEM[0x40]_FSYS_ECFILESYSTEMNEW=0x99
+[TRACE]TRACE_FILESYSTEM[0x40]_FSYS_ECFILESYSTEMNEWDIRL=0x3b
+[TRACE]TRACE_FILESYSTEM[0x40]_FSYS_ECFILESYSTEMNEWDIRLRET=0x3c
+[TRACE]TRACE_FILESYSTEM[0x40]_FSYS_ECFILESYSTEMNEWFILEL=0x36
+[TRACE]TRACE_FILESYSTEM[0x40]_FSYS_ECFILESYSTEMNEWFILELRET=0x37
+[TRACE]TRACE_FILESYSTEM[0x40]_FSYS_ECFILESYSTEMNEWFORMATL=0x6c
+[TRACE]TRACE_FILESYSTEM[0x40]_FSYS_ECFILESYSTEMNEWFORMATLRET=0x6d
+[TRACE]TRACE_FILESYSTEM[0x40]_FSYS_ECFILESYSTEMNEWMOUNTL=0x9
+[TRACE]TRACE_FILESYSTEM[0x40]_FSYS_ECFILESYSTEMNEWMOUNTL1=0x53
+[TRACE]TRACE_FILESYSTEM[0x40]_FSYS_ECFILESYSTEMNEWMOUNTL1RET=0x54
+[TRACE]TRACE_FILESYSTEM[0x40]_FSYS_ECFILESYSTEMNEWMOUNTL2=0x58
+[TRACE]TRACE_FILESYSTEM[0x40]_FSYS_ECFILESYSTEMNEWMOUNTL2RET=0x59
+[TRACE]TRACE_FILESYSTEM[0x40]_FSYS_ECFILESYSTEMNEWMOUNTL3=0x5c
+[TRACE]TRACE_FILESYSTEM[0x40]_FSYS_ECFILESYSTEMNEWMOUNTL3RET=0x5d
+[TRACE]TRACE_FILESYSTEM[0x40]_FSYS_ECFILESYSTEMNEWMOUNTL4=0x60
+[TRACE]TRACE_FILESYSTEM[0x40]_FSYS_ECFILESYSTEMNEWMOUNTL4RET=0x61
+[TRACE]TRACE_FILESYSTEM[0x40]_FSYS_ECFILESYSTEMNEWMOUNTL5=0x64
+[TRACE]TRACE_FILESYSTEM[0x40]_FSYS_ECFILESYSTEMNEWMOUNTL5RET=0x65
+[TRACE]TRACE_FILESYSTEM[0x40]_FSYS_ECFILESYSTEMNEWMOUNTLRET=0xa
+[TRACE]TRACE_FILESYSTEM[0x40]_FSYS_ECFILESYSTEMNEWRET=0x9a
+[TRACE]TRACE_FILESYSTEM[0x40]_FSYS_ECFILESYSTEMREMOVE1=0x97
+[TRACE]TRACE_FILESYSTEM[0x40]_FSYS_ECFILESYSTEMREMOVE1RET=0x98
+[TRACE]TRACE_FILESYSTEM[0x40]_FSYS_ECFILESYSTEMREMOVE2=0x9b
+[TRACE]TRACE_FILESYSTEM[0x40]_FSYS_ECFILESYSTEMREMOVE2RET=0x9c
+[TRACE]TRACE_FILESYSTEM[0x40]_FSYS_ECFORMATCBDOFORMATSTEPL=0x88
+[TRACE]TRACE_FILESYSTEM[0x40]_FSYS_ECFORMATCBDOFORMATSTEPLRET=0x89
+[TRACE]TRACE_FILESYSTEM[0x40]_FSYS_ECMOUNTCBCHECKDISK1=0x43
+[TRACE]TRACE_FILESYSTEM[0x40]_FSYS_ECMOUNTCBCHECKDISK1RET=0x44
+[TRACE]TRACE_FILESYSTEM[0x40]_FSYS_ECMOUNTCBCHECKDISK2=0x45
+[TRACE]TRACE_FILESYSTEM[0x40]_FSYS_ECMOUNTCBCHECKDISK2RET=0x46
+[TRACE]TRACE_FILESYSTEM[0x40]_FSYS_ECMOUNTCBCLEARPASSWORD=0x62
+[TRACE]TRACE_FILESYSTEM[0x40]_FSYS_ECMOUNTCBCLEARPASSWORDRET=0x63
+[TRACE]TRACE_FILESYSTEM[0x40]_FSYS_ECMOUNTCBCONTROLIO=0x6a
+[TRACE]TRACE_FILESYSTEM[0x40]_FSYS_ECMOUNTCBCONTROLIORET=0x6b
+[TRACE]TRACE_FILESYSTEM[0x40]_FSYS_ECMOUNTCBCURRENTFREESPACE=0x11
+[TRACE]TRACE_FILESYSTEM[0x40]_FSYS_ECMOUNTCBCURRENTFREESPACERET=0x12
+[TRACE]TRACE_FILESYSTEM[0x40]_FSYS_ECMOUNTCBDELETEL1=0x25
+[TRACE]TRACE_FILESYSTEM[0x40]_FSYS_ECMOUNTCBDELETEL1_EFILENAME=0x26
+[TRACE]TRACE_FILESYSTEM[0x40]_FSYS_ECMOUNTCBDELETEL1_RET=0x27
+[TRACE]TRACE_FILESYSTEM[0x40]_FSYS_ECMOUNTCBDELETEL2=0x79
+[TRACE]TRACE_FILESYSTEM[0x40]_FSYS_ECMOUNTCBDELETEL2RET=0x7b
+[TRACE]TRACE_FILESYSTEM[0x40]_FSYS_ECMOUNTCBDELETEL2_EFILENAME=0x7a
+[TRACE]TRACE_FILESYSTEM[0x40]_FSYS_ECMOUNTCBDIROPENL=0x3d
+[TRACE]TRACE_FILESYSTEM[0x40]_FSYS_ECMOUNTCBDIROPENLRET=0x3f
+[TRACE]TRACE_FILESYSTEM[0x40]_FSYS_ECMOUNTCBDIROPENL_EDIRNAME=0x3e
+[TRACE]TRACE_FILESYSTEM[0x40]_FSYS_ECMOUNTCBDISMOUNTED=0x68
+[TRACE]TRACE_FILESYSTEM[0x40]_FSYS_ECMOUNTCBDISMOUNTEDRET=0x69
+[TRACE]TRACE_FILESYSTEM[0x40]_FSYS_ECMOUNTCBENTRYL=0x30
+[TRACE]TRACE_FILESYSTEM[0x40]_FSYS_ECMOUNTCBENTRYLRET=0x32
+[TRACE]TRACE_FILESYSTEM[0x40]_FSYS_ECMOUNTCBENTRYL_EFILEPATH=0x31
+[TRACE]TRACE_FILESYSTEM[0x40]_FSYS_ECMOUNTCBERASEPASSWORD=0x66
+[TRACE]TRACE_FILESYSTEM[0x40]_FSYS_ECMOUNTCBERASEPASSWORDRET=0x67
+[TRACE]TRACE_FILESYSTEM[0x40]_FSYS_ECMOUNTCBFILEOPENL=0x38
+[TRACE]TRACE_FILESYSTEM[0x40]_FSYS_ECMOUNTCBFILEOPENLRET=0x3a
+[TRACE]TRACE_FILESYSTEM[0x40]_FSYS_ECMOUNTCBFILEOPENL_EFILENAME=0x39
+[TRACE]TRACE_FILESYSTEM[0x40]_FSYS_ECMOUNTCBFINALISEMOUNT1=0x15
+[TRACE]TRACE_FILESYSTEM[0x40]_FSYS_ECMOUNTCBFINALISEMOUNT1RET=0x16
+[TRACE]TRACE_FILESYSTEM[0x40]_FSYS_ECMOUNTCBFINALISEMOUNT2=0x13
+[TRACE]TRACE_FILESYSTEM[0x40]_FSYS_ECMOUNTCBFINALISEMOUNT2RET=0x14
+[TRACE]TRACE_FILESYSTEM[0x40]_FSYS_ECMOUNTCBFORCEREMOUNTDRIVE=0x55
+[TRACE]TRACE_FILESYSTEM[0x40]_FSYS_ECMOUNTCBFORCEREMOUNTDRIVERET=0x56
+[TRACE]TRACE_FILESYSTEM[0x40]_FSYS_ECMOUNTCBFREESPACE=0xd
+[TRACE]TRACE_FILESYSTEM[0x40]_FSYS_ECMOUNTCBFREESPACERET=0xe
+[TRACE]TRACE_FILESYSTEM[0x40]_FSYS_ECMOUNTCBGETINTERFACE=0x8a
+[TRACE]TRACE_FILESYSTEM[0x40]_FSYS_ECMOUNTCBGETINTERFACERET=0x8b
+[TRACE]TRACE_FILESYSTEM[0x40]_FSYS_ECMOUNTCBGETLONGNAMEL=0x4f
+[TRACE]TRACE_FILESYSTEM[0x40]_FSYS_ECMOUNTCBGETLONGNAMELRET=0x52
+[TRACE]TRACE_FILESYSTEM[0x40]_FSYS_ECMOUNTCBGETLONGNAMEL_ELONGNAME=0x51
+[TRACE]TRACE_FILESYSTEM[0x40]_FSYS_ECMOUNTCBGETLONGNAMEL_ESHORTNAME=0x50
+[TRACE]TRACE_FILESYSTEM[0x40]_FSYS_ECMOUNTCBGETSHORTNAMEL=0x4b
+[TRACE]TRACE_FILESYSTEM[0x40]_FSYS_ECMOUNTCBGETSHORTNAMEL_ECMOUNTCBGETSHORTNAMELRET=0x4e
+[TRACE]TRACE_FILESYSTEM[0x40]_FSYS_ECMOUNTCBGETSHORTNAMEL_ELONGNAME=0x4c
+[TRACE]TRACE_FILESYSTEM[0x40]_FSYS_ECMOUNTCBGETSHORTNAMEL_ESHORTNAME=0x4d
+[TRACE]TRACE_FILESYSTEM[0x40]_FSYS_ECMOUNTCBLOCK=0x5a
+[TRACE]TRACE_FILESYSTEM[0x40]_FSYS_ECMOUNTCBLOCKRET=0x5b
+[TRACE]TRACE_FILESYSTEM[0x40]_FSYS_ECMOUNTCBMKDIRL=0x1f
+[TRACE]TRACE_FILESYSTEM[0x40]_FSYS_ECMOUNTCBMKDIRLRET=0x21
+[TRACE]TRACE_FILESYSTEM[0x40]_FSYS_ECMOUNTCBMKDIRLYS_EDIRNAME=0x20
+[TRACE]TRACE_FILESYSTEM[0x40]_FSYS_ECMOUNTCBMOUNTCONTROL=0xb
+[TRACE]TRACE_FILESYSTEM[0x40]_FSYS_ECMOUNTCBMOUNTCONTROLRET=0xc
+[TRACE]TRACE_FILESYSTEM[0x40]_FSYS_ECMOUNTCBRAWREADL=0x8c
+[TRACE]TRACE_FILESYSTEM[0x40]_FSYS_ECMOUNTCBRAWREADLRET=0x8d
+[TRACE]TRACE_FILESYSTEM[0x40]_FSYS_ECMOUNTCBRAWWRITEL=0x8e
+[TRACE]TRACE_FILESYSTEM[0x40]_FSYS_ECMOUNTCBRAWWRITELRET=0x8f
+[TRACE]TRACE_FILESYSTEM[0x40]_FSYS_ECMOUNTCBREADFILESECTIONL=0x40
+[TRACE]TRACE_FILESYSTEM[0x40]_FSYS_ECMOUNTCBREADFILESECTIONLRET=0x42
+[TRACE]TRACE_FILESYSTEM[0x40]_FSYS_ECMOUNTCBREADFILESECTIONL_EFILENAME=0x41
+[TRACE]TRACE_FILESYSTEM[0x40]_FSYS_ECMOUNTCBREMOUNT1=0x7
+[TRACE]TRACE_FILESYSTEM[0x40]_FSYS_ECMOUNTCBREMOUNT1RET=0x8
+[TRACE]TRACE_FILESYSTEM[0x40]_FSYS_ECMOUNTCBREMOUNT2=0x86
+[TRACE]TRACE_FILESYSTEM[0x40]_FSYS_ECMOUNTCBREMOUNT2RET=0x87
+[TRACE]TRACE_FILESYSTEM[0x40]_FSYS_ECMOUNTCBRENAMEL=0x28
+[TRACE]TRACE_FILESYSTEM[0x40]_FSYS_ECMOUNTCBRENAMELRET=0x2b
+[TRACE]TRACE_FILESYSTEM[0x40]_FSYS_ECMOUNTCBRENAMELYS_ENEWNAME=0x2a
+[TRACE]TRACE_FILESYSTEM[0x40]_FSYS_ECMOUNTCBRENAMELYS_EOLDNAME=0x29
+[TRACE]TRACE_FILESYSTEM[0x40]_FSYS_ECMOUNTCBREPLACEL=0x2c
+[TRACE]TRACE_FILESYSTEM[0x40]_FSYS_ECMOUNTCBREPLACELRET=0x2f
+[TRACE]TRACE_FILESYSTEM[0x40]_FSYS_ECMOUNTCBREPLACEL_ENEWNAME=0x2e
+[TRACE]TRACE_FILESYSTEM[0x40]_FSYS_ECMOUNTCBREPLACEL_EOLDNAME=0x2d
+[TRACE]TRACE_FILESYSTEM[0x40]_FSYS_ECMOUNTCBRMDIRL=0x22
+[TRACE]TRACE_FILESYSTEM[0x40]_FSYS_ECMOUNTCBRMDIRLRET=0x24
+[TRACE]TRACE_FILESYSTEM[0x40]_FSYS_ECMOUNTCBRMDIRLYS_EDIRNAME=0x23
+[TRACE]TRACE_FILESYSTEM[0x40]_FSYS_ECMOUNTCBSCANDRIVE1=0x47
+[TRACE]TRACE_FILESYSTEM[0x40]_FSYS_ECMOUNTCBSCANDRIVE1RET=0x48
+[TRACE]TRACE_FILESYSTEM[0x40]_FSYS_ECMOUNTCBSCANDRIVE2=0x49
+[TRACE]TRACE_FILESYSTEM[0x40]_FSYS_ECMOUNTCBSCANDRIVE2RET=0x4a
+[TRACE]TRACE_FILESYSTEM[0x40]_FSYS_ECMOUNTCBSETENTRYL=0x33
+[TRACE]TRACE_FILESYSTEM[0x40]_FSYS_ECMOUNTCBSETENTRYLRET=0x35
+[TRACE]TRACE_FILESYSTEM[0x40]_FSYS_ECMOUNTCBSETENTRYL_EFILEPATH=0x34
+[TRACE]TRACE_FILESYSTEM[0x40]_FSYS_ECMOUNTCBSETVOLUMEL=0x1c
+[TRACE]TRACE_FILESYSTEM[0x40]_FSYS_ECMOUNTCBSETVOLUMELRET=0x1e
+[TRACE]TRACE_FILESYSTEM[0x40]_FSYS_ECMOUNTCBUNLOCK=0x5e
+[TRACE]TRACE_FILESYSTEM[0x40]_FSYS_ECMOUNTCBUNLOCKRET=0x5f
+[TRACE]TRACE_FILESYSTEM[0x40]_FSYS_ECMOUNTCBVOLUMEL=0x19
+[TRACE]TRACE_FILESYSTEM[0x40]_FSYS_ECMOUNTCBVOLUMELRETA=0x1a
+[TRACE]TRACE_FILESYSTEM[0x40]_FSYS_ECMOUNTCBVOLUMELRETB=0x1b
+[TRACE]TRACE_FILESYSTEM[0x40]_FSYS_ECMOUNTCBVOLUMESIZE=0xf
+[TRACE]TRACE_FILESYSTEM[0x40]_FSYS_ECMOUNTCBVOLUMESIZERET=0x10
+[TRACE]TRACE_FILESYSTEM[0x40]_FSYS_EVOLUMENAME=0x1d
diff -r 2a0ada0a1bf8 -r 95847726fe57 userlibandfileserver/fileserver/sfsrv/cl_cli.cpp
--- a/userlibandfileserver/fileserver/sfsrv/cl_cli.cpp	Wed May 12 10:34:10 2010 +0100
+++ b/userlibandfileserver/fileserver/sfsrv/cl_cli.cpp	Mon May 24 18:38:55 2010 +0100
@@ -17,13 +17,9 @@
 
 #include "cl_std.h"
 #include <f32fsys.h>
-
-
-
-
-
-
-
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "cl_cliTraces.h"
+#endif
 EFSRV_EXPORT_C TBool RFs::IsValidDrive(TInt aDrive)
 /**
 Tests whether the specified drive number is valid.
@@ -97,7 +93,7 @@
 
 	if (aDrive==KDefaultDrive)
 		{
-		TRACE1(UTF::EBorder, UTraceModuleEfsrv::EFsDriveToChar, MODULEUID, aDrive);
+		OstTrace1(TRACE_BORDER, EFSRV_EFSDRIVETOCHAR, "aDrive %d", aDrive);
 		RFs fs;
 		TFileName path;
 		TInt r=fs.Connect();
@@ -108,7 +104,7 @@
 		if (r!=KErrNone)
 			return(r);
 		aChar=path[0];
-		TRACE2(UTF::EBorder, UTraceModuleEfsrv::EFsDriveToCharReturn, MODULEUID, KErrNone, aChar);
+		OstTraceExt2(TRACE_BORDER, EFSRV_EFSDRIVETOCHARRETURN, "r %d aChar %x", (TUint) KErrNone, (TUint) aChar);
 		return(KErrNone);
 		}
 	if (!IsValidDrive(aDrive))
@@ -129,14 +125,12 @@
 @return True, if the address is in ROM; false, if not.
 */
 	{
-	TRACE1(UTF::EBorder, UTraceModuleEfsrv::EFsIsRomAddress, MODULEUID, aPtr);
-
+	OstTrace1(TRACE_BORDER, EFSRV_EFSISROMADDRESS, "aPtr %x", aPtr);
 	TBool res;
 	TInt r=User::IsRomAddress(res,aPtr); // Only returns error on WINS
 	if (r!=KErrNone)
 		res=EFalse;
-
-	TRACERET1(UTF::EBorder, UTraceModuleEfsrv::EFsIsRomAddressReturn, MODULEUID, res);
+	OstTrace1(TRACE_BORDER, EFSRV_EFSISROMADDRESSRETURN, "r %d", res);
 	return(res);
 	}
 
@@ -166,19 +160,18 @@
  */
 EFSRV_EXPORT_C TDriveNumber RFs::GetSystemDrive()
     {
-	TRACE0(UTF::EBorder, UTraceModuleEfsrv::EFsGetSystemDrive, MODULEUID);
+	OstTrace0(TRACE_BORDER, EFSRV_EFSGETSYSTEMDRIVE, "");
     TInt drive;
 	TInt err = RProperty::Get(TSecureId(KFileServerUidValue), KSystemDriveKey, drive);
     if(err==KErrNone)
         {
         if((drive>=EDriveA) && (drive<=EDriveZ))
             {
-			TRACE1(UTF::EBorder, UTraceModuleEfsrv::EFsGetSystemDriveReturn, MODULEUID, drive);
+			OstTrace1(TRACE_BORDER, EFSRV_EFSGETSYSTEMDRIVERETURN1, "r %d", drive);
             return static_cast<TDriveNumber>(drive);
             }
         }
-
-	TRACE1(UTF::EBorder, UTraceModuleEfsrv::EFsGetSystemDriveReturn, MODULEUID, EDriveC);
+	OstTrace1(TRACE_BORDER, EFSRV_EFSGETSYSTEMDRIVERETURN2, "r %d", EDriveC);
     return EDriveC;
 	}
     
@@ -193,11 +186,9 @@
 */
 EFSRV_EXPORT_C TChar RFs::GetSystemDriveChar()
 	{
-	TRACE0(UTF::EBorder, UTraceModuleEfsrv::EFsGetSystemDriveChar, MODULEUID);
-
+	OstTrace0(TRACE_BORDER, EFSRV_EFSGETSYSTEMDRIVECHAR, "");
 	TInt r = 'A' + GetSystemDrive();
-
-	TRACE1(UTF::EBorder, UTraceModuleEfsrv::EFsGetSystemDriveCharReturn, MODULEUID, r);
+	OstTrace1(TRACE_BORDER, EFSRV_EFSGETSYSTEMDRIVECHARRETURN, "RFs::GetSystemDriveChar() r %x", (char) r);
 	return r;
 	}
 
@@ -217,10 +208,9 @@
 */
 EFSRV_EXPORT_C TInt RFs::SetSystemDrive(TDriveNumber aSystemDrive)
 	{
-	TRACE2(UTF::EBorder, UTraceModuleEfsrv::EFsSetSystemDrive, MODULEUID, Handle(), aSystemDrive);
+	OstTraceExt2(TRACE_BORDER, EFSRV_EFSSETSYSTEMDRIVE, "sess %x aSystemDrive %d", (TUint) Handle(), (TUint) aSystemDrive);
     TInt r = SendReceive(EFsSetSystemDrive, TIpcArgs(aSystemDrive));
-
-	TRACERET1(UTF::EBorder, UTraceModuleEfsrv::EFsSetSystemDriveReturn, MODULEUID, r);
+	OstTrace1(TRACE_BORDER, EFSRV_EFSSETSYSTEMDRIVERETURN, "r %d", r);
 	return r;
 	}
 
@@ -247,11 +237,10 @@
         error codes.
 */
 	{
-	TRACE1(UTF::EBorder, UTraceModuleEfsrv::EFsConnect, MODULEUID, aMessageSlots);
+	OstTrace1(TRACE_BORDER, EFSRV_EFSCONNECT, "aMessageSlots %d", aMessageSlots);
 	_LIT(KFileServerName,"!FileServer");
 	TInt r = CreateSession(KFileServerName,Version(),aMessageSlots);
-
-	TRACERET2(UTF::EBorder, UTraceModuleEfsrv::EFsConnectReturn, MODULEUID, r, Handle());
+	OstTraceExt2(TRACE_BORDER, EFSRV_EFSCONNECTRETURN, "r %d sess %x", (TUint) r, (TUint) Handle());
 	return r;
 	}
 
@@ -275,10 +264,9 @@
         error codes.
 */
 	{	
-	TRACE2(UTF::EBorder, UTraceModuleEfsrv::EFsSetSessionToPrivate, MODULEUID, Handle(), aDrive);
+	OstTraceExt2(TRACE_BORDER, EFSRV_EFSSETSESSIONTOPRIVATE, "sess %x  aDrive %d", (TUint) Handle(), (TUint) aDrive);
 	TInt r = SendReceive(EFsSessionToPrivate,TIpcArgs(aDrive));
-
-	TRACERET1(UTF::EBorder, UTraceModuleEfsrv::EFsSetSessionToPrivateReturn, MODULEUID, r);
+	OstTrace1(TRACE_BORDER, EFSRV_EFSSETSESSIONTOPRIVATERETURN, "r %d", r);
 	return r;
 	}
 
@@ -294,10 +282,10 @@
 @param aPath On successful return, contains the private path for a process.
 */
 	{
-	TRACE1(UTF::EBorder, UTraceModuleEfsrv::EFsPrivatePath, MODULEUID, Handle());
+	OstTrace1(TRACE_BORDER, EFSRV_EFSPRIVATEPATH, "sess %x", Handle());
 	TInt r = SendReceive(EFsPrivatePath,TIpcArgs(&aPath));
-
-	TRACERETMULT2(UTF::EBorder, UTraceModuleEfsrv::EFsPrivatePathReturn, MODULEUID, r, aPath);
+	OstTraceData(TRACE_BORDER, EFSRV_EFSPRIVATEPATH_EDIRNAME, "Dir %S", aPath.Ptr(), aPath.Length()<<1);
+	OstTrace1(TRACE_BORDER, EFSRV_EFSPRIVATEPATHRETURN, "r %d", r);
 	return r;
 	}
 
@@ -318,10 +306,9 @@
         error codes.
 */
 	{
-	TRACE2(UTF::EBorder, UTraceModuleEfsrv::EFsCreatePrivatePath, MODULEUID, Handle(), aDrive);
+	OstTraceExt2(TRACE_BORDER, EFSRV_EFSCREATEPRIVATEPATH, "sess %x aDrive %d", (TUint) Handle(), (TUint) aDrive);
 	TInt r = SendReceive(EFsCreatePrivatePath,TIpcArgs(aDrive));
-
-	TRACERET1(UTF::EBorder, UTraceModuleEfsrv::EFsCreatePrivatePathReturn, MODULEUID, r);
+	OstTrace1(TRACE_BORDER, EFSRV_EFSCREATEPRIVATEPATHRETURN, "r %d", r);
 	return r;
 	}	
 
@@ -335,11 +322,9 @@
 @return The client side version number.
 */
 	{
-	TRACE1(UTF::EBorder, UTraceModuleEfsrv::EFsVersion, MODULEUID, Handle());
-
+	OstTrace1(TRACE_BORDER, EFSRV_EFSVERSION, "sess %x", Handle());
 	TVersion r = TVersion(KF32MajorVersionNumber,KF32MinorVersionNumber,KF32BuildVersionNumber);
-
-	TRACERET3(UTF::EBorder, UTraceModuleEfsrv::EFsVersionReturn, MODULEUID, r.iMajor, r.iMinor, r.iBuild);
+	OstTraceExt3(TRACE_BORDER, EFSRV_EFSVERSIONRETURN, "iMajor %d iMinor %d iBuild %d", (TUint) r.iMajor, (TUint) r.iMinor, (TUint) r.iBuild);
 	return r;
 	}
 
@@ -364,7 +349,8 @@
 @see RFs::MountFileSystem        
 */
 	{
-	TRACEMULT2(UTF::EBorder, UTraceModuleEfsrv::EFsAddFileSystem, MODULEUID, Handle(), aFileName);
+	OstTrace1(TRACE_BORDER, EFSRV_EFSADDFILESYSTEM, "sess %x", Handle());
+	OstTraceData(TRACE_BORDER, EFSRV_EFSADDFILESYSTEM_EFILENAME, "FileName %S", aFileName.Ptr(), aFileName.Length()<<1);
 	RLoader loader;
 	TInt r = loader.Connect();
 	if (r==KErrNone)
@@ -372,8 +358,7 @@
 		r = loader.SendReceive(ELoadFileSystem, TIpcArgs(0, &aFileName, 0));
 		loader.Close();
 		}
-
-	TRACERET1(UTF::EBorder, UTraceModuleEfsrv::EFsAddFileSystemReturn, MODULEUID, r);
+	OstTrace1(TRACE_BORDER, EFSRV_EFSADDFILESYSTEMRETURN, "r %d", r);
 	return r;
 	}
 
@@ -395,10 +380,10 @@
 
 */
 	{
-	TRACEMULT2(UTF::EBorder, UTraceModuleEfsrv::EFsRemoveFileSystem, MODULEUID, Handle(), aFileSystemName);
+	OstTrace1(TRACE_BORDER, EFSRV_EFSREMOVEFILESYSTEM, "sess %x", Handle());
+	OstTraceData(TRACE_BORDER, EFSRV_EFSREMOVEFILESYSTEM_EFILESYSTEMNAME, "FileSystemName %S", aFileSystemName.Ptr(), aFileSystemName.Length()<<1);
 	TInt r = SendReceive(EFsRemoveFileSystem,TIpcArgs(&aFileSystemName));
-
-	TRACERET1(UTF::EBorder, UTraceModuleEfsrv::EFsRemoveFileSystemReturn, MODULEUID, r);
+	OstTrace1(TRACE_BORDER, EFSRV_EFSREMOVEFILESYSTEMRETURN, "r %d", r);
 	return r;
 	}
 
@@ -423,10 +408,10 @@
 @see RFs::FileSystemName
 */
 	{
-	TRACEMULT3(UTF::EBorder, UTraceModuleEfsrv::EFsMountFileSystem1, MODULEUID, Handle(), aFileSystemName, aDrive);
+	OstTraceExt2(TRACE_BORDER, EFSRV_EFSMOUNTFILESYSTEM1, "sess %x aDrive %d", (TUint) Handle(), (TUint) aDrive);
+	OstTraceData(TRACE_BORDER, EFSRV_EFSMOUNTFILESYSTEM1_EFILESYSTEMNAME, "FileSystemName %S", aFileSystemName.Ptr(), aFileSystemName.Length()<<1);
 	TInt r = SendReceive(EFsMountFileSystem,TIpcArgs(&aFileSystemName,aDrive,NULL,EFalse));
-
-	TRACERET1(UTF::EBorder, UTraceModuleEfsrv::EFsMountFileSystem1Return, MODULEUID, r);
+	OstTrace1(TRACE_BORDER, EFSRV_EFSMOUNTFILESYSTEM1RETURN, "r %d", r);
 	return r;
 	}
 
@@ -454,16 +439,14 @@
 
 @return KErrNone if successful, otherwise one of the other system-wide error codes.
 @capability DiskAdmin
-
 @see RFs::AddFileSystem
 @see RFs::FileSystemName
 */
 	{
-	TRACEMULT4(UTF::EBorder, UTraceModuleEfsrv::EFsMountFileSystem2, MODULEUID, Handle(), aFileSystemName, aDrive, aIsSync);
-
+	OstTraceExt3(TRACE_BORDER, EFSRV_EFSMOUNTFILESYSTEM2, "sess %x aDrive %d aIsSync %d", (TUint) Handle(), (TUint) aDrive, (TUint) aIsSync);
+	OstTraceData(TRACE_BORDER, EFSRV_EFSMOUNTFILESYSTEM2_EFILESYSTEMNAME, "FileSystemName %S", aFileSystemName.Ptr(), aFileSystemName.Length()<<1);
 	TInt r = SendReceive(EFsMountFileSystem,TIpcArgs(&aFileSystemName,aDrive,NULL,aIsSync));
-
-	TRACERET1(UTF::EBorder, UTraceModuleEfsrv::EFsMountFileSystem2Return, MODULEUID, r);
+	OstTrace1(TRACE_BORDER, EFSRV_EFSMOUNTFILESYSTEM2RETURN, "r %d", r);
 	return r;
 	}
 
@@ -489,11 +472,11 @@
 @see RFs::FileSystemName
 */
 	{
-	TRACEMULT4(UTF::EBorder, UTraceModuleEfsrv::EFsMountFileSystem3, MODULEUID, Handle(), aFileSystemName, aExtensionName, aDrive);
-
+	OstTraceExt2(TRACE_BORDER, EFSRV_EFSMOUNTFILESYSTEM3, "sess %x aDrive %d", (TUint) Handle(), (TUint) aDrive);
+	OstTraceData(TRACE_BORDER, EFSRV_EFSMOUNTFILESYSTEM3_EEXTENSIONNAME, "ExtensionName %S", aExtensionName.Ptr(), aExtensionName.Length()<<1);
+	OstTraceData(TRACE_BORDER, EFSRV_EFSMOUNTFILESYSTEM3_EFILESYSTEMNAME, "FileSystemName %S", aFileSystemName.Ptr(), aFileSystemName.Length()<<1);
 	TInt r = SendReceive(EFsMountFileSystem,TIpcArgs(&aFileSystemName,aDrive,&aExtensionName,EFalse));
-
-	TRACERET1(UTF::EBorder, UTraceModuleEfsrv::EFsMountFileSystem3Return, MODULEUID, r);
+	OstTrace1(TRACE_BORDER, EFSRV_EFSMOUNTFILESYSTEM3RETURN, "r %d", r);
 	return r;
 	}
 
@@ -528,10 +511,11 @@
 @see RFs::FileSystemName
 */
 	{
-	TRACEMULT5(UTF::EBorder, UTraceModuleEfsrv::EFsMountFileSystem4, MODULEUID, Handle(), aFileSystemName, aExtensionName, aDrive, aIsSync);
+	OstTraceExt3(TRACE_BORDER, EFSRV_EFSMOUNTFILESYSTEM4, "sess %x aDrive %d aIsSync %d", (TUint) Handle(), (TUint) aDrive, (TUint) aIsSync);
+	OstTraceData(TRACE_BORDER, EFSRV_EFSMOUNTFILESYSTEM4_EFILESYSTEMNAME, "FileSystemName %S", aFileSystemName.Ptr(), aFileSystemName.Length()<<1);
+	OstTraceData(TRACE_BORDER, EFSRV_EFSMOUNTFILESYSTEM4_EEXTENSIONNAME, "ExtensionName %S", aExtensionName.Ptr(), aExtensionName.Length()<<1);
 	TInt r = SendReceive(EFsMountFileSystem,TIpcArgs(&aFileSystemName,aDrive,&aExtensionName,aIsSync));
-
-	TRACERET1(UTF::EBorder, UTraceModuleEfsrv::EFsMountFileSystem4Return, MODULEUID, r);
+	OstTrace1(TRACE_BORDER, EFSRV_EFSMOUNTFILESYSTEM4RETURN, "r %d", r);
 	return r;
 	}
 
@@ -560,12 +544,12 @@
 @see RFs::FileSystemName
 */
 	{
-	TRACEMULT3(UTF::EBorder, UTraceModuleEfsrv::EFsMountFileSystemAndScan1, MODULEUID, Handle(), aFileSystemName, aDrive);
+	OstTraceExt2(TRACE_BORDER, EFSRV_EFSMOUNTFILESYSTEMANDSCAN1, "sess %x aDrive %d", (TUint) Handle(), (TUint) aDrive);
+	OstTraceData(TRACE_BORDER, EFSRV_EFSMOUNTFILESYSTEMANDSCAN1_EFILESYSTEMNAME, "FileSystemName %S", aFileSystemName.Ptr(), aFileSystemName.Length()<<1);
 	aIsMountSuccess=EFalse;
 	TPckg<TInt> pckg(aIsMountSuccess);
 	TInt r = SendReceive(EFsMountFileSystemScan,TIpcArgs(&aFileSystemName,aDrive,NULL,&pckg));
-
-	TRACERET2(UTF::EBorder, UTraceModuleEfsrv::EFsMountFileSystemAndScan1Return, MODULEUID, r, aIsMountSuccess);
+	OstTraceExt2(TRACE_BORDER, EFSRV_EFSMOUNTFILESYSTEMANDSCAN1RETURN, "r %d aIsMountSuccess %d", (TUint) r, (TUint) aIsMountSuccess);
 	return r;
 	}
 
@@ -598,14 +582,13 @@
 @see RFs::FileSystemName
 */
 	{
-	TRACEMULT5(UTF::EBorder, UTraceModuleEfsrv::EFsMountFileSystemAndScan2, MODULEUID, 
-		Handle(), aFileSystemName, aExtensionName, aDrive, aIsMountSuccess);
-
+	OstTraceExt3(TRACE_BORDER, EFSRV_EFSMOUNTFILESYSTEMANDSCAN2, "sess %x aDrive %d aIsMountSuccess %d", (TUint) Handle(), (TUint) aDrive, (TUint) aIsMountSuccess);
+	OstTraceData(TRACE_BORDER, EFSRV_EFSMOUNTFILESYSTEMANDSCAN2_EFILESYSTEMNAME, "FileSystemName %S", aFileSystemName.Ptr(), aFileSystemName.Length()<<1);
+	OstTraceData(TRACE_BORDER, EFSRV_EFSMOUNTFILESYSTEMANDSCAN2_EEXTENSIONNAME, "ExtensionName %S", aExtensionName.Ptr(), aExtensionName.Length()<<1);
 	aIsMountSuccess=EFalse;
 	TPckg<TInt> pckg(aIsMountSuccess);
 	TInt r = SendReceive(EFsMountFileSystemScan,TIpcArgs(&aFileSystemName,aDrive,&aExtensionName,&pckg));
-
-	TRACERET2(UTF::EBorder, UTraceModuleEfsrv::EFsMountFileSystemAndScan2Return, MODULEUID, r, aIsMountSuccess);
+	OstTraceExt2(TRACE_BORDER, EFSRV_EFSMOUNTFILESYSTEMANDSCAN2RETURN, "r %d aIsMountSuccess %d", (TUint) r, (TUint) aIsMountSuccess);
 	return r;
 	}
 
@@ -632,10 +615,10 @@
 @see RFs::FileSystemName 		
 */
 	{
-	TRACEMULT3(UTF::EBorder, UTraceModuleEfsrv::EFsDismountFileSystem, MODULEUID, Handle(), aFileSystemName, aDrive);
+	OstTraceExt2(TRACE_BORDER, EFSRV_EFSDISMOUNTFILESYSTEM, "sess %x aDrive %d", (TUint) Handle(), (TUint) aDrive);
+	OstTraceData(TRACE_BORDER, EFSRV_EFSDISMOUNTFILESYSTEM_EFILESYSTEMNAME, "FileSystemName %S", aFileSystemName.Ptr(), aFileSystemName.Length()<<1);
 	TInt r = SendReceive(EFsDismountFileSystem,TIpcArgs(&aFileSystemName,aDrive));
-
-	TRACERET1(UTF::EBorder, UTraceModuleEfsrv::EFsDismountFileSystemReturn, MODULEUID, r);
+	OstTrace1(TRACE_BORDER, EFSRV_EFSDISMOUNTFILESYSTEMRETURN, "r %d", r);
 	return r;
 	}
 
@@ -661,12 +644,11 @@
 */
 EFSRV_EXPORT_C TInt RFs::FileSystemName(TDes& aName,TInt aDrive) const
 	{
-	TRACE2(UTF::EBorder, UTraceModuleEfsrv::EFsFileSystemName, MODULEUID, Handle(), aDrive);
-
+	OstTraceExt2(TRACE_BORDER, EFSRV_EFSFILESYSTEMNAME, "sess %x aDrive %d", (TUint) Handle(), (TUint) aDrive);
 	//-- ipc argument "-1" here is to indicate legacy FileSystemName() API
     TInt r = SendReceive(EFsFileSystemName,TIpcArgs(&aName, aDrive, -1)); 
-
-	TRACERETMULT2(UTF::EBorder, UTraceModuleEfsrv::EFsFileSystemNameReturn, MODULEUID, r, aName);
+	OstTraceData(TRACE_BORDER, EFSRV_EFSFILESYSTEMNAME_EFILESYSTEMNAME, "FileSystemName %S", aName.Ptr(), aName.Length()<<1);
+	OstTrace1(TRACE_BORDER, EFSRV_EFSFILESYSTEMNAMERETURN, "r %d", r);
 	return r;
 	}
 
@@ -701,12 +683,11 @@
     {
 	if(aFsEnumerator < 0)
         return KErrArgument; //-- see RFs::FileSystemName(). "-1" is a reserved value
-
-    TRACE2(UTF::EBorder, UTraceModuleEfsrv::EFsFileSystemName, MODULEUID, Handle(), aDrive);
+    OstTraceExt2(TRACE_BORDER, EFSRV_EFSSUPPORTEDFILESYSTEMNAME, "sess %x aDrive %d", (TUint) Handle(), (TUint) aDrive);
     
     TInt r = SendReceive(EFsFileSystemName,TIpcArgs(&aName, aDrive, aFsEnumerator));
-
-	TRACERETMULT2(UTF::EBorder, UTraceModuleEfsrv::EFsFileSystemNameReturn, MODULEUID, r, aName);
+	OstTraceData(TRACE_BORDER, EFSRV_EFSFILESYSTEMNAME_ESUPPORTEDFILESYSTEMNAME, "SupportedFileSystemName %S", aName.Ptr(), aName.Length()<<1);
+	OstTrace1(TRACE_BORDER, EFSRV_EFSSUPPORTEDFILESYSTEMNAMERETURN, "r %d", r);
 	return r;
     }
 
@@ -723,7 +704,8 @@
 @return KErrNone, if successful; otherwise one of the other system wide error codes.
 */
 	{
-	TRACEMULT2(UTF::EBorder, UTraceModuleEfsrv::EFsAddExtension, MODULEUID, Handle(), aFileName);
+	OstTrace1(TRACE_BORDER, EFSRV_EFSADDEXTENSION, "sess %x", Handle());
+	OstTraceData(TRACE_BORDER, EFSRV_EFSADDEXTENSION_EEXTENSIONNAME, "ExtensionName %S", aFileName.Ptr(), aFileName.Length()<<1);
 	RLoader loader;
 	TInt r = loader.Connect();
 	if (r==KErrNone)
@@ -731,8 +713,7 @@
 		r = loader.SendReceive(ELoadFSExtension, TIpcArgs(0, &aFileName, 0));
 		loader.Close();
 		}
-
-	TRACERET1(UTF::EBorder, UTraceModuleEfsrv::EFsAddExtensionReturn, MODULEUID, r);
+	OstTrace1(TRACE_BORDER, EFSRV_EFSADDEXTENSIONRETURN, "r %d", r);
 	return r;
 	}
 
@@ -756,10 +737,10 @@
 @see RFs::ExtensionName
 */
 	{
-	TRACEMULT3(UTF::EBorder, UTraceModuleEfsrv::EFsMountExtension, MODULEUID, Handle(), aExtensionName, aDrive);
+	OstTraceExt2(TRACE_BORDER, EFSRV_EFSMOUNTEXTENSION, "sess %x aDrive %d", (TUint) Handle(), (TUint) aDrive);
+	OstTraceData(TRACE_BORDER, EFSRV_EFSMOUNTEXTENSION_EEXTENSIONNAME, "ExtensionName %S", aExtensionName.Ptr(), aExtensionName.Length()<<1);
 	TInt r = SendReceive(EFsMountExtension,TIpcArgs(&aExtensionName,aDrive));
-
-	TRACERET1(UTF::EBorder, UTraceModuleEfsrv::EFsMountExtensionReturn, MODULEUID, r);
+	OstTrace1(TRACE_BORDER, EFSRV_EFSMOUNTEXTENSIONRETURN, "r %d", r);
 	return r;
 	}
 
@@ -780,10 +761,10 @@
 */
 EFSRV_EXPORT_C TInt RFs::DismountExtension(const TDesC& aExtensionName,TInt aDrive)
 	{
-	TRACEMULT3(UTF::EBorder, UTraceModuleEfsrv::EFsDismountExtension, MODULEUID, Handle(), aExtensionName, aDrive);
+	OstTraceExt2(TRACE_BORDER, EFSRV_EFSDISMOUNTEXTENSION, "sess %x aDrive %d", (TUint) Handle(), (TUint) aDrive);
+	OstTraceData(TRACE_BORDER, EFSRV_EFSDISMOUNTEXTENSION_EEXTENSIONNAME, "ExtensionName %S", aExtensionName.Ptr(), aExtensionName.Length()<<1);
 	TInt r = SendReceive(EFsDismountExtension,TIpcArgs(&aExtensionName,aDrive));
-
-	TRACERET1(UTF::EBorder, UTraceModuleEfsrv::EFsDismountExtensionReturn, MODULEUID, r);
+	OstTrace1(TRACE_BORDER, EFSRV_EFSDISMOUNTEXTENSIONRETURN, "r %d", r);
 	return r;
 	}
 
@@ -800,10 +781,10 @@
         otrherwise one of the other system-wide error codes.
 */
 	{
-	TRACEMULT2(UTF::EBorder, UTraceModuleEfsrv::EFsRemoveExtension, MODULEUID, Handle(), aExtensionName);
+	OstTrace1(TRACE_BORDER, EFSRV_EFSREMOVEEXTENSION, "sess %x", Handle());
+	OstTraceData(TRACE_BORDER, EFSRV_EFSREMOVEEXTENSION_EEXTENSIONNAME, "ExtensionName %S", aExtensionName.Ptr(), aExtensionName.Length()<<1);
 	TInt r = SendReceive(EFsRemoveExtension,TIpcArgs(&aExtensionName));
-
-	TRACERET1(UTF::EBorder, UTraceModuleEfsrv::EFsRemoveExtensionReturn, MODULEUID, r);
+	OstTrace1(TRACE_BORDER, EFSRV_EFSREMOVEEXTENSIONRETURN, "r %d", r);
 	return r;
 	}
 
@@ -823,10 +804,10 @@
         KErrNotFound if the extension name is not found;
 */
 	{
-	TRACEMULT4(UTF::EBorder, UTraceModuleEfsrv::EFsExtensionName, MODULEUID, Handle(), aExtensionName, aDrive, aPos);
+	OstTraceExt3(TRACE_BORDER, EFSRV_EFSEXTENSIONNAME, "sess %x aDrive %d aPos %x", (TUint) Handle(), (TUint) aDrive, (TUint) aPos);
+	OstTraceData(TRACE_BORDER, EFSRV_EFSEXTENSIONNAME_EEXTENSIONNAME, "ExtensionName %S", aExtensionName.Ptr(), aExtensionName.Length()<<1);
 	TInt r = SendReceive(EFsExtensionName,TIpcArgs(&aExtensionName,aDrive,aPos));
-
-	TRACERET1(UTF::EBorder, UTraceModuleEfsrv::EFsExtensionNameReturn, MODULEUID, r);
+	OstTrace1(TRACE_BORDER, EFSRV_EFSEXTENSIONNAMERETURN, "r %d", r);
 	return r;
 	}
 
@@ -850,10 +831,9 @@
         the other system wide error codes.
 */
 	{
-	TRACE4(UTF::EBorder, UTraceModuleEfsrv::EFsRemountDrive, MODULEUID, Handle(), aDrive, aMountInfo, aFlags);
+	OstTraceExt4(TRACE_BORDER, EFSRV_EFSREMOUNTDRIVE, "sess %x aDrive %d aMountInfo %x aFlags %x", (TUint) Handle(), aDrive, (TUint) aMountInfo, (TUint) aFlags);
 	TInt r = SendReceive(EFsRemountDrive,TIpcArgs(aDrive,aMountInfo,aFlags));
-
-	TRACERET1(UTF::EBorder, UTraceModuleEfsrv::EFsRemountDriveReturn, MODULEUID, r);
+	OstTrace1(TRACE_BORDER, EFSRV_EFSREMOUNTDRIVERETURN, "r %d", r);
 	return r;
 	}
 
@@ -899,7 +879,7 @@
 
 */
 	{
-	TRACE3(UTF::EBorder, UTraceModuleEfsrv::EFsNotifyChange1, MODULEUID, Handle(), aType, &aStat);
+	OstTraceExt3(TRACE_BORDER, EFSRV_EFSNOTIFYCHANGE1, "sess %x aType %x status %x", (TUint) Handle(), (TUint) aType, (TUint) &aStat);
 	aStat=KRequestPending;
 	// for backward compatibility
 	TNotifyType type = (aType == 0 ? ENotifyEntry : aType);
@@ -907,7 +887,7 @@
 	//This call is to synchronise with the file server when this functions stack varibles can go out of scope
 	SendReceive(EFsSynchroniseDriveThread, TIpcArgs(-1));		
 
-	TRACE0(UTF::EBorder, UTraceModuleEfsrv::EFsNotifyChange1Return, MODULEUID);
+	OstTrace0(TRACE_BORDER, EFSRV_EFSNOTIFYCHANGE1RETURN, "");
 	}
 
 
@@ -966,7 +946,8 @@
 
 */
 	{
-	TRACEMULT4(UTF::EBorder, UTraceModuleEfsrv::EFsNotifyChange2, MODULEUID, Handle(), (TUint) aType, (TUint) &aStat, aPathName);
+	OstTraceExt3(TRACE_BORDER, EFSRV_EFSNOTIFYCHANGE2, "sess %x aType %x status %x", (TUint) Handle(), (TUint) aType, (TUint) &aStat);
+	OstTraceData(TRACE_BORDER, EFSRV_EFSNOTIFYCHANGE2_EDIRNAME, "Dir %S", aPathName.Ptr(), aPathName.Length()<<1);
 	aStat=KRequestPending;
 	// for backward compatibility
 	TNotifyType type = (aType == 0 ? ENotifyEntry : aType);
@@ -974,7 +955,7 @@
 	//This call is to synchronise with the file server when this functions stack varibles can go out of scope
 	SendReceive(EFsSynchroniseDriveThread, TIpcArgs(-1));
 
-	TRACE0(UTF::EBorder, UTraceModuleEfsrv::EFsNotifyChange2Return, MODULEUID);
+	OstTrace0(TRACE_BORDER, EFSRV_EFSNOTIFYCHANGE2RETURN, "");
 	}
 
 
@@ -991,10 +972,10 @@
 
 */
 	{
-	TRACE1(UTF::EBorder, UTraceModuleEfsrv::EFsNotifyChangeCancel1, MODULEUID, Handle());
+	OstTrace1(TRACE_BORDER, EFSRV_EFSNOTIFYCHANGECANCEL1, "sess %x", Handle());
 	RSessionBase::SendReceive(EFsNotifyChangeCancel);
 
-	TRACE0(UTF::EBorder, UTraceModuleEfsrv::EFsNotifyChangeCancel1Return, MODULEUID);
+	OstTrace0(TRACE_BORDER, EFSRV_EFSNOTIFYCHANGECANCEL1RETURN, "");
 	}
 
 
@@ -1015,11 +996,11 @@
 
 */
 	{
-	TRACE2(UTF::EBorder, UTraceModuleEfsrv::EFsNotifyChangeCancel2, MODULEUID, Handle(), &aStat);
+	OstTraceExt2(TRACE_BORDER, EFSRV_EFSNOTIFYCHANGECANCEL2, "sess %x status %x", (TUint) Handle(), (TUint) &aStat);
 	if (aStat==KRequestPending)			//	May be better to ASSERT this?
 		SendReceive(EFsNotifyChangeCancelEx,TIpcArgs(&aStat));
 
-	TRACE0(UTF::EBorder, UTraceModuleEfsrv::EFsNotifyChangeCancel2Return, MODULEUID);
+	OstTrace0(TRACE_BORDER, EFSRV_EFSNOTIFYCHANGECANCEL2RETURN, "");
 	}
 
 
@@ -1070,8 +1051,8 @@
 @see TDriveNumber
 */
 	{
-	TRACE5(UTF::EBorder, UTraceModuleEfsrv::EFsNotifyDiskSpace, MODULEUID, 
-		Handle(), I64LOW(aThreshold),I64HIGH(aThreshold), aDrive,(TUint) &aStat);
+	OstTraceExt5(TRACE_BORDER, EFSRV_EFSNOTIFYDISKSPACE, "sess %x aThreshold %x:%x aDrive %d status %x", (TUint) Handle(), (TUint) I64HIGH(aThreshold), (TUint) I64LOW(aThreshold), (TUint) aDrive, (TUint) &aStat);
+		
 	aStat=KRequestPending;
 	TPtrC8 tBuf((TUint8*)&aThreshold,sizeof(TInt64));
 	RSessionBase::SendReceive(EFsNotifyDiskSpace,TIpcArgs(&tBuf,aDrive,&aStat), aStat);
@@ -1081,7 +1062,7 @@
 	SendReceive(EFsSynchroniseDriveThread, TIpcArgs(aDrive));
 
 
-	TRACE0(UTF::EBorder, UTraceModuleEfsrv::EFsNotifyDiskSpaceReturn, MODULEUID);
+	OstTrace0(TRACE_BORDER, EFSRV_EFSNOTIFYDISKSPACERETURN, "");
 	}
 
 
@@ -1098,12 +1079,12 @@
 			 notification request.
 */
 	{
-	TRACE2(UTF::EBorder, UTraceModuleEfsrv::EFsNotifyDiskSpaceCancel1, MODULEUID, Handle(), &aStat);
+	OstTraceExt2(TRACE_BORDER, EFSRV_EFSNOTIFYDISKSPACECANCEL1, "sess %x status %x", (TUint) Handle(), (TUint) &aStat);
 	
 	if(aStat==KRequestPending)
 		SendReceive(EFsNotifyDiskSpaceCancel,TIpcArgs(&aStat));
 
-	TRACE0(UTF::EBorder, UTraceModuleEfsrv::EFsNotifyDiskSpaceCancel1Return, MODULEUID);
+	OstTrace0(TRACE_BORDER, EFSRV_EFSNOTIFYDISKSPACECANCEL1RETURN, "");
 	}
 
 
@@ -1117,10 +1098,10 @@
 Outstanding requests complete with KErrCancel.
 */
 	{
-	TRACE1(UTF::EBorder, UTraceModuleEfsrv::EFsNotifyDiskSpaceCancel2, MODULEUID, Handle());
+	OstTrace1(TRACE_BORDER, EFSRV_EFSNOTIFYDISKSPACECANCEL2, "sess %x", Handle());
 	SendReceive(EFsNotifyDiskSpaceCancel,TIpcArgs(NULL));
 
-	TRACE0(UTF::EBorder, UTraceModuleEfsrv::EFsNotifyDiskSpaceCancel2Return, MODULEUID);
+	OstTrace0(TRACE_BORDER, EFSRV_EFSNOTIFYDISKSPACECANCEL2RETURN, "");
 	}
 
 
@@ -1146,10 +1127,9 @@
 @return KErrNone, successful, otherwise one of the other system-wide error codes.
 */
 	{
-	TRACE1(UTF::EBorder, UTraceModuleEfsrv::EFsDriveList1, MODULEUID, Handle());
+	OstTrace1(TRACE_BORDER, EFSRV_EFSDRIVELIST1, "sess %x", Handle());
 	TInt r = SendReceive(EFsDriveList,TIpcArgs(&aList, KDriveAttExclude|KDriveAttRemote|KDriveAttHidden));
-
-	TRACERET1(UTF::EBorder, UTraceModuleEfsrv::EFsDriveList1Return, MODULEUID, r);
+	OstTrace1(TRACE_BORDER, EFSRV_EFSDRIVELIST1RETURN, "r %d", r);
 	return r;
 	}
 
@@ -1180,10 +1160,9 @@
 		KErrArgument, If aFlags contains an invalid attribute combination.
 */
 	{
-	TRACE2(UTF::EBorder, UTraceModuleEfsrv::EFsDriveList2, MODULEUID, Handle(), aFlags);
+	OstTraceExt2(TRACE_BORDER, EFSRV_EFSDRIVELIST2, "sess %x aFlags %x", (TUint) Handle(), (TUint) aFlags);
 	TInt r = SendReceive(EFsDriveList,TIpcArgs(&aList,aFlags));
-
-	TRACERET1(UTF::EBorder, UTraceModuleEfsrv::EFsDriveList2Return, MODULEUID, r);
+	OstTrace1(TRACE_BORDER, EFSRV_EFSDRIVELIST2RETURN, "r %d", r);
 	return r;
 	}
 
@@ -1213,12 +1192,10 @@
 @see RFs::Volume
 */
 	{
-	TRACE2(UTF::EBorder, UTraceModuleEfsrv::EFsDrive, MODULEUID, Handle(), aDrive);
-
+	OstTraceExt2(TRACE_BORDER, EFSRV_EFSDRIVE, "sess %x aDrive %d", (TUint) Handle(), (TUint) aDrive);
 	TPckg<TDriveInfo> m(anInfo);
 	TInt r = SendReceive(EFsDrive,TIpcArgs(&m,aDrive));
-
-	TRACERET4(UTF::EBorder, UTraceModuleEfsrv::EFsDriveReturn, MODULEUID, r, anInfo.iDriveAtt, anInfo.iMediaAtt, anInfo.iType);
+	OstTraceExt4(TRACE_BORDER, EFSRV_EFSDRIVERETURN, "r %d driveAtt %x mediaAtt %x type %x", r, (TUint) anInfo.iDriveAtt, (TUint) anInfo.iMediaAtt, (TUint) anInfo.iType);
 	return r;
 	}
 
@@ -1250,13 +1227,11 @@
 @see RFs::Drive
 */
 	{
-	TRACE2(UTF::EBorder, UTraceModuleEfsrv::EFsVolume1, MODULEUID, Handle(), aDrive);
+	OstTraceExt2(TRACE_BORDER, EFSRV_EFSVOLUME1, "sess %x aDrive %d", (TUint) Handle(), (TUint) aDrive);
 	TPckg<TVolumeInfo> v(aVol);
     TInt r = SendReceive(EFsVolume,TIpcArgs(&v,aDrive,NULL));
-
-	TRACE7(UTF::EBorder, UTraceModuleEfsrv::EFsVolume1Return, MODULEUID, 
-		r, aVol.iUniqueID, I64LOW(aVol.iSize), I64HIGH(aVol.iSize),
-		I64LOW(aVol.iFree), I64HIGH(aVol.iFree), aVol.iFileCacheFlags);
+	OstTraceExt5(TRACE_BORDER, EFSRV_EFSVOLUME1RETURNA, "r %d iSize %x:%x iFree %x:%x", (TUint) r, (TUint) I64HIGH(aVol.iSize), (TUint) I64LOW(aVol.iSize), (TUint) I64HIGH(aVol.iFree), (TUint) I64LOW(aVol.iFree));
+	OstTraceExt2(TRACE_BORDER, EFSRV_EFSVOLUME1RETURNB, "iUniqueID %x iFileCacheFlags %x", (TUint) aVol.iUniqueID, (TUint) aVol.iFileCacheFlags);
 	return r;
 	}
 
@@ -1279,12 +1254,12 @@
 */
 EFSRV_EXPORT_C void RFs::Volume(TVolumeInfo& aVol,TInt aDrive, TRequestStatus& aStat) const
     {
-	TRACE3(UTF::EBorder, UTraceModuleEfsrv::EFsVolume2, MODULEUID, Handle(), aDrive, &aStat);
+	OstTraceExt3(TRACE_BORDER, EFSRV_EFSVOLUME2, "sess %x aDrive %d status %x", (TUint) Handle(), (TUint) aDrive, (TUint) &aStat);
 	TPckg<TVolumeInfo> v(aVol);
     aStat=KRequestPending;
     RSessionBase::SendReceive(EFsVolume,TIpcArgs(&v,aDrive,&aStat), aStat);
 
-	TRACE0(UTF::EBorder, UTraceModuleEfsrv::EFsVolume2Return, MODULEUID);
+	OstTrace0(TRACE_BORDER, EFSRV_EFSVOLUME2RETURN, "");
     }
 
 
@@ -1314,12 +1289,11 @@
 @see RFs::Volume
 */
 	{
-	TRACEMULT3(UTF::EBorder, UTraceModuleEfsrv::EFsSetVolumeLabel, MODULEUID, 
-		Handle(), aName, aDrive);
-
+	OstTraceExt2(TRACE_BORDER, EFSRV_EFSSETVOLUMELABEL, "sess %x aDrive %d", (TUint) Handle(), (TUint) aDrive);
+		
+	OstTraceData(TRACE_BORDER, EFSRV_EFSSETVOLUMELABEL_EVOLUMENAME, "VolumeName %S", aName.Ptr(), aName.Length()<<1);
 	TInt r = SendReceive(EFsSetVolume,TIpcArgs(&aName,aDrive));
-
-	TRACERET1(UTF::EBorder, UTraceModuleEfsrv::EFsSetVolumeLabelReturn, MODULEUID, r);
+	OstTrace1(TRACE_BORDER, EFSRV_EFSSETVOLUMELABELRETURN, "r %d", r);
 	return r;
 	}
 
@@ -1350,10 +1324,10 @@
 @see RFs::Drive
 */
 	{
-	TRACEMULT3(UTF::EBorder, UTraceModuleEfsrv::EFsSubst, MODULEUID, Handle(), aPath, aDrive);
+	OstTraceExt2(TRACE_BORDER, EFSRV_EFSSUBST, "sess %x aDrive %d", (TUint) Handle(), (TUint) aDrive);
+	OstTraceData(TRACE_BORDER, EFSRV_EFSSUBST_EDIRNAME, "Dir %S", aPath.Ptr(), aPath.Length()<<1);
 	TInt r = SendReceive(EFsSubst,TIpcArgs(&aPath,aDrive));
-
-	TRACERET1(UTF::EBorder, UTraceModuleEfsrv::EFsSubstReturn, MODULEUID, r);
+	OstTrace1(TRACE_BORDER, EFSRV_EFSSUBSTRETURN, "r %d", r);
 	return r;
 	}
 
@@ -1402,10 +1376,10 @@
 @capability Dependent If aPath is /Resource then Tcb capability is required.
 */
 	{
-	TRACEMULT3(UTF::EBorder, UTraceModuleEfsrv::EFsSetSubst, MODULEUID, Handle(), aPath, aDrive);
+	OstTraceExt2(TRACE_BORDER, EFSRV_EFSSETSUBST, "sess %x aPath %d", (TUint) Handle(), (TUint) aDrive);
+	OstTraceData(TRACE_BORDER, EFSRV_EFSSETSUBST_EDIRNAME, "Dir %S", aPath.Ptr(), aPath.Length()<<1);
 	TInt r = SendReceive(EFsSetSubst,TIpcArgs(&aPath,aDrive));
-
-	TRACERET1(UTF::EBorder, UTraceModuleEfsrv::EFsSetSubstReturn, MODULEUID, r);
+	OstTrace1(TRACE_BORDER, EFSRV_EFSSETSUBSTRETURN, "r %d", r);
 	return r;
 	}
 
@@ -1433,10 +1407,11 @@
 
 */
 	{
-	TRACEMULT2(UTF::EBorder, UTraceModuleEfsrv::EFsRealName, MODULEUID, Handle(), aName);
+	OstTrace1(TRACE_BORDER, EFSRV_EFSREALNAME, "sess %x", Handle());
+	OstTraceData(TRACE_BORDER, EFSRV_EFSREALNAME_EFILENAME1, "FileName %S", aName.Ptr(), aName.Length()<<1);
 	TInt r = SendReceive(EFsRealName,TIpcArgs(&aName,&aResult));
-
-	TRACERETMULT2(UTF::EBorder, UTraceModuleEfsrv::EFsRealNameReturn, MODULEUID, r, aResult);
+	OstTraceData(TRACE_BORDER, EFSRV_EFSREALNAME_EFILENAME2, "FileName %S", aResult.Ptr(), aResult.Length()<<1);
+	OstTrace1(TRACE_BORDER, EFSRV_EFSREALNAMERETURN, "r %d", r);
 	return r;
 	}
 
@@ -1460,10 +1435,10 @@
 */
 EFSRV_EXPORT_C TInt RFs::GetMediaSerialNumber(TMediaSerialNumber& aSerialNum, TInt aDrive)
     {
-	TRACE2(UTF::EBorder, UTraceModuleEfsrv::EFsGetMediaSerialNumber, MODULEUID, Handle(), aDrive);
+	OstTraceExt2(TRACE_BORDER, EFSRV_EFSGETMEDIASERIALNUMBER, "sess %x aDrive %d", (TUint) Handle(), (TUint) aDrive);
     TInt r = SendReceive(EFsGetMediaSerialNumber, TIpcArgs(&aSerialNum, aDrive));
-
-	TRACERETMULT2(UTF::EBorder, UTraceModuleEfsrv::EFsGetMediaSerialNumberReturn, MODULEUID, r, aSerialNum);
+	OstTrace1(TRACE_BORDER, EFSRV_EFSGETMEDIASERIALNUMBERRETURN, "r %d", r);
+	OstTraceData(TRACE_BORDER, EFSRV_EFSGETMEDIASERIALNUMBER_ESERIALNUMBER, "SerialNum %x", aSerialNum.Ptr(), aSerialNum.Length());
 	return r;
     }
 
@@ -1485,10 +1460,10 @@
         system-wide error codes.
 */
 	{
-	TRACE1(UTF::EBorder, UTraceModuleEfsrv::EFsSessionPath, MODULEUID, Handle());
+	OstTrace1(TRACE_BORDER, EFSRV_EFSSESSIONPATH, "sess %x", Handle());
 	TInt r = SendReceive(EFsSessionPath,TIpcArgs(&aPath));
-
-	TRACERETMULT2(UTF::EBorder, UTraceModuleEfsrv::EFsSessionPathReturn, MODULEUID, r, aPath);
+	OstTrace1(TRACE_BORDER, EFSRV_EFSSESSIONPATHRETURN, "r %d", r);
+	OstTraceData(TRACE_BORDER, EFSRV_EFSSESSIONPATH_EDIRNAME, "Dir %S", aPath.Ptr(), aPath.Length()<<1);
 	return r;
 	}
 
@@ -1526,10 +1501,10 @@
 
 */
 	{
-	TRACEMULT2(UTF::EBorder, UTraceModuleEfsrv::EFsSetSessionPath, MODULEUID, Handle(), aPath);
+	OstTrace1(TRACE_BORDER, EFSRV_EFSSETSESSIONPATH, "sess %x", Handle());
+	OstTraceData(TRACE_BORDER, EFSRV_EFSSETSESSIONPATH_EDIRNAME, "Dir %S", aPath.Ptr(), aPath.Length()<<1);
 	TInt r = SendReceive(EFsSetSessionPath,TIpcArgs(&aPath));
-
-	TRACERET1(UTF::EBorder, UTraceModuleEfsrv::EFsSetSessionPathReturn, MODULEUID, r);
+	OstTrace1(TRACE_BORDER, EFSRV_EFSSETSESSIONPATHRETURN, "r %d", r);
 	return r;
 	}
 
@@ -1603,10 +1578,10 @@
 */
 EFSRV_EXPORT_C TInt RFs::MkDir(const TDesC& aPath)
 	{
-	TRACEMULT2(UTF::EBorder, UTraceModuleEfsrv::EFsMkDir, MODULEUID, Handle(), aPath);
+	OstTrace1(TRACE_BORDER, EFSRV_EFSMKDIR, "sess %x", Handle());
+	OstTraceData(TRACE_BORDER, EFSRV_EFSMKDIR_EDIRNAME, "Dir %S", aPath.Ptr(), aPath.Length()<<1);
 	TInt r = SendReceive(EFsMkDir,TIpcArgs(&aPath,NULL));
-
-	TRACERET1(UTF::EBorder, UTraceModuleEfsrv::EFsMkDirReturn, MODULEUID, r);
+	OstTrace1(TRACE_BORDER, EFSRV_EFSMKDIRRETURN, "r %d", r);
 	return r;
 	}
 
@@ -1653,10 +1628,10 @@
 */
 EFSRV_EXPORT_C TInt RFs::MkDirAll(const TDesC& aPath)
 	{
-	TRACEMULT2(UTF::EBorder, UTraceModuleEfsrv::EFsMkDirAll, MODULEUID, Handle(), aPath);
+	OstTrace1(TRACE_BORDER, EFSRV_EFSMKDIRALL, "sess %x", Handle());
+	OstTraceData(TRACE_BORDER, EFSRV_EFSMKDIRALL_EDIRNAME, "Dir %S", aPath.Ptr(), aPath.Length()<<1);
 	TInt r = SendReceive(EFsMkDir,TIpcArgs(&aPath,TRUE));
-
-	TRACERET1(UTF::EBorder, UTraceModuleEfsrv::EFsMkDirAllReturn, MODULEUID, r);
+	OstTrace1(TRACE_BORDER, EFSRV_EFSMKDIRALLRETURN, "r %d", r);
 	return r;
 	}
 
@@ -1707,10 +1682,10 @@
 @see CFileMan
 */
 	{
-	TRACEMULT2(UTF::EBorder, UTraceModuleEfsrv::EFsRmDir, MODULEUID, Handle(), aPath);
+	OstTrace1(TRACE_BORDER, EFSRV_EFSRMDIR, "sess %x", Handle());
+	OstTraceData(TRACE_BORDER, EFSRV_EFSRMDIR_EDIRNAME, "Dir %S", aPath.Ptr(), aPath.Length()<<1);
 	TInt r = SendReceive(EFsRmDir,TIpcArgs(&aPath));
-
-	TRACERET1(UTF::EBorder, UTraceModuleEfsrv::EFsRmDirReturn, MODULEUID, r);
+	OstTrace1(TRACE_BORDER, EFSRV_EFSRMDIRRETURN, "r %d", r);
 	return r;
 	}
 
@@ -1825,9 +1800,8 @@
 @see TEntryKey
 */
 	{
-	TRACEMULT6(UTF::EBorder, UTraceModuleEfsrv::EFsGetDir1, MODULEUID, 
-		Handle(), aName, aUidType[0].iUid, aUidType[1].iUid, aUidType[2].iUid, aKey);
-
+	OstTraceExt5(TRACE_BORDER, EFSRV_EFSGETDIR1, "sess %x aUidType0 %x aUidType1 %x aUidType2 %x aKey %x", (TUint) Handle(), (TUint) aUidType[0].iUid, (TUint) aUidType[1].iUid, (TUint) aUidType[2].iUid, (TUint) aKey);
+	OstTraceData(TRACE_BORDER, EFSRV_EFSGETDIR1_EDIRNAME, "Dir %S", aName.Ptr(), aName.Length()<<1);
 	RDir d;
 	TRAPD(r,GetDirL(aName,aUidType,aKey,aFileList,d))
 	d.Close();
@@ -1836,8 +1810,7 @@
 		delete aFileList;
 		aFileList=NULL;
 		}
-
-	TRACERET1(UTF::EBorder, UTraceModuleEfsrv::EFsGetDir1Return, MODULEUID, r);
+	OstTrace1(TRACE_BORDER, EFSRV_EFSGETDIR1RETURN, "r %d", r);
 	return r;
 	}
 
@@ -1883,8 +1856,8 @@
 @see TEntryKey
 */
 	{
-	TRACEMULT4(UTF::EBorder, UTraceModuleEfsrv::EFsGetDir2, MODULEUID, Handle(), aName, anAttMask, aKey);
-
+	OstTraceExt3(TRACE_BORDER, EFSRV_EFSGETDIR2, "sess %x anAttMask %x aKey %x", (TUint) Handle(), (TUint) anAttMask, (TUint) aKey);
+	OstTraceData(TRACE_BORDER, EFSRV_EFSGETDIR2_EDIRNAME, "Dir %S", aName.Ptr(), aName.Length()<<1);
 	RDir d;
 	if ((aKey&0xff)==ESortByUid)
 		anAttMask|=KEntryAttAllowUid;
@@ -1895,8 +1868,7 @@
 		delete aFileList;
 		aFileList=NULL;
 		}
-
-	TRACERET1(UTF::EBorder, UTraceModuleEfsrv::EFsGetDir2Return, MODULEUID, r);
+	OstTrace1(TRACE_BORDER, EFSRV_EFSGETDIR2RETURN, "r %d", r);
 	return r;
 	}
 
@@ -1949,8 +1921,8 @@
 @see TEntryKey
 */
 	{
-	TRACEMULT4(UTF::EBorder, UTraceModuleEfsrv::EFsGetDir3, MODULEUID, Handle(), aName, anAttMask, aKey);
-
+	OstTraceExt3(TRACE_BORDER, EFSRV_EFSGETDIR3, "sess %x anAttMask %x aKey %x", (TUint) Handle(), (TUint) anAttMask, (TUint) aKey);
+	OstTraceData(TRACE_BORDER, EFSRV_EFSGETDIR3_EDIRNAME, "Dir %S", aName.Ptr(), aName.Length()<<1);
 	RDir d;
 	if (aKey&ESortByUid)
 		anAttMask|=KEntryAttAllowUid;
@@ -1963,8 +1935,7 @@
 		delete aDirList;
 		aDirList=NULL;
 		}
-
-	TRACERET1(UTF::EBorder, UTraceModuleEfsrv::EFsGetDir3Return, MODULEUID, r);
+	OstTrace1(TRACE_BORDER, EFSRV_EFSGETDIR3RETURN, "r %d", r);
 	return r;
 	}
 
@@ -2011,13 +1982,13 @@
         system-wide error codes.
 */
 	{
-	TRACEMULT2(UTF::EBorder, UTraceModuleEfsrv::EFsParse1, MODULEUID, Handle(), aName);
+	OstTrace1(TRACE_BORDER, EFSRV_EFSPARSE1, "sess %x", Handle());
+	OstTraceData(TRACE_BORDER, EFSRV_EFSPARSE1_EFILEPATH, "FilePath %S", aName.Ptr(), aName.Length()<<1);
 	TFileName session_path;
 	TInt r = SessionPath(session_path);
 	if (r==KErrNone)
 		r = aParse.Set(aName, NULL, &session_path);
-
-	TRACERET1(UTF::EBorder, UTraceModuleEfsrv::EFsParse1Return, MODULEUID, r);
+	OstTrace1(TRACE_BORDER, EFSRV_EFSPARSE1RETURN, "r %d", r);
 	return r;
 	}
 
@@ -2066,13 +2037,14 @@
         system-wide error codes.
 */
 	{
-	TRACEMULT3(UTF::EBorder, UTraceModuleEfsrv::EFsParse2, MODULEUID, Handle(), aName, aRelated);
+	OstTrace1(TRACE_BORDER, EFSRV_EFSPARSE2, "sess %x", Handle());
+	OstTraceData(TRACE_BORDER, EFSRV_EFSPARSE2_EFILENAME, "FileName %S", aName.Ptr(), aName.Length()<<1);
+	OstTraceData(TRACE_BORDER, EFSRV_EFSPARSE2_ERELATED, "Related %S", aRelated.Ptr(), aRelated.Length()<<1);
 	TFileName session_path;
 	TInt r = SessionPath(session_path);
 	if (r==KErrNone)
 		r = aParse.Set(aName, &aRelated, &session_path);
-
-	TRACERET1(UTF::EBorder, UTraceModuleEfsrv::EFsParse2Return, MODULEUID, r);
+	OstTrace1(TRACE_BORDER, EFSRV_EFSPARSE2RETURN, "r %d", r);
 	return r;
 	}
 
@@ -2105,10 +2077,10 @@
 @see CFileMan        
 */
 	{
-	TRACEMULT2(UTF::EBorder, UTraceModuleEfsrv::EFsDelete, MODULEUID, Handle(), aName);
+	OstTrace1(TRACE_BORDER, EFSRV_EFSDELETE, "sess %x", Handle());
+	OstTraceData(TRACE_BORDER, EFSRV_EFSDELETE_EFILENAME, "FileName %S", aName.Ptr(), aName.Length()<<1);
 	TInt r = SendReceive(EFsDelete,TIpcArgs(&aName));
-
-	TRACERET1(UTF::EBorder, UTraceModuleEfsrv::EFsDeleteReturn, MODULEUID, r);
+	OstTrace1(TRACE_BORDER, EFSRV_EFSDELETERETURN, "r %d", r);
 	return r;
 	}
 
@@ -2167,15 +2139,15 @@
 @see CFileMan        
 */
 	{
-	TRACEMULT3(UTF::EBorder, UTraceModuleEfsrv::EFsRename, MODULEUID, Handle(), anOldName, aNewName);
-
+	OstTrace1(TRACE_BORDER, EFSRV_EFSRENAME, "sess %x", Handle());
+	OstTraceData(TRACE_BORDER, EFSRV_EFSRENAME_EOLDNAME, "OldName %S", anOldName.Ptr(), anOldName.Length()<<1);
+	OstTraceData(TRACE_BORDER, EFSRV_EFSRENAME_ENEWNAME, "NewName %S", aNewName.Ptr(), aNewName.Length()<<1);
 	TInt r;
 	if (anOldName.Length() <= 0 || aNewName.Length() <= 0 )
 		r = KErrBadName;
 	else
 		r = SendReceive(EFsRename,TIpcArgs(&anOldName,&aNewName));
-
-	TRACERET1(UTF::EBorder, UTraceModuleEfsrv::EFsRenameReturn, MODULEUID, r);
+	OstTrace1(TRACE_BORDER, EFSRV_EFSRENAMERETURN, "r %d", r);
 	return r;
 	}
 
@@ -2226,10 +2198,11 @@
 
 */
 	{
-	TRACEMULT3(UTF::EBorder, UTraceModuleEfsrv::EFsReplace, MODULEUID, Handle(), anOldName, aNewName);
+	OstTrace1(TRACE_BORDER, EFSRV_EFSREPLACE, "sess %x", Handle());
+	OstTraceData(TRACE_BORDER, EFSRV_EFSREPLACE_EOLDNAME, "OldName %S", anOldName.Ptr(), anOldName.Length()<<1);
+	OstTraceData(TRACE_BORDER, EFSRV_EFSREPLACE_ENEWNAME, "NewName %S", aNewName.Ptr(), aNewName.Length()<<1);
 	TInt r = SendReceive(EFsReplace,TIpcArgs(&anOldName,&aNewName));
-
-	TRACERET1(UTF::EBorder, UTraceModuleEfsrv::EFsReplaceReturn, MODULEUID, r);
+	OstTrace1(TRACE_BORDER, EFSRV_EFSREPLACERETURN, "r %d", r);
 	return r;
 	}
 
@@ -2256,14 +2229,13 @@
 @see KEntryAttNormal
 */
 	{
-	TRACEMULT2(UTF::EBorder, UTraceModuleEfsrv::EFsAtt, MODULEUID, Handle(), aName);
-
+	OstTrace1(TRACE_BORDER, EFSRV_EFSATT, "sess %x", Handle());
+	OstTraceData(TRACE_BORDER, EFSRV_EFSATT_EFILENAME, "FileName %S", aName.Ptr(), aName.Length()<<1);
 	TEntry e;
 	TInt r=Entry(aName,e);
 	if (r==KErrNone)
 		aVal=e.iAtt;
-
-	TRACERET2(UTF::EBorder, UTraceModuleEfsrv::EFsAttReturn, MODULEUID, r, aVal);
+	OstTraceExt2(TRACE_BORDER, EFSRV_EFSATTRETURN, "r %d aVal %x", (TUint) r, (TUint) aVal);
 	return r;
 	}
 
@@ -2303,12 +2275,10 @@
 
 */
 	{
-	TRACEMULT4(UTF::EBorder, UTraceModuleEfsrv::EFsSetAtt, MODULEUID, 
-		Handle(), aName, aSetAttMask, aClearAttMask);
-
+	OstTraceExt3(TRACE_BORDER, EFSRV_EFSSETATT, "sess %x aSetAttMask %x aClearAttMask %x", (TUint) Handle(), (TUint) aSetAttMask, (TUint) aClearAttMask);
+	OstTraceData(TRACE_BORDER, EFSRV_EFSSETATT_EFILENAME, "FileName %S", aName.Ptr(), aName.Length()<<1);
  	TInt r = SetEntry(aName,TTime(0),aSetAttMask,aClearAttMask);
-
-	TRACERET1(UTF::EBorder, UTraceModuleEfsrv::EFsSetAttReturn, MODULEUID, r);
+	OstTrace1(TRACE_BORDER, EFSRV_EFSSETATTRETURN, "r %d", r);
 	return r;
 	}
 
@@ -2336,14 +2306,13 @@
 
 */
 	{
-	TRACEMULT2(UTF::EBorder, UTraceModuleEfsrv::EFsModified, MODULEUID, Handle(), aName);
-
+	OstTrace1(TRACE_BORDER, EFSRV_EFSMODIFIED, "sess %x", Handle());
+	OstTraceData(TRACE_BORDER, EFSRV_EFSMODIFIED_EFILENAME, "FileName %S", aName.Ptr(), aName.Length()<<1);
 	TEntry e;
 	TInt r=Entry(aName,e);
 	if (r==KErrNone)
 		aTime=e.iModified;
-
-	TRACERET3(UTF::EBorder, UTraceModuleEfsrv::EFsModifiedReturn, MODULEUID, r, I64LOW(aTime.Int64()), I64HIGH(aTime.Int64()));
+	OstTraceExt3(TRACE_BORDER, EFSRV_EFSMODIFIEDRETURN, "r %d aTime %x:%x ", (TUint) r, (TUint) I64HIGH(aTime.Int64()), (TUint) I64LOW(aTime.Int64()));
 	return r;
 	}
 
@@ -2370,11 +2339,10 @@
 
 */
 	{
-	TRACEMULT4(UTF::EBorder, UTraceModuleEfsrv::EFsSetModified, MODULEUID, Handle(), aName, I64LOW(aTime.Int64()), I64HIGH(aTime.Int64()) );
-
+	OstTraceExt3(TRACE_BORDER, EFSRV_EFSSETMODIFIED, "sess %x aTime %x:%x ", (TUint) Handle(), (TUint) I64HIGH(aTime.Int64()), (TUint) I64LOW(aTime.Int64()) );
+	OstTraceData(TRACE_BORDER, EFSRV_EFSSETMODIFIED_EFILENAME, "FileName %S", aName.Ptr(), aName.Length()<<1);
 	TInt r = SetEntry(aName,aTime,KEntryAttModified,0);
-
-	TRACERET1(UTF::EBorder, UTraceModuleEfsrv::EFsSetModifiedReturn, MODULEUID, r);
+	OstTrace1(TRACE_BORDER, EFSRV_EFSSETMODIFIEDRETURN, "r %d", r);
 	return r;
 	}
 
@@ -2403,14 +2371,11 @@
 					  readable with AllFiles capability or if <n> matches the process' SID.
 */
 	{
-	TRACEMULT2(UTF::EBorder, UTraceModuleEfsrv::EFsEntry, MODULEUID, Handle(), aName);
+	OstTrace1(TRACE_BORDER, EFSRV_EFSENTRY, "sess %x", Handle());
+	OstTraceData(TRACE_BORDER, EFSRV_EFSENTRY_EFILENAME, "FileName %S", aName.Ptr(), aName.Length()<<1);
 	TPckg<TEntry> e(anEntry);
 	TInt r = SendReceive(EFsEntry,TIpcArgs(&aName,&e));
-
-	TRACE5(UTF::EBorder, UTraceModuleEfsrv::EFsEntryReturn, MODULEUID, 
-		r, anEntry.iAtt, 
-		I64LOW(anEntry.iModified.Int64()), I64HIGH(anEntry.iModified.Int64()), 
-		anEntry.iSize);
+	OstTraceExt5(TRACE_BORDER, EFSRV_EFSENTRYRETURN, "r %d att %x modified %x:%x  size %d", (TUint) r, (TUint) anEntry.iAtt, (TUint) I64HIGH(anEntry.iModified.Int64()), (TUint) I64LOW(anEntry.iModified.Int64()), (TUint) anEntry.iSize);
 	return r;
 	}
 
@@ -2450,16 +2415,12 @@
 @see KEntryAttVolume
 */
 	{
-	TRACEMULT6(UTF::EBorder, UTraceModuleEfsrv::EFsSetEntry, MODULEUID, 
-		Handle(), aName, 
-		I64LOW(aTime.Int64()), I64HIGH(aTime.Int64()), 
-		aSetAttMask, aClearAttMask);
-
+	OstTraceExt5(TRACE_BORDER, EFSRV_EFSSETENTRY, "sess %x aTime %x:%x  aSetAttMask %x aClearAttMask %x", (TUint) Handle(), (TUint) I64HIGH(aTime.Int64()), (TUint) I64LOW(aTime.Int64()), (TUint) aSetAttMask, (TUint) aClearAttMask);
+	OstTraceData(TRACE_BORDER, EFSRV_EFSSETENTRY_EFILENAME, "FileName %S", aName.Ptr(), aName.Length()<<1);
 	__ASSERT_ALWAYS((aSetAttMask&aClearAttMask)==0,Panic(EAttributesIllegal));
 	TPtrC8 timeBuf((TUint8*)&aTime,sizeof(TTime));
 	TInt r = SendReceive(EFsSetEntry,TIpcArgs(&aName,&timeBuf,aSetAttMask,aClearAttMask));
-
-	TRACERET1(UTF::EBorder, UTraceModuleEfsrv::EFsSetEntryReturn, MODULEUID, r);
+	OstTrace1(TRACE_BORDER, EFSRV_EFSSETENTRYRETURN, "r %d", r);
 	return r;
 	}
 
@@ -2496,15 +2457,14 @@
 */
 EFSRV_EXPORT_C TInt RFs::ReadFileSection(const TDesC& aName,TInt64 aPos,TDes8& aDes,TInt aLength) const
 	{
-	TRACEMULT5(UTF::EBorder, UTraceModuleEfsrv::EFsReadFileSection, MODULEUID, 
-		Handle(), aName, I64LOW(aPos), I64HIGH(aPos), aLength);
-
+	OstTraceExt4(TRACE_BORDER, EFSRV_EFSREADFILESECTION, "sess %x aPos %x:%x aLength %d", (TUint) Handle(), (TUint) I64HIGH(aPos), (TUint) I64LOW(aPos), aLength);
+	OstTraceData(TRACE_BORDER, EFSRV_EFSREADFILESECTION_EFILENAME, "FileName %S", aName.Ptr(), aName.Length()<<1);
 	__ASSERT_ALWAYS(aPos>=0,Panic(EPosNegative));
 	
 #ifndef SYMBIAN_ENABLE_64_BIT_FILE_SERVER_API
 	if(aPos > KMaxTInt)
 		{
-		TRACE1(UTF::EBorder, UTraceModuleEfsrv::EFsReadFileSectionReturn, MODULEUID, KErrTooBig);
+		OstTrace1(TRACE_BORDER, EFSRV_EFSREADFILESECTIONRETURN1, "r %d", KErrTooBig);
 		return KErrTooBig;
 		}
 	if((aPos + aLength) > KMaxTInt)
@@ -2517,7 +2477,7 @@
 	else
 		{
 		aDes.Zero();
-		TRACE1(UTF::EBorder, UTraceModuleEfsrv::EFsReadFileSectionReturn, MODULEUID, KErrNone);
+		OstTrace1(TRACE_BORDER, EFSRV_EFSREADFILESECTIONRETURN2, "r %d", KErrNone);
 		return(KErrNone);
 		}
 		
@@ -2533,19 +2493,17 @@
 		TPckgC<TInt64> pkPos(aPos);
 		r = SendReceive(EFsReadFileSection|KIpcArgSlot2Desc,TIpcArgs(&aDes,&aName,&pkPos,aLength));
 		}
-	TRACERET1(UTF::EBorder, UTraceModuleEfsrv::EFsReadFileSectionReturn, MODULEUID, r);
+	OstTrace1(TRACE_BORDER, EFSRV_EFSREADFILESECTIONRETURN3, "r %d", r);
 	return r;
 	}
 /**
 Maintained for BC
-
 @internalTechnology
 */
 EFSRV_EXPORT_C TInt RFs::ReadFileSection_RESERVED(const TDesC& aName,TInt aPos,TDes8& aDes,TInt aLength) const
 	{
-	TRACEMULT5(UTF::EBorder, UTraceModuleEfsrv::EFsReadFileSection, MODULEUID, 
-		Handle(), aName, aPos, 0, aLength);
-
+	OstTraceExt3(TRACE_BORDER, EFSRV_EFSREADFILESECTION_RESERVED, "sess %x aPos %x aLength %d", (TUint) Handle(), (TUint) aPos, aLength);
+	OstTraceData(TRACE_BORDER, EFSRV_EFSREADFILESECTION_RESERVED_EFILENAME, "FileName %S", aName.Ptr(), aName.Length()<<1);
 	__ASSERT_ALWAYS(aPos>=0,Panic(EPosNegative));
 	
 	if (aLength)	//	Number of characters to read
@@ -2555,15 +2513,14 @@
 	else
 		{
 		aDes.Zero();
-		TRACE1(UTF::EBorder, UTraceModuleEfsrv::EFsReadFileSectionReturn, MODULEUID, KErrNone);
+		OstTrace1(TRACE_BORDER, EFSRV_EFSREADFILESECTION_RESERVED_RETURN1, "r %d", KErrNone);
 		return(KErrNone);
 		}
 		
 	__ASSERT_ALWAYS(aDes.MaxLength()>=aLength,Panic(EBadLength));
 		
 	TInt r = SendReceive(EFsReadFileSection,TIpcArgs(&aDes,&aName,aPos,aLength));
-
-	TRACERET1(UTF::EBorder, UTraceModuleEfsrv::EFsReadFileSectionReturn, MODULEUID, r);
+	OstTrace1(TRACE_BORDER, EFSRV_EFSREADFILESECTION_RESERVED_RETURN2, "r %d", r);
 	return r;
 	}
 
@@ -2578,11 +2535,11 @@
 to the file server, and before any resources are opened.
 */
 	{
-	TRACE1(UTF::EBorder, UTraceModuleEfsrv::EFsResourceCountMarkStart, MODULEUID, Handle());
+	OstTrace1(TRACE_BORDER, EFSRV_EFSRESOURCECOUNTMARKSTART, "sess %x", Handle());
 	
 	RSessionBase::SendReceive(EFsResourceCountMarkStart);
 
-	TRACE0(UTF::EBorder, UTraceModuleEfsrv::EFsResourceCountMarkStartReturn, MODULEUID);
+	OstTrace0(TRACE_BORDER, EFSRV_EFSRESOURCECOUNTMARKSTARTRETURN, "");
 	}
 
 
@@ -2597,11 +2554,10 @@
        count checking is not equal to the number of resources closed.
 */
 	{
-	TRACE1(UTF::EBorder, UTraceModuleEfsrv::EFsResourceCountMarkEnd, MODULEUID, Handle());
-
+	OstTrace1(TRACE_BORDER, EFSRV_EFSRESOURCECOUNTMARKEND, "sess %x", Handle());
 	RSessionBase::SendReceive(EFsResourceCountMarkEnd);
 
-	TRACE0(UTF::EBorder, UTraceModuleEfsrv::EFsResourceCountMarkEndReturn, MODULEUID);
+	OstTrace0(TRACE_BORDER, EFSRV_EFSRESOURCECOUNTMARKENDRETURN, "");
 	}
 
 
@@ -2618,48 +2574,54 @@
 @return The number of resources currently open.
 */
 	{
-	TRACE1(UTF::EBorder, UTraceModuleEfsrv::EFsResourceCount, MODULEUID, Handle());
-
+	OstTrace1(TRACE_BORDER, EFSRV_EFSRESOURCECOUNT, "sess %x", Handle());
 	TInt count;
 	TPckg<TInt> pckg(count);
 	SendReceive(EFsResourceCount,TIpcArgs(&pckg));
 	TInt r = *(TInt*)pckg.Ptr();
-
-	TRACERET1(UTF::EBorder, UTraceModuleEfsrv::EFsResourceCountReturn, MODULEUID, r);
+	OstTrace1(TRACE_BORDER, EFSRV_EFSRESOURCECOUNTRETURN, "r %d", r);
 	return r;
 	}
 
 
-
 /**
-Checks the integrity of the disk on the specified drive.
-On FAT, this checks if a cluster number is invalid, if a cluster is allocated to
-more than one file entry, if an unallocated cluster is not set free, and if size
-of an entry is invalid.
-
-@param aDrive Path indicating the drive which contains the disk to be checked. If the drive 
-        information is not specified the current session drive is taken by default.
-		Checkdisk is performed on the requested drive irrespective of the correctness or
-		existance of the given path.
-
-@return KErrNone, if successful;
-		1, if successful but a file cluster contains a bad value;
-		2, if successful but two files are linked to the same cluster;
-		3, if successful but an unallocated cluster contains a value;
-		4, if successful but the size of a file is not equal to the number of clusters in chain;
-        KErrNotReady, if the specified drive is empty;
-        KErrNotSupported, if the drive cannot handle this request;
-        KErrPermissionDenied, if the caller doesn't have DiskAdmin capability;
-        Other system wide error codes may also be returned.
-
-@capability DiskAdmin
+Checks the integrity of the File System mounted on the specified drive.
+The behaviour of this API and return codes are File System specific,
+dependent on how the File System implements its CheckDisk functionality.
+Note that CheckDisk does not fix any errors that may be found,
+it just reports the first problem it has found.
+
+@param	aDrive	Path containing the drive to be checked.
+				If the drive letter is not specified, the current session drive is taken by default.
+
+@return	KErrNone				If CheckDisk has not found any errors it knows about.
+        KErrNotReady			If the specified drive is not ready.
+        KErrNotSupported		If this functionality is not supported.
+        KErrPermissionDenied	If the caller does not have DiskAdmin capability.
+        Other system-wide error codes.
+
+@capability	DiskAdmin
+
+FAT File System specific information:
+
+CheckDisk checks for a limited amount of possible corruption cases such as
+invalid cluster numbers in the FAT table, lost and cross-linked cluster chains,
+various errors within the directory entry etc.
+
+If CheckDisk returns KErrNone, this means that there are no errors that CheckDisk on FAT is aware of.
+
+Error codes returned by the FAT version of CheckDisk include: 
+		1	Bad cluster value in FAT table detected.
+		2	Cross-linked cluster chain detected.
+		3	Lost cluster chain detected.
+		4	File size does not correspond to the number of clusters reported in the FAT table.
 */
 EFSRV_EXPORT_C TInt RFs::CheckDisk(const TDesC& aDrive) const
 	{
-	TRACEMULT2(UTF::EBorder, UTraceModuleEfsrv::EFsCheckDisk, MODULEUID, Handle(), aDrive);
+	OstTrace1(TRACE_BORDER, EFSRV_EFSCHECKDISK, "sess %x", Handle());
+	OstTraceData(TRACE_BORDER, EFSRV_EFSCHECKDISK_EDIRNAME, "Dir %S", aDrive.Ptr(), aDrive.Length()<<1);
 	TInt r = SendReceive(EFsCheckDisk,TIpcArgs(&aDrive));
-
-	TRACERET1(UTF::EBorder, UTraceModuleEfsrv::EFsCheckDiskReturn, MODULEUID, r);
+	OstTrace1(TRACE_BORDER, EFSRV_EFSCHECKDISKRETURN, "r %d", r);
 	return r;
 	}
 
@@ -2668,30 +2630,48 @@
 
 EFSRV_EXPORT_C TInt RFs::ScanDrive(const TDesC& aDrive) const
 /**
-Checks the specified drive for errors and corrects them. Specifically, it
-checks if long file name entries' IDs are in sequence and short name is valid,
-and file's allocated clusters are not used by other files.
-
-This does not run on the internal RAM drive, and only applies to a
-FAT file system.
-
-@param aDrive Path indicating the drive which contains the disk to be checked. If the drive 
-        information is not specified the current session drive is taken by default.
-		ScanDrive is performed on the requested drive irrespective of the correctness or
-		existance of the given path.
-
-@return KErrNone if successful,
-        KErrPermissionDenied if caller doesn't have capability DiskAdmin,
-        KErrInUse if drive is in use,
-        otherwise one of the other system-wide error codes
-
-@capability DiskAdmin
+Checks the integrity of the File System mounted on the specified drive
+and attempts to correct some known File System errors.
+The behaviour of this API and return codes are File System specific,
+dependent on how the File System implements its ScanDrive functionality.
+
+ScanDrive will not run on drives that have files or directories opened.
+
+@param	aDrive	Path indicating the drive which contains the disk to be checked.
+				If the drive letter is not specified, the current session drive is taken by default.
+
+@return KErrNone				On success.
+		KErrInUse				If drive is in use (i.e. if there are files and/or directories opened in the drive).
+		KErrCorrupt				If ScanDrive has detected a file system corruption that it cannot fix.
+        KErrNotSupported		If this functionality is not supported.
+        KErrPermissionDenied	If the caller does not have DiskAdmin capability.
+		Other system-wide error codes.
+
+@capability	DiskAdmin
+
+FAT File System specific information:
+
+ScanDrive is intended to be run ONLY on "Rugged-FAT" file system
+which is applicable to internal non-removable drives.
+Internal RAM drives are not supported.
+
+The "Rugged FAT" file system is designed in such a way that only a limited number
+of known cases of corruption can be caused by sudden power loss.
+All of these known cases can be corrected by ScanDrive.
+Hence, running ScanDrive on "Rugged FAT" file system will result in:
+		KErrNone	If there was no File System corruption or ScanDrive has successfully repaired the File System.
+		KErrCorrupt If ScanDrive has found a File System error that it cannot repair.
+		Other system-wide error codes, see above.
+
+Running ScanDrive on removable media or media that has FAT file system not in
+"Rugged FAT" mode is not practical, because ScanDrive is not designed for this.
+Therefore, do not treat ScanDrive on removable media as a generic "disk repair utility".
 */
 	{
-	TRACEMULT2(UTF::EBorder, UTraceModuleEfsrv::EFsScanDrive, MODULEUID, Handle(), aDrive);
+	OstTrace1(TRACE_BORDER, EFSRV_EFSSCANDRIVE, "sess %x", Handle());
+	OstTraceData(TRACE_BORDER, EFSRV_EFSSCANDRIVE_EDIRNAME, "Dir %S", aDrive.Ptr(), aDrive.Length()<<1);
 	TInt r = SendReceive(EFsScanDrive,TIpcArgs(&aDrive));
-
-	TRACERET1(UTF::EBorder, UTraceModuleEfsrv::EFsScanDriveReturn, MODULEUID, r);
+	OstTrace1(TRACE_BORDER, EFSRV_EFSSCANDRIVERETURN, "r %d", r);
 	return r;
 	}
 
@@ -2720,10 +2700,11 @@
 					  have the relevant SID capability AllFiles is required
 */
 	{
-	TRACEMULT2(UTF::EBorder, UTraceModuleEfsrv::EFsGetShortName, MODULEUID, Handle(), aLongName);
+	OstTrace1(TRACE_BORDER, EFSRV_EFSGETSHORTNAME, "sess %x", Handle());
+	OstTraceData(TRACE_BORDER, EFSRV_EFSGETSHORTNAME_ELONGNAME, "LongName %S", aLongName.Ptr(), aLongName.Length()<<1);
 	TInt r = SendReceive(EFsGetShortName,TIpcArgs(&aLongName,&aShortName));
-
-	TRACERETMULT2(UTF::EBorder, UTraceModuleEfsrv::EFsGetShortNameReturn, MODULEUID, r, aShortName);
+	OstTraceData(TRACE_BORDER, EFSRV_EFSGETSHORTNAME_ESHORTNAME, "ShortName %S", aShortName.Ptr(), aShortName.Length()<<1);
+	OstTrace1(TRACE_BORDER, EFSRV_EFSGETSHORTNAMERETURN, "r %d", r);
 	return r;
 	}
 
@@ -2752,10 +2733,11 @@
 
 */
 	{
-	TRACEMULT2(UTF::EBorder, UTraceModuleEfsrv::EFsGetLongName, MODULEUID, Handle(), aShortName);
+	OstTrace1(TRACE_BORDER, EFSRV_EFSGETLONGNAME, "sess %x", Handle());
+	OstTraceData(TRACE_BORDER, EFSRV_EFSGETLONGNAME_ESHORTNAME, "ShortName %S", aShortName.Ptr(), aShortName.Length()<<1);
 	TInt r = SendReceive(EFsGetLongName,TIpcArgs(&aShortName,&aLongName));
-
-	TRACERETMULT2(UTF::EBorder, UTraceModuleEfsrv::EFsGetLongNameReturn, MODULEUID, r, aLongName);
+	OstTraceData(TRACE_BORDER, EFSRV_EFSGETLONGNAME_ELONGNAME, "LongName %S", aLongName.Ptr(), aLongName.Length()<<1);
+	OstTrace1(TRACE_BORDER, EFSRV_EFSGETLONGNAMERETURN, "r %d", r);
 	return r;
 	}
 
@@ -2788,11 +2770,11 @@
 @see RFs::Replace
 */
 	{
-	TRACEMULT2(UTF::EBorder, UTraceModuleEfsrv::EFsIsFileOpen, MODULEUID, Handle(), aFileName);
+	OstTrace1(TRACE_BORDER, EFSRV_EFSISFILEOPEN, "sess %x", Handle());
+	OstTraceData(TRACE_BORDER, EFSRV_EFSISFILEOPEN_EFILENAME, "FileName %S", aFileName.Ptr(), aFileName.Length()<<1);
 	TPckg<TBool> b(anAnswer);
 	TInt r = SendReceive(EFsIsFileOpen,TIpcArgs(&aFileName,&b));
-
-	TRACERET2(UTF::EBorder, UTraceModuleEfsrv::EFsIsFileOpenReturn, MODULEUID, r, anAnswer);
+	OstTraceExt2(TRACE_BORDER, EFSRV_EFSISFILEOPENRETURN, "r %d anAnswer %d", (TUint) r, (TUint) anAnswer);
 	return r;
 	}
 
@@ -2824,14 +2806,12 @@
 @return True if notification in effect, false if not.
 */
 	{
-	TRACE1(UTF::EBorder, UTraceModuleEfsrv::EFsGetNotifyUser, MODULEUID, Handle());
-
+	OstTrace1(TRACE_BORDER, EFSRV_EFSGETNOTIFYUSER, "sess %x", Handle());
 	TInt notifyUser;
 	TPckg<TInt> pckgNotify(notifyUser);
 	SendReceive(EFsGetNotifyUser,TIpcArgs(&pckgNotify));
 	TBool r = notifyUser;
-
-	TRACERET1(UTF::EBorder, UTraceModuleEfsrv::EFsGetNotifyUserReturn, MODULEUID, r);
+	OstTrace1(TRACE_BORDER, EFSRV_EFSGETNOTIFYUSERRETURN, "r %d", r);
 	return r;
 	}
 
@@ -2848,10 +2828,10 @@
               EFalse, for no notification.
 */
 	{
-	TRACE2(UTF::EBorder, UTraceModuleEfsrv::EFsSetNotifyUser, MODULEUID, Handle(), aValue);
+	OstTraceExt2(TRACE_BORDER, EFSRV_EFSSETNOTIFYUSER, "sess %x aValue %d", (TUint) Handle(), (TUint) aValue);
 	SendReceive(EFsSetNotifyUser,TIpcArgs(aValue));
 
-	TRACE0(UTF::EBorder, UTraceModuleEfsrv::EFsSetNotifyUserReturn, MODULEUID);
+	OstTrace0(TRACE_BORDER, EFSRV_EFSSETNOTIFYUSERRETURN, "");
 	}
 
 
@@ -2881,8 +2861,8 @@
 
 */
 	{
-	TRACEMULT2(UTF::EBorder, UTraceModuleEfsrv::EFsIsFileInRom, MODULEUID, Handle(), aFileName);
-
+	OstTrace1(TRACE_BORDER, EFSRV_EFSISFILEINROM, "sess %x", Handle());
+	OstTraceData(TRACE_BORDER, EFSRV_EFSISFILEINROM_EFILENAME, "FileName %S", aFileName.Ptr(), aFileName.Length()<<1);
 	TPckgBuf<TUint8*> start;
 
 	TUint8* r;
@@ -2891,7 +2871,7 @@
 	else
 		r = start();
 
-	TRACE1(UTF::EBorder, UTraceModuleEfsrv::EFsIsFileInRomReturn, MODULEUID, r);
+	OstTrace1(TRACE_BORDER, EFSRV_EFSISFILEINROMRETURN, "r %d", r);
 	return r;
 	}
 
@@ -2931,7 +2911,8 @@
 */
 EFSRV_EXPORT_C TBool RFs::IsValidName(const TDesC& aFileName) const
 	{
-	TRACEMULT2(UTF::EBorder, UTraceModuleEfsrv::EFsIsValidName1, MODULEUID, Handle(), aFileName);
+	OstTrace1(TRACE_BORDER, EFSRV_EFSISVALIDNAME1, "sess %x", Handle());
+	OstTraceData(TRACE_BORDER, EFSRV_EFSISVALIDNAME1_EFILENAME, "FileName %S", aFileName.Ptr(), aFileName.Length()<<1);
 	TBool returnInvalidChar=EFalse;
 	TPckg<TBool> bPckg(returnInvalidChar);
 	TBool b;
@@ -2939,7 +2920,7 @@
 		b = EFalse;
 	else
 		b = ETrue;
-	TRACE1(UTF::EBorder, UTraceModuleEfsrv::EFsIsValidName1Return, MODULEUID, b);
+	OstTrace1(TRACE_BORDER, EFSRV_EFSISVALIDNAME1RETURN, "r %d", b);
 	return b;
 	}
 
@@ -2982,7 +2963,8 @@
 */
 EFSRV_EXPORT_C TBool RFs::IsValidName(const TDesC& aFileName,TText& aBadChar) const
 	{
-	TRACEMULT2(UTF::EBorder, UTraceModuleEfsrv::EFsIsValidName2, MODULEUID, Handle(), aFileName);
+	OstTrace1(TRACE_BORDER, EFSRV_EFSISVALIDNAME2, "sess %x", Handle());
+	OstTraceData(TRACE_BORDER, EFSRV_EFSISVALIDNAME2_EFILENAME, "FileName %S", aFileName.Ptr(), aFileName.Length()<<1);
 	TBool returnInvalidChar=ETrue;
 	TPckg<TBool> boolPckg(returnInvalidChar);
 	TPckg<TText> textPckg(aBadChar);
@@ -2991,7 +2973,7 @@
 		b = EFalse;
 	else 
 		b = ETrue;
-	TRACE2(UTF::EBorder, UTraceModuleEfsrv::EFsIsValidName2Return, MODULEUID, b, aBadChar);
+	OstTraceExt2(TRACE_BORDER, EFSRV_EFSISVALIDNAME2RETURN, "r %d aBadChar %x", (TUint) b, (TUint) aBadChar);
 	return b;
 	}
 /**
@@ -3040,14 +3022,15 @@
 */
 EFSRV_EXPORT_C TBool RFs::IsValidName(const TDesC& aName, TNameValidParam& aParam )
 	{
-	TRACEMULT2(UTF::EBorder, UTraceModuleEfsrv::EFsIsValidName3, MODULEUID, Handle(), aName);
+	OstTrace1(TRACE_BORDER, EFSRV_EFSISVALIDNAME3, "sess %x", Handle());
+	OstTraceData(TRACE_BORDER, EFSRV_EFSISVALIDNAME3_EFILENAME, "FileName %S", aName.Ptr(), aName.Length()<<1);
 	TPckg<TNameValidParam> paramPckg(aParam);
 	TBool b;
 	if (SendReceive(EFsIsValidName,TIpcArgs(&aName,NULL,NULL,&paramPckg))!=KErrNone)
 		b = EFalse;
 	else
 		b = ETrue;
-	TRACE2(UTF::EBorder, UTraceModuleEfsrv::EFsIsValidName3Return, MODULEUID, b, aParam.ErrorCode());
+	OstTraceExt2(TRACE_BORDER, EFSRV_EFSISVALIDNAME3RETURN, "r %d err %d", (TUint) b, (TUint) aParam.ErrorCode());
 	return b;
 	}
 
@@ -3073,10 +3056,10 @@
 @see TDriveNumber
 */
 	{
-	TRACE2(UTF::EBorder, UTraceModuleEfsrv::EFsGetDriveName, MODULEUID, Handle(), aDrive);
+	OstTraceExt2(TRACE_BORDER, EFSRV_EFSGETDRIVENAME, "sess %x aDrive %d", (TUint) Handle(), (TUint) aDrive);
 	TInt r = SendReceive(EFsGetDriveName,TIpcArgs(aDrive,&aDriveName));
-
-	TRACERETMULT2(UTF::EBorder, UTraceModuleEfsrv::EFsGetDriveNameReturn, MODULEUID, r, aDriveName);
+	OstTraceData(TRACE_BORDER, EFSRV_EFSGETDRIVENAME_EDRIVENAME, "DriveName %S", aDriveName.Ptr(), aDriveName.Length()<<1);
+	OstTrace1(TRACE_BORDER, EFSRV_EFSGETDRIVENAMERETURN, "r %d", r);
 	return r;
 	}
 
@@ -3104,10 +3087,10 @@
 
 */
 	{
-	TRACEMULT3(UTF::EBorder, UTraceModuleEfsrv::EFsSetDriveName, MODULEUID, Handle(), aDrive, aDriveName);
+	OstTraceExt2(TRACE_BORDER, EFSRV_EFSSETDRIVENAME, "sess %x aDrive %d", (TUint) Handle(), (TUint) aDrive);
+	OstTraceData(TRACE_BORDER, EFSRV_EFSSETDRIVENAME_EDRIVENAME, "DriveName %S", aDriveName.Ptr(), aDriveName.Length()<<1);
 	TInt r = SendReceive(EFsSetDriveName,TIpcArgs(aDrive,&aDriveName));
-
-	TRACERET1(UTF::EBorder, UTraceModuleEfsrv::EFsSetDriveNameReturn, MODULEUID, r);
+	OstTrace1(TRACE_BORDER, EFSRV_EFSSETDRIVENAMERETURN, "r %d", r);
 	return r;
 	}
 
@@ -3138,10 +3121,9 @@
 
 */
 	{
-	TRACE3(UTF::EBorder, UTraceModuleEfsrv::EFsLockDrive, MODULEUID, Handle(), aDrv, aStore);
+	OstTraceExt3(TRACE_BORDER, EFSRV_EFSLOCKDRIVE, "sess %x aDrv %d aStore %d", (TUint) Handle(), (TUint) aDrv, (TUint) aStore);
 	TInt r = SendReceive(EFsLockDrive,TIpcArgs(aDrv,&aOld,&aNew,aStore));
-
-	TRACERET1(UTF::EBorder, UTraceModuleEfsrv::EFsLockDriveReturn, MODULEUID, r);
+	OstTrace1(TRACE_BORDER, EFSRV_EFSLOCKDRIVERETURN, "r %d", r);
 	return r;
 	}
 
@@ -3170,10 +3152,9 @@
 
 */
 	{
-	TRACE3(UTF::EBorder, UTraceModuleEfsrv::EFsUnlockDrive, MODULEUID, Handle(), aDrive, aStore);
+	OstTraceExt3(TRACE_BORDER, EFSRV_EFSUNLOCKDRIVE, "sess %x aDrv %d aStore %d", (TUint) Handle(), (TUint) aDrive, (TUint) aStore);
 	TInt r = SendReceive(EFsUnlockDrive,TIpcArgs(aDrive,&aPassword,aStore));
-
-	TRACERET1(UTF::EBorder, UTraceModuleEfsrv::EFsUnlockDriveReturn, MODULEUID, r);
+	OstTrace1(TRACE_BORDER, EFSRV_EFSUNLOCKDRIVERETURN, "r %d", r);
 	return r;
 	}
 
@@ -3199,10 +3180,9 @@
 
 */
 	{
-	TRACE2(UTF::EBorder, UTraceModuleEfsrv::EFsClearPassword, MODULEUID, Handle(), aDrv);
+	OstTraceExt2(TRACE_BORDER, EFSRV_EFSCLEARPASSWORD, "sess %x aDrv %d", (TUint) Handle(), (TUint) aDrv);
 	TInt r = SendReceive(EFsClearPassword,TIpcArgs(aDrv,&aPswd));
-
-	TRACERET1(UTF::EBorder, UTraceModuleEfsrv::EFsClearPasswordReturn, MODULEUID, r);
+	OstTrace1(TRACE_BORDER, EFSRV_EFSCLEARPASSWORDRETURN, "r %d", r);
 	return r;
 	}
 
@@ -3227,10 +3207,9 @@
 
 */
 	{
-	TRACE2(UTF::EBorder, UTraceModuleEfsrv::EFsErasePassword, MODULEUID, Handle(), aDrv);
+	OstTraceExt2(TRACE_BORDER, EFSRV_EFSERASEPASSWORD, "sess %x aDrv %d", (TUint) Handle(), (TUint) aDrv);
 	TInt r = SendReceive(EFsErasePassword,TIpcArgs(aDrv));
-
-	TRACERET1(UTF::EBorder, UTraceModuleEfsrv::EFsErasePasswordReturn, MODULEUID, r);
+	OstTrace1(TRACE_BORDER, EFSRV_EFSERASEPASSWORDRETURN, "r %d", r);
 	return r;
 	}
 
@@ -3247,11 +3226,11 @@
 // Notify file server that startup initialisation has been completed
 //
 	{
-	TRACE2(UTF::EBorder, UTraceModuleEfsrv::EFsStartupInitComplete, MODULEUID, Handle(), &aStat);
+	OstTraceExt2(TRACE_BORDER, EFSRV_EFSSTARTUPINITCOMPLETE, "sess %x status %x", (TUint) Handle(), (TUint) &aStat);
 	aStat=KRequestPending;
 	RSessionBase::SendReceive(EFsStartupInitComplete,aStat);
 
-	TRACE0(UTF::EBorder, UTraceModuleEfsrv::EFsStartupInitCompleteReturn, MODULEUID);
+	OstTrace0(TRACE_BORDER, EFSRV_EFSSTARTUPINITCOMPLETERETURN, "");
 	}
 
 
@@ -3262,11 +3241,11 @@
 // Set the local drive mapping
 //
 	{
-	TRACEMULT2(UTF::EBorder, UTraceModuleEfsrv::EFsSetLocalDriveMapping, MODULEUID, Handle(), aMapping);
-
+	OstTrace1(TRACE_BORDER, EFSRV_EFSSETLOCALDRIVEMAPPING, "sess %x", Handle());
+	
+	OstTraceData( TRACE_BORDER, EFSRV_EFSSETLOCALDRIVEMAPPING_ELOCALDRIVEMAPPING, "aMapping %{int32[]}", aMapping.Ptr(), aMapping.Length());
 	TInt r = SendReceive(EFsSetLocalDriveMapping,TIpcArgs(&aMapping));
-
-	TRACERET1(UTF::EBorder, UTraceModuleEfsrv::EFsSetLocalDriveMappingReturn, MODULEUID, r);
+	OstTrace1(TRACE_BORDER, EFSRV_EFSSETLOCALDRIVEMAPPINGRETURN, "r %d", r);
 	return r;
 	}
 
@@ -3288,10 +3267,9 @@
 */
 EFSRV_EXPORT_C TInt RFs::FinaliseDrive(TInt aDriveNo, TFinaliseDrvMode aMode) const
     {
-	TRACE3(UTF::EBorder, UTraceModuleEfsrv::EFsFinaliseDrive, MODULEUID, Handle(), aDriveNo, aMode);
+	OstTraceExt3(TRACE_BORDER, EFSRV_EFSFINALISEDRIVE, "sess %x aDriveNo %d aMode %d", (TUint) Handle(), (TUint) aDriveNo, (TUint) aMode);
     TInt r = SendReceive(EFsFinaliseDrive,TIpcArgs(aDriveNo, (TInt)aMode));
-
-	TRACERET1(UTF::EBorder, UTraceModuleEfsrv::EFsFinaliseDriveReturn, MODULEUID, r);
+	OstTrace1(TRACE_BORDER, EFSRV_EFSFINALISEDRIVERETURN, "r %d", r);
 	return r;
     }
 
@@ -3307,7 +3285,7 @@
 */
 EFSRV_EXPORT_C TInt RFs::FinaliseDrives()
 	{
-	TRACE1(UTF::EBorder, UTraceModuleEfsrv::EFsFinaliseDrives, MODULEUID, Handle());
+	OstTrace1(TRACE_BORDER, EFSRV_EFSFINALISEDRIVES, "sess %x", Handle());
 	TInt nRes;
 	TDriveList driveList;
 	TDriveInfo driveInfo;
@@ -3315,7 +3293,7 @@
 	nRes=DriveList(driveList);
 	if(nRes != KErrNone)
 		{
-		TRACE1(UTF::EBorder, UTraceModuleEfsrv::EFsFinaliseDrivesReturn, MODULEUID, nRes);
+		OstTrace1(TRACE_BORDER, EFSRV_EFSFINALISEDRIVESRETURN1, "r %d", nRes);
 	    return nRes; //-- unable to obtain drives list
 		}
 	
@@ -3337,7 +3315,7 @@
 	    }
 	
 
-	TRACE1(UTF::EBorder, UTraceModuleEfsrv::EFsFinaliseDrivesReturn, MODULEUID, KErrNone);
+	OstTrace1(TRACE_BORDER, EFSRV_EFSFINALISEDRIVESRETURN2, "r %d", KErrNone);
 	return 	KErrNone;
 	}
 
@@ -3364,10 +3342,11 @@
 @capability DiskAdmin
 */
 	{
-	TRACEMULT4(UTF::EBorder, UTraceModuleEfsrv::EFsSwapFileSystem, MODULEUID, Handle(), aOldFileSystemName, aNewFileSystemName, aDrive);
+	OstTraceExt2(TRACE_BORDER, EFSRV_EFSSWAPFILESYSTEM, "sess %x aDrive %d", (TUint) Handle(), (TUint) aDrive);
+	OstTraceData(TRACE_BORDER, EFSRV_EFSSWAPFILESYSTEM_EOLDNAME, "OldName %S", aOldFileSystemName.Ptr(), aOldFileSystemName.Length()<<1);
+	OstTraceData(TRACE_BORDER, EFSRV_EFSSWAPFILESYSTEM_ENEWNAME, "NewName %S", aNewFileSystemName.Ptr(), aNewFileSystemName.Length()<<1);
 	TInt r = SendReceive(EFsSwapFileSystem,TIpcArgs(&aNewFileSystemName,aDrive,&aOldFileSystemName));
-
-	TRACERET1(UTF::EBorder, UTraceModuleEfsrv::EFsSwapFileSystemReturn, MODULEUID, r);
+	OstTrace1(TRACE_BORDER, EFSRV_EFSSWAPFILESYSTEMRETURN, "r %d", r);
 	return r;
 	}
 
@@ -3392,11 +3371,10 @@
 @capability DiskAdmin
 */
 	{
-	TRACEMULT5(UTF::EBorder, UTraceModuleEfsrv::EFsAddCompositeMount, MODULEUID, 
-		Handle(), aFileSystemName, aLocalDriveToMount, aCompositeDrive, aSync);
+	OstTraceExt4(TRACE_BORDER, EFSRV_EFSADDCOMPOSITEMOUNT, "sess %x aLocalDriveToMount %d aCompositeDrive %d aSync %d", (TUint) Handle(), aLocalDriveToMount, aCompositeDrive, aSync);
+	OstTraceData(TRACE_BORDER, EFSRV_EFSADDCOMPOSITEMOUNT_EFILESYSTEMNAME, "FileSystemName %S", aFileSystemName.Ptr(), aFileSystemName.Length()<<1);
 	TInt r = SendReceive(EFsAddCompositeMount,TIpcArgs(&aFileSystemName,aLocalDriveToMount,aCompositeDrive,aSync));
-
-	TRACERET1(UTF::EBorder, UTraceModuleEfsrv::EFsAddCompositeMountReturn, MODULEUID, r);
+	OstTrace1(TRACE_BORDER, EFSRV_EFSADDCOMPOSITEMOUNTRETURN, "r %d", r);
 	return r;
 	}
 
@@ -3435,10 +3413,9 @@
         any of the possible error return codes from TDrive::Volume()
 */
 	{
-	TRACE3(UTF::EBorder, UTraceModuleEfsrv::EFsReserveDriveSpace, MODULEUID, Handle(), aDriveNo, aSpace);
+	OstTraceExt3(TRACE_BORDER, EFSRV_EFSRESERVEDRIVESPACE, "sess %x aDriveNo %d aSpace %d", (TUint) Handle(), (TUint) aDriveNo, (TUint) aSpace);
 	TInt r = SendReceive(EFsReserveDriveSpace, TIpcArgs(aDriveNo, aSpace));
-
-	TRACERET1(UTF::EBorder, UTraceModuleEfsrv::EFsReserveDriveSpaceReturn, MODULEUID, r);
+	OstTrace1(TRACE_BORDER, EFSRV_EFSRESERVEDRIVESPACERETURN, "r %d", r);
 	return r;
 	}
 
@@ -3456,10 +3433,9 @@
         KErrPermissionDenied if the drive has no spare reserved space
 */
 	{
-	TRACE2(UTF::EBorder, UTraceModuleEfsrv::EFsGetReserveAccess, MODULEUID, Handle(), aDriveNo);
+	OstTraceExt2(TRACE_BORDER, EFSRV_EFSGETRESERVEACCESS, "sess %x aDriveNo %d", (TUint) Handle(), (TUint) aDriveNo);
 	TInt r = SendReceive(EFsGetReserveAccess, TIpcArgs(aDriveNo));
-
-	TRACERET1(UTF::EBorder, UTraceModuleEfsrv::EFsGetReserveAccessReturn, MODULEUID, r);
+	OstTrace1(TRACE_BORDER, EFSRV_EFSGETRESERVEACCESSRETURN, "r %d", r);
 	return r;
 	}
 
@@ -3473,10 +3449,9 @@
 
 */
 	{
-	TRACE2(UTF::EBorder, UTraceModuleEfsrv::EFsReleaseReserveAccess, MODULEUID, Handle(), aDriveNo);
+	OstTraceExt2(TRACE_BORDER, EFSRV_EFSRELEASERESERVEACCESS, "sess %x aDriveNo %d", (TUint) Handle(), (TUint) aDriveNo);
 	TInt r = SendReceive(EFsReleaseReserveAccess, TIpcArgs(aDriveNo));
-
-	TRACERET1(UTF::EBorder, UTraceModuleEfsrv::EFsReleaseReserveAccessReturn, MODULEUID, r);
+	OstTrace1(TRACE_BORDER, EFSRV_EFSRELEASERESERVEACCESSRETURN, "r %d", r);
 	return r;
 	}
 
@@ -3533,7 +3508,7 @@
 */
 EFSRV_EXPORT_C void RFs::NotifyDismount(TInt aDrive, TRequestStatus& aStat, TNotifyDismountMode aMode /*=EFsDismountRegisterClient*/) const
 	{
-	TRACE4(UTF::EBorder, UTraceModuleEfsrv::EFsNotifyDismount, MODULEUID, Handle(), aDrive, &aStat, aMode);
+	OstTraceExt4(TRACE_BORDER, EFSRV_EFSNOTIFYDISMOUNT, "sess %x aDrive %d status %x aMode %d", (TUint) Handle(), aDrive, (TUint) &aStat, (TInt) aMode);
 	aStat = KRequestPending;
 	RSessionBase::SendReceive(EFsNotifyDismount, TIpcArgs(aDrive,aMode,&aStat), aStat);
 	// This call is to synchronise with the driver thread as the corresponding cancel function (NotifyDismountCancel)
@@ -3541,7 +3516,7 @@
 	// This call guarantees that the notify request has been added to queue.
 	SendReceive(EFsSynchroniseDriveThread, TIpcArgs(aDrive));
 
-	TRACE0(UTF::EBorder, UTraceModuleEfsrv::EFsNotifyDismountReturn, MODULEUID);
+	OstTrace0(TRACE_BORDER, EFSRV_EFSNOTIFYDISMOUNTRETURN, "");
 	}
 
 
@@ -3556,12 +3531,12 @@
 */
 EFSRV_EXPORT_C void RFs::NotifyDismountCancel(TRequestStatus& aStat) const
 	{
-	TRACE2(UTF::EBorder, UTraceModuleEfsrv::EFsNotifyDismountCancel1, MODULEUID, Handle(), &aStat);
+	OstTraceExt2(TRACE_BORDER, EFSRV_EFSNOTIFYDISMOUNTCANCEL1, "sess %x status %x", (TUint) Handle(), (TUint) &aStat);
 	
 	if (aStat == KRequestPending)
 		SendReceive(EFsNotifyDismountCancel, TIpcArgs(&aStat));
 
-	TRACE0(UTF::EBorder, UTraceModuleEfsrv::EFsNotifyDismountCancel1Return, MODULEUID);
+	OstTrace0(TRACE_BORDER, EFSRV_EFSNOTIFYDISMOUNTCANCEL1RETURN, "");
 	}
 
 
@@ -3573,11 +3548,10 @@
 */
 EFSRV_EXPORT_C void RFs::NotifyDismountCancel() const
 	{
-	TRACE1(UTF::EBorder, UTraceModuleEfsrv::EFsNotifyDismountCancel2, MODULEUID, Handle());
-
+	OstTrace1(TRACE_BORDER, EFSRV_EFSNOTIFYDISMOUNTCANCEL2, "sess %x", Handle());
 	SendReceive(EFsNotifyDismountCancel, TIpcArgs(NULL));
 
-	TRACE0(UTF::EBorder, UTraceModuleEfsrv::EFsNotifyDismountCancel2Return, MODULEUID);
+	OstTrace0(TRACE_BORDER, EFSRV_EFSNOTIFYDISMOUNTCANCEL2RETURN, "");
 	}
 
 
@@ -3597,10 +3571,9 @@
 */
 EFSRV_EXPORT_C TInt RFs::AllowDismount(TInt aDrive) const
 	{
-	TRACE2(UTF::EBorder, UTraceModuleEfsrv::EFsAllowDismount, MODULEUID, Handle(), aDrive);
+	OstTraceExt2(TRACE_BORDER, EFSRV_EFSALLOWDISMOUNT, "sess %x aDrive %d", (TUint) Handle(), (TUint) aDrive);
 	TInt r = SendReceive(EFsAllowDismount, TIpcArgs(aDrive));
-
-	TRACERET1(UTF::EBorder, UTraceModuleEfsrv::EFsAllowDismountReturn, MODULEUID, r);
+	OstTrace1(TRACE_BORDER, EFSRV_EFSALLOWDISMOUNTRETURN, "r %d", r);
 	return r;
 	}
 
@@ -3621,10 +3594,9 @@
 @return KErrNone if successful, KErrPermissionDenied if called outside estart
 */
     {
-	TRACE4(UTF::EBorder, UTraceModuleEfsrv::EFsSetStartupConfiguration, MODULEUID, Handle(), aCommand, aParam1, aParam2);
+	OstTraceExt4(TRACE_BORDER, EFSRV_EFSSETSTARTUPCONFIGURATION, "sess %x aCommand %d aParam1 %x aParam2 %x", (TUint) Handle(), aCommand, (TUint) aParam1, (TUint) aParam2);
     TInt r = SendReceive(EFsSetStartupConfiguration, TIpcArgs(aCommand,aParam1,aParam2));
-
-	TRACERET1(UTF::EBorder, UTraceModuleEfsrv::EFsSetStartupConfigurationReturn, MODULEUID, r);
+	OstTrace1(TRACE_BORDER, EFSRV_EFSSETSTARTUPCONFIGURATIONRETURN, "r %d", r);
 	return r;
     }
 
@@ -3644,10 +3616,9 @@
 @see RFs::NotifyChange
  */
 	{
-	TRACE2(UTF::EBorder, UTraceModuleEfsrv::EFsSetNotifyChange, MODULEUID, Handle(), aNotifyChange);
+	OstTraceExt2(TRACE_BORDER, EFSRV_EFSSETNOTIFYCHANGE, "sess %x aNotifyChange %d", (TUint) Handle(), (TUint) aNotifyChange);
 	TInt r = SendReceive(EFsSetSessionFlags, TIpcArgs(aNotifyChange ? EFsSessionNotifyChange: 0, aNotifyChange ? 0 : EFsSessionNotifyChange));
-
-	TRACERET1(UTF::EBorder, UTraceModuleEfsrv::EFsSetNotifyChangeReturn, MODULEUID, r);
+	OstTrace1(TRACE_BORDER, EFSRV_EFSSETNOTIFYCHANGERETURN, "r %d", r);
 	return r;
 	}
 
@@ -3681,10 +3652,9 @@
 @capability KDiskAdmin
 */
 	{
-	TRACE3(UTF::EBorder, UTraceModuleEfsrv::EFsInitialisePropertiesFile, MODULEUID, Handle(), aPtr.Ptr(), aPtr.Length());
+	OstTraceExt3(TRACE_BORDER, EFSRV_EFSINITIALISEPROPERTIESFILE, "sess %x filePtr %x fileLen %d", (TUint) Handle(), (TUint) aPtr.Ptr(), (TUint) aPtr.Length());
 	TInt r = SendReceive(EFsInitialisePropertiesFile, TIpcArgs(aPtr.Ptr(), aPtr.Length(), ETrue));
-
-	TRACERET1(UTF::EBorder, UTraceModuleEfsrv::EFsInitialisePropertiesFileReturn, MODULEUID, r);
+	OstTrace1(TRACE_BORDER, EFSRV_EFSINITIALISEPROPERTIESFILERETURN, "r %d", r);
 	return r;
 	}
 
@@ -3703,10 +3673,9 @@
 @see TVolumeIOParamInfo
  */
 	{
-	TRACE3(UTF::EBorder, UTraceModuleEfsrv::EFsQueryVolumeInfoExt, MODULEUID, Handle(), aDrive, aCommand);
+	OstTraceExt3(TRACE_BORDER, EFSRV_EFSQUERYVOLUMEINFOEXT, "sess %x aDrive %d aCommand %d", (TUint) Handle(), (TUint) aDrive, (TUint) aCommand);
 	TInt r = SendReceive(EFsQueryVolumeInfoExt, TIpcArgs(aDrive, aCommand, &aInfo));
-
-	TRACERET1(UTF::EBorder, UTraceModuleEfsrv::EFsQueryVolumeInfoExtReturn, MODULEUID, r);
+	OstTrace1(TRACE_BORDER, EFSRV_EFSQUERYVOLUMEINFOEXTRETURN, "r %d", r);
 	return r;
 	}
 
@@ -3725,8 +3694,7 @@
 @return KErrNone if successful; otherwise, another system wide error code is returned.
 */
 	{
-	TRACE2(UTF::EBorder, UTraceModuleEfsrv::EFsVolumeIOParam, MODULEUID, Handle(), aDrive);
-
+	OstTraceExt2(TRACE_BORDER, EFSRV_EFSVOLUMEIOPARAM, "sess %x aDrive %d", (TUint) Handle(), (TUint) aDrive);
 	TInt r = KErrNone;
 
 	if (!IsValidDrive(aDrive))
@@ -3739,9 +3707,8 @@
 		if (r == KErrNone)
 			aParamInfo = infoPckg();
 		}
-
-	TRACE5(UTF::EBorder, UTraceModuleEfsrv::EFsVolumeIOParamReturn, MODULEUID, 
-		r, aParamInfo.iBlockSize, aParamInfo.iClusterSize, aParamInfo.iRecReadBufSize, aParamInfo.iRecWriteBufSize);
+	OstTraceExt5(TRACE_BORDER, EFSRV_EFSVOLUMEIOPARAMRETURN, "r %d iBlockSize %d iClusterSize %d iRecReadBufSize %d iRecWriteBufSize %d", (TUint) r, (TUint) aParamInfo.iBlockSize, (TUint) aParamInfo.iClusterSize, (TUint) aParamInfo.iRecReadBufSize, (TUint) aParamInfo.iRecWriteBufSize);
+		
 	return r;
 	}
 
@@ -3770,7 +3737,7 @@
 */
 EFSRV_EXPORT_C TInt RFs::FileSystemSubType(TInt aDrive, TDes& aName) const
 	{
-	TRACEMULT3(UTF::EBorder, UTraceModuleEfsrv::EFsFileSystemSubType, MODULEUID, Handle(), aDrive, aName);
+	OstTraceExt2(TRACE_BORDER, EFSRV_EFSFILESYSTEMSUBTYPE, "sess %x aDrive %d", (TUint) Handle(), (TUint) aDrive);
 
 	TInt r = KErrNone;
 
@@ -3784,8 +3751,11 @@
 		if (r == KErrNone || r == KErrNotSupported)
 			aName = namePckg();
 		}
-
-	TRACERET1(UTF::EBorder, UTraceModuleEfsrv::EFsFileSystemSubTypeReturn, MODULEUID, r);
+	
+	OstTraceData(TRACE_BORDER, EFSRV_EFSFILESYSTEMSUBTYPE_EFILESYSTEMNAME, "FileSystemName %S", aName.Ptr(), aName.Length()<<1);
+
+	OstTrace1(TRACE_BORDER, EFSRV_EFSFILESYSTEMSUBTYPERETURN, "r %d", r);
+
 	return r;
 	}
 
@@ -3868,14 +3838,21 @@
 	return SendReceive(EFsDismountProxyDrive,TIpcArgs(aProxyDriveNumber));
 	}
 
+
+/**
+Closes the file server session.
+
+NB This function was added to support tracing and was not present in earlier versions of Symbian OS.
+For this reason no extra funcitonality should be added to this function.
+
+*/
 EFSRV_EXPORT_C void RFs::Close()
 	{
-	TRACE1(UTF::EBorder, UTraceModuleEfsrv::EFsClose, MODULEUID, Handle());
-	RFTRACE_CLOSE;
+	OstTrace1(TRACE_BORDER, EFSRV_EFSCLOSE, "sess %x", Handle());
 
 	RSessionBase::Close();
 
-	TRACE0(UTF::EBorder, UTraceModuleEfsrv::EFsCloseReturn, MODULEUID);
+	OstTrace0(TRACE_BORDER, EFSRV_EFSCLOSERETURN, "");
 	}
 
 
diff -r 2a0ada0a1bf8 -r 95847726fe57 userlibandfileserver/fileserver/sfsrv/cl_dir.cpp
--- a/userlibandfileserver/fileserver/sfsrv/cl_dir.cpp	Wed May 12 10:34:10 2010 +0100
+++ b/userlibandfileserver/fileserver/sfsrv/cl_dir.cpp	Mon May 24 18:38:55 2010 +0100
@@ -17,6 +17,10 @@
 
 #include "cl_std.h"
 
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "cl_dirTraces.h"
+#endif
+
 
 
 
@@ -48,13 +52,14 @@
 
 */
 	{
-	TRACEMULT5(UTF::EBorder, UTraceModuleEfsrv::EDirOpen1, MODULEUID,
-		Session().Handle(), aName, aUidType[0].iUid, aUidType[1].iUid, aUidType[2].iUid);
+	OstTraceExt4(TRACE_BORDER, EFSRV_EDIROPEN1, "sess %x aUidType0 %x aUidType1 %x aUidType2 %x", (TUint) Session().Handle(), (TUint) aUidType[0].iUid, (TUint) aUidType[1].iUid, (TUint) aUidType[2].iUid);
+	OstTraceData(TRACE_BORDER, EFSRV_EDIROPEN1_EDIRNAME, "Dir %S", aName.Ptr(), aName.Length()<<1);
 
 	TPckgC<TUidType> pckgUid(aUidType);
 	TInt r = CreateSubSession(aFs,EFsDirOpen,TIpcArgs(&aName,KEntryAttAllowUid,&pckgUid));
 
-	TRACERET2(UTF::EBorder, UTraceModuleEfsrv::EDirOpen1Return, MODULEUID, r, SubSessionHandle());
+	OstTraceExt2(TRACE_BORDER, EFSRV_EDIROPEN1RETURN, "r %d subs %x", (TUint) r, (TUint) SubSessionHandle());
+
 	return r;
 	}
 
@@ -92,13 +97,15 @@
 
 */
 	{
-	TRACEMULT3(UTF::EBorder, UTraceModuleEfsrv::EDirOpen2, MODULEUID, Session().Handle(), aName, anAttMask);
+	OstTraceExt2(TRACE_BORDER, EFSRV_EDIROPEN2, "sess %x anAttMask %x", (TUint) Session().Handle(), (TUint) anAttMask);
+	OstTraceData(TRACE_BORDER, EFSRV_EDIROPEN2_EDIRNAME, "Dir %S", aName.Ptr(), aName.Length()<<1);
 
 	TUidType uidType(TUid::Null(),TUid::Null(),TUid::Null());
 	TPckgC<TUidType> pckgUid(uidType);
 	TInt r = CreateSubSession(aFs,EFsDirOpen,TIpcArgs(&aName,anAttMask,&pckgUid));
 
-	TRACERET2(UTF::EBorder, UTraceModuleEfsrv::EDirOpen2Return, MODULEUID, r, SubSessionHandle());
+	OstTraceExt2(TRACE_BORDER, EFSRV_EDIROPEN2RETURN, "r %d subs %x", (TUint) r, (TUint) SubSessionHandle());
+
 	return r;
 	}
 
@@ -112,11 +119,11 @@
 it completed successfully or not.
 */
 	{
-	TRACE2(UTF::EBorder, UTraceModuleEfsrv::EDirClose, MODULEUID, Session().Handle(), SubSessionHandle());
+	OstTraceExt2(TRACE_BORDER, EFSRV_EDIRCLOSE, "sess %x subs %x", (TUint) Session().Handle(), (TUint) SubSessionHandle());
 
 	CloseSubSession(EFsDirSubClose);
 
-	TRACE0(UTF::EBorder, UTraceModuleEfsrv::EDirCloseReturn, MODULEUID);
+	OstTrace0(TRACE_BORDER, EFSRV_EDIRCLOSERETURN, "");
 	}
 
 
@@ -140,12 +147,13 @@
         (e.g. KErrCorrupt, KErrNoMemory etc).
 */
 	{
-	TRACE2(UTF::EBorder, UTraceModuleEfsrv::EDirRead1, MODULEUID, Session().Handle(), SubSessionHandle());
+	OstTraceExt2(TRACE_BORDER, EFSRV_EDIRREAD1, "sess %x subs %x", (TUint) Session().Handle(), (TUint) SubSessionHandle());
 
 	anArray.iCount=KCountNeeded;
 	TInt r = SendReceive(EFsDirReadPacked,TIpcArgs(&anArray.iBuf));
 
-	TRACERET2(UTF::EBorder, UTraceModuleEfsrv::EDirRead1Return, MODULEUID, r, anArray.Count());
+	OstTraceExt2(TRACE_BORDER, EFSRV_EDIRREAD1RETURN, "r %d count %d", (TUint) r, (TUint) anArray.Count());
+
 	return r;
 	}
 
@@ -171,12 +179,12 @@
                (e.g. KErrCorrupt, KErrNoMemory etc).
 */
 	{
-	TRACE3(UTF::EBorder, UTraceModuleEfsrv::EDirRead2, MODULEUID, Session().Handle(), SubSessionHandle(), &aStatus);
+	OstTraceExt3(TRACE_BORDER, EFSRV_EDIRREAD2, "sess %x subs %x status %x", (TUint) Session().Handle(), (TUint) SubSessionHandle(), (TUint) &aStatus);
 
 	anArray.iCount=KCountNeeded;
 	RSubSessionBase::SendReceive(EFsDirReadPacked,TIpcArgs(&anArray.iBuf),aStatus);
 
-	TRACE0(UTF::EBorder, UTraceModuleEfsrv::EDirRead2Return, MODULEUID);
+	OstTrace0(TRACE_BORDER, EFSRV_EDIRREAD2RETURN, "");
 	}
 
 
@@ -194,12 +202,13 @@
         codes.
 */
 	{
-	TRACE2(UTF::EBorder, UTraceModuleEfsrv::EDirRead3, MODULEUID, Session().Handle(), SubSessionHandle());
+	OstTraceExt2(TRACE_BORDER, EFSRV_EDIRREAD3, "sess %x subs %x", (TUint) Session().Handle(), (TUint) SubSessionHandle());
 
 	TPckg<TEntry> e(anEntry);
 	TInt r = SendReceive(EFsDirReadOne,TIpcArgs(&e));
 
-	TRACERET1(UTF::EBorder, UTraceModuleEfsrv::EDirRead3Return, MODULEUID, r);
+	OstTrace1(TRACE_BORDER, EFSRV_EDIRREAD3RETURN, "r %d", r);
+
 	return r;
 	}
 
@@ -218,9 +227,9 @@
                error codes.
 */
 	{
-	TRACE3(UTF::EBorder, UTraceModuleEfsrv::EDirRead4, MODULEUID, Session().Handle(), SubSessionHandle(), &aStatus);
+	OstTraceExt3(TRACE_BORDER, EFSRV_EDIRREAD4, "sess %x subs %x status %x", (TUint) Session().Handle(), (TUint) SubSessionHandle(), (TUint) &aStatus);
 
 	RSubSessionBase::SendReceive(EFsDirReadOne,TIpcArgs(&anEntry),aStatus);
 
-	TRACE0(UTF::EBorder, UTraceModuleEfsrv::EDirRead4Return, MODULEUID);
+	OstTrace0(TRACE_BORDER, EFSRV_EDIRREAD4RETURN, "");
 	}
diff -r 2a0ada0a1bf8 -r 95847726fe57 userlibandfileserver/fileserver/sfsrv/cl_file.cpp
--- a/userlibandfileserver/fileserver/sfsrv/cl_file.cpp	Wed May 12 10:34:10 2010 +0100
+++ b/userlibandfileserver/fileserver/sfsrv/cl_file.cpp	Mon May 24 18:38:55 2010 +0100
@@ -16,7 +16,9 @@
 //
 
 #include "cl_std.h"
-
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "cl_fileTraces.h"
+#endif
 static _LIT_SECURITY_POLICY_S1(KFileServerPolicy,KFileServerUidValue,ECapabilityTCB);
 
 EFSRV_EXPORT_C TInt RFile::Adopt(RFs& aFs, TInt aHandle)
@@ -34,26 +36,23 @@
 */
 	{
 
-	TRACE2(UTF::EBorder, UTraceModuleEfsrv::EFileAdopt, MODULEUID, aFs.Handle(), aHandle);
-
+	OstTraceExt2(TRACE_BORDER, EFSRV_EFILEADOPT, "sess %x subs %x", (TUint) aFs.Handle(), (TUint) aHandle);
 	// duplicate the sub-session handle; don't panic if it's invalid.
 	RFile file;
 	TInt r = file.CreateSubSession(aFs, EFsFileDuplicate, TIpcArgs(aHandle, EFalse));
 	if (r == KErrArgument)
 		{
-		TRACE1(UTF::EBorder, UTraceModuleEfsrv::EFileAdoptReturn, MODULEUID, KErrBadHandle);
+		OstTrace1(TRACE_BORDER, EFSRV_EFILEADOPTRETURN1, "r %d", KErrBadHandle);
 		return KErrBadHandle;
 		}
 	else if (r != KErrNone)
 		{
-		TRACERET1(UTF::EBorder, UTraceModuleEfsrv::EFileAdoptReturn, MODULEUID, r);
+		OstTrace1(TRACE_BORDER, EFSRV_EFILEADOPTRETURN2, "r %d", r);
 		return r;
 		}
 	// adopt the duplicated handle
 	r = CreateAutoCloseSubSession(aFs, EFsFileAdopt, TIpcArgs(file.SubSessionHandle(), KFileAdopt32));
-
-	TRACERET3(UTF::EBorder, UTraceModuleEfsrv::EFileAdoptReturn, MODULEUID, r, Session().Handle(), SubSessionHandle());
-
+	OstTraceExt3(TRACE_BORDER, EFSRV_EFILEADOPTRETURN3, "r %d sess %x subs %x", (TUint) r, (TUint) Session().Handle(), (TUint) SubSessionHandle());
 	return r;
 	}
 
@@ -77,19 +76,16 @@
         error codes.
 */
 	{
-	TRACE2(UTF::EBorder, UTraceModuleEfsrv::EFileAdoptFromServer, MODULEUID, aFsHandle, aFileHandle);
-
+	OstTraceExt2(TRACE_BORDER, EFSRV_EFILEADOPTFROMSERVER, "sess %x subs %x", (TUint) aFsHandle, (TUint) aFileHandle);
 	RFs fs;
 	TInt r = fs.SetReturnedHandle(aFsHandle, KFileServerPolicy);
 	if (r != KErrNone)
 		{
-		TRACERET1(UTF::EBorder, UTraceModuleEfsrv::EFileAdoptFromServerReturn, MODULEUID, r);
+		OstTrace1(TRACE_BORDER, EFSRV_EFILEADOPTFROMSERVERRETURN1, "r %d", r);
 		return r;
 		}
 	r = CreateAutoCloseSubSession(fs, EFsFileAdopt, TIpcArgs(aFileHandle, KFileAdopt32));
-
-	TRACERET3(UTF::EBorder, UTraceModuleEfsrv::EFileAdoptFromServerReturn, MODULEUID, r, Session().Handle(), SubSessionHandle());
-
+	OstTraceExt3(TRACE_BORDER, EFSRV_EFILEADOPTFROMSERVERRETURN2, "r %d sess %x subs %x", (TUint) r, (TUint) Session().Handle(), (TUint) SubSessionHandle());
 	return r;
 	}
 
@@ -130,7 +126,7 @@
 	else
 		r = KErrArgument;
 
-#ifdef SYMBIAN_FTRACE_ENABLE
+#ifdef OST_TRACE_COMPILER_IN_USE
 	TInt handle = NULL;
 	if (aFsHandleIndex == 0)
 		handle = aMsg.Int0();
@@ -140,12 +136,12 @@
 		handle = aMsg.Int2();
 	else if (aFsHandleIndex == 3)
 		handle = aMsg.Int3();
-	TRACE4(UTF::EBorder, UTraceModuleEfsrv::EFileAdoptFromClient, MODULEUID, handle, fileHandle, aFsHandleIndex, aFileHandleIndex);
+	OstTraceExt4(TRACE_BORDER, EFSRV_EFILEADOPTFROMCLIENT, "sess %x subs %x aFsHandleIndex %d aFileHandleIndex %d ", (TUint) handle, (TUint) fileHandle, (TUint) aFsHandleIndex, (TUint) aFileHandleIndex);
 #endif
 
 	if (r != KErrNone)
 		{
-		TRACERET1(UTF::EBorder, UTraceModuleEfsrv::EFileAdoptFromClientReturn, MODULEUID, r);
+		OstTrace1(TRACE_BORDER, EFSRV_EFILEADOPTFROMCLIENTRETURN1, "r %d", r);
 		return r;
 		}
 
@@ -155,14 +151,12 @@
 	r = fs.Open(aMsg, aFsHandleIndex, KFileServerPolicy);
 	if (r != KErrNone)
 		{
-		TRACERET1(UTF::EBorder, UTraceModuleEfsrv::EFileAdoptFromClientReturn, MODULEUID, r);
+		OstTrace1(TRACE_BORDER, EFSRV_EFILEADOPTFROMCLIENTRETURN2, "r %d", r);
 		return r;
 		}
 
 	r = CreateAutoCloseSubSession(fs, EFsFileAdopt, TIpcArgs(fileHandle, KFileAdopt32));
-
-	TRACERET3(UTF::EBorder, UTraceModuleEfsrv::EFileAdoptFromClientReturn, MODULEUID, r, Session().Handle(), SubSessionHandle());
-
+	OstTraceExt3(TRACE_BORDER, EFSRV_EFILEADOPTFROMCLIENTRETURN3, "r %d sess %x subs %x", (TUint) r, (TUint) Session().Handle(), (TUint) SubSessionHandle());
 	return r;
 	}
 
@@ -193,11 +187,10 @@
 
 	TInt r = User::GetTIntParameter(aFileHandleIndex,  fileHandle);
 
-	TRACE3(UTF::EBorder, UTraceModuleEfsrv::EFileAdoptFromCreator, MODULEUID, fileHandle, aFsHandleIndex, aFileHandleIndex);
-
+	OstTraceExt3(TRACE_BORDER, EFSRV_EFILEADOPTFROMCREATOR, "subs %x aFsHandleIndex %d aFileHandleIndex %d", (TUint) fileHandle, (TUint) aFsHandleIndex, (TUint) aFileHandleIndex);
 	if (r != KErrNone)
 		{
-		TRACERET1(UTF::EBorder, UTraceModuleEfsrv::EFileAdoptFromCreatorReturn, MODULEUID, r);
+		OstTrace1(TRACE_BORDER, EFSRV_EFILEADOPTFROMCREATORRETURN1, "r %d", r);
 		return r;
 		}
 
@@ -208,14 +201,12 @@
 	r = fs.Open(aFsHandleIndex, KFileServerPolicy);
 	if (r != KErrNone)
 		{
-		TRACERET1(UTF::EBorder, UTraceModuleEfsrv::EFileAdoptFromCreatorReturn, MODULEUID, r);
+		OstTrace1(TRACE_BORDER, EFSRV_EFILEADOPTFROMCREATORRETURN2, "r %d", r);
 		return r;
 		}
 
 	r = CreateAutoCloseSubSession(fs, EFsFileAdopt, TIpcArgs(fileHandle, KFileAdopt32));
-
-	TRACERET3(UTF::EBorder, UTraceModuleEfsrv::EFileAdoptFromCreatorReturn, MODULEUID, r, Session().Handle(), SubSessionHandle());
-
+	OstTraceExt3(TRACE_BORDER, EFSRV_EFILEADOPTFROMCREATORRETURN3, "r %d sess %x subs %x", (TUint) r, (TUint) Session().Handle(), (TUint) SubSessionHandle());
 	return r;
 	}
 
@@ -237,8 +228,7 @@
 */
 EFSRV_EXPORT_C TInt RFile::Duplicate(const RFile& aFile, TOwnerType aType)
 	{
-	TRACE3(UTF::EBorder, UTraceModuleEfsrv::EFileDuplicate, MODULEUID, aFile.Session().Handle(), aFile.SubSessionHandle(), aType);
-
+	OstTraceExt3(TRACE_BORDER, EFSRV_EFILEDUPLICATE, "sess %x subs %x aType %d", (TUint) aFile.Session().Handle(), (TUint) aFile.SubSessionHandle(), (TUint) aType);
 	RFs fs;
 	fs.SetHandle(aFile.Session().Handle());
 
@@ -247,7 +237,7 @@
 	TInt r = fs.Duplicate(RThread(), aType);
 	if (r != KErrNone)
 		{
-		TRACERET1(UTF::EBorder, UTraceModuleEfsrv::EFileDuplicateReturn, MODULEUID, r);
+		OstTrace1(TRACE_BORDER, EFSRV_EFILEDUPLICATERETURN1, "r %d", r);
 		return r;
 		}
 	
@@ -256,15 +246,14 @@
 	r = aFile.DuplicateHandle(dupSubSessionHandle);
 	if (r != KErrNone)
 		{
-		TRACERET1(UTF::EBorder, UTraceModuleEfsrv::EFileDuplicateReturn, MODULEUID, r);
+		OstTrace1(TRACE_BORDER, EFSRV_EFILEDUPLICATERETURN2, "r %d", r);
 		return r;
 		}
 
 	// adopt the duplicated sub-session handle
 	r = CreateAutoCloseSubSession(fs, EFsFileAdopt, TIpcArgs(dupSubSessionHandle, KFileDuplicate));
 
-	TRACERET3(UTF::EBorder, UTraceModuleEfsrv::EFileDuplicateReturn, MODULEUID, r, Session().Handle(), SubSessionHandle());
-
+	OstTraceExt3(TRACE_BORDER, EFSRV_EFILEDUPLICATERETURN3, "r %d sess %x subs %x", (TUint) r, (TUint) Session().Handle(), (TUint) SubSessionHandle());
 	return r;
 	}
 
@@ -321,11 +310,10 @@
 */
 EFSRV_EXPORT_C TInt RFile::TransferToServer(TIpcArgs& aIpcArgs, TInt aFsHandleIndex, TInt aFileHandleIndex) const
 	{
-	TRACE4(UTF::EBorder, UTraceModuleEfsrv::EFileTransferToServer, MODULEUID, Session().Handle(), SubSessionHandle(), aFsHandleIndex, aFileHandleIndex);
-
+	OstTraceExt4(TRACE_BORDER, EFSRV_EFILETRANSFERTOSERVER, "sess %x subs %x aFsHandleIndex %d aFileHandleIndex %d", (TUint) Session().Handle(), (TUint) SubSessionHandle(), (TUint) aFsHandleIndex, (TUint) aFileHandleIndex);
 	if ((aFsHandleIndex < 0) || (aFsHandleIndex > (KMaxMessageArguments-2)))
 		{
-		TRACE1(UTF::EBorder, UTraceModuleEfsrv::EFileTransferToServerReturn, MODULEUID,  (TUint) KErrArgument);
+		OstTrace1(TRACE_BORDER, EFSRV_EFILETRANSFERTOSERVERRETURN1, "r %d",  (TUint) KErrArgument);
 		return KErrArgument;
 		}
 
@@ -336,8 +324,7 @@
 		aIpcArgs.Set(aFsHandleIndex, Session());
 		aIpcArgs.Set(aFileHandleIndex, dupSubSessionHandle);
 		}
-
-	TRACERET1(UTF::EBorder, UTraceModuleEfsrv::EFileTransferToServerReturn, MODULEUID, r);
+	OstTrace1(TRACE_BORDER, EFSRV_EFILETRANSFERTOSERVERRETURN2, "r %d", r);
 	return r;
 	}
 
@@ -368,11 +355,10 @@
 */
 EFSRV_EXPORT_C TInt RFile::TransferToClient(const RMessage2& aMsg, TInt aFileHandleIndex) const
 	{
-	TRACE3(UTF::EBorder, UTraceModuleEfsrv::EFileTransferToClient, MODULEUID, Session().Handle(), SubSessionHandle(), aFileHandleIndex);
-
+	OstTraceExt3(TRACE_BORDER, EFSRV_EFILETRANSFERTOCLIENT, "sess %x subs %x aFileHandleIndex %d", (TUint) Session().Handle(), (TUint) SubSessionHandle(), (TUint) aFileHandleIndex);
 	if (TUint(aFileHandleIndex) >= TUint(KMaxMessageArguments))
 		{
-		TRACE1(UTF::EBorder, UTraceModuleEfsrv::EFileTransferToClientReturn, MODULEUID,  (TUint) KErrArgument);
+		OstTrace1(TRACE_BORDER, EFSRV_EFILETRANSFERTOCLIENTRETURN1, "r %d",  (TUint) KErrArgument);
 		return KErrArgument;
 		}
 
@@ -383,14 +369,13 @@
 
 	if (r != KErrNone)
 		{
-		TRACERET1(UTF::EBorder, UTraceModuleEfsrv::EFileTransferToClientReturn, MODULEUID, r);
+		OstTrace1(TRACE_BORDER, EFSRV_EFILETRANSFERTOCLIENTRETURN2, "r %d", r);
 		return r;
 		}
 
 	aMsg.Complete(Session());
 	
-	TRACE1(UTF::EBorder, UTraceModuleEfsrv::EFileTransferToClientReturn, MODULEUID, r);
-
+	OstTrace1(TRACE_BORDER, EFSRV_EFILETRANSFERTOCLIENTRETURN3, "r %d", r);
 	return r;
 	}
 
@@ -423,8 +408,7 @@
 // NB slot 0 is reserved for the command line
 EFSRV_EXPORT_C TInt RFile::TransferToProcess(RProcess& aProcess, TInt aFsHandleIndex, TInt aFileHandleIndex) const
 	{
-	TRACE4(UTF::EBorder, UTraceModuleEfsrv::EFileTransferToProcess, MODULEUID, Session().Handle(), SubSessionHandle(), aFsHandleIndex, aFileHandleIndex);
-
+	OstTraceExt4(TRACE_BORDER, EFSRV_EFILETRANSFERTOPROCESS, "sess %x subs %x aFsHandleIndex %d aFileHandleIndex %d", (TUint) Session().Handle(), (TUint) SubSessionHandle(), (TUint) aFsHandleIndex, (TUint) aFileHandleIndex);
 	TInt dupSubSessionHandle;
 	TInt r = DuplicateHandle(dupSubSessionHandle);
 
@@ -433,9 +417,7 @@
 	
 	if (r == KErrNone)
 		r = aProcess.SetParameter(aFileHandleIndex, dupSubSessionHandle);
-
-	TRACERET1(UTF::EBorder, UTraceModuleEfsrv::EFileTransferToProcessReturn, MODULEUID, r);
-
+	OstTrace1(TRACE_BORDER, EFSRV_EFILETRANSFERTOPROCESSRETURN, "r %d", r);
 	return r;
 	}
 
@@ -455,12 +437,10 @@
 
 */
 	{
-	TRACE2(UTF::EBorder, UTraceModuleEfsrv::EFileName, MODULEUID, Session().Handle(), SubSessionHandle());
-
+	OstTraceExt2(TRACE_BORDER, EFSRV_EFILEGETNAME, "sess %x subs %x", (TUint) Session().Handle(), (TUint) SubSessionHandle());
 	TInt r = SendReceive(EFsFileName, TIpcArgs(&aName));
-
-	TRACERETMULT2(UTF::EBorder, UTraceModuleEfsrv::EFileNameReturn, MODULEUID, r, aName);
-
+	OstTraceData(TRACE_BORDER, EFSRV_EFILEGETNAME_EFILENAME, "FileName %S", aName.Ptr(), aName.Length()<<1);
+	OstTrace1(TRACE_BORDER, EFSRV_EFILEGETNAMERETURN, "r %d", r);
 	return r;
 	}
 
@@ -480,12 +460,10 @@
 
 */
 	{
-	TRACE2(UTF::EBorder, UTraceModuleEfsrv::EFileFullName, MODULEUID, Session().Handle(), SubSessionHandle());
-
+	OstTraceExt2(TRACE_BORDER, EFSRV_EFILEFULLNAME, "sess %x subs %x", (TUint) Session().Handle(), (TUint) SubSessionHandle());
 	TInt r = SendReceive(EFsFileFullName, TIpcArgs(&aName));
-
-	TRACERETMULT2(UTF::EBorder, UTraceModuleEfsrv::EFileFullNameReturn, MODULEUID, r, aName);
-
+	OstTraceData(TRACE_BORDER, EFSRV_EFILEFULLNAME_EFILENAME, "FileName %S", aName.Ptr(), aName.Length()<<1);
+	OstTrace1(TRACE_BORDER, EFSRV_EFILEFULLNAMERETURN, "r %d", r);
 	return r;
 	}
 
@@ -540,13 +518,11 @@
 
 */
 	{
-	TRACEMULT3(UTF::EBorder, UTraceModuleEfsrv::EFileOpen, MODULEUID, aFs.Handle(), aMode, aName);
-
+	OstTraceExt2(TRACE_BORDER, EFSRV_EFILEOPEN, "sess %x mode %x", (TUint) aFs.Handle(), (TUint) aMode);
+	OstTraceData(TRACE_BORDER, EFSRV_EFILEOPEN_EFILENAME, "FileName %S", aName.Ptr(), aName.Length()<<1);
 	aMode &= ~EFileBigFile;
 	TInt r = CreateSubSession(aFs,EFsFileOpen,TIpcArgs(&aName,aMode));
-
-	TRACERET2(UTF::EBorder, UTraceModuleEfsrv::EFileOpenReturn, MODULEUID, r, SubSessionHandle());
-
+	OstTraceExt2(TRACE_BORDER, EFSRV_EFILEOPENRETURN, "r %d subs %x", (TUint) r, (TUint) SubSessionHandle());
 	return r;
 	}
 
@@ -564,22 +540,11 @@
 no-operation.
 */
 	{
-	TRACE2(UTF::EBorder, UTraceModuleEfsrv::EFileClose, MODULEUID, Session().Handle(), SubSessionHandle());
+	OstTraceExt2(TRACE_BORDER, EFSRV_EFILECLOSE, "sess %x subs %x", (TUint) Session().Handle(), (TUint) SubSessionHandle());
 	
-#if defined (SYMBIAN_FTRACE_ENABLE) && defined(__DLL__)
-	// Need to close the handle to the trace LDD if this is an auto-close subsession
-	// as these close their parent session by calling RHandleBase::Close(), i.e. they
-	// bypass RFs::Close() which would normally be responsible for closing the LDD
-	TInt h = Session().Handle() ^ CObjectIx::ENoClose;
-	if ( h != NULL && (!(h & CObjectIx::ENoClose)) ) 
-		{
-		RFTRACE_CLOSE;
-		}
-#endif
-
 	CloseSubSession(EFsFileSubClose);
 
-	TRACE0(UTF::EBorder, UTraceModuleEfsrv::EFileCloseReturn, MODULEUID);
+	OstTrace0(TRACE_BORDER, EFSRV_EFILECLOSERETURN, "");
 	}
 
 
@@ -623,13 +588,10 @@
 */
 	{
 	aMode &= ~EFileBigFile;
-
-	TRACEMULT3(UTF::EBorder, UTraceModuleEfsrv::EFileCreate, MODULEUID, aFs.Handle(), aMode, aName);
-
+	OstTraceExt2(TRACE_BORDER, EFSRV_EFILECREATE, "sess %x mode %x", (TUint) aFs.Handle(), (TUint) aMode);
+	OstTraceData(TRACE_BORDER, EFSRV_EFILECREATE_EFILENAME, "FileName %S", aName.Ptr(), aName.Length()<<1);
 	TInt r = CreateSubSession(aFs,EFsFileCreate,TIpcArgs(&aName,aMode));
-
-	TRACERET2(UTF::EBorder, UTraceModuleEfsrv::EFileCreateReturn, MODULEUID, r, SubSessionHandle());
-
+	OstTraceExt2(TRACE_BORDER, EFSRV_EFILECREATERETURN, "r %d subs %x", (TUint) r, (TUint) SubSessionHandle());
 	return r;
 	}
 
@@ -680,10 +642,11 @@
 
 */
 	{
-	TRACEMULT3(UTF::EBorder, UTraceModuleEfsrv::EFileReplace, MODULEUID, aFs.Handle(), aMode, aName);
+	OstTraceExt2(TRACE_BORDER, EFSRV_EFILEREPLACE, "sess %x mode %x", (TUint) aFs.Handle(), (TUint) aMode);
+	OstTraceData(TRACE_BORDER, EFSRV_EFILEREPLACE_EFILENAME, "FileName %S", aName.Ptr(), aName.Length()<<1);
 	aMode &= ~EFileBigFile;
 	TInt r = CreateSubSession(aFs,EFsFileReplace,TIpcArgs(&aName,aMode));
-	TRACERET2(UTF::EBorder, UTraceModuleEfsrv::EFileReplaceReturn, MODULEUID, r, SubSessionHandle());
+	OstTraceExt2(TRACE_BORDER, EFSRV_EFILEREPLACERETURN, "r %d subs %x", (TUint) r, (TUint) SubSessionHandle());
 	return r;
 	}
 
@@ -717,10 +680,13 @@
 					  SID then AllFiles capability is required.
 */
 	{
-   	TRACEMULT3(UTF::EBorder, UTraceModuleEfsrv::EFileTemp, MODULEUID, aFs.Handle(), aPath, aMode);
+   	OstTraceExt2(TRACE_BORDER, EFSRV_EFILETEMP, "sess %x aMode %x", (TUint) aFs.Handle(), (TUint) aMode);
+	OstTraceData(TRACE_BORDER, EFSRV_EFILETEMP_EDIRNAME, "Dir %S", aPath.Ptr(), aPath.Length()<<1);
 	aMode &= ~EFileBigFile;
 	TInt r = CreateSubSession(aFs,EFsFileTemp,TIpcArgs(&aPath,aMode,&aName));
-	TRACERETMULT3(UTF::EBorder, UTraceModuleEfsrv::EFileTempReturn, MODULEUID, r, SubSessionHandle(), aName);
+	OstTraceData(TRACE_BORDER, EFSRV_EFILETEMP_EFILENAME, "FileName %S", aName.Ptr(), aName.Length()<<1);
+	OstTraceExt2(TRACE_BORDER, EFSRV_EFILETEMPRETURN, "r %d subs %x", (TUint) r, (TUint) SubSessionHandle());
+	
 	return r;
 	}
 
@@ -748,12 +714,9 @@
 @see TDesC8::Length
 */
 	{
-	TRACE3(UTF::EBorder, UTraceModuleEfsrv::EFileRead1, MODULEUID, Session().Handle(), SubSessionHandle(), aDes.MaxLength());
-
+	OstTraceExt3(TRACE_BORDER, EFSRV_EFILEREAD1, "sess %x subs %x desmaxlen %d", (TUint) Session().Handle(), (TUint) SubSessionHandle(), (TUint) aDes.MaxLength());
 	TInt r = SendReceive(EFsFileRead,TIpcArgs(&aDes,aDes.MaxLength(),I64LOW(KCurrentPosition64)));
-
-	TRACERET2(UTF::EBorder, UTraceModuleEfsrv::EFileRead1Return, MODULEUID, r, aDes.Length());
-
+	OstTraceExt2(TRACE_BORDER, EFSRV_EFILEREAD1RETURN, "r %d len %d", (TUint) r, (TUint) aDes.Length());
 	return r;
 	}
 
@@ -787,11 +750,10 @@
 @see TDesC8::Length       
 */
 	{
-	TRACE4(UTF::EBorder, UTraceModuleEfsrv::EFileRead2, MODULEUID, Session().Handle(), SubSessionHandle(), aDes.MaxLength(), &aStatus);
-
+	OstTraceExt3(TRACE_BORDER, EFSRV_EFILEREAD2, "sess %x subs %x maxdeslen %d", (TUint) Session().Handle(), (TUint) SubSessionHandle(), (TUint) aDes.MaxLength());
     RSubSessionBase::SendReceive(EFsFileRead,TIpcArgs(&aDes,aDes.MaxLength(),I64LOW(KCurrentPosition64)),aStatus);
 
-	TRACE0(UTF::EBorder, UTraceModuleEfsrv::EFileRead2Return, MODULEUID);
+	OstTrace0(TRACE_BORDER, EFSRV_EFILEREAD2RETURN, "");
 	}
 
 
@@ -826,8 +788,7 @@
         codes.
 */
 	{
-	TRACE3(UTF::EBorder, UTraceModuleEfsrv::EFileRead1, MODULEUID, Session().Handle(), SubSessionHandle(), aLength);
-
+	OstTraceExt3(TRACE_BORDER, EFSRV_EFILEREAD5, "sess %x subs %x aLength %d", (TUint) Session().Handle(), (TUint) SubSessionHandle(), (TUint) aLength);
 	if (aLength==0)
 		{
 		aDes.Zero();
@@ -838,9 +799,7 @@
 		return(KErrOverflow);
 		}
 	TInt r = SendReceive(EFsFileRead,TIpcArgs(&aDes,aLength,I64LOW(KCurrentPosition64)));
-
-	TRACERET2(UTF::EBorder, UTraceModuleEfsrv::EFileRead1Return, MODULEUID, r, aDes.Length());
-
+	OstTraceExt2(TRACE_BORDER, EFSRV_EFILEREAD5RETURN, "r %d len %d", (TUint) r, (TUint) aDes.Length());
 	return r;
 	}
 
@@ -880,8 +839,7 @@
                otherwise one of the other system-wide error codes.
 */
 	{
-	TRACE4(UTF::EBorder, UTraceModuleEfsrv::EFileRead2, MODULEUID, Session().Handle(), SubSessionHandle(), aLength, &aStatus);
-
+	OstTraceExt3(TRACE_BORDER, EFSRV_EFILEREAD6, "sess %x subs %x aLength %d", (TUint) Session().Handle(), (TUint) SubSessionHandle(), (TUint) aLength);
 	if (aLength==0)
 		{
 		aDes.Zero();
@@ -897,8 +855,7 @@
 		}
 		
 	RSubSessionBase::SendReceive(EFsFileRead,TIpcArgs(&aDes,aLength,I64LOW(KCurrentPosition64)),aStatus);
-
-	TRACE0(UTF::EBorder, UTraceModuleEfsrv::EFileRead2Return, MODULEUID);
+	OstTrace0(TRACE_BORDER, EFSRV_EFILEREAD6RETURN, "");
 	}
 
 
@@ -932,14 +889,11 @@
 @panic FSCLIENT 19 if aPos is negative.        
 */
 	{
-	TRACE5(UTF::EBorder, UTraceModuleEfsrv::EFileRead3, MODULEUID, Session().Handle(), SubSessionHandle(), aPos, 0, aDes.MaxLength());
-
+	OstTraceExt4(TRACE_BORDER, EFSRV_EFILEREAD3, "sess %x subs %x aPos %x maxdeslen %d", (TUint) Session().Handle(), (TUint) SubSessionHandle(), (TUint) aPos, (TUint) aDes.MaxLength());
 	__ASSERT_ALWAYS(aPos>=0,Panic(EPosNegative));
 
 	TInt r = SendReceive(EFsFileRead,TIpcArgs(&aDes,aDes.MaxLength(),aPos));
-
-	TRACERET2(UTF::EBorder, UTraceModuleEfsrv::EFileRead3Return, MODULEUID, r, aDes.Length());
-
+	OstTraceExt2(TRACE_BORDER, EFSRV_EFILEREAD3RETURN, "r %d len %d", (TUint) r, (TUint) aDes.Length());
 	return r;
 	}
 
@@ -979,12 +933,11 @@
 @panic FSCLIENT 19 if aPos is negative.        
 */
 	{
-	TRACE6(UTF::EBorder, UTraceModuleEfsrv::EFileRead4, MODULEUID, Session().Handle(), SubSessionHandle(), aPos, 0, aDes.MaxLength(), &aStatus);
-
+	OstTraceExt4(TRACE_BORDER, EFSRV_EFILEREAD4, "sess %x subs %x aPos %x maxdeslen %d", (TUint) Session().Handle(), (TUint) SubSessionHandle(), (TUint) aPos, (TUint) aDes.MaxLength());
 	__ASSERT_ALWAYS(aPos>=0,Panic(EPosNegative));
 	RSubSessionBase::SendReceive(EFsFileRead,TIpcArgs(&aDes,aDes.MaxLength(),aPos),aStatus);
 
-	TRACE0(UTF::EBorder, UTraceModuleEfsrv::EFileRead4Return, MODULEUID);
+	OstTrace0(TRACE_BORDER, EFSRV_EFILEREAD4RETURN, "");
 	}
 
 
@@ -1026,8 +979,7 @@
 @panic FSCLIENT 19 if aPos is negative.        
 */
 	{
-	TRACE5(UTF::EBorder, UTraceModuleEfsrv::EFileRead3, MODULEUID, Session().Handle(), SubSessionHandle(), aPos, 0, aLength);
-
+	OstTraceExt4(TRACE_BORDER, EFSRV_EFILEREAD7, "sess %x subs %x aPos %x aLength %d", (TUint) Session().Handle(), (TUint) SubSessionHandle(), (TUint) aPos, (TUint) aLength);
 	__ASSERT_ALWAYS(aPos>=0,Panic(EPosNegative));
 	if (aLength==0)
 		{
@@ -1040,9 +992,7 @@
 		}
 		
 	TInt r = SendReceive(EFsFileRead,TIpcArgs(&aDes,aLength,aPos));
-
-	TRACERET2(UTF::EBorder, UTraceModuleEfsrv::EFileRead3Return, MODULEUID, r, aDes.Length());
-
+	OstTraceExt2(TRACE_BORDER, EFSRV_EFILEREAD7RETURN, "r %d len %d", (TUint) r, (TUint) aDes.Length());
 	return r;
 	}
 
@@ -1091,8 +1041,7 @@
 @panic FSCLIENT 19 if aPos is negative.                       
 */
 	{
-	TRACE6(UTF::EBorder, UTraceModuleEfsrv::EFileRead4, MODULEUID, Session().Handle(), SubSessionHandle(), aPos, 0, aLength, &aStatus);
-
+	OstTraceExt4(TRACE_BORDER, EFSRV_EFILEREAD9, "sess %x subs %x aPos %x maxlen %d", (TUint) Session().Handle(), (TUint) SubSessionHandle(), (TUint) aPos, (TUint) aLength);
 	__ASSERT_ALWAYS(aPos>=0,Panic(EPosNegative));
 	if (aLength==0)
 		{
@@ -1109,8 +1058,7 @@
 		}
 		
 	RSubSessionBase::SendReceive(EFsFileRead,TIpcArgs(&aDes,aLength,aPos),aStatus);
-
-	TRACE0(UTF::EBorder, UTraceModuleEfsrv::EFileRead4Return, MODULEUID);
+	OstTrace0(TRACE_BORDER, EFSRV_EFILEREAD9RETURN, "");
 	}
 
 
@@ -1162,9 +1110,9 @@
         codes.
 */
 	{
-	TRACE3(UTF::EBorder, UTraceModuleEfsrv::EFileWrite1, MODULEUID, Session().Handle(), SubSessionHandle(), aDes.Length());
+	OstTraceExt3(TRACE_BORDER, EFSRV_EFILEWRITE1, "sess %x subs %x deslen %d", (TUint) Session().Handle(), (TUint) SubSessionHandle(), (TUint) aDes.Length());
 	TInt r = SendReceive(EFsFileWrite,TIpcArgs(&aDes,aDes.Length(),I64LOW(KCurrentPosition64)));
-	TRACERET1(UTF::EBorder, UTraceModuleEfsrv::EFileWrite1Return, MODULEUID, r);
+	OstTrace1(TRACE_BORDER, EFSRV_EFILEWRITE1RETURN, "r %d", r);
 	return r;
 	}
 
@@ -1189,10 +1137,9 @@
                otherwise one of the other system-wide error codes.
 */
 	{
-	TRACE4(UTF::EBorder, UTraceModuleEfsrv::EFileWrite2, MODULEUID, Session().Handle(), SubSessionHandle(), aDes.Length(), &aStatus);
-
+	OstTraceExt3(TRACE_BORDER, EFSRV_EFILEWRITE2, "sess %x subs %x deslen %d", (TUint) Session().Handle(), (TUint) SubSessionHandle(), (TUint) aDes.Length());
 	RSubSessionBase::SendReceive(EFsFileWrite,TIpcArgs(&aDes,aDes.Length(),I64LOW(KCurrentPosition64)),aStatus);
-	TRACE0(UTF::EBorder, UTraceModuleEfsrv::EFileWrite2Return, MODULEUID);
+	OstTrace0(TRACE_BORDER, EFSRV_EFILEWRITE2RETURN, "");
 	}
 
 
@@ -1219,12 +1166,10 @@
        of the descriptor aDes.  
 */
 	{
-	TRACE3(UTF::EBorder, UTraceModuleEfsrv::EFileWrite1, MODULEUID, Session().Handle(), SubSessionHandle(), aLength);
-
+	OstTraceExt3(TRACE_BORDER, EFSRV_EFILEWRITE5, "sess %x subs %x aLength %d", (TUint) Session().Handle(), (TUint) SubSessionHandle(), (TUint) aLength);
 	__ASSERT_DEBUG(aDes.Length()>=aLength,Panic(EBadLength));
 	TInt r = SendReceive(EFsFileWrite,TIpcArgs(&aDes,aLength,I64LOW(KCurrentPosition64)));
-
-	TRACERET1(UTF::EBorder, UTraceModuleEfsrv::EFileWrite1Return, MODULEUID, r);
+	OstTrace1(TRACE_BORDER, EFSRV_EFILEWRITE5RETURN, "r %d", r);
 	return r;
 	}
 
@@ -1257,11 +1202,10 @@
 
 */
 	{
-	TRACE4(UTF::EBorder, UTraceModuleEfsrv::EFileWrite2, MODULEUID, Session().Handle(), SubSessionHandle(), aLength, &aStatus);
+	OstTraceExt3(TRACE_BORDER, EFSRV_EFILEWRITE9, "sess %x subs %x aLength %d", (TUint) Session().Handle(), (TUint) SubSessionHandle(), (TUint) aLength);
 		
 	RSubSessionBase::SendReceive(EFsFileWrite,TIpcArgs(&aDes,aLength,I64LOW(KCurrentPosition64)),aStatus);
-
-	TRACE0(UTF::EBorder, UTraceModuleEfsrv::EFileWrite2Return, MODULEUID);
+	OstTrace0(TRACE_BORDER, EFSRV_EFILEWRITE9RETURN, "");
 	}
 
 
@@ -1291,12 +1235,10 @@
 @panic FSCLIENT 19 if aPos is negative.                       
 */
 	{
-	TRACE5(UTF::EBorder, UTraceModuleEfsrv::EFileWrite3, MODULEUID, Session().Handle(), SubSessionHandle(), aPos, 0, aDes.Length());
-
+	OstTraceExt4(TRACE_BORDER, EFSRV_EFILEWRITE3, "sess %x subs %x aPos %x len %d", (TUint) Session().Handle(), (TUint) SubSessionHandle(), (TUint) aPos, (TUint) aDes.Length());
 	__ASSERT_ALWAYS(aPos>=0,Panic(EPosNegative));
 	TInt r = SendReceive(EFsFileWrite,TIpcArgs(&aDes,aDes.Length(),aPos));
-
-	TRACERET1(UTF::EBorder, UTraceModuleEfsrv::EFileWrite3Return, MODULEUID, r);
+	OstTrace1(TRACE_BORDER, EFSRV_EFILEWRITE3RETURN, "r %d", r);
 	return r;
 	}
 
@@ -1331,11 +1273,10 @@
 @panic FSCLIENT 19 if aPos is negative.                       
 */
 	{
-	TRACE6(UTF::EBorder, UTraceModuleEfsrv::EFileWrite4, MODULEUID, Session().Handle(), SubSessionHandle(), aPos, 0, aDes.Length(), &aStatus);
-
+	OstTraceExt4(TRACE_BORDER, EFSRV_EFILEWRITE4, "sess %x subs %x aPos %x deslen %d", (TUint) Session().Handle(), (TUint) SubSessionHandle(), (TUint) aPos, (TUint) aDes.Length());
 	__ASSERT_ALWAYS(aPos>=0,Panic(EPosNegative));
 	RSubSessionBase::SendReceive(EFsFileWrite,TIpcArgs(&aDes,aDes.Length(),aPos),aStatus);
-	TRACE0(UTF::EBorder, UTraceModuleEfsrv::EFileWrite4Return, MODULEUID);
+	OstTrace0(TRACE_BORDER, EFSRV_EFILEWRITE4RETURN, "");
 	}
 
 
@@ -1365,12 +1306,10 @@
 @panic FSCLIENT 19 if aPos is negative.                       
 */
 	{
-	TRACE3(UTF::EBorder, UTraceModuleEfsrv::EFileWrite1, MODULEUID, Session().Handle(), SubSessionHandle(), aLength);
-
+	OstTraceExt4(TRACE_BORDER, EFSRV_EFILEWRITE6, "sess %x subs %x aPos %x aLength %d", (TUint) Session().Handle(), (TUint) SubSessionHandle(), (TUint) aPos, (TUint) aLength);
 	__ASSERT_ALWAYS(aPos>=0,Panic(EPosNegative));
 	TInt r = SendReceive(EFsFileWrite,TIpcArgs(&aDes,aLength,aPos));
-
-	TRACERET1(UTF::EBorder, UTraceModuleEfsrv::EFileWrite1Return, MODULEUID, r);
+	OstTrace1(TRACE_BORDER, EFSRV_EFILEWRITE6RETURN, "r %d", r);
 	return r;
 	}
 
@@ -1408,11 +1347,10 @@
 @panic FSCLIENT 19 if aPos is negative.                       
 */
 	{
-	TRACE6(UTF::EBorder, UTraceModuleEfsrv::EFileWrite2, MODULEUID, Session().Handle(), SubSessionHandle(), aPos, 0, aLength, &aStatus);
-
+	OstTraceExt4(TRACE_BORDER, EFSRV_EFILEWRITE10, "sess %x subs %x aPos %x aLength %d", (TUint) Session().Handle(), (TUint) SubSessionHandle(), (TUint) aPos, (TUint) aLength);
 	__ASSERT_ALWAYS(aPos>=0,Panic(EPosNegative));
 	RSubSessionBase::SendReceive(EFsFileWrite,TIpcArgs(&aDes,aLength,aPos),aStatus);
-	TRACE0(UTF::EBorder, UTraceModuleEfsrv::EFileWrite2Return, MODULEUID);
+	OstTrace0(TRACE_BORDER, EFSRV_EFILEWRITE10RETURN, "");
 	}
 
 
@@ -1446,13 +1384,10 @@
 
 */
 	{
-	TRACE5(UTF::EBorder, UTraceModuleEfsrv::EFileLock, MODULEUID, Session().Handle(), SubSessionHandle(), aPos, 0, aLength);
-
+	OstTraceExt4(TRACE_BORDER, EFSRV_EFILELOCK, "RFile::Lock() sess %x subs %x aPos %x aLength %d", (TUint) Session().Handle(), (TUint) SubSessionHandle(), (TUint) aPos, (TUint) aLength);
 	__ASSERT_ALWAYS(aPos>=0,Panic(EPosNegative));
-
 	TInt r = SendReceive(EFsFileLock,TIpcArgs(aPos,aLength));
-
-	TRACERET1(UTF::EBorder, UTraceModuleEfsrv::EFileLockReturn, MODULEUID, r);
+	OstTrace1(TRACE_BORDER, EFSRV_EFILELOCKRETURN, "r %d", r);
 	return r;
 	}
 
@@ -1480,12 +1415,10 @@
 @panic FSCLIENT 19 if aPos is negative. 
 */
 	{
-	TRACE5(UTF::EBorder, UTraceModuleEfsrv::EFileUnLock, MODULEUID, Session().Handle(), SubSessionHandle(), aPos, 0, aLength);
-
+	OstTraceExt4(TRACE_BORDER, EFSRV_EFILEUNLOCK, "RFile::UnLock() sess %x subs %x aPos %x aLength %d", (TUint) Session().Handle(), (TUint) SubSessionHandle(), (TUint) aPos, (TUint) aLength);
 	__ASSERT_ALWAYS(aPos>=0,Panic(EPosNegative));
 	TInt r = SendReceive(EFsFileUnLock,TIpcArgs(aPos,aLength));
-
-	TRACERET1(UTF::EBorder, UTraceModuleEfsrv::EFileUnLockReturn, MODULEUID, r);
+	OstTrace1(TRACE_BORDER, EFSRV_EFILEUNLOCKRETURN, "r %d", r);
 	return r;
 	}
 
@@ -1529,15 +1462,13 @@
         codes.
 */
 	{
-	TRACE5(UTF::EBorder, UTraceModuleEfsrv::EFileSeek, MODULEUID, Session().Handle(), SubSessionHandle(), aMode, aPos, 0);
-
+	OstTraceExt4(TRACE_BORDER, EFSRV_EFILESEEK1, "sess %x subs %x aMode %x aPos %x", (TUint) Session().Handle(), (TUint) SubSessionHandle(), (TUint) aMode, (TUint) aPos);
 	TInt64 newPos = aPos;
 	TPckg<TInt64>  pkNewPos(newPos);
 	TInt r = SendReceive(EFsFileSeek|KIpcArgSlot2Desc,TIpcArgs(aPos,aMode,&pkNewPos));
 	if(KErrNone == r)
 		aPos = I64LOW(newPos);
-
-	TRACERET1(UTF::EBorder, UTraceModuleEfsrv::EFileSeekReturn, MODULEUID, r);
+	OstTrace1(TRACE_BORDER, EFSRV_EFILESEEK1RETURN, "r %d", r);
 	return r;
 	}
 
@@ -1559,11 +1490,9 @@
         codes.
 */
 	{
-	TRACE3(UTF::EBorder, UTraceModuleEfsrv::EFileFlush, MODULEUID, Session().Handle(), SubSessionHandle(), NULL);
-
+	OstTraceExt3(TRACE_BORDER, EFSRV_EFILEFLUSH1, "sess %x subs %x status %x", (TUint) Session().Handle(), (TUint) SubSessionHandle(), (TUint) NULL);
 	TInt r = RSubSessionBase::SendReceive(EFsFileFlush);
-
-	TRACERET1(UTF::EBorder, UTraceModuleEfsrv::EFileFlushReturn, MODULEUID, r);
+	OstTrace1(TRACE_BORDER, EFSRV_EFILEFLUSH1RETURN, "r %d", r);
 	return r;
 	}
 
@@ -1585,11 +1514,9 @@
                otherwise one of the other system-wide error codes.
 */
 	{
-	TRACE3(UTF::EBorder, UTraceModuleEfsrv::EFileFlush, MODULEUID, Session().Handle(), SubSessionHandle(), &aStatus);
-
+	OstTraceExt3(TRACE_BORDER, EFSRV_EFILEFLUSH2, "sess %x subs %x status %x", (TUint) Session().Handle(), (TUint) SubSessionHandle(), (TUint) &aStatus);
 	RSubSessionBase::SendReceive(EFsFileFlush, aStatus);
-
-	TRACE0(UTF::EBorder, UTraceModuleEfsrv::EFileFlushReturn, MODULEUID);
+	OstTrace0(TRACE_BORDER, EFSRV_EFILEFLUSH2RETURN, "");
 	}
 
 
@@ -1605,8 +1532,7 @@
         codes.
 */
 	{
-	TRACE2(UTF::EBorder, UTraceModuleEfsrv::EFileSize, MODULEUID, Session().Handle(), SubSessionHandle());
-
+	OstTraceExt2(TRACE_BORDER, EFSRV_EFILESIZE, "sess %x subs %x", (TUint) Session().Handle(), (TUint) SubSessionHandle());
 	TInt64 size = aSize;
 	TPckg<TInt64> pkSize(size);
 	TInt r = SendReceive(EFsFileSize|KIpcArgSlot0Desc,TIpcArgs(&pkSize));
@@ -1617,8 +1543,7 @@
 	if (size > KMaxTInt)
 		return (KErrTooBig);
 #endif
-
-	TRACE2(UTF::EBorder, UTraceModuleEfsrv::EFileSizeReturn, MODULEUID, r, aSize);
+	OstTraceExt2(TRACE_BORDER, EFSRV_EFILESIZERETURN, "r %d aSize %d", (TUint) r, (TUint) aSize);
 	return r;
 	}
 
@@ -1650,11 +1575,9 @@
 
 */
 	{
-	TRACE4(UTF::EBorder, UTraceModuleEfsrv::EFileSetSize, MODULEUID, Session().Handle(), SubSessionHandle(), aSize, 0);
-
+	OstTraceExt3(TRACE_BORDER, EFSRV_EFILESETSIZE1, "sess %x subs %x aSize %d", (TUint) Session().Handle(), (TUint) SubSessionHandle(), (TUint) aSize);
 	TInt r = SendReceive(EFsFileSetSize,TIpcArgs(aSize));
-
-	TRACERET1(UTF::EBorder, UTraceModuleEfsrv::EFileSetSizeReturn, MODULEUID, r);
+	OstTrace1(TRACE_BORDER, EFSRV_EFILESETSIZE1RETURN, "r %d", r);
 	return r;
 	}
 
@@ -1675,13 +1598,11 @@
 @see KEntryAttNormal        
 */
 	{
-	TRACE2(UTF::EBorder, UTraceModuleEfsrv::EFileAtt, MODULEUID, Session().Handle(), SubSessionHandle());
-
+	OstTraceExt2(TRACE_BORDER, EFSRV_EFILEATT, "sess %x subs %x", (TUint) Session().Handle(), (TUint) SubSessionHandle());
 	TPtr8 a((TUint8*)&aVal,sizeof(TUint));
 	
 	TInt r = SendReceive(EFsFileAtt,TIpcArgs(&a));
-
-	TRACERET2(UTF::EBorder, UTraceModuleEfsrv::EFileAttReturn, MODULEUID, r, aVal);
+	OstTraceExt2(TRACE_BORDER, EFSRV_EFILEATTRETURN, "r %d aVal %x", (TUint) r, (TUint) aVal);
 	return r;
 	}
 
@@ -1718,13 +1639,11 @@
 @panic FSCLIENT 21 if the same attribute bit is set in both bitmasks.
 */
 	{
-	TRACE4(UTF::EBorder, UTraceModuleEfsrv::EFileSetAtt, MODULEUID, Session().Handle(), SubSessionHandle(), aSetAttMask, aClearAttMask);
-
+	OstTraceExt4(TRACE_BORDER, EFSRV_EFILESETATT, "sess %x subs %x aSetAttMask %x aClearAttMask %x", (TUint) Session().Handle(), (TUint) SubSessionHandle(), (TUint) aSetAttMask, (TUint) aClearAttMask);
 	__ASSERT_ALWAYS((aSetAttMask&aClearAttMask)==0,Panic(EAttributesIllegal));
 
 	TInt r = SendReceive(EFsFileSetAtt,TIpcArgs(aSetAttMask,aClearAttMask));
-
-	TRACERET1(UTF::EBorder, UTraceModuleEfsrv::EFileSetAttReturn, MODULEUID, r);
+	OstTrace1(TRACE_BORDER, EFSRV_EFILESETATTRETURN, "r %d", r);
 	return r;
 	}
 
@@ -1741,12 +1660,10 @@
         codes.
 */
 	{
-	TRACE2(UTF::EBorder, UTraceModuleEfsrv::EFileModified, MODULEUID, Session().Handle(), SubSessionHandle());
-
+	OstTraceExt2(TRACE_BORDER, EFSRV_EFILEMODIFIED, "sess %x subs %x", (TUint) Session().Handle(), (TUint) SubSessionHandle());
 	TPtr8 t((TUint8*)&aTime,sizeof(TTime));
 	TInt r = SendReceive(EFsFileModified,TIpcArgs(&t));
-
-	TRACERET3(UTF::EBorder, UTraceModuleEfsrv::EFileModifiedReturn, MODULEUID, r, I64LOW(aTime.Int64()), I64HIGH(aTime.Int64()));
+	OstTraceExt3(TRACE_BORDER, EFSRV_EFILEMODIFIEDRETURN, "r %d aTime %x:%x ", (TUint) r, (TUint) I64HIGH(aTime.Int64()), (TUint) I64LOW(aTime.Int64()));
 	return r;
 	}
 
@@ -1770,12 +1687,10 @@
         codes.
 */
 	{
-	TRACE4(UTF::EBorder, UTraceModuleEfsrv::EFileSetModified, MODULEUID, Session().Handle(), SubSessionHandle(), I64LOW(aTime.Int64()), I64HIGH(aTime.Int64()));
-
+	OstTraceExt4(TRACE_BORDER, EFSRV_EFILESETMODIFIED, "sess %x subs %x aTime %x:%x ", (TUint) Session().Handle(), (TUint) SubSessionHandle(), (TUint) I64HIGH(aTime.Int64()), (TUint) I64LOW(aTime.Int64()));
 	TPtrC8 t((TUint8*)&aTime,sizeof(TTime));
 	TInt r = SendReceive(EFsFileSetModified,TIpcArgs(&t));
-
-	TRACERET1(UTF::EBorder, UTraceModuleEfsrv::EFileSetModifiedReturn, MODULEUID, r);
+	OstTrace1(TRACE_BORDER, EFSRV_EFILESETMODIFIEDRETURN, "r %d", r);
 	return r;
 	}
 
@@ -1806,14 +1721,12 @@
 @see RFile::SetAtt
 */
 	{
-	TRACE6(UTF::EBorder, UTraceModuleEfsrv::EFileSet, MODULEUID, 
-		Session().Handle(), SubSessionHandle(), I64LOW(aTime.Int64()), I64HIGH(aTime.Int64()), aMask, aVal);
-
+	OstTraceExt4(TRACE_BORDER, EFSRV_EFILESETA, "sess %x subs %x aSetAttMask %x aClearAttMask %x", (TUint) Session().Handle(), (TUint) SubSessionHandle(), (TUint) aMask, (TUint) aVal);
+	OstTraceExt2(TRACE_BORDER, EFSRV_EFILESETB, "aTime %x:%x ", (TUint) I64HIGH(aTime.Int64()), (TUint) I64LOW(aTime.Int64()));
 	__ASSERT_ALWAYS((aVal&aMask)==0,Panic(EAttributesIllegal));
 	TPtrC8 t((TUint8*)&aTime,sizeof(TTime));
 	TInt r = SendReceive(EFsFileSet,TIpcArgs(&t,aMask,aVal));
-
-	TRACERET1(UTF::EBorder, UTraceModuleEfsrv::EFileSetReturn, MODULEUID, r);
+	OstTrace1(TRACE_BORDER, EFSRV_EFILESETRETURN, "r %d", r);
 	return r;
 	}
 
@@ -1842,13 +1755,11 @@
 
 */
 	{
-	TRACE3(UTF::EBorder, UTraceModuleEfsrv::EFileChangeMode, MODULEUID, Session().Handle(), SubSessionHandle(), aNewMode);
-
+	OstTraceExt3(TRACE_BORDER, EFSRV_EFILECHANGEMODE, "sess %x subs %x aNewMode %x", (TUint) Session().Handle(), (TUint) SubSessionHandle(), (TUint) aNewMode);
 	if (aNewMode!=EFileShareExclusive && aNewMode!=EFileShareReadersOnly)
 		return(KErrArgument);
 	TInt r = SendReceive(EFsFileChangeMode,TIpcArgs(aNewMode));
-
-	TRACERET1(UTF::EBorder, UTraceModuleEfsrv::EFileChangeModeReturn, MODULEUID, r);
+	OstTrace1(TRACE_BORDER, EFSRV_EFILECHANGEMODERETURN, "r %d", r);
 	return r;
 	}
 
@@ -1894,11 +1805,10 @@
 
 */
 	{
-	TRACEMULT3(UTF::EBorder, UTraceModuleEfsrv::EFileRename, MODULEUID, Session().Handle(), SubSessionHandle(), aNewName);
-
+	OstTraceExt2(TRACE_BORDER, EFSRV_EFILERENAME, "sess %x subs %x", (TUint) Session().Handle(), (TUint) SubSessionHandle());
+	OstTraceData(TRACE_BORDER, EFSRV_EFILERENAME_ENEWNAME, "NewName %S", aNewName.Ptr(), aNewName.Length()<<1);
 	TInt r = SendReceive(EFsFileRename,TIpcArgs(&aNewName));
-
-	TRACERET1(UTF::EBorder, UTraceModuleEfsrv::EFileRenameReturn, MODULEUID, r);
+	OstTrace1(TRACE_BORDER, EFSRV_EFILERENAMERETURN, "r %d", r);
 	return r;
 	}
 
@@ -1921,13 +1831,11 @@
 @see RFs::Drive
 */
 	{
-	TRACE2(UTF::EBorder, UTraceModuleEfsrv::EFileDrive, MODULEUID, Session().Handle(), SubSessionHandle());
-
+	OstTraceExt2(TRACE_BORDER, EFSRV_EFILEDRIVE, "sess %x subs %x", (TUint) Session().Handle(), (TUint) SubSessionHandle());
 	TPckg<TInt> pki(aDriveNumber);
 	TPckg<TDriveInfo> pkdi(aDriveInfo);
 	TInt r = SendReceive(EFsFileDrive,TIpcArgs(&pki,&pkdi));
-
-	TRACERET4(UTF::EBorder, UTraceModuleEfsrv::EFileDriveReturn, MODULEUID, r, aDriveInfo.iDriveAtt, aDriveInfo.iMediaAtt, aDriveInfo.iType);
+	OstTraceExt4(TRACE_BORDER, EFSRV_EFILEDRIVERETURN, "r %d driveAtt %x mediaAtt %x type %x", (TUint) r, (TUint) aDriveInfo.iDriveAtt, (TUint) aDriveInfo.iMediaAtt, (TUint) aDriveInfo.iType);
 	return r;
 	}
 
@@ -1944,12 +1852,10 @@
 @see RFs::Unclamp
 */
 	{
-	TRACE2(UTF::EBorder, UTraceModuleEfsrv::EFileClamp, MODULEUID, Session().Handle(), SubSessionHandle());
-
+	OstTraceExt2(TRACE_BORDER, EFSRV_EFILECLAMP, "sess %x subs %x", (TUint) Session().Handle(), (TUint) SubSessionHandle());
 	TPckg<RFileClamp> pkHandle(aHandle);
 	TInt r = SendReceive(EFsFileClamp,TIpcArgs(& pkHandle));
-
-	TRACERET1(UTF::EBorder, UTraceModuleEfsrv::EFileClampReturn, MODULEUID, r);
+	OstTrace1(TRACE_BORDER, EFSRV_EFILECLAMPRETURN, "r %d", r);
 	return r;
 	}
 
@@ -1979,9 +1885,8 @@
 */
 EFSRV_EXPORT_C TInt RFile::BlockMap(SBlockMapInfo& aInfo, TInt64& aStartPos, TInt64 aEndPos, TInt aBlockMapUsage) const
 	{
-	TRACE7(UTF::EBorder, UTraceModuleEfsrv::EFileBlockMap, MODULEUID, 
-		Session().Handle(), SubSessionHandle(), I64LOW(aStartPos), I64HIGH(aEndPos), I64LOW(aEndPos), I64HIGH(aEndPos), aBlockMapUsage);
-
+	OstTraceExt2(TRACE_BORDER, EFSRV_EFILEBLOCKMAPA, "sess %x subs %x", (TUint) Session().Handle(), (TUint) SubSessionHandle());
+	OstTraceExt5(TRACE_BORDER, EFSRV_EFILEBLOCKMAPB, "RFile::BlockMap() aStartPos %x:%x aEndPos %x:%x aBlockMapusage %d", (TUint) I64HIGH(aStartPos), (TUint) I64LOW(aStartPos), (TUint) I64HIGH(aEndPos), (TUint) I64LOW(aEndPos), (TUint) aBlockMapUsage);
 	SBlockMapArgs args;
 	args.iStartPos = aStartPos;
 	args.iEndPos = aEndPos;
@@ -1990,8 +1895,7 @@
  	TInt r = SendReceive(EFsBlockMap, TIpcArgs(&pkInfo, &pkArgs, aBlockMapUsage));
 	if(r==KErrNone)
 		aStartPos = args.iStartPos;
-
-	TRACERET1(UTF::EBorder, UTraceModuleEfsrv::EFileBlockMapReturn, MODULEUID, r);
+	OstTrace1(TRACE_BORDER, EFSRV_EFILEBLOCKMAPRETURN, "r %d", r);
 	return r;
 	}
 
@@ -2044,11 +1948,12 @@
 */
 EFSRV_EXPORT_C TInt RFile64::Open(RFs& aFs,const TDesC& aName,TUint aFileMode)
 	{
-	TRACEMULT3(UTF::EBorder, UTraceModuleEfsrv::EFileOpen, MODULEUID, aFs.Handle(), aFileMode, aName);
+	OstTraceExt2(TRACE_BORDER, EFSRV_EFILE64OPEN, "sess %x mode %x", (TUint) aFs.Handle(), (TUint) aFileMode);
+	OstTraceData(TRACE_BORDER, EFSRV_EFILE64OPEN_EFILENAME, "FileName %S", aName.Ptr(), aName.Length()<<1);
 	
 	TInt r = CreateSubSession(aFs,EFsFileOpen,TIpcArgs(&aName,aFileMode|EFileBigFile));
 	
-	TRACERET2(UTF::EBorder, UTraceModuleEfsrv::EFileOpenReturn, MODULEUID, r, SubSessionHandle());
+	OstTraceExt2(TRACE_BORDER, EFSRV_EFILE64OPENRETURN, "r %d subs %x", (TUint) r, (TUint) SubSessionHandle());
 	return r;
 	}
 
@@ -2093,11 +1998,10 @@
 */
 EFSRV_EXPORT_C TInt RFile64::Create(RFs& aFs,const TDesC& aName,TUint aFileMode)
 	{
-	TRACEMULT3(UTF::EBorder, UTraceModuleEfsrv::EFileCreate, MODULEUID, aFs.Handle(), aFileMode, aName);
-
+	OstTraceExt2(TRACE_BORDER, EFSRV_EFILE64CREATE, "sess %x mode %x", (TUint) aFs.Handle(), (TUint) aFileMode);
+	OstTraceData(TRACE_BORDER, EFSRV_EFILE64CREATE_EFILENAME, "FileName %S", aName.Ptr(), aName.Length()<<1);
 	TInt r = CreateSubSession(aFs,EFsFileCreate,TIpcArgs(&aName,aFileMode|EFileBigFile));
-
-	TRACERET2(UTF::EBorder, UTraceModuleEfsrv::EFileCreateReturn, MODULEUID, r, SubSessionHandle());
+	OstTraceExt2(TRACE_BORDER, EFSRV_EFILE64CREATERETURN, "r %d subs %x", (TUint) r, (TUint) SubSessionHandle());
 	return r;
 	}
 
@@ -2148,11 +2052,10 @@
 */
 EFSRV_EXPORT_C TInt RFile64::Replace(RFs& aFs,const TDesC& aName,TUint aFileMode)
 	{
-	TRACEMULT3(UTF::EBorder, UTraceModuleEfsrv::EFileReplace, MODULEUID, aFs.Handle(), aFileMode, aName);
-
+	OstTraceExt2(TRACE_BORDER, EFSRV_EFILE64REPLACE, "sess %x mode %x", (TUint) aFs.Handle(), (TUint) aFileMode);
+	OstTraceData(TRACE_BORDER, EFSRV_EFILE64REPLACE_EFILENAME, "FileName %S", aName.Ptr(), aName.Length()<<1);
 	TInt r = CreateSubSession(aFs,EFsFileReplace,TIpcArgs(&aName,aFileMode|EFileBigFile));
-
-	TRACERET2(UTF::EBorder, UTraceModuleEfsrv::EFileReplaceReturn, MODULEUID, r, SubSessionHandle());
+	OstTraceExt2(TRACE_BORDER, EFSRV_EFILE64REPLACERETURN, "r %d subs %x", (TUint) r, (TUint) SubSessionHandle());
 	return r;
 	}
 
@@ -2189,9 +2092,12 @@
 */
 EFSRV_EXPORT_C TInt RFile64::Temp(RFs& aFs,const TDesC& aPath,TFileName& aName,TUint aFileMode)
 	{
-   	TRACEMULT3(UTF::EBorder, UTraceModuleEfsrv::EFileTemp, MODULEUID, aFs.Handle(), aPath, aFileMode);
+   	OstTraceExt2(TRACE_BORDER, EFSRV_EFILE64TEMP, "sess %x aMode %x", (TUint) aFs.Handle(), (TUint) aFileMode);
+	OstTraceData(TRACE_BORDER, EFSRV_EFILE64TEMP_EDIRNAME, "Dir %S", aPath.Ptr(), aPath.Length()<<1);
 	TInt r = CreateSubSession(aFs,EFsFileTemp,TIpcArgs(&aPath,aFileMode|EFileBigFile,&aName));
-	TRACERETMULT3(UTF::EBorder, UTraceModuleEfsrv::EFileTempReturn, MODULEUID, r, SubSessionHandle(), aName);
+	OstTraceData(TRACE_BORDER, EFSRV_EFILE64TEMP_EFILENAME, "FileName %S", aName.Ptr(), aName.Length()<<1);
+	OstTraceExt2(TRACE_BORDER, EFSRV_EFILE64TEMPRETURN, "r %d subs %x", (TUint) r, (TUint) SubSessionHandle());
+	
 	return r;
 	}
 
@@ -2243,7 +2149,7 @@
 	else
 		r = KErrArgument;
 
-#ifdef SYMBIAN_FTRACE_ENABLE
+#ifdef OST_TRACE_COMPILER_IN_USE
 	TInt handle = NULL;
 	if (aFsHandleIndex == 0)
 		handle = aMsg.Int0();
@@ -2253,31 +2159,27 @@
 		handle = aMsg.Int2();
 	else if (aFsHandleIndex == 3)
 		handle = aMsg.Int3();
-	TRACE4(UTF::EBorder, UTraceModuleEfsrv::EFileAdoptFromClient, MODULEUID, handle, fileHandle, aFsHandleIndex, aFileHandleIndex);
+	OstTraceExt4(TRACE_BORDER, EFSRV_EFILE64ADOPTFROMCLIENT, "sess %x subs %x aFsHandleIndex %d aFileHandleIndex %d ", (TUint) handle, (TUint) fileHandle, (TUint) aFsHandleIndex, (TUint) aFileHandleIndex);
 #endif
-
 	if (r != KErrNone)
 		{
-		TRACERET1(UTF::EBorder, UTraceModuleEfsrv::EFileAdoptFromClientReturn, MODULEUID, r);
+		OstTrace1(TRACE_BORDER, EFSRV_EFILE64ADOPTFROMCLIENTRETURN1, "r %d", r);
 		return r;
 		}
-
 	// Duplicates the file server (RFs) session handle identified by an 
 	// existing handle contained in the message slot at index aFsHandleIndex
 	RFs fs;
 	r = fs.Open(aMsg, aFsHandleIndex, KFileServerPolicy);
 	if (r != KErrNone)
 		{
-		TRACERET1(UTF::EBorder, UTraceModuleEfsrv::EFileAdoptFromClientReturn, MODULEUID, r);
+		OstTrace1(TRACE_BORDER, EFSRV_EFILE64ADOPTFROMCLIENTRETURN2, "r %d", r);
 		return r;
 		}
 
 	//return CreateAutoCloseSubSession(fs, EFsFileAdopt, TIpcArgs(fileHandle));
 	// Slot 1: Indicate Large File Supportis required.
 	r = CreateAutoCloseSubSession(fs, EFsFileAdopt, TIpcArgs(fileHandle, KFileAdopt64));
-
-	TRACERET3(UTF::EBorder, UTraceModuleEfsrv::EFileAdoptFromClientReturn, MODULEUID, r, Session().Handle(), SubSessionHandle());
-
+	OstTraceExt3(TRACE_BORDER, EFSRV_EFILE64ADOPTFROMCLIENTRETURN3, "r %d sess %x subs %x", (TUint) r, (TUint) Session().Handle(), (TUint) SubSessionHandle());
 	return r;
 	}
 
@@ -2311,22 +2213,19 @@
 */
 EFSRV_EXPORT_C TInt RFile64::AdoptFromServer(TInt aFsHandle, TInt aFileHandle)
 	{
-	TRACE2(UTF::EBorder, UTraceModuleEfsrv::EFileAdoptFromServer, MODULEUID, aFsHandle, aFileHandle);
-
+	OstTraceExt2(TRACE_BORDER, EFSRV_EFILE64ADOPTFROMSERVER, "sess %x subs %x", (TUint) aFsHandle, (TUint) aFileHandle);
 	RFs fs;
 	TInt r = fs.SetReturnedHandle(aFsHandle, KFileServerPolicy);
 	if (r != KErrNone)
 		{
-		TRACERET1(UTF::EBorder, UTraceModuleEfsrv::EFileAdoptFromServerReturn, MODULEUID, r);
+		OstTrace1(TRACE_BORDER, EFSRV_EFILE64ADOPTFROMSERVERRETURN1, "r %d", r);
 		return r;
 		}
 
 	//return(CreateAutoCloseSubSession(fs, EFsFileAdopt, TIpcArgs(aFileHandle)));
 	// Slot 1: Indicate Large File Supportis required.
 	r = CreateAutoCloseSubSession(fs, EFsFileAdopt, TIpcArgs(aFileHandle, KFileAdopt64));
-
-	TRACERET3(UTF::EBorder, UTraceModuleEfsrv::EFileAdoptFromServerReturn, MODULEUID, r, Session().Handle(), SubSessionHandle());
-
+	OstTraceExt3(TRACE_BORDER, EFSRV_EFILE64ADOPTFROMSERVERRETURN2, "r %d sess %x subs %x", (TUint) r, (TUint) Session().Handle(), (TUint) SubSessionHandle());
 	return r;
 	}
 
@@ -2368,11 +2267,10 @@
 	TInt fileHandle;
 	TInt r = User::GetTIntParameter(aFileHandleIndex,  fileHandle);
 
-	TRACE3(UTF::EBorder, UTraceModuleEfsrv::EFileAdoptFromCreator, MODULEUID, fileHandle, aFsHandleIndex, aFileHandleIndex);
-
+	OstTraceExt3(TRACE_BORDER, EFSRV_EFILE64ADOPTFROMCREATOR, "subs %x aFsHandleIndex %d aFileHandleIndex %d", (TUint) fileHandle, (TUint) aFsHandleIndex, (TUint) aFileHandleIndex);
 	if (r != KErrNone)
 		{
-		TRACERET1(UTF::EBorder, UTraceModuleEfsrv::EFileAdoptFromCreatorReturn, MODULEUID, r);
+		OstTrace1(TRACE_BORDER, EFSRV_EFILE64ADOPTFROMCREATORRETURN1, "r %d", r);
 		return r;
 		}
 
@@ -2383,16 +2281,14 @@
 	r = fs.Open(aFsHandleIndex, KFileServerPolicy);
 	if (r != KErrNone)
 		{
-		TRACERET1(UTF::EBorder, UTraceModuleEfsrv::EFileAdoptFromCreatorReturn, MODULEUID, r);
+		OstTrace1(TRACE_BORDER, EFSRV_EFILE64ADOPTFROMCREATORRETURN2, "r %d", r);
 		return r;
 		}
 
 	//return(CreateAutoCloseSubSession(fs, EFsFileAdopt, TIpcArgs(fileHandle)));
 	// Slot 1: Indicate Large File Supportis required.
 	r = CreateAutoCloseSubSession(fs, EFsFileAdopt, TIpcArgs(fileHandle, KFileAdopt64));
-
-	TRACERET3(UTF::EBorder, UTraceModuleEfsrv::EFileAdoptFromCreatorReturn, MODULEUID, r, Session().Handle(), SubSessionHandle());
-
+	OstTraceExt3(TRACE_BORDER, EFSRV_EFILE64ADOPTFROMCREATORRETURN3, "r %d sess %x subs %x", (TUint) r, (TUint) Session().Handle(), (TUint) SubSessionHandle());
 	return r;
 	}
 
@@ -2431,8 +2327,7 @@
 */
 EFSRV_EXPORT_C TInt RFile64::Read(TInt64 aPos, TDes8& aDes) const
 	{
-	TRACE5(UTF::EBorder, UTraceModuleEfsrv::EFileRead3, MODULEUID, Session().Handle(), SubSessionHandle(), I64LOW(aPos), I64HIGH(aPos), aDes.MaxLength());
-
+	OstTraceExt5(TRACE_BORDER, EFSRV_EFILE64READ8, "RFile::Read() sess %x subs %x aPos %x:%x maxdeslen %d", (TUint) Session().Handle(), (TUint) SubSessionHandle(), (TUint) I64HIGH(aPos), (TUint) I64LOW(aPos), (TUint) aDes.MaxLength());
 	__ASSERT_ALWAYS(aPos>=0,Panic(EPosNegative));
 
 	TInt r;
@@ -2445,9 +2340,7 @@
 		TPckgC<TInt64> pkPos(aPos);
  		r = SendReceive(EFsFileRead|KIpcArgSlot2Desc,TIpcArgs(&aDes,aDes.MaxLength(),&pkPos));
 		}
-
-	TRACERET2(UTF::EBorder, UTraceModuleEfsrv::EFileRead3Return, MODULEUID, r, aDes.Length());
-
+	OstTraceExt2(TRACE_BORDER, EFSRV_EFILE64READ8RETURN, "r %d len %d", (TUint) r, (TUint) aDes.Length());
 	return r;
 	}
 
@@ -2491,8 +2384,7 @@
 */
 EFSRV_EXPORT_C void RFile64::Read(TInt64 aPos, TDes8& aDes, TRequestStatus& aStatus) const
 	{
-	TRACE6(UTF::EBorder, UTraceModuleEfsrv::EFileRead4, MODULEUID, Session().Handle(), SubSessionHandle(), I64LOW(aPos), I64HIGH(aPos), aDes.MaxLength(), &aStatus);
-
+	OstTraceExt5(TRACE_BORDER, EFSRV_EFILE64READ10, "RFile::Read() sess %x subs %x aPos %x:%x maxlen %d", (TUint) Session().Handle(), (TUint) SubSessionHandle(), (TUint) I64HIGH(aPos), (TUint) I64LOW(aPos), (TUint) aDes.MaxLength());
 	__ASSERT_ALWAYS(aPos>=0,Panic(EPosNegative));
 	if (!(I64HIGH(aPos+1)))
 		{
@@ -2503,8 +2395,7 @@
 		TPckgC<TInt64> pkPos(aPos);
 		RSubSessionBase::SendReceive(EFsFileRead|KIpcArgSlot2Desc,TIpcArgs(&aDes,aDes.MaxLength(),&pkPos),aStatus);
 		}
-
-	TRACE0(UTF::EBorder, UTraceModuleEfsrv::EFileRead4Return, MODULEUID);
+	OstTrace0(TRACE_BORDER, EFSRV_EFILE64READ10RETURN, "");
 	}
 
 
@@ -2550,8 +2441,7 @@
 */    	
 EFSRV_EXPORT_C TInt RFile64::Read(TInt64 aPos, TDes8& aDes, TInt aLength) const
 	{
-	TRACE5(UTF::EBorder, UTraceModuleEfsrv::EFileRead3, MODULEUID, Session().Handle(), SubSessionHandle(), I64LOW(aPos), I64HIGH(aPos), aLength);
-
+	OstTraceExt5(TRACE_BORDER, EFSRV_EFILE64READ15, "RFile::Read() sess %x subs %x aPos %x:%x aLength %d", (TUint) Session().Handle(), (TUint) SubSessionHandle(), (TUint) I64HIGH(aPos), (TUint) I64LOW(aPos), (TUint) aLength);
 	__ASSERT_ALWAYS(aPos>=0,Panic(EPosNegative));
 	if (aLength==0)
 		{
@@ -2573,9 +2463,7 @@
 		TPckgC<TInt64> pkPos(aPos);
 		r = SendReceive(EFsFileRead|KIpcArgSlot2Desc,TIpcArgs(&aDes,aLength,&pkPos));
 		}
-
-	TRACERET2(UTF::EBorder, UTraceModuleEfsrv::EFileRead3Return, MODULEUID, r, aDes.Length());
-
+	OstTraceExt2(TRACE_BORDER, EFSRV_EFILE64READ15RETURN, "r %d len %d", (TUint) r, (TUint) aDes.Length());
 	return r;
 	}
 
@@ -2628,8 +2516,7 @@
 */
 EFSRV_EXPORT_C void RFile64::Read(TInt64 aPos, TDes8& aDes, TInt aLength,TRequestStatus& aStatus) const
 	{
-	TRACE6(UTF::EBorder, UTraceModuleEfsrv::EFileRead4, MODULEUID, Session().Handle(), SubSessionHandle(), I64LOW(aPos), I64HIGH(aPos), aLength, &aStatus);
-
+	OstTraceExt5(TRACE_BORDER, EFSRV_EFILE64READ11, "RFile::Read() sess %x subs %x aPos %x:%x aLength %d", (TUint) Session().Handle(), (TUint) SubSessionHandle(), (TUint) I64HIGH(aPos), (TUint) I64LOW(aPos), (TUint) aLength);
 	__ASSERT_ALWAYS(aPos>=0,Panic(EPosNegative));
 	if (aLength==0)
 		{
@@ -2654,8 +2541,7 @@
 		TPckgC<TInt64> pkPos(aPos);
 		RSubSessionBase::SendReceive(EFsFileRead|KIpcArgSlot2Desc,TIpcArgs(&aDes,aLength,&pkPos),aStatus);
 		}
-
-	TRACE0(UTF::EBorder, UTraceModuleEfsrv::EFileRead4Return, MODULEUID);
+	OstTrace0(TRACE_BORDER, EFSRV_EFILE64READ11RETURN, "");
 	}
 
 
@@ -2687,8 +2573,7 @@
 */
 EFSRV_EXPORT_C TInt RFile64::Write(TInt64 aPos, const TDesC8& aDes)
 	{
-	TRACE5(UTF::EBorder, UTraceModuleEfsrv::EFileWrite3, MODULEUID, Session().Handle(), SubSessionHandle(), I64LOW(aPos), I64HIGH(aPos), aDes.Length());
-
+	OstTraceExt5(TRACE_BORDER, EFSRV_EFILE64WRITE13, "RFile::Write() sess %x subs %x aPos %x:%x deslen %d", (TUint) Session().Handle(), (TUint) SubSessionHandle(), (TUint) I64HIGH(aPos), (TUint) I64LOW(aPos), (TUint) aDes.Length());
 	__ASSERT_ALWAYS(aPos>=0,Panic(EPosNegative));
 
 	TInt r;
@@ -2701,8 +2586,7 @@
 		TPckgC<TInt64> pkPos(aPos);
 		r = SendReceive(EFsFileWrite|KIpcArgSlot2Desc,TIpcArgs(&aDes,aDes.Length(),&pkPos));
 		}
-
-	TRACERET1(UTF::EBorder, UTraceModuleEfsrv::EFileWrite3Return, MODULEUID, r);
+	OstTrace1(TRACE_BORDER, EFSRV_EFILE64WRITE13RETURN, "r %d", r);
 	return r;
 	}
 
@@ -2740,8 +2624,7 @@
 */
 EFSRV_EXPORT_C void RFile64::Write(TInt64 aPos, const TDesC8& aDes,TRequestStatus& aStatus)
 	{
-	TRACE4(UTF::EBorder, UTraceModuleEfsrv::EFileWrite4, MODULEUID, Session().Handle(), SubSessionHandle(), aDes.Length(), &aStatus);
-
+	OstTraceExt5(TRACE_BORDER, EFSRV_EFILE64WRITE15, "RFile::Write() sess %x subs %x pos %x:%x len %d", (TUint) Session().Handle(), (TUint) SubSessionHandle(), (TUint) I64HIGH(aPos), (TUint) I64LOW(aPos), (TUint) aDes.Length());
 	__ASSERT_ALWAYS(aPos>=0,Panic(EPosNegative));
 	
 	if (!(I64HIGH(aPos+1)))
@@ -2753,8 +2636,7 @@
 		TPckgC<TInt64> pkPos(aPos);
 		RSubSessionBase::SendReceive(EFsFileWrite|KIpcArgSlot2Desc,TIpcArgs(&aDes,aDes.Length(),&pkPos),aStatus);
 		}
-
-	TRACE0(UTF::EBorder, UTraceModuleEfsrv::EFileWrite4Return, MODULEUID);
+	OstTrace0(TRACE_BORDER, EFSRV_EFILE64WRITE15RETURN, "");
 	}
 
 
@@ -2786,8 +2668,7 @@
 */
 EFSRV_EXPORT_C TInt RFile64::Write(TInt64 aPos, const TDesC8& aDes,TInt aLength)
 	{
-	TRACE3(UTF::EBorder, UTraceModuleEfsrv::EFileWrite1, MODULEUID, Session().Handle(), SubSessionHandle(), aLength);
-
+	OstTraceExt5(TRACE_BORDER, EFSRV_EFILE64WRITE7, "RFile::Write() sess %x subs %x aPos %x:%x aLength %d", (TUint) Session().Handle(), (TUint) SubSessionHandle(), (TUint) I64HIGH(aPos), (TUint) I64LOW(aPos), (TUint) aLength);
 	__ASSERT_ALWAYS(aPos>=0,Panic(EPosNegative));
 	
 	TInt r;
@@ -2800,8 +2681,7 @@
 		TPckgC<TInt64> pkPos(aPos);
 		r = SendReceive(EFsFileWrite|KIpcArgSlot2Desc,TIpcArgs(&aDes,aLength,&pkPos));
 		}
-
-	TRACERET1(UTF::EBorder, UTraceModuleEfsrv::EFileWrite1Return, MODULEUID, r);
+	OstTrace1(TRACE_BORDER, EFSRV_EFILE64WRITE7RETURN, "r %d", r);
 	return r;
 	}
 
@@ -2841,8 +2721,7 @@
 */
 EFSRV_EXPORT_C void RFile64::Write(TInt64 aPos, const TDesC8& aDes,TInt aLength,TRequestStatus& aStatus)
 	{
-	TRACE6(UTF::EBorder, UTraceModuleEfsrv::EFileWrite2, MODULEUID, Session().Handle(), SubSessionHandle(), I64LOW(aPos), I64HIGH(aPos), aLength, &aStatus);
-
+	OstTraceExt5(TRACE_BORDER, EFSRV_EFILE64WRITE11, "RFile::Write() sess %x subs %x aPos %x:%x aLength %d", (TUint) Session().Handle(), (TUint) SubSessionHandle(), (TUint) I64HIGH(aPos), (TUint) I64LOW(aPos), (TUint) aLength);
 	__ASSERT_ALWAYS(aPos>=0,Panic(EPosNegative));
 	
 	if (!(I64HIGH(aPos+1)))
@@ -2854,8 +2733,7 @@
 		TPckgC<TInt64> pkPos(aPos);
 		RSubSessionBase::SendReceive(EFsFileWrite|KIpcArgSlot2Desc,TIpcArgs(&aDes,aLength,&pkPos),aStatus);
 		}
-
-	TRACE0(UTF::EBorder, UTraceModuleEfsrv::EFileWrite2Return, MODULEUID);
+	OstTrace0(TRACE_BORDER, EFSRV_EFILE64WRITE11RETURN, "");
 	}
 
 
@@ -2902,13 +2780,11 @@
 */
 EFSRV_EXPORT_C TInt RFile64::Seek(TSeek aMode, TInt64& aPos) const
 	{
-	TRACE5(UTF::EBorder, UTraceModuleEfsrv::EFileSeek, MODULEUID, Session().Handle(), SubSessionHandle(), aMode, aPos, 0);
-
+	OstTraceExt5(TRACE_BORDER, EFSRV_EFILE64SEEK2, "RFile::Seek() sess %x subs %x aMode %x aPos %x:%x", (TUint) Session().Handle(), (TUint) SubSessionHandle(), (TUint) aMode, (TUint) I64HIGH(aPos), (TUint) I64LOW(aPos));
 	TPckgC<TInt64> pkOffset(aPos);
 	TPckg<TInt64> pkNewPos(aPos);
  	TInt r = SendReceive(EFsFileSeek|KIpcArgSlot0Desc|KIpcArgSlot2Desc,TIpcArgs(&pkOffset,aMode,&pkNewPos));
-
-	TRACERET1(UTF::EBorder, UTraceModuleEfsrv::EFileSeekReturn, MODULEUID, r);
+	OstTrace1(TRACE_BORDER, EFSRV_EFILE64SEEK2RETURN, "r %d", r);
 	return r;
 	}
 
@@ -2930,12 +2806,10 @@
 */
 EFSRV_EXPORT_C TInt RFile64::Size(TInt64& aSize) const
 	{
-	TRACE2(UTF::EBorder, UTraceModuleEfsrv::EFileSize2, MODULEUID, Session().Handle(), SubSessionHandle());
-
+	OstTraceExt2(TRACE_BORDER, EFSRV_EFILE64SIZE2, "sess %x subs %x", (TUint) Session().Handle(), (TUint) SubSessionHandle());
 	TPckg<TInt64> pkSize(aSize);
 	TInt r = SendReceive(EFsFileSize|KIpcArgSlot0Desc,TIpcArgs(&pkSize));
-
-	TRACERET3(UTF::EBorder, UTraceModuleEfsrv::EFileSize2Return, MODULEUID, r, I64LOW(aSize), I64HIGH(aSize));
+	OstTraceExt3(TRACE_BORDER, EFSRV_EFILE64SIZE2RETURN, "r %d aSize %x:%x", (TUint) r, (TUint) I64HIGH(aSize), (TUint) I64LOW(aSize));
 	return r;
 	}
 
@@ -2971,12 +2845,10 @@
 */
 EFSRV_EXPORT_C TInt RFile64::SetSize(TInt64 aSize)
 	{
-	TRACE4(UTF::EBorder, UTraceModuleEfsrv::EFileSetSize, MODULEUID, Session().Handle(), SubSessionHandle(), I64LOW(aSize), I64HIGH(aSize));
-
+	OstTraceExt4(TRACE_BORDER, EFSRV_EFILE64SETSIZE2, "sess %x subs %x aSize %x:%x", (TUint) Session().Handle(), (TUint) SubSessionHandle(), (TUint) I64HIGH(aSize), (TUint) I64LOW(aSize));
 	TPckgC<TInt64> pkSize(aSize);
 	TInt r = SendReceive(EFsFileSetSize|KIpcArgSlot0Desc, TIpcArgs(&pkSize));
-
-	TRACERET1(UTF::EBorder, UTraceModuleEfsrv::EFileSetSizeReturn, MODULEUID, r);
+	OstTrace1(TRACE_BORDER, EFSRV_EFILE64SETSIZE2RETURN, "r %d", r);
 	return r;
 	}
 
@@ -3013,8 +2885,7 @@
 */
 EFSRV_EXPORT_C TInt RFile64::Lock(TInt64 aPos, TInt64 aLength) const
 	{
-	TRACE5(UTF::EBorder, UTraceModuleEfsrv::EFileLock, MODULEUID, Session().Handle(), SubSessionHandle(), I64LOW(aPos), I64HIGH(aPos), aLength);
-
+	OstTraceExt5(TRACE_BORDER, EFSRV_EFILE64LOCK, "RFile::Lock() sess %x subs %x aPos %x:%x aLength %d", (TUint) Session().Handle(), (TUint) SubSessionHandle(), (TUint) I64HIGH(aPos), (TUint) I64LOW(aPos), (TUint) aLength);
 	__ASSERT_ALWAYS(aPos>=0,Panic(EPosNegative));
 	TPckgC<TInt64> pkPos(aPos);
 	TPckgC<TInt64> pkLength(aLength);
@@ -3029,7 +2900,7 @@
 		r = SendReceive(EFsFileLock|KIpcArgSlot0Desc,TIpcArgs(&pkPos, I64LOW(aLength)));
 	else 
 		r = SendReceive(EFsFileLock|KIpcArgSlot0Desc|KIpcArgSlot1Desc,TIpcArgs(&pkPos, &pkLength));
-	TRACERET1(UTF::EBorder, UTraceModuleEfsrv::EFileLockReturn, MODULEUID, r);
+	OstTrace1(TRACE_BORDER, EFSRV_EFILE64LOCKRETURN, "r %d", r);
 	return r;
 	}
 
@@ -3060,8 +2931,7 @@
 */
 EFSRV_EXPORT_C TInt RFile64::UnLock(TInt64 aPos, TInt64 aLength) const
 	{
-	TRACE5(UTF::EBorder, UTraceModuleEfsrv::EFileUnLock, MODULEUID, Session().Handle(), SubSessionHandle(), I64LOW(aPos), I64HIGH(aPos), aLength);
-
+	OstTraceExt5(TRACE_BORDER, EFSRV_EFILE64UNLOCK, "RFile::UnLock() sess %x subs %x aPos %x:%x aLength %d", (TUint) Session().Handle(), (TUint) SubSessionHandle(), (TUint) I64HIGH(aPos), (TUint) I64LOW(aPos), (TUint) aLength);
 	__ASSERT_ALWAYS(aPos>=0,Panic(EPosNegative));
 	
 	TPckgC<TInt64> pkPos(aPos);
@@ -3078,7 +2948,7 @@
 	else 
 		r = SendReceive(EFsFileUnLock|KIpcArgSlot0Desc|KIpcArgSlot1Desc,TIpcArgs(&pkPos, &pkLength));
 	
-	TRACERET1(UTF::EBorder, UTraceModuleEfsrv::EFileUnLockReturn, MODULEUID, r);
+	OstTrace1(TRACE_BORDER, EFSRV_EFILE64UNLOCKRETURN, "r %d", r);
 	return r;
 	}
 
@@ -3122,8 +2992,7 @@
 */
 EFSRV_EXPORT_C TInt RFile64::Read(TUint aPos,TDes8& aDes) const
 	{
-	TRACE5(UTF::EBorder, UTraceModuleEfsrv::EFileRead3, MODULEUID, Session().Handle(), SubSessionHandle(), aPos, 0, aDes.MaxLength());
-
+	OstTraceExt4(TRACE_BORDER, EFSRV_EFILE64READ14, "sess %x subs %x aPos %x maxlen %d", (TUint) Session().Handle(), (TUint) SubSessionHandle(), (TUint) aPos, (TUint) aDes.MaxLength());
 	TInt r;
 	if(!(aPos + 1))
 		{
@@ -3135,9 +3004,7 @@
 		TPckgC<TInt64> pkPos(pos);
  		r = SendReceive(EFsFileRead|KIpcArgSlot2Desc,TIpcArgs(&aDes,aDes.MaxLength(),&pkPos));
 		}
-
-	TRACERET2(UTF::EBorder, UTraceModuleEfsrv::EFileRead3Return, MODULEUID, r, aDes.Length());
-
+	OstTraceExt2(TRACE_BORDER, EFSRV_EFILE64READ14RETURN, "r %d len %d", (TUint) r, (TUint) aDes.Length());
 	return r;
 	}
 
@@ -3186,8 +3053,7 @@
 */
 EFSRV_EXPORT_C void RFile64::Read(TUint aPos,TDes8& aDes,TRequestStatus& aStatus) const
 	{
-	TRACE6(UTF::EBorder, UTraceModuleEfsrv::EFileRead4, MODULEUID, Session().Handle(), SubSessionHandle(), aPos, 0, aDes.MaxLength(), &aStatus);
-
+	OstTraceExt4(TRACE_BORDER, EFSRV_EFILE64READ12, "sess %x subs %x aPos %x maxlen %d", (TUint) Session().Handle(), (TUint) SubSessionHandle(), (TUint) aPos, (TUint) aDes.MaxLength());
 	if(!(aPos + 1))
 		{
 		RSubSessionBase::SendReceive(EFsFileRead,TIpcArgs(&aDes,aDes.MaxLength(),aPos),aStatus);
@@ -3198,8 +3064,7 @@
 		TPckgC<TInt64> pkPos(pos);
 		RSubSessionBase::SendReceive(EFsFileRead|KIpcArgSlot2Desc,TIpcArgs(&aDes,aDes.MaxLength(),&pkPos),aStatus);
 		}
-
-	TRACE0(UTF::EBorder, UTraceModuleEfsrv::EFileRead4Return, MODULEUID);
+	OstTrace0(TRACE_BORDER, EFSRV_EFILE64READ12RETURN, "");
 	}
 
 
@@ -3251,8 +3116,7 @@
 */    
 EFSRV_EXPORT_C TInt RFile64::Read(TUint aPos,TDes8& aDes,TInt aLength) const
 	{
-	TRACE5(UTF::EBorder, UTraceModuleEfsrv::EFileRead3, MODULEUID, Session().Handle(), SubSessionHandle(), aPos, 0, aLength);
-
+	OstTraceExt4(TRACE_BORDER, EFSRV_EFILE64READ16, "sess %x subs %x aPos %x aLength %d", (TUint) Session().Handle(), (TUint) SubSessionHandle(), (TUint) aPos, (TUint) aLength);
 	if (aLength==0)
 		{
 		aDes.Zero();
@@ -3274,9 +3138,7 @@
 		TPckgC<TInt64> pkPos(pos);
 		r = SendReceive(EFsFileRead|KIpcArgSlot2Desc,TIpcArgs(&aDes,aLength,&pkPos));
 		}
-
-	TRACERET2(UTF::EBorder, UTraceModuleEfsrv::EFileRead3Return, MODULEUID, r, aDes.Length());
-
+	OstTraceExt2(TRACE_BORDER, EFSRV_EFILE64READ16RETURN, "r %d len %d", (TUint) r, (TUint) aDes.Length());
 	return r;
 	}
 
@@ -3335,8 +3197,7 @@
 */
 EFSRV_EXPORT_C void RFile64::Read(TUint aPos,TDes8& aDes,TInt aLength,TRequestStatus& aStatus) const
 	{
-	TRACE6(UTF::EBorder, UTraceModuleEfsrv::EFileRead4, MODULEUID, Session().Handle(), SubSessionHandle(), aPos, 0, aLength, &aStatus);
-
+	OstTraceExt4(TRACE_BORDER, EFSRV_EFILE64READ13, "sess %x subs %x aPos %x aLength %d", (TUint) Session().Handle(), (TUint) SubSessionHandle(), (TUint) aPos, (TUint) aLength);
 	if (aLength==0)
 		{
 		aDes.Zero();
@@ -3361,8 +3222,7 @@
 		TPckgC<TInt64> pkPos(pos);
 		RSubSessionBase::SendReceive(EFsFileRead|KIpcArgSlot2Desc,TIpcArgs(&aDes,aLength,&pkPos),aStatus);
 		}
-
-	TRACE0(UTF::EBorder, UTraceModuleEfsrv::EFileRead4Return, MODULEUID);
+	OstTrace0(TRACE_BORDER, EFSRV_EFILE64READ13RETURN, "");
 	}
 
 
@@ -3400,8 +3260,7 @@
 */
 EFSRV_EXPORT_C TInt RFile64::Write(TUint aPos,const TDesC8& aDes)
 	{
-	TRACE5(UTF::EBorder, UTraceModuleEfsrv::EFileWrite3, MODULEUID, Session().Handle(), SubSessionHandle(), aPos, 0, aDes.Length());
-
+	OstTraceExt4(TRACE_BORDER, EFSRV_EFILE64WRITE14, "sess %x subs %x aPos %x len %d", (TUint) Session().Handle(), (TUint) SubSessionHandle(), (TUint) aPos, (TUint) aDes.Length());
 	TInt r;
 	if(!(aPos + 1))
 		{
@@ -3413,8 +3272,7 @@
 		TPckgC<TInt64> pkPos(pos);
 		r = SendReceive(EFsFileWrite|KIpcArgSlot2Desc,TIpcArgs(&aDes,aDes.Length(),&pkPos));
 		}
-
-	TRACERET1(UTF::EBorder, UTraceModuleEfsrv::EFileWrite3Return, MODULEUID, r);
+	OstTrace1(TRACE_BORDER, EFSRV_EFILE64WRITE14RETURN, "r %d", r);
 	return r;
 	}
 
@@ -3458,8 +3316,7 @@
 */
 EFSRV_EXPORT_C void RFile64::Write(TUint aPos,const TDesC8& aDes,TRequestStatus& aStatus)
 	{
-	TRACE6(UTF::EBorder, UTraceModuleEfsrv::EFileWrite4, MODULEUID, Session().Handle(), SubSessionHandle(), aPos, 0, aDes.Length(), &aStatus);
-
+	OstTraceExt4(TRACE_BORDER, EFSRV_EFILE64WRITE16, "sess %x subs %x pos %x len %d", (TUint) Session().Handle(), (TUint) SubSessionHandle(), (TUint) aPos, (TUint) aDes.Length());
 	if(!(aPos + 1))
 		{
 		RSubSessionBase::SendReceive(EFsFileWrite,TIpcArgs(&aDes,aDes.Length(),aPos),aStatus);
@@ -3470,7 +3327,7 @@
 		TPckgC<TInt64> pkPos(pos);
 		RSubSessionBase::SendReceive(EFsFileWrite|KIpcArgSlot2Desc,TIpcArgs(&aDes,aDes.Length(),&pkPos),aStatus);
 		}
-	TRACE0(UTF::EBorder, UTraceModuleEfsrv::EFileWrite4Return, MODULEUID);
+	OstTrace0(TRACE_BORDER, EFSRV_EFILE64WRITE16RETURN, "");
 	}
 
 
@@ -3508,8 +3365,7 @@
 */
 EFSRV_EXPORT_C TInt RFile64::Write(TUint aPos,const TDesC8& aDes,TInt aLength)
 	{
-	TRACE3(UTF::EBorder, UTraceModuleEfsrv::EFileWrite1, MODULEUID, Session().Handle(), SubSessionHandle(), aLength);
-
+	OstTraceExt4(TRACE_BORDER, EFSRV_EFILE64WRITE8, "sess %x subs %x aPos %x aLength %d", (TUint) Session().Handle(), (TUint) SubSessionHandle(), (TUint) aPos, (TUint) aLength);
 	TInt r;
 	if(!(aPos + 1))
 		{
@@ -3521,8 +3377,7 @@
 		TPckgC<TInt64> pkPos(pos);
 		r = SendReceive(EFsFileWrite|KIpcArgSlot2Desc,TIpcArgs(&aDes,aLength,&pkPos));
 		}
-
-	TRACERET1(UTF::EBorder, UTraceModuleEfsrv::EFileWrite1Return, MODULEUID, r);
+	OstTrace1(TRACE_BORDER, EFSRV_EFILE64WRITE8RETURN, "r %d", r);
 	return r;
 	}
 
@@ -3569,8 +3424,7 @@
 */
 EFSRV_EXPORT_C void RFile64::Write(TUint aPos,const TDesC8& aDes,TInt aLength,TRequestStatus& aStatus)
 	{
-	TRACE6(UTF::EBorder, UTraceModuleEfsrv::EFileWrite2, MODULEUID, Session().Handle(), SubSessionHandle(), aPos, 0, aLength, &aStatus);
-
+	OstTraceExt4(TRACE_BORDER, EFSRV_EFILE64WRITE12, "sess %x subs %x aPos %x len %d", (TUint) Session().Handle(), (TUint) SubSessionHandle(), (TUint) aPos, (TUint) aLength);
 	if(!(aPos + 1))
 		{
 		RSubSessionBase::SendReceive(EFsFileWrite,TIpcArgs(&aDes,aLength,aPos),aStatus);
@@ -3581,7 +3435,7 @@
 		TPckgC<TInt64> pkPos(pos);
 		RSubSessionBase::SendReceive(EFsFileWrite|KIpcArgSlot2Desc,TIpcArgs(&aDes,aLength,&pkPos),aStatus);
 		}
-	TRACE0(UTF::EBorder, UTraceModuleEfsrv::EFileWrite2Return, MODULEUID);
+	OstTrace0(TRACE_BORDER, EFSRV_EFILE64WRITE12RETURN, "");
 	}
 #else
 EFSRV_EXPORT_C TInt RFile64::Open(RFs& /*aFs*/,const TDesC& /*aName*/,TUint /*aFileMode*/)
diff -r 2a0ada0a1bf8 -r 95847726fe57 userlibandfileserver/fileserver/sfsrv/cl_fman.cpp
--- a/userlibandfileserver/fileserver/sfsrv/cl_fman.cpp	Wed May 12 10:34:10 2010 +0100
+++ b/userlibandfileserver/fileserver/sfsrv/cl_fman.cpp	Mon May 24 18:38:55 2010 +0100
@@ -15,21 +15,10 @@
 
 #include "cl_std.h"
 
-#define RETURNIFERROR(a,b,t)  					\
-	{											\
-	if ((a=b)!=KErrNone)						\
-		{										\
-		if(iStatus)								\
-			User::RequestComplete(iStatus,a);	\
-		TInt _t = t;							\
-		if (_t)	{TRACE1(UTF::EBorder, t, MODULEUID, a);}	\
-		return(a);								\
-		}										\
-	}
-
-#define RETURNIFERRORD(a,b,t)  		 			\
-	TInt a; 									\
-	RETURNIFERROR(a,b,t)
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "cl_fmanTraces.h"
+#endif
+
 
 const TUint KRecurseFlag	=	0x40000000;
 const TUint KScanDownFlag	=	0x20000000;
@@ -528,14 +517,14 @@
 @return Newly created CFileMan object.
 */
 	{
-	TRACE1(UTF::EBorder, UTraceModuleEfsrv::ECFileManNewL1, MODULEUID, aFs.Handle());
+	OstTrace1(TRACE_BORDER, EFSRV_ECFILEMANNEWL1, "sess %x", aFs.Handle());
 
 	CFileMan* fileMan=new(ELeave) CFileMan(aFs);
 	CleanupStack::PushL(fileMan);
 	fileMan->CFileBase::ConstructL();
 	CleanupStack::Pop();
 
-	TRACE1(UTF::EBorder, UTraceModuleEfsrv::ECFileManNewL1Return, MODULEUID, fileMan);
+	OstTrace1(TRACE_BORDER, EFSRV_ECFILEMANNEWL1RETURN, "CFileMan* %x", fileMan);
 	return fileMan;
 	}
 
@@ -552,7 +541,7 @@
 @return Newly created CFileMan object.
 */
 	{
-	TRACE2(UTF::EBorder, UTraceModuleEfsrv::ECFileManNewL2, MODULEUID, aFs.Handle(), anObserver);
+	OstTraceExt2(TRACE_BORDER, EFSRV_ECFILEMANNEWL2, "sess %x anObserver %x", (TUint) aFs.Handle(), (TUint) anObserver);
 
 	CFileMan* fileMan=new(ELeave) CFileMan(aFs);
 	CleanupStack::PushL(fileMan);
@@ -560,7 +549,7 @@
 	CleanupStack::Pop();
 	fileMan->SetObserver(anObserver);
 
-	TRACE1(UTF::EBorder, UTraceModuleEfsrv::ECFileManNewL2Return, MODULEUID, fileMan);
+	OstTrace1(TRACE_BORDER, EFSRV_ECFILEMANNEWL2RETURN, "CFileMan* %x", fileMan);
 	return fileMan;
 	}
 
@@ -576,9 +565,9 @@
 	}
 CFileMan::~CFileMan()
 	{
-	TRACE1(UTF::EBorder, UTraceModuleEfsrv::ECFileManDestructor, MODULEUID, this);
-
-	TRACE0(UTF::EBorder, UTraceModuleEfsrv::ECFileManDestructorReturn, MODULEUID);
+	OstTrace1(TRACE_BORDER, EFSRV_ECFILEMANDESTRUCTOR, "this %x", this);
+
+	OstTrace0(TRACE_BORDER, EFSRV_ECFILEMANDESTRUCTORRETURN, "");
 	}
 
 
@@ -589,7 +578,7 @@
 @return The action which CFileMan is carrying out.
 */
 	{
-	TRACE1(UTF::EBorder, UTraceModuleEfsrv::ECFileManCurrentAction, MODULEUID, this);
+	OstTrace1(TRACE_BORDER, EFSRV_ECFILEMANCURRENTACTION, "this %x", this);
 
 	TAction action = ENone;
 
@@ -628,7 +617,7 @@
 		Panic(EFManUnknownAction);
 		}
 
-	TRACE1(UTF::EBorder, UTraceModuleEfsrv::ECFileManCurrentActionReturn, MODULEUID, action);
+	OstTrace1(TRACE_BORDER, EFSRV_ECFILEMANCURRENTACTIONRETURN, "action %d", action);
 	return (action);
 	}
 
@@ -646,11 +635,12 @@
                 the current CFileMan operation
 */
 	{
-	TRACE1(UTF::EBorder, UTraceModuleEfsrv::ECFileManGetCurrentTarget, MODULEUID, this);
+	OstTrace1(TRACE_BORDER, EFSRV_ECFILEMANGETCURRENTTARGET, "this %x", this);
 
 	GetSrcAndTrg(iTmpParse, aTrgName);
 
-	TRACEMULT1(UTF::EBorder, UTraceModuleEfsrv::ECFileManGetCurrentTargetReturn, MODULEUID, aTrgName);
+	OstTrace0(TRACE_BORDER, EFSRV_ECFILEMANGETCURRENTTARGETRETURN, "");
+	OstTraceData(TRACE_BORDER, EFSRV_ECFILEMANGETCURRENTTARGET_EFILENAME, "FileName %S", aTrgName.Ptr(), aTrgName.Length()<<1);
 	}
 
 
@@ -667,13 +657,14 @@
                 CFileMan operation.
 */
 	{
-	TRACE1(UTF::EBorder, UTraceModuleEfsrv::ECFileManGetCurrentSource, MODULEUID, this);
+	OstTrace1(TRACE_BORDER, EFSRV_ECFILEMANGETCURRENTSOURCE, "this %x", this);
 
     TPtrC fullPath(FullPath());
 	iTmpParse.Set(CurrentEntry().iName, &fullPath, NULL);
 	aSrcName = iTmpParse.FullName();
 
-	TRACEMULT1(UTF::EBorder, UTraceModuleEfsrv::ECFileManGetCurrentSourceReturn, MODULEUID, aSrcName);
+	OstTrace0(TRACE_BORDER, EFSRV_ECFILEMANGETCURRENTSOURCERETURN, "");
+	OstTraceData(TRACE_BORDER, EFSRV_ECFILEMANGETCURRENTSOURCE_EFILENAME, "FileName %S", aSrcName.Ptr(), aSrcName.Length()<<1);
 	}
 
 void CFileMan::GetSrcAndTrg(TParse& aSrcName,TFileName& aTrgName)
@@ -734,7 +725,7 @@
 @return The number of bytes transferred.
 */
 	{
-	TRACE2(UTF::EBorder, UTraceModuleEfsrv::ECFileManBytesTransferredByCopyStep, MODULEUID, this, iBytesTransferred);
+	OstTraceExt2(TRACE_BORDER, EFSRV_ECFILEMANBYTESTRANSFERREDBYCOPYSTEP, "this %x BytesTransferred %d", (TUint) this, (TUint) iBytesTransferred);
 
 	return(iBytesTransferred);
 	}
@@ -904,8 +895,9 @@
 
 */
 	{
-	TRACEMULT8(UTF::EBorder, UTraceModuleEfsrv::ECFileManAttribs1, MODULEUID,
-		(TUint) this, aName, aSetMask, aClearMask, I64LOW(aTime.Int64()), I64HIGH(aTime.Int64()), aSwitches, (TUint) &aStatus);
+	OstTraceExt5(TRACE_BORDER, EFSRV_ECFILEMANATTRIBS1A, "this %x aSetMask %x aClearMask %x aSwitches %d status %x", (TUint) this, (TUint) aSetMask, (TUint) aClearMask, (TUint) aSwitches, (TUint) &aStatus);
+	OstTraceExt2(TRACE_BORDER, EFSRV_ECFILEMANATTRIBS1B, "aTime %x:%x ", (TUint) I64HIGH(aTime.Int64()), (TUint) I64LOW(aTime.Int64()));
+	OstTraceData(TRACE_BORDER, EFSRV_ECFILEMANATTRIBS1A_EFILEPATH, "FilePath %S", aName.Ptr(), aName.Length()<<1);
 
 	TInt r;
 	if (iSwitches&KFManBusyFlag)
@@ -918,7 +910,8 @@
 		r = Attribs(aName,aSetMask,aClearMask,aTime,aSwitches);
 		}
 
-	TRACERET1(UTF::EBorder, UTraceModuleEfsrv::ECFileManAttribs1Return, MODULEUID, r);
+	OstTrace1(TRACE_BORDER, EFSRV_ECFILEMANATTRIBS1RETURN, "r %d", r);
+
 	return r;
 	}
 
@@ -974,8 +967,9 @@
 
 */
 	{
-	TRACEMULT7(UTF::EBorder, UTraceModuleEfsrv::ECFileManAttribs2, MODULEUID,
-		(TUint) this, aName, aSetMask, aClearMask, I64LOW(aTime.Int64()), I64HIGH(aTime.Int64()), aSwitches);
+	OstTraceExt4(TRACE_BORDER, EFSRV_ECFILEMANATTRIBS2A, "this %x aSetMask %x aClearMask %x aSwitches %x", (TUint) this, (TUint) aSetMask, (TUint) aClearMask, (TUint) aSwitches);
+	OstTraceExt2(TRACE_BORDER, EFSRV_ECFILEMANATTRIBS2B, "aTime %x:%x ", (TUint) I64HIGH(aTime.Int64()), (TUint) I64LOW(aTime.Int64()));
+	OstTraceData(TRACE_BORDER, EFSRV_ECFILEMANATTRIBS2A_EFILEPATH, "FilePath %S", aName.Ptr(), aName.Length()<<1);
 
 	TInt ret;
 	if (iSwitches&KFManBusyFlag)
@@ -985,7 +979,15 @@
 	else
 		{
 		SetFlags(aSwitches&EOverWrite,aSwitches&ERecurse,ETrue,EFalse);
-		RETURNIFERRORD(r,iFs.Parse(aName,iSrcFile),UTraceModuleEfsrv::ECFileManAttribs2Return);
+		TInt r;
+		if ((r = iFs.Parse(aName,iSrcFile)) != KErrNone)
+			{
+			if(iStatus)
+				User::RequestComplete(iStatus,r);
+			OstTrace1(TRACE_BORDER, EFSRV_ECFILEMANATTRIBS2RETURN1, "r %d", r);
+			return r;
+			}
+
 		iSetMask=aSetMask;
 		iClearMask=aClearMask;
 		iTime=aTime;
@@ -997,7 +999,8 @@
 		DoSynchronize(r);
 		}
 
-	TRACERET1(UTF::EBorder, UTraceModuleEfsrv::ECFileManAttribs2Return, MODULEUID, ret);
+	OstTrace1(TRACE_BORDER, EFSRV_ECFILEMANATTRIBS2RETURN2, "r %d", ret);
+
 	return(ret);
 	}
 
@@ -1037,8 +1040,9 @@
 
 */
 	{
-	TRACEMULT5(UTF::EBorder, UTraceModuleEfsrv::ECFileManCopy1, MODULEUID,
-		(TUint) this, anOld, aNew, aSwitches, (TUint) &aStatus);
+	OstTraceExt3(TRACE_BORDER, EFSRV_ECFILEMANCOPY1, "this %x aSwitches %x status %x", (TUint) this, (TUint) aSwitches, (TUint) &aStatus);
+	OstTraceData(TRACE_BORDER, EFSRV_ECFILEMANCOPY1_EOLDNAME, "OldName %S", anOld.Ptr(), anOld.Length()<<1);
+	OstTraceData(TRACE_BORDER, EFSRV_ECFILEMANCOPY1_ENEWNAME, "NewName %S", aNew.Ptr(), aNew.Length()<<1);
 
 	TInt r;
 	if (iSwitches&KFManBusyFlag)
@@ -1049,7 +1053,8 @@
 		r = Copy(anOld,aNew,aSwitches);
 		}
 
-	TRACERET1(UTF::EBorder, UTraceModuleEfsrv::ECFileManCopy1Return, MODULEUID, r);
+	OstTrace1(TRACE_BORDER, EFSRV_ECFILEMANCOPY1RETURN, "r %d", r);
+
 	return(r);
 	}
 
@@ -1178,21 +1183,38 @@
 
 */
 	{
-	TRACEMULT4(UTF::EBorder, UTraceModuleEfsrv::ECFileManCopy2, MODULEUID, (TUint) this, anOld, aNew, aSwitches);
+	OstTraceExt2(TRACE_BORDER, EFSRV_ECFILEMANCOPY2, "this %x aSwitches %d", (TUint) this, (TUint) aSwitches);
+	OstTraceData(TRACE_BORDER, EFSRV_ECFILEMANCOPY2_EOLDNAME, "OldName %S", anOld.Ptr(), anOld.Length()<<1);
+	OstTraceData(TRACE_BORDER, EFSRV_ECFILEMANCOPY2_ENEWNAME, "NewName %S", aNew.Ptr(), aNew.Length()<<1);
 
 	if (iSwitches&KFManBusyFlag)
 		{
-		TRACE1(UTF::EBorder, UTraceModuleEfsrv::ECFileManCopy2Return, MODULEUID, KErrInUse);
+		OstTrace1(TRACE_BORDER, EFSRV_ECFILEMANCOPY2RETURN1, "r %d", KErrInUse);
 		return(KErrInUse);
 		}
 	SetFlags(aSwitches&EOverWrite,aSwitches&ERecurse,ETrue,EFalse);
-	RETURNIFERRORD(r,iFs.Parse(anOld,iSrcFile),UTraceModuleEfsrv::ECFileManCopy2Return);
-	RETURNIFERROR(r,iFs.Parse(aNew,_L("*"),iTrgFile),UTraceModuleEfsrv::ECFileManCopy2Return);
+	TInt r;
+	if ((r = iFs.Parse(anOld,iSrcFile)) != KErrNone)
+		{
+		if(iStatus)
+			User::RequestComplete(iStatus,r);
+		OstTrace1(TRACE_BORDER, EFSRV_ECFILEMANCOPY2RETURN2, "r %d", r);
+		return r;
+		}
+
+	if ((r = iFs.Parse(aNew,_L("*"),iTrgFile)) != KErrNone)
+		{
+		if(iStatus)
+			User::RequestComplete(iStatus,r);
+		OstTrace1(TRACE_BORDER, EFSRV_ECFILEMANCOPY2RETURN3, "r %d", r);
+		return r;
+		}
+
 	CheckForDirectory();
 
 	if((iSwitches&KRecurseFlag) && iTrgFile.DriveAndPath().MatchF(iSrcFile.FullName()) != KErrNotFound)
 		{
-		TRACE1(UTF::EBorder, UTraceModuleEfsrv::ECFileManCopy2Return, MODULEUID, KErrArgument);
+		OstTrace1(TRACE_BORDER, EFSRV_ECFILEMANCOPY2RETURN4, "r %d", KErrArgument);
 		return(KErrArgument);
 		}
 
@@ -1203,7 +1225,8 @@
 	TInt ret=(r==KErrNone) ? iLastError : r;
 	DoSynchronize(r);
 
-	TRACERET1(UTF::EBorder, UTraceModuleEfsrv::ECFileManCopy2Return, MODULEUID, ret);
+	OstTrace1(TRACE_BORDER, EFSRV_ECFILEMANCOPY2RETURN5, "r %d", ret);
+
 	return(ret);
 	}
 
@@ -1243,7 +1266,8 @@
 @see KNullDesC
 */
 	{
-	TRACEMULT4(UTF::EBorder, UTraceModuleEfsrv::ECFileManDelete1, MODULEUID, (TUint) this, aName, aSwitches, (TUint) &aStatus);
+	OstTraceExt3(TRACE_BORDER, EFSRV_ECFILEMANDELETE1, "this %x aSwitches %x status %x", (TUint) this, (TUint) aSwitches, (TUint) &aStatus);
+	OstTraceData(TRACE_BORDER, EFSRV_ECFILEMANDELETE1_EFILEPATH, "FilePath %S", aName.Ptr(), aName.Length()<<1);
 
 	TInt r;
 	if (iSwitches&KFManBusyFlag)
@@ -1256,7 +1280,8 @@
 		r = Delete(aName,aSwitches);
 		}
 
-	TRACERET1(UTF::EBorder, UTraceModuleEfsrv::ECFileManDelete1Return, MODULEUID, r);
+	OstTrace1(TRACE_BORDER, EFSRV_ECFILEMANDELETE1RETURN, "r %d", r);
+
 	return(r);
 	}
 
@@ -1303,7 +1328,8 @@
 @see KNullDesC
 */
 	{
-	TRACEMULT3(UTF::EBorder, UTraceModuleEfsrv::ECFileManDelete2, MODULEUID, (TUint) this, aName, aSwitches);
+	OstTraceExt2(TRACE_BORDER, EFSRV_ECFILEMANDELETE2, "this %x aSwitches %d", (TUint) this, (TUint) aSwitches);
+	OstTraceData(TRACE_BORDER, EFSRV_ECFILEMANDELETE2_EFILEPATH, "FilePath %S", aName.Ptr(), aName.Length()<<1);
 
 	TInt ret;
 	if (iSwitches&KFManBusyFlag)
@@ -1313,7 +1339,15 @@
 	else
 		{
 		SetFlags(aSwitches&EOverWrite,aSwitches&ERecurse,ETrue,EFalse);
-		RETURNIFERRORD(r,iFs.Parse(aName,iSrcFile),UTraceModuleEfsrv::ECFileManDelete2Return);
+		TInt r;
+		if ((r = iFs.Parse(aName,iSrcFile)) != KErrNone)
+			{
+			if(iStatus)
+				User::RequestComplete(iStatus,r);
+			OstTrace1(TRACE_BORDER, EFSRV_ECFILEMANDELETE2RETURN1, "() r %d", r);
+			return r;
+			}
+
 		iAction = EInternalDelete;
 		iMatchEntry=KEntryAttHidden|KEntryAttMatchExclude|KEntryAttDir;
 	//	Exclude directories and system files - include hidden files
@@ -1323,7 +1357,8 @@
 		DoSynchronize(r);
 		}
 
-	TRACERET1(UTF::EBorder, UTraceModuleEfsrv::ECFileManDelete2Return, MODULEUID, ret);
+	OstTrace1(TRACE_BORDER, EFSRV_ECFILEMANDELETE2RETURN2, "() r %d", ret);
+
 	return(ret);
 	}
 
@@ -1367,8 +1402,9 @@
 
 */
 	{
-	TRACEMULT5(UTF::EBorder, UTraceModuleEfsrv::ECFileManMove1, MODULEUID,
-		(TUint) this, anOld, aNew, aSwitches, (TUint) &aStatus);
+	OstTraceExt3(TRACE_BORDER, EFSRV_ECFILEMANMOVE1, "this %x aSwitches %x status %x", (TUint) this, (TUint) aSwitches, (TUint) &aStatus);
+	OstTraceData(TRACE_BORDER, EFSRV_ECFILEMANMOVE1_EOLDNAME, "OldName %S", anOld.Ptr(), anOld.Length()<<1);
+	OstTraceData(TRACE_BORDER, EFSRV_ECFILEMANMOVE1_ENEWNAME, "NewName %S", aNew.Ptr(), aNew.Length()<<1);
 
 	TInt r;
 	if (iSwitches&KFManBusyFlag)
@@ -1381,7 +1417,8 @@
 		r = Move(anOld,aNew,aSwitches);
 		}
 
-	TRACERET1(UTF::EBorder, UTraceModuleEfsrv::ECFileManMove1Return, MODULEUID, r);
+	OstTrace1(TRACE_BORDER, EFSRV_ECFILEMANMOVE1RETURN, "r %d", r);
+
 	return r;
 	}
 
@@ -1521,20 +1558,36 @@
 @see CFileBase::GetLastError()
 */
 	{
-	TRACEMULT4(UTF::EBorder, UTraceModuleEfsrv::ECFileManMove2, MODULEUID,
-		(TUint) this, anOld, aNew, aSwitches);
+	OstTraceExt2(TRACE_BORDER, EFSRV_ECFILEMANMOVE2, "this %x aSwitches %d", (TUint) this, (TUint) aSwitches);
+	OstTraceData(TRACE_BORDER, EFSRV_ECFILEMANMOVE2_EOLDNAME, "OldName %S", anOld.Ptr(), anOld.Length()<<1);
+	OstTraceData(TRACE_BORDER, EFSRV_ECFILEMANMOVE2_ENEWNAME, "NewName %S", aNew.Ptr(), aNew.Length()<<1);
 
 
 	if (iSwitches&KFManBusyFlag)
 		{
-		TRACE1(UTF::EBorder, UTraceModuleEfsrv::ECFileManMove2Return, MODULEUID, KErrInUse);
+		OstTrace1(TRACE_BORDER, EFSRV_ECFILEMANMOVE2RETURN1, "r %d", KErrInUse);
 		return(KErrInUse);
 		}
 
 	iNumberOfFilesProcessed = 0;
 
-	RETURNIFERRORD(r,iFs.Parse(anOld,iSrcFile),UTraceModuleEfsrv::ECFileManMove2Return);
-	RETURNIFERROR(r,iFs.Parse(aNew,_L("*"),iTrgFile),UTraceModuleEfsrv::ECFileManMove2Return);
+	TInt r;
+	if ((r = iFs.Parse(anOld,iSrcFile)) != KErrNone)
+		{
+		if(iStatus)
+			User::RequestComplete(iStatus,r);
+		OstTrace1(TRACE_BORDER, EFSRV_ECFILEMANMOVE2RETURN2, "r %d", r);
+		return r;
+		}
+
+	if ((r = iFs.Parse(aNew,_L("*"),iTrgFile)) != KErrNone)
+		{
+		if(iStatus)
+			User::RequestComplete(iStatus,r);
+		OstTrace1(TRACE_BORDER, EFSRV_ECFILEMANMOVE2RETURN3, "r %d", r);
+		return r;
+		}
+
 
 	TInt ret = KErrNone;
 	TBool aComplete = EFalse;
@@ -1553,7 +1606,7 @@
 			{
 			User::RequestComplete(iStatus, ret);
 			}
-		TRACERET1(UTF::EBorder, UTraceModuleEfsrv::ECFileManMove2Return, MODULEUID, ret);
+		OstTrace1(TRACE_BORDER, EFSRV_ECFILEMANMOVE2RETURN4, "r %d", ret);
 		return(ret);
 		}
 
@@ -1568,7 +1621,8 @@
 	ret = (r==KErrNone) ? iLastError : r;
 	DoSynchronize(r);
 
-	TRACERET1(UTF::EBorder, UTraceModuleEfsrv::ECFileManMove2Return, MODULEUID, ret);
+	OstTrace1(TRACE_BORDER, EFSRV_ECFILEMANMOVE2RETURN5, "r %d", ret);
+
 	return(ret);
 	}
 
@@ -1915,8 +1969,9 @@
 
 */
 	{
-	TRACEMULT5(UTF::EBorder, UTraceModuleEfsrv::ECFileManRename1, MODULEUID,
-		(TUint) this, aName, aNewName, aSwitches, (TUint) &aStatus);
+	OstTraceExt3(TRACE_BORDER, EFSRV_ECFILEMANRENAME1, "this %x aSwitches %x status %x", (TUint) this, (TUint) aSwitches, (TUint) &aStatus);
+	OstTraceData(TRACE_BORDER, EFSRV_ECFILEMANRENAME1_EOLDNAME, "OldName %S", aName.Ptr(), aName.Length()<<1);
+	OstTraceData(TRACE_BORDER, EFSRV_ECFILEMANRENAME1_ENEWNAME, "NewName %S", aNewName.Ptr(), aNewName.Length()<<1);
 
 	TInt r;
 	if (iSwitches&KFManBusyFlag)
@@ -1929,7 +1984,8 @@
 		r = Rename(aName,aNewName,aSwitches);
 		}
 
-	TRACERET1(UTF::EBorder, UTraceModuleEfsrv::ECFileManRename1Return, MODULEUID, r);
+	OstTrace1(TRACE_BORDER, EFSRV_ECFILEMANRENAME1RETURN, "r %d", r);
+
 	return(r);
 	}
 
@@ -2095,8 +2151,9 @@
 
 */
 	{
-	TRACEMULT4(UTF::EBorder, UTraceModuleEfsrv::ECFileManRename2, MODULEUID,
-		(TUint) this, aName, aNewName, aSwitches);
+	OstTraceExt2(TRACE_BORDER, EFSRV_ECFILEMANRENAME2, "this %x aSwitches %d", (TUint) this, (TUint) aSwitches);
+	OstTraceData(TRACE_BORDER, EFSRV_ECFILEMANRENAME2_EOLDNAME, "OldName %S", aName.Ptr(), aName.Length()<<1);
+	OstTraceData(TRACE_BORDER, EFSRV_ECFILEMANRENAME2_ENEWNAME, "NewName %S", aNewName.Ptr(), aNewName.Length()<<1);
 
 	TInt ret;
 	if (iSwitches&KFManBusyFlag)
@@ -2106,8 +2163,22 @@
 	else
 		{
 		SetFlags(aSwitches&EOverWrite,EFalse,ETrue,EFalse);
-		RETURNIFERRORD(r,iFs.Parse(aName,iSrcFile),UTraceModuleEfsrv::ECFileManRename2Return);
-		RETURNIFERROR(r,iFs.Parse(aNewName,_L("*"),iTrgFile),UTraceModuleEfsrv::ECFileManRename2Return);
+		TInt r;
+		if ((r = iFs.Parse(aName,iSrcFile)) != KErrNone)
+			{
+			if(iStatus)
+				User::RequestComplete(iStatus,r);
+			OstTrace1(TRACE_BORDER, EFSRV_ECFILEMANRENAME2RETURN1, "r %d", r);
+			return r;
+			}
+
+		if ((r = iFs.Parse(aNewName,_L("*"),iTrgFile)) != KErrNone)
+			{
+			if(iStatus)
+				User::RequestComplete(iStatus,r);
+			OstTrace1(TRACE_BORDER, EFSRV_ECFILEMANRENAME2RETURN2, "r %d", r);
+			return r;
+			}
 
 		iAction = EInternalRename;
 		iMatchEntry=KEntryAttMaskSupported;
@@ -2117,7 +2188,8 @@
 		DoSynchronize(r);
 		}
 
-	TRACERET1(UTF::EBorder, UTraceModuleEfsrv::ECFileManRename2Return, MODULEUID, ret);
+	OstTrace1(TRACE_BORDER, EFSRV_ECFILEMANRENAME2RETURN3, "r %d", ret);
+
 	return(ret);
 	}
 
@@ -2147,7 +2219,8 @@
 
 */
 	{
-	TRACEMULT3(UTF::EBorder, UTraceModuleEfsrv::ECFileManRmDir1, MODULEUID, (TUint) this, aDirName, (TUint) &aStatus);
+	OstTraceExt2(TRACE_BORDER, EFSRV_ECFILEMANRMDIR1, "this %x status %x", (TUint) this, (TUint) &aStatus);
+	OstTraceData(TRACE_BORDER, EFSRV_ECFILEMANRMDIR1_EDIRNAME, "Dir %S", aDirName.Ptr(), aDirName.Length()<<1);
 
 	TInt r;
 	if (iSwitches&KFManBusyFlag)
@@ -2160,7 +2233,8 @@
 		r = RmDir(aDirName);
 		}
 
-	TRACERET1(UTF::EBorder, UTraceModuleEfsrv::ECFileManRmDir1Return, MODULEUID, r);
+	OstTrace1(TRACE_BORDER, EFSRV_ECFILEMANRMDIR1RETURN, "r %d", r);
+
 	return r;
 	}
 
@@ -2195,7 +2269,8 @@
 
 */
 	{
-	TRACEMULT2(UTF::EBorder, UTraceModuleEfsrv::ECFileManRmDir2, MODULEUID, (TUint) this, aDirName);
+	OstTrace1(TRACE_BORDER, EFSRV_ECFILEMANRMDIR2, "this %x", (TUint) this);
+	OstTraceData(TRACE_BORDER, EFSRV_ECFILEMANRMDIR2_EDIRNAME, "Dir %S", aDirName.Ptr(), aDirName.Length()<<1);
 
 	TInt ret;
 	if (iSwitches&KFManBusyFlag)
@@ -2205,7 +2280,15 @@
 	else
 		{
 		SetFlags(ETrue,ETrue,EFalse,EFalse);
-		RETURNIFERRORD(r,iFs.Parse(aDirName,iTrgFile),UTraceModuleEfsrv::ECFileManRmDir2Return);
+		TInt r;
+		if ((r = iFs.Parse(aDirName,iTrgFile)) != KErrNone)
+			{
+			if(iStatus)
+				User::RequestComplete(iStatus,r);
+			OstTrace1(TRACE_BORDER, EFSRV_ECFILEMANRMDIR2RETURN1, "r %d", r);
+			return r;
+			}
+
 		iSrcFile.Set(iTrgFile.DriveAndPath(),NULL,NULL);
 		iAction = EInternalRmDir;
 		iMatchEntry=KEntryAttMaskSupported;
@@ -2215,7 +2298,8 @@
 		ret = (r!=KErrNone) ? iLastError : KErrNone;
 		}
 
-	TRACERET1(UTF::EBorder, UTraceModuleEfsrv::ECFileManRmDir2Return, MODULEUID, ret);
+	OstTrace1(TRACE_BORDER, EFSRV_ECFILEMANRMDIR2RETURN2, "r %d", ret);
+
 	return ret;
 	}
 
@@ -2613,8 +2697,8 @@
 @capability Dependent If the path for aNew begins with /Resource then Tcb capability is required.
 */
 	{
-	TRACEMULT4(UTF::EBorder, UTraceModuleEfsrv::ECFileManCopy3, MODULEUID,
-		(TUint) this, anOld.SubSessionHandle(), aNew, aSwitches);
+	OstTraceExt3(TRACE_BORDER, EFSRV_ECFILEMANCOPY3, "this %x anOldSubs %x aSwitches %x", (TUint) this, (TUint) anOld.SubSessionHandle(), (TUint) aSwitches);
+	OstTraceData(TRACE_BORDER, EFSRV_ECFILEMANCOPY3_ENEWNAME, "NewName %S", aNew.Ptr(), aNew.Length()<<1);
 
 	TInt ret;
 	if (iSwitches&KFManBusyFlag)
@@ -2636,11 +2720,23 @@
 		iSwitches|= KCopyFromHandle;
 
 		TInt r;
-		RETURNIFERROR(r, iFs.Parse(aNew, iTrgFile),UTraceModuleEfsrv::ECFileManCopy3Return);
+		if ((r = iFs.Parse(aNew, iTrgFile)) != KErrNone)
+			{
+			if(iStatus)
+				User::RequestComplete(iStatus,r);
+			OstTrace1(TRACE_BORDER, EFSRV_ECFILEMANCOPY3RETURN1, "r %d", r);
+			return r;
+			}
 
 		// Need to duplicate the RFile handle so that any threads owned
 		// by this process can use it - i.e. the worker thread
-		RETURNIFERROR(r, iSrcFileHandle.Duplicate(anOld, EOwnerProcess),UTraceModuleEfsrv::ECFileManCopy3Return);
+		if ((r = iSrcFileHandle.Duplicate(anOld, EOwnerProcess)) != KErrNone)
+			{
+			if(iStatus)
+				User::RequestComplete(iStatus,r);
+			OstTrace1(TRACE_BORDER, EFSRV_ECFILEMANCOPY3RETURN2, "r %d", r);
+			return r;
+			}
 
 		iAction = EInternalCopyFromHandle;
 		iNumberOfFilesProcessed = 0;
@@ -2649,7 +2745,8 @@
 		DoSynchronize(r);
 		}
 
-	TRACERET1(UTF::EBorder, UTraceModuleEfsrv::ECFileManCopy3Return, MODULEUID, ret);
+	OstTrace1(TRACE_BORDER, EFSRV_ECFILEMANCOPY3RETURN3, "r %d", ret);
+
 	return(ret);
 	}
 
@@ -2685,8 +2782,8 @@
 @capability Dependent If the path for aNew begins with /Resource then Tcb capability is required.
 */
 	{
-	TRACEMULT5(UTF::EBorder, UTraceModuleEfsrv::ECFileManCopy4, MODULEUID,
-		(TUint) this, anOld.SubSessionHandle(), aNew, aSwitches, (TUint) &aStatus);
+	OstTraceExt4(TRACE_BORDER, EFSRV_ECFILEMANCOPY4, "this %x anOldSubs %x aSwitches %dstatus %x", (TUint) this, (TUint) anOld.SubSessionHandle(), (TUint) aSwitches, (TUint) &aStatus);
+	OstTraceData(TRACE_BORDER, EFSRV_ECFILEMANCOPY4_ENEWNAME, "NewName %S", aNew.Ptr(), aNew.Length()<<1);
 
 	TInt r;
 	if (iSwitches&KFManBusyFlag)
@@ -2699,7 +2796,8 @@
 		r = Copy(anOld,aNew,aSwitches);
 		}
 
-	TRACERET1(UTF::EBorder, UTraceModuleEfsrv::ECFileManCopy4Return, MODULEUID, r);
+	OstTrace1(TRACE_BORDER, EFSRV_ECFILEMANCOPY4RETURN, "r %d", r);
+
 	return(r);
 	}
 
@@ -2761,8 +2859,21 @@
 	{
 	TInt64 rem;
 #endif
-	RETURNIFERRORD(r,aSrcFile.Size(rem),EFalse);
-	RETURNIFERROR(r, aDstFile.SetSize(rem),EFalse);
+	TInt r;
+	if ((r = aSrcFile.Size(rem)) != KErrNone)
+		{
+		if(iStatus)
+			User::RequestComplete(iStatus,r);
+		return r;
+		}
+
+
+	if ((r = aDstFile.SetSize(rem)) != KErrNone)
+		{
+		if(iStatus)
+			User::RequestComplete(iStatus,r);
+		return r;
+		}
 
 	HBufC8* bufPtr = NULL;
 	bufPtr = AllocateBuffer(rem);
diff -r 2a0ada0a1bf8 -r 95847726fe57 userlibandfileserver/fileserver/sfsrv/cl_fmt.cpp
--- a/userlibandfileserver/fileserver/sfsrv/cl_fmt.cpp	Wed May 12 10:34:10 2010 +0100
+++ b/userlibandfileserver/fileserver/sfsrv/cl_fmt.cpp	Mon May 24 18:38:55 2010 +0100
@@ -17,6 +17,10 @@
 
 #include "cl_std.h"
 
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "cl_fmtTraces.h"
+#endif
+
 
 
 
@@ -48,12 +52,14 @@
 
 */
 	{
-	TRACEMULT3(UTF::EBorder, UTraceModuleEfsrv::EFormat1Open, MODULEUID, aFs.Handle(), aName, aFormatMode);
+	OstTraceExt2(TRACE_BORDER, EFSRV_EFORMAT1OPEN, "sess %x aFormatMode %x", (TUint) aFs.Handle(), (TUint) aFormatMode);
+	OstTraceData(TRACE_BORDER, EFSRV_EFORMAT1OPEN_EDRIVENAME, "DriveName %S", aName.Ptr(), aName.Length()<<1);
 
 	TPtr8 c((TUint8*)&aCount,sizeof(TUint),sizeof(TUint));
 	TInt r = CreateSubSession(aFs,EFsFormatOpen,TIpcArgs(&aName,aFormatMode,&c));
 
-	TRACERET3(UTF::EBorder, UTraceModuleEfsrv::EFormatOpen1Return, MODULEUID, r, SubSessionHandle(), aCount);
+	OstTraceExt3(TRACE_BORDER, EFSRV_EFORMATOPEN1RETURN, "r %d subs %x aCount %d", (TUint) r, (TUint) SubSessionHandle(), (TUint) aCount);
+
 	return r;
 	}
 
@@ -86,7 +92,8 @@
 @capability DiskAdmin
 */
 	{
-	TRACEMULT4(UTF::EBorder, UTraceModuleEfsrv::EFormat2Open, MODULEUID, aFs.Handle(), aName, aFormatMode, TUint(&aInfo));
+	OstTraceExt3(TRACE_BORDER, EFSRV_EFORMAT2OPEN, "sess %x aFormatMode %x aInfo %x", (TUint) aFs.Handle(), (TUint) aFormatMode, (TUint) TUint(&aInfo));
+	OstTraceData(TRACE_BORDER, EFSRV_EFORMAT2OPEN_EDRIVENAME, "DriveName %S", aName.Ptr(), aName.Length()<<1);
 
 	TInt size = sizeof(TUint)+aInfo.Length();
 	TUint8* buf = new TUint8[size];
@@ -106,7 +113,8 @@
 		delete[] buf;
 		}
 
-	TRACERET3(UTF::EBorder, UTraceModuleEfsrv::EFormatOpen2Return, MODULEUID, r, SubSessionHandle(), aCount);
+	OstTraceExt3(TRACE_BORDER, EFSRV_EFORMATOPEN2RETURN, "r %d subs %x aCount %d", (TUint) r, (TUint) SubSessionHandle(), (TUint) aCount);
+
 	return r;
 	}
 
@@ -122,11 +130,11 @@
 it completed successfully or not.
 */
 	{
-	TRACE2(UTF::EBorder, UTraceModuleEfsrv::EFormatClose, MODULEUID, Session().Handle(), SubSessionHandle());
+	OstTraceExt2(TRACE_BORDER, EFSRV_EFORMATCLOSE, "sess %x subs %x", (TUint) Session().Handle(), (TUint) SubSessionHandle());
 
 	CloseSubSession(EFsFormatSubClose);
 	
-	TRACE0(UTF::EBorder, UTraceModuleEfsrv::EFormatCloseReturn, MODULEUID);
+	OstTrace0(TRACE_BORDER, EFSRV_EFORMATCLOSERETURN, "");
 	}
 
 
@@ -152,12 +160,13 @@
 
 */
 	{
-	TRACE2(UTF::EBorder, UTraceModuleEfsrv::EFormatNext1, MODULEUID, Session().Handle(), SubSessionHandle());
+	OstTraceExt2(TRACE_BORDER, EFSRV_EFORMATNEXT1, "sess %x subs %x", (TUint) Session().Handle(), (TUint) SubSessionHandle());
 
 	TPckg<TInt> e(aStep);
 	TInt r = SendReceive(EFsFormatNext,TIpcArgs(&e));
 
-	TRACERET2(UTF::EBorder, UTraceModuleEfsrv::EFormatNext1Return, MODULEUID, r, aStep);
+	OstTraceExt2(TRACE_BORDER, EFSRV_EFORMATNEXT1RETURN, "r %d aStep %d", (TUint) r, (TUint) aStep);
+
 	return r;
 	}
 
@@ -187,9 +196,9 @@
 
 */
 	{
-	TRACE3(UTF::EBorder, UTraceModuleEfsrv::EFormatNext2, MODULEUID, Session().Handle(), SubSessionHandle(), &aStatus);
+	OstTraceExt3(TRACE_BORDER, EFSRV_EFORMATNEXT2, "sess %x subs %x status %x", (TUint) Session().Handle(), (TUint) SubSessionHandle(), (TUint) &aStatus);
 
 	SendReceive(EFsFormatNext,TIpcArgs(&aStep),aStatus);
 
-	TRACE0(UTF::EBorder, UTraceModuleEfsrv::EFormatNext2Return, MODULEUID);
+	OstTrace0(TRACE_BORDER, EFSRV_EFORMATNEXT2RETURN, "");
 	}
diff -r 2a0ada0a1bf8 -r 95847726fe57 userlibandfileserver/fileserver/sfsrv/cl_main.cpp
--- a/userlibandfileserver/fileserver/sfsrv/cl_main.cpp	Wed May 12 10:34:10 2010 +0100
+++ b/userlibandfileserver/fileserver/sfsrv/cl_main.cpp	Mon May 24 18:38:55 2010 +0100
@@ -17,12 +17,16 @@
 
 #include "cl_std.h"
 
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "cl_mainTraces.h"
+#endif
+
 GLDEF_C void Panic(TClientPanic aPanic)
 //
 // Panic the current client with a file server client side panic.
 //
 	{
-	TRACE1(UTF::EPanic, UTraceModuleEfsrv::EPanic, MODULEUID, aPanic);
+	OstTrace1(TRACE_PANIC, EFSRV_EPANIC, "%d", aPanic);
 
 	User::Panic(_L("FSCLIENT panic"),aPanic);
 	}
diff -r 2a0ada0a1bf8 -r 95847726fe57 userlibandfileserver/fileserver/sfsrv/cl_plugin.cpp
--- a/userlibandfileserver/fileserver/sfsrv/cl_plugin.cpp	Wed May 12 10:34:10 2010 +0100
+++ b/userlibandfileserver/fileserver/sfsrv/cl_plugin.cpp	Mon May 24 18:38:55 2010 +0100
@@ -17,6 +17,10 @@
 
 #include "cl_std.h"
 
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "cl_pluginTraces.h"
+#endif
+
  
 EXPORT_C TInt RFs::AddPlugin(const TDesC& aFileName) const
 /**
@@ -31,7 +35,8 @@
 @capability DiskAdmin
 */
 	{
-	TRACEMULT2(UTF::EBorder, UTraceModuleEfsrv::EFsAddPlugin, MODULEUID, Handle(), aFileName);
+	OstTrace1(TRACE_BORDER, EFSRV_EFSADDPLUGIN, "sess %x", Handle());
+	OstTraceData(TRACE_BORDER, EFSRV_EFSADDPLUGIN_EFILENAME, "FileName %S", aFileName.Ptr(), aFileName.Length()<<1);
 
 	RLoader loader;
 	TInt r = loader.Connect();
@@ -41,7 +46,8 @@
 		loader.Close();
 		}
 
-	TRACERET1(UTF::EBorder, UTraceModuleEfsrv::EFsAddPluginReturn, MODULEUID, r);
+	OstTrace1(TRACE_BORDER, EFSRV_EFSADDPLUGINRETURN, "r %d", r);
+
 	return r;
 	}
 
@@ -60,11 +66,13 @@
 @capability DiskAdmin
 */
 	{
-	TRACEMULT2(UTF::EBorder, UTraceModuleEfsrv::EFsRemovePlugin, MODULEUID, Handle(), aPluginName);
+	OstTrace1(TRACE_BORDER, EFSRV_EFSREMOVEPLUGIN, "sess %x", Handle());
+	OstTraceData(TRACE_BORDER, EFSRV_EFSREMOVEPLUGIN_EPLUGINNAME, "PluginName %S", aPluginName.Ptr(), aPluginName.Length()<<1);
 
 	TInt r = SendReceive(EFsRemovePlugin,TIpcArgs(&aPluginName));
 
-	TRACERET1(UTF::EBorder, UTraceModuleEfsrv::EFsRemovePluginReturn, MODULEUID, r);
+	OstTrace1(TRACE_BORDER, EFSRV_EFSREMOVEPLUGINRETURN, "r %d", r);
+
 	return r;
 	}
 
@@ -95,11 +103,13 @@
 @capability DiskAdmin      
 */
 	{
-	TRACEMULT2(UTF::EBorder, UTraceModuleEfsrv::EFsMountPlugin1, MODULEUID, Handle(), aPluginName);
+	OstTrace1(TRACE_BORDER, EFSRV_EFSMOUNTPLUGIN1, "sess %x", Handle());
+	OstTraceData(TRACE_BORDER, EFSRV_EFSMOUNTPLUGIN1_EPLUGINNAME, "PluginName %S", aPluginName.Ptr(), aPluginName.Length()<<1);
 
 	TInt r = SendReceive(EFsMountPlugin,TIpcArgs(&aPluginName,KPluginAutoAttach,KPluginAutoLocate));
 
-	TRACERET1(UTF::EBorder, UTraceModuleEfsrv::EFsMountPlugin1Return, MODULEUID, r);
+	OstTrace1(TRACE_BORDER, EFSRV_EFSMOUNTPLUGIN1RETURN, "r %d", r);
+
 	return r;
 	}
 
@@ -131,11 +141,13 @@
 @capability DiskAdmin      
 */
 	{
-	TRACEMULT3(UTF::EBorder, UTraceModuleEfsrv::EFsMountPlugin2, MODULEUID, Handle(), aPluginName, aDrive);
+	OstTraceExt2(TRACE_BORDER, EFSRV_EFSMOUNTPLUGIN2, "sess %x aDrive %d", (TUint) Handle(), (TUint) aDrive);
+	OstTraceData(TRACE_BORDER, EFSRV_EFSMOUNTPLUGIN2_EPLUGINNAME, "PluginName %S", aPluginName.Ptr(), aPluginName.Length()<<1);
 
 	TInt r = SendReceive(EFsMountPlugin,TIpcArgs(&aPluginName,aDrive,KPluginAutoLocate));
 
-	TRACERET1(UTF::EBorder, UTraceModuleEfsrv::EFsMountPlugin2Return, MODULEUID, r);
+	OstTrace1(TRACE_BORDER, EFSRV_EFSMOUNTPLUGIN2RETURN, "r %d", r);
+
 	return r;
 	}
 
@@ -175,11 +187,13 @@
 @capability DiskAdmin        
 */
 	{
-	TRACEMULT4(UTF::EBorder, UTraceModuleEfsrv::EFsMountPlugin3, MODULEUID, Handle(), aPluginName, aDrive, aPos);
+	OstTraceExt3(TRACE_BORDER, EFSRV_EFSMOUNTPLUGIN3, "sess %x aDrive %d aPos %x", (TUint) Handle(), (TUint) aDrive, (TUint) aPos);
+	OstTraceData(TRACE_BORDER, EFSRV_EFSMOUNTPLUGIN3_EPLUGINNAME, "PluginName %S", aPluginName.Ptr(), aPluginName.Length()<<1);
 
 	TInt r = SendReceive(EFsMountPlugin,TIpcArgs(&aPluginName,aDrive,aPos));
 
-	TRACERET1(UTF::EBorder, UTraceModuleEfsrv::EFsMountPlugin3Return, MODULEUID, r);
+	OstTrace1(TRACE_BORDER, EFSRV_EFSMOUNTPLUGIN3RETURN, "r %d", r);
+
 	return r;
 	}
 
@@ -200,11 +214,13 @@
 @capability DiskAdmin       
 */
 	{
-	TRACEMULT2(UTF::EBorder, UTraceModuleEfsrv::EFsDismountPlugin1, MODULEUID, Handle(), aPluginName);
+	OstTrace1(TRACE_BORDER, EFSRV_EFSDISMOUNTPLUGIN1, "sess %x", Handle());
+	OstTraceData(TRACE_BORDER, EFSRV_EFSDISMOUNTPLUGIN1_EPLUGINNAME, "PluginName %S", aPluginName.Ptr(), aPluginName.Length()<<1);
 
 	TInt r = SendReceive(EFsDismountPlugin,TIpcArgs(&aPluginName,KPluginAutoAttach,KPluginAutoLocate));
 
-	TRACERET1(UTF::EBorder, UTraceModuleEfsrv::EFsDismountPlugin1Return, MODULEUID, r);
+	OstTrace1(TRACE_BORDER, EFSRV_EFSDISMOUNTPLUGIN1RETURN, "r %d", r);
+
 	return r;
 	}
 
@@ -233,11 +249,13 @@
 @capability DiskAdmin       
 */
 	{
-	TRACEMULT3(UTF::EBorder, UTraceModuleEfsrv::EFsDismountPlugin2, MODULEUID, Handle(), aPluginName, aDrive);
+	OstTraceExt2(TRACE_BORDER, EFSRV_EFSDISMOUNTPLUGIN2, "sess %x aDrive %d", (TUint) Handle(), (TUint) aDrive);
+	OstTraceData(TRACE_BORDER, EFSRV_EFSDISMOUNTPLUGIN2_EPLUGINNAME, "PluginName %S", aPluginName.Ptr(), aPluginName.Length()<<1);
 
 	TInt r = SendReceive(EFsDismountPlugin,TIpcArgs(&aPluginName,aDrive,KPluginAutoLocate));
 
-	TRACERET1(UTF::EBorder, UTraceModuleEfsrv::EFsDismountPlugin2Return, MODULEUID, r);
+	OstTrace1(TRACE_BORDER, EFSRV_EFSDISMOUNTPLUGIN2RETURN, "r %d", r);
+
 	return r;
 	}
 
@@ -269,11 +287,13 @@
 @capability DiskAdmin      
 */
 	{
-	TRACEMULT4(UTF::EBorder, UTraceModuleEfsrv::EFsDismountPlugin3, MODULEUID, Handle(), aPluginName, aDrive, aPos);
+	OstTraceExt3(TRACE_BORDER, EFSRV_EFSDISMOUNTPLUGIN3, "sess %x aDrive %d aPos %x", (TUint) Handle(), (TUint) aDrive, (TUint) aPos);
+	OstTraceData(TRACE_BORDER, EFSRV_EFSDISMOUNTPLUGIN3_EPLUGINNAME, "PluginName %S", aPluginName.Ptr(), aPluginName.Length()<<1);
 
 	TInt r = SendReceive(EFsDismountPlugin,TIpcArgs(&aPluginName,aDrive,aPos));
 
-	TRACERET1(UTF::EBorder, UTraceModuleEfsrv::EFsDismountPlugin3Return, MODULEUID, r);
+	OstTrace1(TRACE_BORDER, EFSRV_EFSDISMOUNTPLUGIN3RETURN, "r %d", r);
+
 	return r;
 	}
 
@@ -293,11 +313,14 @@
         KErrNotFound if the plugin name is not found;
 */
 	{
-	TRACE3(UTF::EBorder, UTraceModuleEfsrv::EFsPluginName, MODULEUID, Handle(), aDrive, aPos);
+	OstTraceExt3(TRACE_BORDER, EFSRV_EFSPLUGINNAME, "sess %x aDrive %d aPos %x", (TUint) Handle(), (TUint) aDrive, (TUint) aPos);
 
 	TInt r = SendReceive(EFsPluginName,TIpcArgs(&aPluginName,aDrive,aPos));
 
-	TRACERETMULT2(UTF::EBorder, UTraceModuleEfsrv::EFsPluginName, MODULEUID, r, aPluginName);
+	OstTraceData(TRACE_BORDER, EFSRV_EFSPLUGINNAME_EPLUGINNAME, "PluginName %S", aPluginName.Ptr(), aPluginName.Length()<<1);
+
+	OstTrace1(TRACE_BORDER, EFSRV_EFSPLUGINNAMERETURN, "r %d", r);
+
 	return r;
 	}
 
@@ -313,11 +336,12 @@
 
 */
 	{
-	TRACE2(UTF::EBorder, UTraceModuleEfsrv::EPluginOpen, MODULEUID, aFs.Handle(), aPos);
+	OstTraceExt2(TRACE_BORDER, EFSRV_EPLUGINOPEN, "sess %x aPos %x", (TUint) aFs.Handle(), (TUint) aPos);
 
 	TInt r = CreateSubSession(aFs,EFsPluginOpen,TIpcArgs(aPos,0,0));
 
-	TRACERET2(UTF::EBorder, UTraceModuleEfsrv::EPluginOpenReturn, MODULEUID, r, SubSessionHandle());
+	OstTraceExt2(TRACE_BORDER, EFSRV_EPLUGINOPENRETURN, "r %d subs %x", (TUint) r, (TUint) SubSessionHandle());
+
 	return r;
 	}
 
@@ -328,11 +352,11 @@
 Closes a plugin 
 */
 	{
-	TRACE2(UTF::EBorder, UTraceModuleEfsrv::EPluginClose, MODULEUID, Session().Handle(), SubSessionHandle());
+	OstTraceExt2(TRACE_BORDER, EFSRV_EPLUGINCLOSE, "sess %x subs %x", (TUint) Session().Handle(), (TUint) SubSessionHandle());
 
 	CloseSubSession(EFsPluginSubClose);
 
-	TRACE0(UTF::EBorder, UTraceModuleEfsrv::EPluginCloseReturn, MODULEUID);
+	OstTrace0(TRACE_BORDER, EFSRV_EPLUGINCLOSERETURN, "");
 	}
 
 EXPORT_C void RPlugin::DoRequest(TInt aReqNo, TRequestStatus& aStatus) const
@@ -345,12 +369,12 @@
 @param aStatus: status of the request
 */
 	{
-	TRACE4(UTF::EBorder, UTraceModuleEfsrv::EPluginDoRequest1, MODULEUID, Session().Handle(), SubSessionHandle(), aReqNo, &aStatus);
+	OstTraceExt4(TRACE_BORDER, EFSRV_EPLUGINDOREQUEST1, "sess %x subs %x aReqNo %d status %x", (TUint) Session().Handle(), (TUint) SubSessionHandle(), (TUint) aReqNo, (TUint) &aStatus);
 
 	aStatus=KRequestPending;
 	SendReceive(EFsPluginDoRequest, TIpcArgs(aReqNo, NULL, NULL), aStatus);
 
-	TRACE0(UTF::EBorder, UTraceModuleEfsrv::EPluginDoRequest1Return, MODULEUID);
+	OstTrace0(TRACE_BORDER, EFSRV_EPLUGINDOREQUEST1RETURN, "");
 	}
 
 EXPORT_C void RPlugin::DoRequest(TInt aReqNo, TRequestStatus& aStatus, TDes8& a1) const
@@ -364,12 +388,12 @@
 @param a1: returning value from plugin
 */
 	{
-	TRACE5(UTF::EBorder, UTraceModuleEfsrv::EPluginDoRequest2, MODULEUID, Session().Handle(), SubSessionHandle(), aReqNo, &aStatus, &a1);
+	OstTraceExt5(TRACE_BORDER, EFSRV_EPLUGINDOREQUEST2, "sess %x subs %x aReqNo %d status %x a1 %x", (TUint) Session().Handle(), (TUint) SubSessionHandle(), (TUint) aReqNo, (TUint) &aStatus, (TUint) &a1);
 
 	aStatus=KRequestPending;
 	SendReceive(EFsPluginDoRequest, TIpcArgs(aReqNo, &a1, NULL), aStatus);
 
-	TRACE0(UTF::EBorder, UTraceModuleEfsrv::EPluginDoRequest2Return, MODULEUID);
+	OstTrace0(TRACE_BORDER, EFSRV_EPLUGINDOREQUEST2RETURN, "");
 	}
 
 EXPORT_C void RPlugin::DoRequest(TInt aReqNo, TRequestStatus& aStatus, TDes8& a1, TDes8& a2) const
@@ -382,12 +406,12 @@
 @param a2: 2nd returning value from plugin
 */
 	{
-	TRACE6(UTF::EBorder, UTraceModuleEfsrv::EPluginDoRequest3, MODULEUID, Session().Handle(), SubSessionHandle(), aReqNo, &aStatus, &a1, &a2);
+	OstTraceExt5(TRACE_BORDER, EFSRV_EPLUGINDOREQUEST3, "sess %x subs %x aReqNo %d a1 %x a2 %x", (TUint) Session().Handle(), (TUint) SubSessionHandle(), (TUint) aReqNo, (TUint) &a1, (TUint) &a2);
 
 	aStatus=KRequestPending;
 	SendReceive(EFsPluginDoRequest, TIpcArgs(aReqNo, &a1, &a2), aStatus);
 
-	TRACE0(UTF::EBorder, UTraceModuleEfsrv::EPluginDoRequest3Return, MODULEUID);
+	OstTrace0(TRACE_BORDER, EFSRV_EPLUGINDOREQUEST3RETURN, "");
 	}
 
 EXPORT_C TInt RPlugin::DoControl(TInt aFunction) const
@@ -399,11 +423,12 @@
 @param	aFunction: The operation to be handled
 */
 	{
-	TRACE3(UTF::EBorder, UTraceModuleEfsrv::EPluginDoControl1, MODULEUID, Session().Handle(), SubSessionHandle(), aFunction);
+	OstTraceExt3(TRACE_BORDER, EFSRV_EPLUGINDOCONTROL1, "sess %x subs %x aFunction %d", (TUint) Session().Handle(), (TUint) SubSessionHandle(), (TUint) aFunction);
 
 	TInt r = SendReceive(EFsPluginDoControl,TIpcArgs(aFunction,0,0));
 
-	TRACERET1(UTF::EBorder, UTraceModuleEfsrv::EPluginDoControl1Return, MODULEUID, r);
+	OstTrace1(TRACE_BORDER, EFSRV_EPLUGINDOCONTROL1RETURN, "r %d", r);
+
 	return r;
 	}
 
@@ -417,11 +442,12 @@
 @param	a1: returned buffer from plugin on completion of the request
 */
 	{
-	TRACE4(UTF::EBorder, UTraceModuleEfsrv::EPluginDoControl2, MODULEUID, Session().Handle(), SubSessionHandle(), aFunction, &a1);
+	OstTraceExt4(TRACE_BORDER, EFSRV_EPLUGINDOCONTROL2, "sess %x subs %x aFunction %d a1 %x", (TUint) Session().Handle(), (TUint) SubSessionHandle(), (TUint) aFunction, (TUint) &a1);
 
 	TInt r = SendReceive(EFsPluginDoControl,TIpcArgs(aFunction,&a1,0));
 
-	TRACERET1(UTF::EBorder, UTraceModuleEfsrv::EPluginDoControl2Return, MODULEUID, r);
+	OstTrace1(TRACE_BORDER, EFSRV_EPLUGINDOCONTROL2RETURN, "r %d", r);
+
 	return r;
 	}
 
@@ -436,11 +462,12 @@
 @param  a2: 2nd returned buffer from plugin on completion of the request
 */
 	{
-	TRACE5(UTF::EBorder, UTraceModuleEfsrv::EPluginDoControl3, MODULEUID, Session().Handle(), SubSessionHandle(), aFunction, &a1, &a2);
+	OstTraceExt5(TRACE_BORDER, EFSRV_EPLUGINDOCONTROL3, "sess %x subs %x aFunction %d a1 %x a2 %x", (TUint) Session().Handle(), (TUint) SubSessionHandle(), (TUint) aFunction, (TUint) &a1, (TUint) &a2);
 
 	TInt r = SendReceive(EFsPluginDoControl,TIpcArgs(aFunction,&a1,&a2));
 
-	TRACERET1(UTF::EBorder, UTraceModuleEfsrv::EPluginDoControl3Return, MODULEUID, r);
+	OstTrace1(TRACE_BORDER, EFSRV_EPLUGINDOCONTROL3RETURN, "r %d", r);
+
 	return r;
 	}
 
@@ -453,10 +480,10 @@
 @param	aReqMask: the bit mask for the operation to be cancelled
 */
 	{
-	TRACE3(UTF::EBorder, UTraceModuleEfsrv::EPluginDoCancel, MODULEUID, Session().Handle(), SubSessionHandle(), aReqMask);
+	OstTraceExt3(TRACE_BORDER, EFSRV_EPLUGINDOCANCEL, "sess %x subs %x aReqMask %x", (TUint) Session().Handle(), (TUint) SubSessionHandle(), (TUint) aReqMask);
 
 	SendReceive(EFsPluginDoCancel,TIpcArgs(KMaxTInt,aReqMask,0));
 
-	TRACE0(UTF::EBorder, UTraceModuleEfsrv::EPluginDoCancelReturn, MODULEUID);
+	OstTrace0(TRACE_BORDER, EFSRV_EPLUGINDOCANCELRETURN, "");
 	}
 
diff -r 2a0ada0a1bf8 -r 95847726fe57 userlibandfileserver/fileserver/sfsrv/cl_scan.cpp
--- a/userlibandfileserver/fileserver/sfsrv/cl_scan.cpp	Wed May 12 10:34:10 2010 +0100
+++ b/userlibandfileserver/fileserver/sfsrv/cl_scan.cpp	Mon May 24 18:38:55 2010 +0100
@@ -16,6 +16,10 @@
 #include "cl_std.h"
 #include "cl_scan.h"
 
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "cl_scanTraces.h"
+#endif
+
 const TInt KDirStackGranularity=8;
 
 /** Replace long names in path and filename with their sohrter version (if exists). Optionally appends
@@ -115,13 +119,13 @@
 @return A pointer to the new directory scan object.
 */
 	{
-	TRACE1(UTF::EBorder, UTraceModuleEfsrv::ECDirScanNewLC, MODULEUID, aFs.Handle());
+	OstTrace1(TRACE_BORDER, EFSRV_ECDIRSCANNEWLC, "sess %x", aFs.Handle());
 
 	CDirScan* scan=new(ELeave) CDirScan(aFs);
 	CleanupStack::PushL(scan);
 	scan->iStack=CDirStack::NewL();
 
-	TRACE1(UTF::EBorder, UTraceModuleEfsrv::ECDirScanNewLCReturn, MODULEUID, scan);
+	OstTrace1(TRACE_BORDER, EFSRV_ECDIRSCANNEWLCRETURN, "CDirScan* %x", scan);
 	return scan;
 	}
 
@@ -137,12 +141,12 @@
 @return A pointer to the new directory scan object.
 */
 	{
-	TRACE1(UTF::EBorder, UTraceModuleEfsrv::ECDirScanNewL, MODULEUID, aFs.Handle());
+	OstTrace1(TRACE_BORDER, EFSRV_ECDIRSCANNEWL, "sess %x", aFs.Handle());
 
 	CDirScan* scan=CDirScan::NewLC(aFs);
 	CleanupStack::Pop();
 
-	TRACE1(UTF::EBorder, UTraceModuleEfsrv::ECDirScanNewLReturn, MODULEUID, scan);
+	OstTrace1(TRACE_BORDER, EFSRV_ECDIRSCANNEWLRETURN, "CDirScan* %x", scan);
 	return scan;
 	}
 
@@ -156,11 +160,11 @@
 Frees all resources owned by the object, prior to its destruction.
 */
 	{
-	TRACE1(UTF::EBorder, UTraceModuleEfsrv::ECDirScanDestructor, MODULEUID, this);
+	OstTrace1(TRACE_BORDER, EFSRV_ECDIRSCANDESTRUCTOR, "this %x", this);
 
 	delete iStack;
 
-	TRACE0(UTF::EBorder, UTraceModuleEfsrv::ECDirScanDestructorReturn, MODULEUID);
+	OstTrace0(TRACE_BORDER, EFSRV_ECDIRSCANDESTRUCTORRETURN, "");
 	}
 
 
@@ -214,13 +218,13 @@
 @param aScanDir       The direction of the scan. The default is downwards.
 */
 	{
-	TRACEMULT5(UTF::EBorder, UTraceModuleEfsrv::ECDirScanSetScanDataL, MODULEUID, (TUint) 
-		this, aMatchName, anEntryAttMask, anEntrySortKey, (TUint) aScanDir);
+	OstTraceExt4(TRACE_BORDER, EFSRV_ECDIRSCANSETSCANDATAL, "this %x anEntryAttMask %x anEntrySortKey %d aScanDir %d", (TUint) this, (TUint) anEntryAttMask, (TUint) anEntrySortKey, (TUint) aScanDir);
+	OstTraceData(TRACE_BORDER, EFSRV_ECDIRSCANSETSCANDATAL_EFILEPATH, "FilePath %S", aMatchName.Ptr(), aMatchName.Length()<<1);
 
 	TInt r = Fs().Parse(aMatchName,iFullPath);
 	if (r != KErrNone)
 		{
-		TRACERET1(UTF::EBorder, UTraceModuleEfsrv::ECDirScanSetScanDataLReturn, MODULEUID, r);
+		OstTrace1(TRACE_BORDER, EFSRV_ECDIRSCANSETSCANDATALRETURN1, "r %d", r);
 		User::Leave(r);
 		}
 
@@ -234,7 +238,7 @@
 	if (aScanDir==EScanDownTree)
 		iFullPath.PopDir();
 
-	TRACE1(UTF::EBorder, UTraceModuleEfsrv::ECDirScanSetScanDataLReturn, MODULEUID, KErrNone);
+	OstTrace1(TRACE_BORDER, EFSRV_ECDIRSCANSETSCANDATALRETURN2, "r %d", KErrNone);
 	}
 
 void CDirScan::UpdateAbbreviatedPath()
@@ -278,15 +282,14 @@
                    no more directories in the structure.
 */
 	{
-	TRACE1(UTF::EBorder, UTraceModuleEfsrv::ECDirScanNextL, MODULEUID, this);
+	OstTrace1(TRACE_BORDER, EFSRV_ECDIRSCANNEXTL, "this %x", this);
 
 	if (iScanDir==EScanUpTree)
 		ScanUpTreeL(aDirEntries);
 	else
 		ScanDownTreeL(aDirEntries);
 
-	TRACE2(UTF::EBorder, UTraceModuleEfsrv::ECDirScanNextLReturn, MODULEUID, 
-		KErrNone, aDirEntries ? (*aDirEntries).Count() : 0);
+	OstTraceExt2(TRACE_BORDER, EFSRV_ECDIRSCANNEXTLRETURN, "r %d DirEntries %d", (TUint) KErrNone, (TUint) aDirEntries ? (*aDirEntries).Count() : 0);
 	}
 
 void CDirScan::ScanUpTreeL(CDir*& aDirEntries)
@@ -337,7 +340,7 @@
 			}
 		if (r != KErrNone)
 			{
-			TRACERET1(UTF::EBorder, UTraceModuleEfsrv::ECDirScanLeave, MODULEUID, r);
+			OstTrace1(TRACE_BORDER, EFSRV_ECDIRSCANLEAVE1, "r %d", r);
 			User::LeaveIfError(r);
 			}
 
@@ -355,7 +358,7 @@
 		else if (r != KErrNone)
 			{
 			iScanning = EFalse;
-			TRACERET1(UTF::EBorder, UTraceModuleEfsrv::ECDirScanLeave, MODULEUID, r);
+			OstTrace1(TRACE_BORDER, EFSRV_ECDIRSCANLEAVE2, "r %d", r);
 			User::Leave(r);
 			}
 		
@@ -393,7 +396,7 @@
 	TInt r = Fs().GetDir(iFullPath.FullName(),iEntryAttMask,iEntrySortMask,aDirEntries);
 	if (r != KErrNone)
 		{
-		TRACERET1(UTF::EBorder, UTraceModuleEfsrv::ECDirScanLeave, MODULEUID, r);
+		OstTrace1(TRACE_BORDER, EFSRV_ECDIRSCANLEAVE3, "r %d", r);
 		User::Leave(r);
 		}
 	}
@@ -425,7 +428,7 @@
 	r=iFullPath.AddDir(dirName);
 	if (r==KErrGeneral)	//	Adding dirName makes iFullPath>256 characters
 		{
-		TRACE1(UTF::EBorder, UTraceModuleEfsrv::ECDirScanLeave, MODULEUID, KErrTooBig);
+		OstTrace1(TRACE_BORDER, EFSRV_ECDIRSCANLEAVE4, "r %d", KErrTooBig);
 		User::Leave(KErrTooBig);
 		}
 
@@ -447,7 +450,7 @@
 									   iEntrySortMask,dirList);
 		if (r != KErrNone)
 			{
-			TRACERET1(UTF::EBorder, UTraceModuleEfsrv::ECDirScanLeave, MODULEUID, r);
+			OstTrace1(TRACE_BORDER, EFSRV_ECDIRSCANLEAVE5, "r %d", r);
 			User::Leave(r);
 			}
 		iStack->PushL(*dirList);
@@ -464,7 +467,7 @@
 	else
 		{
 		iScanning = EFalse;
-		TRACERET1(UTF::EBorder, UTraceModuleEfsrv::ECDirScanLeave, MODULEUID, r);
+		OstTrace1(TRACE_BORDER, EFSRV_ECDIRSCANLEAVE6, "r %d", r);
 		User::Leave(r);
 		}
 	}
@@ -568,7 +571,7 @@
 	if (r!=KErrNone)
 		{
 		delete nextLevel;
-		TRACERET1(UTF::EBorder, UTraceModuleEfsrv::ECDirScanLeave, MODULEUID, r);
+		OstTrace1(TRACE_BORDER, EFSRV_ECDIRSCANLEAVE7, "r %d", r);
 		User::Leave(r);
 		}
 	}
@@ -706,7 +709,7 @@
 		TInt r = iFs->GetOpenFileList(iScanPos,iEntryListPos,theId,array);
 		if (r != KErrNone)
 			{
-			TRACERET1(UTF::EBorder, UTraceModuleEfsrv::ECDirScanLeave, MODULEUID, r);
+			OstTrace1(TRACE_BORDER, EFSRV_ECDIRSCANLEAVE8, "r %d", r);
 			User::Leave(r);
 			}
 		TInt count=array.Count();
diff -r 2a0ada0a1bf8 -r 95847726fe57 userlibandfileserver/fileserver/sfsrv/cl_std.h
--- a/userlibandfileserver/fileserver/sfsrv/cl_std.h	Wed May 12 10:34:10 2010 +0100
+++ b/userlibandfileserver/fileserver/sfsrv/cl_std.h	Mon May 24 18:38:55 2010 +0100
@@ -26,7 +26,6 @@
 #include <f32ver.h>
 #include <e32svr.h>
 #include <f32plugin.h>
-#include <utraceefsrv.h>
 #include "f32trace.h"
 
 enum TClientPanic
diff -r 2a0ada0a1bf8 -r 95847726fe57 userlibandfileserver/fileserver/sfsrv/efsrv.mmh
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/userlibandfileserver/fileserver/sfsrv/efsrv.mmh	Mon May 24 18:38:55 2010 +0100
@@ -0,0 +1,63 @@
+// Copyright (c) 1996-2009 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"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+// f32\group\efsrv.mmp
+// efsrv.dll File Server client-side library
+// 
+//
+
+/**
+ @file
+*/
+
+
+
+USERINCLUDE		../ftrace
+
+USERINCLUDE		../sfsrv/traces
+
+SOURCEPATH		../sfsrv
+SOURCE			 cl_cdir.cpp cl_cli.cpp cl_debug.cpp cl_dir.cpp
+SOURCE			 cl_drive.cpp cl_entry.cpp cl_file.cpp cl_find.cpp
+SOURCE			 cl_fman.cpp cl_fmt.cpp cl_fraw.cpp cl_ftext.cpp
+SOURCE			 cl_main.cpp cl_parse.cpp cl_scan.cpp cl_insecure.cpp
+SOURCE			 cl_plugin.cpp cl_blockmap.cpp cl_clamp.cpp
+SOURCE			 cl_shim.cpp
+SOURCE			 cl_notification.cpp
+SOURCEPATH	../group
+DOCUMENT		 release.txt
+
+TARGETTYPE		dll
+
+DEFFILE			 efsrv.def
+
+USERINCLUDE	../inc
+#ifdef SYMBIAN_OLD_EXPORT_LOCATION
+SYSTEMINCLUDE	../inc
+#endif
+OS_LAYER_SYSTEMINCLUDE_SYMBIAN
+
+LIBRARY			 euser.lib hal.lib
+
+START WINS
+BASEADDRESS		0x66000000
+END
+
+UID		0x1000008d 0x100039e4
+VENDORID 0x70000001
+CAPABILITY	All
+
+unpagedcode
+
+SMPSAFE
+
diff -r 2a0ada0a1bf8 -r 95847726fe57 userlibandfileserver/fileserver/sfsrv/efsrv.mmp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/userlibandfileserver/fileserver/sfsrv/efsrv.mmp	Mon May 24 18:38:55 2010 +0100
@@ -0,0 +1,35 @@
+// Copyright (c) 1996-2009 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"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+// f32/sfsrv/efsrv.mmp
+// efsrv.dll File Server client-side library
+// 
+//
+
+/**
+ @file
+*/
+
+
+TARGET			efsrv.dll
+
+#include "f32.mmh"  	// Generic definitions for the whole f32 component
+
+// By default, tracepoints are compiled in to UDEB version only
+#ifdef SYMBIAN_TRACE_SYSTEM_INCLUDE
+	macro SYMBIAN_FTRACE_ENABLE_UDEB
+//	macro SYMBIAN_FTRACE_ENABLE_UREL
+#endif
+
+
+#include "efsrv.mmh"
diff -r 2a0ada0a1bf8 -r 95847726fe57 userlibandfileserver/fileserver/sfsrv/traces/OstTraceDefinitions.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/userlibandfileserver/fileserver/sfsrv/traces/OstTraceDefinitions.h	Mon May 24 18:38:55 2010 +0100
@@ -0,0 +1,21 @@
+// Copyright (c) 2009 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"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+
+#ifndef __OSTTRACEDEFINITIONS_H__
+#define __OSTTRACEDEFINITIONS_H__
+// OST_TRACE_COMPILER_IN_USE flag has been added by Trace Compiler
+// REMOVE BEFORE CHECK-IN TO VERSION CONTROL
+//#define OST_TRACE_COMPILER_IN_USE
+#include <OpenSystemTrace.h>
+#endif
diff -r 2a0ada0a1bf8 -r 95847726fe57 userlibandfileserver/fileserver/sfsrv/traces/fixed_id.definitions
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/userlibandfileserver/fileserver/sfsrv/traces/fixed_id.definitions	Mon May 24 18:38:55 2010 +0100
@@ -0,0 +1,646 @@
+#Fixed group and trace id definitions. If this file is removed, the identifiers are rebuilt.
+[GROUP]TRACE_BORDER=0x40
+[GROUP]TRACE_PANIC=0x41
+[TRACE]TRACE_BORDER[0x40]_EFSRV_ECDIRSCANDESTRUCTOR=0x273
+[TRACE]TRACE_BORDER[0x40]_EFSRV_ECDIRSCANDESTRUCTORRETURN=0x274
+[TRACE]TRACE_BORDER[0x40]_EFSRV_ECDIRSCANLEAVE1=0x27b
+[TRACE]TRACE_BORDER[0x40]_EFSRV_ECDIRSCANLEAVE2=0x27c
+[TRACE]TRACE_BORDER[0x40]_EFSRV_ECDIRSCANLEAVE3=0x27d
+[TRACE]TRACE_BORDER[0x40]_EFSRV_ECDIRSCANLEAVE4=0x27e
+[TRACE]TRACE_BORDER[0x40]_EFSRV_ECDIRSCANLEAVE5=0x27f
+[TRACE]TRACE_BORDER[0x40]_EFSRV_ECDIRSCANLEAVE6=0x280
+[TRACE]TRACE_BORDER[0x40]_EFSRV_ECDIRSCANLEAVE7=0x281
+[TRACE]TRACE_BORDER[0x40]_EFSRV_ECDIRSCANLEAVE8=0x282
+[TRACE]TRACE_BORDER[0x40]_EFSRV_ECDIRSCANNEWL=0x271
+[TRACE]TRACE_BORDER[0x40]_EFSRV_ECDIRSCANNEWLC=0x26f
+[TRACE]TRACE_BORDER[0x40]_EFSRV_ECDIRSCANNEWLCRETURN=0x270
+[TRACE]TRACE_BORDER[0x40]_EFSRV_ECDIRSCANNEWLRETURN=0x272
+[TRACE]TRACE_BORDER[0x40]_EFSRV_ECDIRSCANNEXTL=0x279
+[TRACE]TRACE_BORDER[0x40]_EFSRV_ECDIRSCANNEXTLRETURN=0x27a
+[TRACE]TRACE_BORDER[0x40]_EFSRV_ECDIRSCANSETSCANDATAL=0x275
+[TRACE]TRACE_BORDER[0x40]_EFSRV_ECDIRSCANSETSCANDATALRETURN1=0x277
+[TRACE]TRACE_BORDER[0x40]_EFSRV_ECDIRSCANSETSCANDATALRETURN2=0x278
+[TRACE]TRACE_BORDER[0x40]_EFSRV_ECDIRSCANSETSCANDATAL_EFILEPATH=0x276
+[TRACE]TRACE_BORDER[0x40]_EFSRV_ECFILEMANATTRIBS1A=0x1f5
+[TRACE]TRACE_BORDER[0x40]_EFSRV_ECFILEMANATTRIBS1A_EFILEPATH=0x1f7
+[TRACE]TRACE_BORDER[0x40]_EFSRV_ECFILEMANATTRIBS1B=0x1f6
+[TRACE]TRACE_BORDER[0x40]_EFSRV_ECFILEMANATTRIBS1RETURN=0x1f8
+[TRACE]TRACE_BORDER[0x40]_EFSRV_ECFILEMANATTRIBS2A=0x1f9
+[TRACE]TRACE_BORDER[0x40]_EFSRV_ECFILEMANATTRIBS2A_EFILEPATH=0x1fb
+[TRACE]TRACE_BORDER[0x40]_EFSRV_ECFILEMANATTRIBS2B=0x1fa
+[TRACE]TRACE_BORDER[0x40]_EFSRV_ECFILEMANATTRIBS2RETURN1=0x1fc
+[TRACE]TRACE_BORDER[0x40]_EFSRV_ECFILEMANATTRIBS2RETURN2=0x1fd
+[TRACE]TRACE_BORDER[0x40]_EFSRV_ECFILEMANBYTESTRANSFERREDBYCOPYSTEP=0x1f4
+[TRACE]TRACE_BORDER[0x40]_EFSRV_ECFILEMANCOPY1=0x1fe
+[TRACE]TRACE_BORDER[0x40]_EFSRV_ECFILEMANCOPY1RETURN=0x201
+[TRACE]TRACE_BORDER[0x40]_EFSRV_ECFILEMANCOPY1_ENEWNAME=0x200
+[TRACE]TRACE_BORDER[0x40]_EFSRV_ECFILEMANCOPY1_EOLDNAME=0x1ff
+[TRACE]TRACE_BORDER[0x40]_EFSRV_ECFILEMANCOPY2=0x202
+[TRACE]TRACE_BORDER[0x40]_EFSRV_ECFILEMANCOPY2RETURN1=0x205
+[TRACE]TRACE_BORDER[0x40]_EFSRV_ECFILEMANCOPY2RETURN2=0x206
+[TRACE]TRACE_BORDER[0x40]_EFSRV_ECFILEMANCOPY2RETURN3=0x207
+[TRACE]TRACE_BORDER[0x40]_EFSRV_ECFILEMANCOPY2RETURN4=0x208
+[TRACE]TRACE_BORDER[0x40]_EFSRV_ECFILEMANCOPY2RETURN5=0x209
+[TRACE]TRACE_BORDER[0x40]_EFSRV_ECFILEMANCOPY2_ENEWNAME=0x204
+[TRACE]TRACE_BORDER[0x40]_EFSRV_ECFILEMANCOPY2_EOLDNAME=0x203
+[TRACE]TRACE_BORDER[0x40]_EFSRV_ECFILEMANCOPY3=0x22e
+[TRACE]TRACE_BORDER[0x40]_EFSRV_ECFILEMANCOPY3RETURN1=0x230
+[TRACE]TRACE_BORDER[0x40]_EFSRV_ECFILEMANCOPY3RETURN2=0x231
+[TRACE]TRACE_BORDER[0x40]_EFSRV_ECFILEMANCOPY3RETURN3=0x232
+[TRACE]TRACE_BORDER[0x40]_EFSRV_ECFILEMANCOPY3_ENEWNAME=0x22f
+[TRACE]TRACE_BORDER[0x40]_EFSRV_ECFILEMANCOPY4=0x233
+[TRACE]TRACE_BORDER[0x40]_EFSRV_ECFILEMANCOPY4RETURN=0x235
+[TRACE]TRACE_BORDER[0x40]_EFSRV_ECFILEMANCOPY4_ENEWNAME=0x234
+[TRACE]TRACE_BORDER[0x40]_EFSRV_ECFILEMANCURRENTACTION=0x1ec
+[TRACE]TRACE_BORDER[0x40]_EFSRV_ECFILEMANCURRENTACTIONRETURN=0x1ed
+[TRACE]TRACE_BORDER[0x40]_EFSRV_ECFILEMANDELETE1=0x20a
+[TRACE]TRACE_BORDER[0x40]_EFSRV_ECFILEMANDELETE1RETURN=0x20c
+[TRACE]TRACE_BORDER[0x40]_EFSRV_ECFILEMANDELETE1_EFILEPATH=0x20b
+[TRACE]TRACE_BORDER[0x40]_EFSRV_ECFILEMANDELETE2=0x20d
+[TRACE]TRACE_BORDER[0x40]_EFSRV_ECFILEMANDELETE2RETURN1=0x20f
+[TRACE]TRACE_BORDER[0x40]_EFSRV_ECFILEMANDELETE2RETURN2=0x210
+[TRACE]TRACE_BORDER[0x40]_EFSRV_ECFILEMANDELETE2_EFILEPATH=0x20e
+[TRACE]TRACE_BORDER[0x40]_EFSRV_ECFILEMANDESTRUCTOR=0x1ea
+[TRACE]TRACE_BORDER[0x40]_EFSRV_ECFILEMANDESTRUCTORRETURN=0x1eb
+[TRACE]TRACE_BORDER[0x40]_EFSRV_ECFILEMANGETCURRENTSOURCE=0x1f1
+[TRACE]TRACE_BORDER[0x40]_EFSRV_ECFILEMANGETCURRENTSOURCERETURN=0x1f2
+[TRACE]TRACE_BORDER[0x40]_EFSRV_ECFILEMANGETCURRENTSOURCE_EFILENAME=0x1f3
+[TRACE]TRACE_BORDER[0x40]_EFSRV_ECFILEMANGETCURRENTTARGET=0x1ee
+[TRACE]TRACE_BORDER[0x40]_EFSRV_ECFILEMANGETCURRENTTARGETRETURN=0x1ef
+[TRACE]TRACE_BORDER[0x40]_EFSRV_ECFILEMANGETCURRENTTARGET_EFILENAME=0x1f0
+[TRACE]TRACE_BORDER[0x40]_EFSRV_ECFILEMANMOVE1=0x211
+[TRACE]TRACE_BORDER[0x40]_EFSRV_ECFILEMANMOVE1RETURN=0x214
+[TRACE]TRACE_BORDER[0x40]_EFSRV_ECFILEMANMOVE1_ENEWNAME=0x213
+[TRACE]TRACE_BORDER[0x40]_EFSRV_ECFILEMANMOVE1_EOLDNAME=0x212
+[TRACE]TRACE_BORDER[0x40]_EFSRV_ECFILEMANMOVE2=0x215
+[TRACE]TRACE_BORDER[0x40]_EFSRV_ECFILEMANMOVE2RETURN1=0x218
+[TRACE]TRACE_BORDER[0x40]_EFSRV_ECFILEMANMOVE2RETURN2=0x219
+[TRACE]TRACE_BORDER[0x40]_EFSRV_ECFILEMANMOVE2RETURN3=0x21a
+[TRACE]TRACE_BORDER[0x40]_EFSRV_ECFILEMANMOVE2RETURN4=0x21b
+[TRACE]TRACE_BORDER[0x40]_EFSRV_ECFILEMANMOVE2RETURN5=0x21c
+[TRACE]TRACE_BORDER[0x40]_EFSRV_ECFILEMANMOVE2_ENEWNAME=0x217
+[TRACE]TRACE_BORDER[0x40]_EFSRV_ECFILEMANMOVE2_EOLDNAME=0x216
+[TRACE]TRACE_BORDER[0x40]_EFSRV_ECFILEMANNEWL1=0x1e6
+[TRACE]TRACE_BORDER[0x40]_EFSRV_ECFILEMANNEWL1RETURN=0x1e7
+[TRACE]TRACE_BORDER[0x40]_EFSRV_ECFILEMANNEWL2=0x1e8
+[TRACE]TRACE_BORDER[0x40]_EFSRV_ECFILEMANNEWL2RETURN=0x1e9
+[TRACE]TRACE_BORDER[0x40]_EFSRV_ECFILEMANRENAME1=0x21d
+[TRACE]TRACE_BORDER[0x40]_EFSRV_ECFILEMANRENAME1RETURN=0x220
+[TRACE]TRACE_BORDER[0x40]_EFSRV_ECFILEMANRENAME1_ENEWNAME=0x21f
+[TRACE]TRACE_BORDER[0x40]_EFSRV_ECFILEMANRENAME1_EOLDNAME=0x21e
+[TRACE]TRACE_BORDER[0x40]_EFSRV_ECFILEMANRENAME2=0x221
+[TRACE]TRACE_BORDER[0x40]_EFSRV_ECFILEMANRENAME2RETURN1=0x224
+[TRACE]TRACE_BORDER[0x40]_EFSRV_ECFILEMANRENAME2RETURN2=0x225
+[TRACE]TRACE_BORDER[0x40]_EFSRV_ECFILEMANRENAME2RETURN3=0x226
+[TRACE]TRACE_BORDER[0x40]_EFSRV_ECFILEMANRENAME2_ENEWNAME=0x223
+[TRACE]TRACE_BORDER[0x40]_EFSRV_ECFILEMANRENAME2_EOLDNAME=0x222
+[TRACE]TRACE_BORDER[0x40]_EFSRV_ECFILEMANRMDIR1=0x227
+[TRACE]TRACE_BORDER[0x40]_EFSRV_ECFILEMANRMDIR1RETURN=0x229
+[TRACE]TRACE_BORDER[0x40]_EFSRV_ECFILEMANRMDIR1_EDIRNAME=0x228
+[TRACE]TRACE_BORDER[0x40]_EFSRV_ECFILEMANRMDIR2=0x22a
+[TRACE]TRACE_BORDER[0x40]_EFSRV_ECFILEMANRMDIR2RETURN1=0x22c
+[TRACE]TRACE_BORDER[0x40]_EFSRV_ECFILEMANRMDIR2RETURN2=0x22d
+[TRACE]TRACE_BORDER[0x40]_EFSRV_ECFILEMANRMDIR2_EDIRNAME=0x22b
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EDIRCLOSE=0x124
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EDIRCLOSERETURN=0x125
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EDIROPEN1=0x11e
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EDIROPEN1RETURN=0x120
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EDIROPEN1_EDIRNAME=0x11f
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EDIROPEN2=0x121
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EDIROPEN2RETURN=0x123
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EDIROPEN2_EDIRNAME=0x122
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EDIRREAD1=0x126
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EDIRREAD1RETURN=0x127
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EDIRREAD2=0x128
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EDIRREAD2RETURN=0x129
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EDIRREAD3=0x12a
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EDIRREAD3RETURN=0x12b
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EDIRREAD4=0x12c
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EDIRREAD4RETURN=0x12d
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFILE64ADOPTFROMCLIENT=0x1b1
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFILE64ADOPTFROMCLIENTRETURN1=0x1b2
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFILE64ADOPTFROMCLIENTRETURN2=0x1b3
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFILE64ADOPTFROMCLIENTRETURN3=0x1b4
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFILE64ADOPTFROMCREATOR=0x1b8
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFILE64ADOPTFROMCREATORRETURN1=0x1b9
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFILE64ADOPTFROMCREATORRETURN2=0x1ba
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFILE64ADOPTFROMCREATORRETURN3=0x1bb
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFILE64ADOPTFROMSERVER=0x1b5
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFILE64ADOPTFROMSERVERRETURN1=0x1b6
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFILE64ADOPTFROMSERVERRETURN2=0x1b7
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFILE64CREATE=0x1a7
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFILE64CREATERETURN=0x1a9
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFILE64CREATE_EFILENAME=0x1a8
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFILE64LOCK=0x1d2
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFILE64LOCKRETURN=0x1d3
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFILE64OPEN=0x1a4
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFILE64OPENRETURN=0x1a6
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFILE64OPEN_EFILENAME=0x1a5
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFILE64READ10=0x1be
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFILE64READ10RETURN=0x1bf
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFILE64READ11=0x1c2
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFILE64READ11RETURN=0x1c3
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFILE64READ12=0x1d8
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFILE64READ12RETURN=0x1d9
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFILE64READ13=0x1dc
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFILE64READ13RETURN=0x1dd
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFILE64READ14=0x1d6
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFILE64READ14RETURN=0x1d7
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFILE64READ15=0x1c0
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFILE64READ15RETURN=0x1c1
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFILE64READ16=0x1da
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFILE64READ16RETURN=0x1db
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFILE64READ8=0x1bc
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFILE64READ8RETURN=0x1bd
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFILE64REPLACE=0x1aa
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFILE64REPLACERETURN=0x1ac
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFILE64REPLACE_EFILENAME=0x1ab
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFILE64SEEK2=0x1cc
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFILE64SEEK2RETURN=0x1cd
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFILE64SETSIZE2=0x1d0
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFILE64SETSIZE2RETURN=0x1d1
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFILE64SIZE2=0x1ce
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFILE64SIZE2RETURN=0x1cf
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFILE64TEMP=0x1ad
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFILE64TEMPRETURN=0x1b0
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFILE64TEMP_EDIRNAME=0x1ae
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFILE64TEMP_EFILENAME=0x1af
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFILE64UNLOCK=0x1d4
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFILE64UNLOCKRETURN=0x1d5
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFILE64WRITE11=0x1ca
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFILE64WRITE11RETURN=0x1cb
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFILE64WRITE12=0x1e4
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFILE64WRITE12RETURN=0x1e5
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFILE64WRITE13=0x1c4
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFILE64WRITE13RETURN=0x1c5
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFILE64WRITE14=0x1de
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFILE64WRITE14RETURN=0x1df
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFILE64WRITE15=0x1c6
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFILE64WRITE15RETURN=0x1c7
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFILE64WRITE16=0x1e0
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFILE64WRITE16RETURN=0x1e1
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFILE64WRITE7=0x1c8
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFILE64WRITE7RETURN=0x1c9
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFILE64WRITE8=0x1e2
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFILE64WRITE8RETURN=0x1e3
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFILEADOPT=0x12e
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFILEADOPTFROMCLIENT=0x135
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFILEADOPTFROMCLIENTRETURN1=0x136
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFILEADOPTFROMCLIENTRETURN2=0x137
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFILEADOPTFROMCLIENTRETURN3=0x138
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFILEADOPTFROMCREATOR=0x139
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFILEADOPTFROMCREATORRETURN1=0x13a
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFILEADOPTFROMCREATORRETURN2=0x13b
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFILEADOPTFROMCREATORRETURN3=0x13c
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFILEADOPTFROMSERVER=0x132
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFILEADOPTFROMSERVERRETURN1=0x133
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFILEADOPTFROMSERVERRETURN2=0x134
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFILEADOPTRETURN1=0x12f
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFILEADOPTRETURN2=0x130
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFILEADOPTRETURN3=0x131
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFILEATT=0x18d
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFILEATTRETURN=0x18e
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFILEBLOCKMAPA=0x1a1
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFILEBLOCKMAPB=0x1a2
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFILEBLOCKMAPRETURN=0x1a3
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFILECHANGEMODE=0x198
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFILECHANGEMODERETURN=0x199
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFILECLAMP=0x19f
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFILECLAMPRETURN=0x1a0
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFILECLOSE=0x153
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFILECLOSERETURN=0x154
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFILECREATE=0x155
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFILECREATERETURN=0x157
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFILECREATE_EFILENAME=0x156
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFILEDRIVE=0x19d
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFILEDRIVERETURN=0x19e
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFILEDUPLICATE=0x13d
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFILEDUPLICATERETURN1=0x13e
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFILEDUPLICATERETURN2=0x13f
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFILEDUPLICATERETURN3=0x140
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFILEFLUSH1=0x185
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFILEFLUSH1RETURN=0x186
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFILEFLUSH2=0x187
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFILEFLUSH2RETURN=0x188
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFILEFULLNAME=0x14d
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFILEFULLNAMERETURN=0x14f
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFILEFULLNAME_EFILENAME=0x14e
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFILEGETNAME=0x14a
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFILEGETNAMERETURN=0x14c
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFILEGETNAME_EFILENAME=0x14b
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFILELOCK=0x17f
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFILELOCKRETURN=0x180
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFILEMODIFIED=0x191
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFILEMODIFIEDRETURN=0x192
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFILEOPEN=0x150
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFILEOPENRETURN=0x152
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFILEOPEN_EFILENAME=0x151
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFILEREAD1=0x15f
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFILEREAD1RETURN=0x160
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFILEREAD2=0x161
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFILEREAD2RETURN=0x162
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFILEREAD3=0x167
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFILEREAD3RETURN=0x168
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFILEREAD4=0x169
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFILEREAD4RETURN=0x16a
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFILEREAD5=0x163
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFILEREAD5RETURN=0x164
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFILEREAD6=0x165
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFILEREAD6RETURN=0x166
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFILEREAD7=0x16b
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFILEREAD7RETURN=0x16c
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFILEREAD9=0x16d
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFILEREAD9RETURN=0x16e
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFILERENAME=0x19a
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFILERENAMERETURN=0x19c
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFILERENAME_ENEWNAME=0x19b
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFILEREPLACE=0x158
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFILEREPLACERETURN=0x15a
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFILEREPLACE_EFILENAME=0x159
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFILESEEK1=0x183
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFILESEEK1RETURN=0x184
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFILESETA=0x195
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFILESETATT=0x18f
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFILESETATTRETURN=0x190
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFILESETB=0x196
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFILESETMODIFIED=0x193
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFILESETMODIFIEDRETURN=0x194
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFILESETRETURN=0x197
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFILESETSIZE1=0x18b
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFILESETSIZE1RETURN=0x18c
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFILESIZE=0x189
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFILESIZERETURN=0x18a
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFILETEMP=0x15b
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFILETEMPRETURN=0x15e
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFILETEMP_EDIRNAME=0x15c
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFILETEMP_EFILENAME=0x15d
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFILETRANSFERTOCLIENT=0x144
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFILETRANSFERTOCLIENTRETURN1=0x145
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFILETRANSFERTOCLIENTRETURN2=0x146
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFILETRANSFERTOCLIENTRETURN3=0x147
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFILETRANSFERTOPROCESS=0x148
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFILETRANSFERTOPROCESSRETURN=0x149
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFILETRANSFERTOSERVER=0x141
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFILETRANSFERTOSERVERRETURN1=0x142
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFILETRANSFERTOSERVERRETURN2=0x143
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFILEUNLOCK=0x181
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFILEUNLOCKRETURN=0x182
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFILEWRITE1=0x16f
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFILEWRITE10=0x17d
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFILEWRITE10RETURN=0x17e
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFILEWRITE1RETURN=0x170
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFILEWRITE2=0x171
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFILEWRITE2RETURN=0x172
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFILEWRITE3=0x177
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFILEWRITE3RETURN=0x178
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFILEWRITE4=0x179
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFILEWRITE4RETURN=0x17a
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFILEWRITE5=0x173
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFILEWRITE5RETURN=0x174
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFILEWRITE6=0x17b
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFILEWRITE6RETURN=0x17c
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFILEWRITE9=0x175
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFILEWRITE9RETURN=0x176
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFORMAT1OPEN=0x236
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFORMAT1OPEN_EDRIVENAME=0x237
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFORMAT2OPEN=0x239
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFORMAT2OPEN_EDRIVENAME=0x23a
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFORMATCLOSE=0x23c
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFORMATCLOSERETURN=0x23d
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFORMATNEXT1=0x23e
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFORMATNEXT1RETURN=0x23f
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFORMATNEXT2=0x240
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFORMATNEXT2RETURN=0x241
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFORMATOPEN1RETURN=0x238
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFORMATOPEN2RETURN=0x23b
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSADDCOMPOSITEMOUNT=0xfe
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSADDCOMPOSITEMOUNTRETURN=0x100
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSADDCOMPOSITEMOUNT_EFILESYSTEMNAME=0xff
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSADDEXTENSION=0x3b
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSADDEXTENSIONRETURN=0x3d
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSADDEXTENSION_EEXTENSIONNAME=0x3c
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSADDFILESYSTEM=0x17
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSADDFILESYSTEMRETURN=0x19
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSADDFILESYSTEM_EFILENAME=0x18
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSADDPLUGIN=0x242
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSADDPLUGINRETURN=0x244
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSADDPLUGIN_EFILENAME=0x243
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSALLOWDISMOUNT=0x10d
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSALLOWDISMOUNTRETURN=0x10e
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSATT=0xa0
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSATTRETURN=0xa2
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSATT_EFILENAME=0xa1
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSCHECKDISK=0xc1
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSCHECKDISKRETURN=0xc3
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSCHECKDISK_EDIRNAME=0xc2
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSCLEARPASSWORD=0xec
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSCLEARPASSWORDRETURN=0xed
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSCLOSE=0x11c
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSCLOSERETURN=0x11d
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSCONNECT=0xc
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSCONNECTRETURN=0xd
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSCREATEPRIVATEPATH=0x13
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSCREATEPRIVATEPATHRETURN=0x14
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSDELETE=0x95
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSDELETERETURN=0x97
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSDELETE_EFILENAME=0x96
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSDISMOUNTEXTENSION=0x41
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSDISMOUNTEXTENSIONRETURN=0x43
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSDISMOUNTEXTENSION_EEXTENSIONNAME=0x42
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSDISMOUNTFILESYSTEM=0x32
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSDISMOUNTFILESYSTEMRETURN=0x34
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSDISMOUNTFILESYSTEM_EFILESYSTEMNAME=0x33
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSDISMOUNTPLUGIN1=0x251
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSDISMOUNTPLUGIN1RETURN=0x253
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSDISMOUNTPLUGIN1_EPLUGINNAME=0x252
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSDISMOUNTPLUGIN2=0x254
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSDISMOUNTPLUGIN2RETURN=0x256
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSDISMOUNTPLUGIN2_EPLUGINNAME=0x255
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSDISMOUNTPLUGIN3=0x257
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSDISMOUNTPLUGIN3RETURN=0x259
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSDISMOUNTPLUGIN3_EPLUGINNAME=0x258
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSDRIVE=0x5f
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSDRIVELIST1=0x5b
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSDRIVELIST1RETURN=0x5c
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSDRIVELIST2=0x5d
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSDRIVELIST2RETURN=0x5e
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSDRIVERETURN=0x60
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSDRIVETOCHAR=0x1
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSDRIVETOCHARRETURN=0x2
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSENTRY=0xac
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSENTRYRETURN=0xae
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSENTRY_EFILENAME=0xad
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSERASEPASSWORD=0xee
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSERASEPASSWORDRETURN=0xef
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSEXTENSIONNAME=0x47
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSEXTENSIONNAMERETURN=0x49
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSEXTENSIONNAME_EEXTENSIONNAME=0x48
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSFILESYSTEMNAME=0x35
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSFILESYSTEMNAMERETURN=0x37
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSFILESYSTEMNAME_EFILESYSTEMNAME=0x36
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSFILESYSTEMNAME_ESUPPORTEDFILESYSTEMNAME=0x39
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSFILESYSTEMSUBTYPE=0x119
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSFILESYSTEMSUBTYPERETURN=0x11b
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSFILESYSTEMSUBTYPE_EFILESYSTEMNAME=0x11a
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSFINALISEDRIVE=0xf5
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSFINALISEDRIVERETURN=0xf6
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSFINALISEDRIVES=0xf7
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSFINALISEDRIVESRETURN1=0xf8
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSFINALISEDRIVESRETURN2=0xf9
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSGETDIR1=0x85
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSGETDIR1RETURN=0x87
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSGETDIR1_EDIRNAME=0x86
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSGETDIR2=0x88
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSGETDIR2RETURN=0x8a
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSGETDIR2_EDIRNAME=0x89
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSGETDIR3=0x8b
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSGETDIR3RETURN=0x8d
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSGETDIR3_EDIRNAME=0x8c
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSGETDRIVENAME=0xe2
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSGETDRIVENAMERETURN=0xe4
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSGETDRIVENAME_EDRIVENAME=0xe3
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSGETLONGNAME=0xcb
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSGETLONGNAMERETURN=0xce
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSGETLONGNAME_ELONGNAME=0xcd
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSGETLONGNAME_ESHORTNAME=0xcc
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSGETMEDIASERIALNUMBER=0x73
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSGETMEDIASERIALNUMBERRETURN=0x74
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSGETMEDIASERIALNUMBER_ESERIALNUMBER=0x75
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSGETNOTIFYUSER=0xd2
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSGETNOTIFYUSERRETURN=0xd3
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSGETRESERVEACCESS=0x103
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSGETRESERVEACCESSRETURN=0x104
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSGETSHORTNAME=0xc7
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSGETSHORTNAMERETURN=0xca
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSGETSHORTNAME_ELONGNAME=0xc8
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSGETSHORTNAME_ESHORTNAME=0xc9
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSGETSYSTEMDRIVE=0x5
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSGETSYSTEMDRIVECHAR=0x8
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSGETSYSTEMDRIVECHARRETURN=0x9
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSGETSYSTEMDRIVERETURN1=0x6
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSGETSYSTEMDRIVERETURN2=0x7
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSINITIALISEPROPERTIESFILE=0x113
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSINITIALISEPROPERTIESFILERETURN=0x114
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSISFILEINROM=0xd6
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSISFILEINROMRETURN=0xd8
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSISFILEINROM_EFILENAME=0xd7
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSISFILEOPEN=0xcf
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSISFILEOPENRETURN=0xd1
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSISFILEOPEN_EFILENAME=0xd0
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSISROMADDRESS=0x3
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSISROMADDRESSRETURN=0x4
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSISVALIDNAME1=0xd9
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSISVALIDNAME1RETURN=0xdb
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSISVALIDNAME1_EFILENAME=0xda
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSISVALIDNAME2=0xdc
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSISVALIDNAME2RETURN=0xde
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSISVALIDNAME2_EFILENAME=0xdd
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSISVALIDNAME3=0xdf
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSISVALIDNAME3RETURN=0xe1
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSISVALIDNAME3_EFILENAME=0xe0
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSLOCKDRIVE=0xe8
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSLOCKDRIVERETURN=0xe9
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSMKDIR=0x7c
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSMKDIRALL=0x7f
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSMKDIRALLRETURN=0x81
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSMKDIRALL_EDIRNAME=0x80
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSMKDIRRETURN=0x7e
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSMKDIR_EDIRNAME=0x7d
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSMODIFIED=0xa6
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSMODIFIEDRETURN=0xa8
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSMODIFIED_EFILENAME=0xa7
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSMOUNTEXTENSION=0x3e
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSMOUNTEXTENSIONRETURN=0x40
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSMOUNTEXTENSION_EEXTENSIONNAME=0x3f
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSMOUNTFILESYSTEM1=0x1d
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSMOUNTFILESYSTEM1RETURN=0x1f
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSMOUNTFILESYSTEM1_EFILESYSTEMNAME=0x1e
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSMOUNTFILESYSTEM2=0x20
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSMOUNTFILESYSTEM2RETURN=0x22
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSMOUNTFILESYSTEM2_EFILESYSTEMNAME=0x21
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSMOUNTFILESYSTEM3=0x23
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSMOUNTFILESYSTEM3RETURN=0x26
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSMOUNTFILESYSTEM3_EEXTENSIONNAME=0x24
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSMOUNTFILESYSTEM3_EFILESYSTEMNAME=0x25
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSMOUNTFILESYSTEM4=0x27
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSMOUNTFILESYSTEM4RETURN=0x2a
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSMOUNTFILESYSTEM4_EEXTENSIONNAME=0x29
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSMOUNTFILESYSTEM4_EFILESYSTEMNAME=0x28
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSMOUNTFILESYSTEMANDSCAN1=0x2b
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSMOUNTFILESYSTEMANDSCAN1RETURN=0x2d
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSMOUNTFILESYSTEMANDSCAN1_EFILESYSTEMNAME=0x2c
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSMOUNTFILESYSTEMANDSCAN2=0x2e
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSMOUNTFILESYSTEMANDSCAN2RETURN=0x31
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSMOUNTFILESYSTEMANDSCAN2_EEXTENSIONNAME=0x30
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSMOUNTFILESYSTEMANDSCAN2_EFILESYSTEMNAME=0x2f
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSMOUNTPLUGIN1=0x248
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSMOUNTPLUGIN1RETURN=0x24a
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSMOUNTPLUGIN1_EPLUGINNAME=0x249
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSMOUNTPLUGIN2=0x24b
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSMOUNTPLUGIN2RETURN=0x24d
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSMOUNTPLUGIN2_EPLUGINNAME=0x24c
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSMOUNTPLUGIN3=0x24e
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSMOUNTPLUGIN3RETURN=0x250
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSMOUNTPLUGIN3_EPLUGINNAME=0x24f
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSNOTIFYCHANGE1=0x4c
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSNOTIFYCHANGE1RETURN=0x4d
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSNOTIFYCHANGE2=0x4e
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSNOTIFYCHANGE2RETURN=0x50
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSNOTIFYCHANGE2_EDIRNAME=0x4f
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSNOTIFYCHANGECANCEL1=0x51
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSNOTIFYCHANGECANCEL1RETURN=0x52
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSNOTIFYCHANGECANCEL2=0x53
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSNOTIFYCHANGECANCEL2RETURN=0x54
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSNOTIFYDISKSPACE=0x55
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSNOTIFYDISKSPACECANCEL1=0x57
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSNOTIFYDISKSPACECANCEL1RETURN=0x58
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSNOTIFYDISKSPACECANCEL2=0x59
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSNOTIFYDISKSPACECANCEL2RETURN=0x5a
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSNOTIFYDISKSPACERETURN=0x56
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSNOTIFYDISMOUNT=0x107
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSNOTIFYDISMOUNTCANCEL1=0x109
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSNOTIFYDISMOUNTCANCEL1RETURN=0x10a
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSNOTIFYDISMOUNTCANCEL2=0x10b
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSNOTIFYDISMOUNTCANCEL2RETURN=0x10c
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSNOTIFYDISMOUNTRETURN=0x108
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSPARSE1=0x8e
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSPARSE1RETURN=0x90
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSPARSE1_EFILEPATH=0x8f
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSPARSE2=0x91
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSPARSE2RETURN=0x94
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSPARSE2_EFILENAME=0x92
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSPARSE2_ERELATED=0x93
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSPLUGINNAME=0x25a
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSPLUGINNAMERETURN=0x25c
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSPLUGINNAME_EPLUGINNAME=0x25b
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSPRIVATEPATH=0x10
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSPRIVATEPATHRETURN=0x12
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSPRIVATEPATH_EDIRNAME=0x11
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSQUERYVOLUMEINFOEXT=0x115
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSQUERYVOLUMEINFOEXTRETURN=0x116
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSREADFILESECTION=0xb2
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSREADFILESECTIONRETURN1=0xb4
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSREADFILESECTIONRETURN2=0xb5
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSREADFILESECTIONRETURN3=0xb6
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSREADFILESECTION_EFILENAME=0xb3
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSREADFILESECTION_RESERVED=0xb7
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSREADFILESECTION_RESERVED_EFILENAME=0xb8
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSREADFILESECTION_RESERVED_RETURN1=0xb9
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSREADFILESECTION_RESERVED_RETURN2=0xba
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSREALNAME=0x6f
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSREALNAMERETURN=0x72
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSREALNAME_EFILENAME1=0x70
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSREALNAME_EFILENAME2=0x71
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSRELEASERESERVEACCESS=0x105
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSRELEASERESERVEACCESSRETURN=0x106
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSREMOUNTDRIVE=0x4a
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSREMOUNTDRIVERETURN=0x4b
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSREMOVEEXTENSION=0x44
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSREMOVEEXTENSIONRETURN=0x46
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSREMOVEEXTENSION_EEXTENSIONNAME=0x45
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSREMOVEFILESYSTEM=0x1a
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSREMOVEFILESYSTEMRETURN=0x1c
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSREMOVEFILESYSTEM_EFILESYSTEMNAME=0x1b
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSREMOVEPLUGIN=0x245
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSREMOVEPLUGINRETURN=0x247
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSREMOVEPLUGIN_EPLUGINNAME=0x246
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSRENAME=0x98
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSRENAMERETURN=0x9b
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSRENAME_ENEWNAME=0x9a
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSRENAME_EOLDNAME=0x99
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSREPLACE=0x9c
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSREPLACERETURN=0x9f
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSREPLACE_ENEWNAME=0x9e
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSREPLACE_EOLDNAME=0x9d
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSRESERVEDRIVESPACE=0x101
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSRESERVEDRIVESPACERETURN=0x102
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSRESOURCECOUNT=0xbf
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSRESOURCECOUNTMARKEND=0xbd
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSRESOURCECOUNTMARKENDRETURN=0xbe
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSRESOURCECOUNTMARKSTART=0xbb
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSRESOURCECOUNTMARKSTARTRETURN=0xbc
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSRESOURCECOUNTRETURN=0xc0
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSRMDIR=0x82
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSRMDIRRETURN=0x84
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSRMDIR_EDIRNAME=0x83
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSSCANDRIVE=0xc4
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSSCANDRIVERETURN=0xc6
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSSCANDRIVE_EDIRNAME=0xc5
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSSESSIONPATH=0x76
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSSESSIONPATHRETURN=0x77
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSSESSIONPATH_EDIRNAME=0x78
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSSETATT=0xa3
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSSETATTRETURN=0xa5
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSSETATT_EFILENAME=0xa4
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSSETDRIVENAME=0xe5
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSSETDRIVENAMERETURN=0xe7
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSSETDRIVENAME_EDRIVENAME=0xe6
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSSETENTRY=0xaf
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSSETENTRYRETURN=0xb1
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSSETENTRY_EFILENAME=0xb0
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSSETLOCALDRIVEMAPPING=0xf2
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSSETLOCALDRIVEMAPPINGRETURN=0xf4
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSSETLOCALDRIVEMAPPING_ELOCALDRIVEMAPPING=0xf3
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSSETMODIFIED=0xa9
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSSETMODIFIEDRETURN=0xab
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSSETMODIFIED_EFILENAME=0xaa
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSSETNOTIFYCHANGE=0x111
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSSETNOTIFYCHANGERETURN=0x112
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSSETNOTIFYUSER=0xd4
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSSETNOTIFYUSERRETURN=0xd5
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSSETSESSIONPATH=0x79
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSSETSESSIONPATHRETURN=0x7b
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSSETSESSIONPATH_EDIRNAME=0x7a
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSSETSESSIONTOPRIVATE=0xe
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSSETSESSIONTOPRIVATERETURN=0xf
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSSETSTARTUPCONFIGURATION=0x10f
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSSETSTARTUPCONFIGURATIONRETURN=0x110
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSSETSUBST=0x6c
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSSETSUBSTRETURN=0x6e
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSSETSUBST_EDIRNAME=0x6d
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSSETSYSTEMDRIVE=0xa
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSSETSYSTEMDRIVERETURN=0xb
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSSETVOLUMELABEL=0x66
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSSETVOLUMELABELRETURN=0x68
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSSETVOLUMELABEL_EVOLUMENAME=0x67
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSSTARTUPINITCOMPLETE=0xf0
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSSTARTUPINITCOMPLETERETURN=0xf1
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSSUBST=0x69
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSSUBSTRETURN=0x6b
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSSUBST_EDIRNAME=0x6a
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSSUPPORTEDFILESYSTEMNAME=0x38
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSSUPPORTEDFILESYSTEMNAMERETURN=0x3a
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSSWAPFILESYSTEM=0xfa
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSSWAPFILESYSTEMRETURN=0xfd
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSSWAPFILESYSTEM_ENEWNAME=0xfc
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSSWAPFILESYSTEM_EOLDNAME=0xfb
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSUNLOCKDRIVE=0xea
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSUNLOCKDRIVERETURN=0xeb
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSVERSION=0x15
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSVERSIONRETURN=0x16
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSVOLUME1=0x61
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSVOLUME1RETURNA=0x62
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSVOLUME1RETURNB=0x63
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSVOLUME2=0x64
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSVOLUME2RETURN=0x65
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSVOLUMEIOPARAM=0x117
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EFSVOLUMEIOPARAMRETURN=0x118
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EPLUGINCLOSE=0x25f
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EPLUGINCLOSERETURN=0x260
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EPLUGINDOCANCEL=0x26d
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EPLUGINDOCANCELRETURN=0x26e
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EPLUGINDOCONTROL1=0x267
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EPLUGINDOCONTROL1RETURN=0x268
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EPLUGINDOCONTROL2=0x269
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EPLUGINDOCONTROL2RETURN=0x26a
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EPLUGINDOCONTROL3=0x26b
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EPLUGINDOCONTROL3RETURN=0x26c
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EPLUGINDOREQUEST1=0x261
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EPLUGINDOREQUEST1RETURN=0x262
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EPLUGINDOREQUEST2=0x263
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EPLUGINDOREQUEST2RETURN=0x264
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EPLUGINDOREQUEST3=0x265
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EPLUGINDOREQUEST3RETURN=0x266
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EPLUGINOPEN=0x25d
+[TRACE]TRACE_BORDER[0x40]_EFSRV_EPLUGINOPENRETURN=0x25e
+[TRACE]TRACE_PANIC[0x41]_EFSRV_EPANIC=0x1