--- a/usbmgmt/usbmgr/host/functiondrivers/ms/msmm/server/src/msmmterminator.cpp Tue Aug 31 17:01:47 2010 +0300
+++ b/usbmgmt/usbmgr/host/functiondrivers/ms/msmm/server/src/msmmterminator.cpp Wed Sep 01 12:35:00 2010 +0100
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
+* 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 "Eclipse Public License v1.0"
@@ -24,39 +24,33 @@
#include "eventqueue.h"
#include <usb/usblogger.h>
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "msmmterminatorTraces.h"
+
+#ifdef __FLOG_ACTIVE
+_LIT8(KLogComponent, "UsbHostMsmmServer");
#endif
-
const TInt KShutdownDelay = 2000000; // approx 2 seconds
const TInt KMsmmTerminatorPriority = CActive::EPriorityStandard;
CMsmmTerminator* CMsmmTerminator::NewL(const CDeviceEventQueue& anEventQueue)
{
- OstTraceFunctionEntry0( CMSMMTERMINATOR_NEWL_ENTRY );
-
+ LOG_STATIC_FUNC_ENTRY
CMsmmTerminator* self = new (ELeave) CMsmmTerminator(anEventQueue);
CleanupStack::PushL(self);
self->ConstructL();
CleanupStack::Pop(self);
- OstTraceFunctionExit0( CMSMMTERMINATOR_NEWL_EXIT );
return self;
}
void CMsmmTerminator::Start()
{
- OstTraceFunctionEntry0( CMSMMTERMINATOR_START_ENTRY );
-
+ LOG_FUNC
After(KShutdownDelay);
- OstTraceFunctionExit0( CMSMMTERMINATOR_START_EXIT );
}
void CMsmmTerminator::RunL()
{
- OstTraceFunctionEntry0( CMSMMTERMINATOR_RUNL_ENTRY );
-
+ LOG_FUNC
if (iEventQueue.Count())
{
// There are some events still in the event queue to
@@ -67,25 +61,20 @@
{
CActiveScheduler::Stop();
}
- OstTraceFunctionExit0( CMSMMTERMINATOR_RUNL_EXIT );
}
CMsmmTerminator::CMsmmTerminator(const CDeviceEventQueue& anEventQueue):
CTimer(KMsmmTerminatorPriority),
iEventQueue(anEventQueue)
{
- OstTraceFunctionEntry0( CMSMMTERMINATOR_CMSMMTERMINATOR_CONS_ENTRY );
-
+ LOG_FUNC
CActiveScheduler::Add(this);
- OstTraceFunctionExit0( CMSMMTERMINATOR_CMSMMTERMINATOR_CONS_EXIT );
}
void CMsmmTerminator::ConstructL()
{
- OstTraceFunctionEntry0( CMSMMTERMINATOR_CONSTRUCTL_ENTRY );
-
+ LOG_FUNC
CTimer::ConstructL();
- OstTraceFunctionExit0( CMSMMTERMINATOR_CONSTRUCTL_EXIT );
}
// End of file