usbmgmt/usbmgr/device/classdrivers/acm/classimplementation/ecacm/src/ActiveReadOneOrMoreReader.cpp
--- a/usbmgmt/usbmgr/device/classdrivers/acm/classimplementation/ecacm/src/ActiveReadOneOrMoreReader.cpp Wed Jul 07 14:16:40 2010 +0800
+++ b/usbmgmt/usbmgr/device/classdrivers/acm/classimplementation/ecacm/src/ActiveReadOneOrMoreReader.cpp Wed Jul 07 15:08:54 2010 +0800
@@ -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"
@@ -22,10 +22,9 @@
#include "AcmPanic.h"
#include "AcmUtils.h"
#include "ReadOneOrMoreObserver.h"
-#include <usb/usblogger.h>
-
-#ifdef __FLOG_ACTIVE
-_LIT8(KLogComponent, "ECACM");
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "ActiveReadOneOrMoreReaderTraces.h"
#endif
CActiveReadOneOrMoreReader::CActiveReadOneOrMoreReader(
@@ -45,7 +44,9 @@
* @param aEndpoint The endpoint to read from.
*/
{
+ OstTraceFunctionEntry0( CACTIVEREADONEORMOREREADER_CACTIVEREADONEORMOREREADER_CONS_ENTRY );
CActiveScheduler::Add(this);
+ OstTraceFunctionExit0( CACTIVEREADONEORMOREREADER_CACTIVEREADONEORMOREREADER_CONS_EXIT );
}
CActiveReadOneOrMoreReader::~CActiveReadOneOrMoreReader()
@@ -53,9 +54,9 @@
* Destructor.
*/
{
- LOG_FUNC
-
+ OstTraceFunctionEntry0( CACTIVEREADONEORMOREREADER_CACTIVEREADONEORMOREREADER_DES_ENTRY );
Cancel();
+ OstTraceFunctionExit0( CACTIVEREADONEORMOREREADER_CACTIVEREADONEORMOREREADER_DES_EXIT );
}
CActiveReadOneOrMoreReader* CActiveReadOneOrMoreReader::NewL(
@@ -72,10 +73,10 @@
* @return Ownership of a new CActiveReadOneOrMoreReader object.
*/
{
- LOG_STATIC_FUNC_ENTRY
-
+ OstTraceFunctionEntry0( CACTIVEREADONEORMOREREADER_NEWL_ENTRY );
CActiveReadOneOrMoreReader* self =
new(ELeave) CActiveReadOneOrMoreReader(aParent, aLdd, aEndpoint);
+ OstTraceFunctionExit0( CACTIVEREADONEORMOREREADER_NEWL_EXIT );
return self;
}
@@ -87,13 +88,12 @@
* @param aLength The length to read.
*/
{
- LOGTEXT2(_L8(">>CActiveReadOneOrMoreReader::ReadOneOrMore "
- "aLength=%d"), aLength);
-
+ OstTraceFunctionEntry0( CACTIVEREADONEORMOREREADER_READONEORMORE_ENTRY );
+ OstTrace1( TRACE_NORMAL, CACTIVEREADONEORMOREREADER_READONEORMORE,
+ "CActiveReadOneOrMoreReader::ReadOneOrMore;aLength=%d", aLength );
iLdd.ReadOneOrMore(iStatus, iEndpoint, aDes, aLength);
SetActive();
-
- LOGTEXT(_L8("<<CActiveReadOneOrMoreReader::ReadOneOrMore"));
+ OstTraceFunctionExit0( CACTIVEREADONEORMOREREADER_READONEORMORE_EXIT );
}
void CActiveReadOneOrMoreReader::DoCancel()
@@ -101,9 +101,9 @@
* Cancel an outstanding request.
*/
{
- LOG_FUNC
-
+ OstTraceFunctionEntry0( CACTIVEREADONEORMOREREADER_DOCANCEL_ENTRY );
iLdd.ReadCancel(iEndpoint);
+ OstTraceFunctionExit0( CACTIVEREADONEORMOREREADER_DOCANCEL_EXIT );
}
void CActiveReadOneOrMoreReader::RunL()
@@ -112,13 +112,11 @@
* parent class of the completion.
*/
{
- LOG_LINE
- LOGTEXT2(_L8(">>CActiveReadOneOrMoreReader::RunL iStatus=%d"),
- iStatus.Int());
-
+ OstTraceFunctionEntry0( CACTIVEREADONEORMOREREADER_RUNL_ENTRY );
+ OstTrace1( TRACE_NORMAL, CACTIVEREADONEORMOREREADER_RUNL,
+ "CActiveReadOneOrMoreReader::RunL;iStatus=%d", iStatus.Int() );
iParent.ReadOneOrMoreCompleted(iStatus.Int());
-
- LOGTEXT(_L8("<<CActiveReadOneOrMoreReader::RunL"));
+ OstTraceFunctionExit0( CACTIVEREADONEORMOREREADER_RUNL_EXIT );
}
//