diff -r d3e8e7d462dd -r f92a4f87e424 usbmgmt/usbmgr/usbman/server/SRC/CUsbScheduler.cpp --- a/usbmgmt/usbmgr/usbman/server/SRC/CUsbScheduler.cpp Thu Jul 15 20:42:20 2010 +0300 +++ b/usbmgmt/usbmgr/usbman/server/SRC/CUsbScheduler.cpp Tue Aug 31 17:01:47 2010 +0300 @@ -1,5 +1,5 @@ /* -* Copyright (c) 1997-2009 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 1997-2010 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" @@ -19,13 +19,14 @@ @file */ -#include #include "CUsbScheduler.h" #include "CUsbServer.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "CUsbSchedulerTraces.h" +#endif -#ifdef __FLOG_ACTIVE -_LIT8(KLogComponent, "USBSVR"); -#endif + /** * The CUsbScheduler::NewL method @@ -36,9 +37,10 @@ */ CUsbScheduler* CUsbScheduler::NewL() { - LOG_STATIC_FUNC_ENTRY - + OstTraceFunctionEntry0( CUSBSCHEDULER_NEWL_ENTRY ); + CUsbScheduler* self = new(ELeave) CUsbScheduler; + OstTraceFunctionExit0( CUSBSCHEDULER_NEWL_EXIT ); return self; } @@ -80,7 +82,8 @@ */ void CUsbScheduler::Error(TInt aError) const { - LOGTEXT2(_L8("CUsbScheduler::Error aError=%d"), aError); + OstTrace1( TRACE_NORMAL, CUSBSCHEDULER_ERROR, "CUsbScheduler::Error;aError=%d", aError ); + if (iServer) {