--- a/usbmgmt/usbmgr/host/fdf/production/fdcbase/src/fdcplugin.cpp Wed Jul 07 14:16:40 2010 +0800
+++ b/usbmgmt/usbmgr/host/fdf/production/fdcbase/src/fdcplugin.cpp Wed Jul 07 15:08:54 2010 +0800
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007-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"
@@ -24,30 +24,32 @@
#include <ecom/ecom.h>
#include <usbhost/internal/fdcplugin.h>
#include <usbhost/internal/fdcpluginobserver.h>
-#include <usb/usblogger.h>
-#ifdef __FLOG_ACTIVE
-_LIT8(KLogComponent, "fdcplugin");
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "fdcpluginTraces.h"
#endif
+
EXPORT_C CFdcPlugin::~CFdcPlugin()
{
- LOG_FUNC
-
+ OstTraceFunctionEntry0( CFDCPLUGIN_CFDCPLUGIN_DES_ENTRY );
+
REComSession::DestroyedImplementation(iInstanceId);
}
EXPORT_C CFdcPlugin::CFdcPlugin(MFdcPluginObserver& aObserver)
: iObserver(aObserver)
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CFDCPLUGIN_CFDCPLUGIN_CONS_ENTRY );
+
}
EXPORT_C CFdcPlugin* CFdcPlugin::NewL(TUid aImplementationUid, MFdcPluginObserver& aObserver)
{
- LOG_STATIC_FUNC_ENTRY
-
- LOGTEXT2(_L8("\t\tFDC implementation UID: 0x%08x"), aImplementationUid);
+ OstTraceFunctionEntry0( CFDCPLUGIN_NEWL_ENTRY );
+
+ OstTrace1( TRACE_NORMAL, CFDCPLUGIN_NEWL, "\t\tFDC implementation UID: 0x%08x", aImplementationUid.iUid);
CFdcPlugin* plugin = reinterpret_cast<CFdcPlugin*>(
REComSession::CreateImplementationL(
@@ -57,7 +59,8 @@
)
);
- LOGTEXT2(_L8("\tplugin = 0x%08x"), plugin);
+ OstTrace1( TRACE_NORMAL, CFDCPLUGIN_NEWL_DUP1, "\tplugin = 0x%08x", plugin);
+
return plugin;
}