--- a/usbmgmt/usbmgr/device/classcontroller/SRC/CUsbClassControllerIterator.cpp Wed Jul 07 14:16:40 2010 +0800
+++ b/usbmgmt/usbmgr/device/classcontroller/SRC/CUsbClassControllerIterator.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"
@@ -24,10 +24,12 @@
#include <cusbclasscontrolleriterator.h>
#include <usb/usblogger.h>
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "CUsbClassControllerIteratorTraces.h"
+#endif
-#ifdef __FLOG_ACTIVE
-_LIT8(KLogComponent, "USBSVR");
-#endif
+
// Panic category only used in debug builds
#ifdef _DEBUG
@@ -130,10 +132,13 @@
*/
EXPORT_C CUsbClassControllerBase* CUsbClassControllerIterator::Current()
{
- __ASSERT_DEBUG((iClassControllerIndex >= 0) &&
- (iClassControllerIndex < iClassControllerArray.Count()),
- _USB_PANIC(KUsbCcIteratorPanicCategory, EIndexOutOfRange));
-
+#ifdef _DEBUG
+ if(!((iClassControllerIndex >= 0) && (iClassControllerIndex < iClassControllerArray.Count())))
+ {
+ OstTrace1( TRACE_FATAL, CUSBCLASSCONTROLLERITERATOR_CURRENT, "CUsbClassControllerIterator::Current;panic reason=%d", EIndexOutOfRange );
+ User::Panic(KUsbCcIteratorPanicCategory, EIndexOutOfRange );
+ }
+#endif
return iClassControllerArray[iClassControllerIndex];
}
--- a/usbmgmt/usbmgr/device/classcontroller/SRC/CUsbClassControllerPlugIn.cpp Wed Jul 07 14:16:40 2010 +0800
+++ b/usbmgmt/usbmgr/device/classcontroller/SRC/CUsbClassControllerPlugIn.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"
@@ -24,11 +24,11 @@
#include <cusbclasscontrollerplugin.h>
#include <ecom/ecom.h>
-#include <usb/usblogger.h>
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "CUsbClassControllerPlugInTraces.h"
+#endif
-#ifdef __FLOG_ACTIVE
-_LIT8(KLogComponent, "USBSVR");
-#endif
/**
* Constructor.
@@ -50,7 +50,7 @@
EXPORT_C CUsbClassControllerPlugIn* CUsbClassControllerPlugIn::NewL(TUid aImplementationId,
MUsbClassControllerNotify& aOwner)
{
- LOG_STATIC_FUNC_ENTRY
+ OstTraceFunctionEntry0( CUSBCLASSCONTROLLERPLUGIN_NEWL_ENTRY );
return (reinterpret_cast<CUsbClassControllerPlugIn*>(REComSession::CreateImplementationL
(aImplementationId, _FOFF(CUsbClassControllerPlugIn, iPrivateEComUID),
--- a/usbmgmt/usbmgr/device/classcontroller/group/UsbClassController.mmp Wed Jul 07 14:16:40 2010 +0800
+++ b/usbmgmt/usbmgr/device/classcontroller/group/UsbClassController.mmp 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"
@@ -38,4 +38,4 @@
library euser.lib
library ecom.lib
-#include <usb/usblogger.mmh>
+USERINCLUDE ../traces
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usbmgmt/usbmgr/device/classcontroller/traces/OstTraceDefinitions.h Wed Jul 07 15:08:54 2010 +0800
@@ -0,0 +1,7 @@
+#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
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usbmgmt/usbmgr/device/classcontroller/traces/fixed_id.definitions Wed Jul 07 15:08:54 2010 +0800
@@ -0,0 +1,6 @@
+#Fixed group and trace id definitions. If this file is removed, the identifiers are rebuilt.
+[GROUP]TRACE_FATAL=0x81
+[GROUP]TRACE_FLOW=0x8a
+[TRACE]TRACE_FATAL[0x81]_CUSBCLASSCONTROLLERITERATOR_CURRENT=0x1
+[TRACE]TRACE_FLOW[0x8A]_CUSBCLASSCONTROLLERPLUGIN_NEWL_ENTRY=0x1
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBCLASSCONTROLLERITERATOR_CURRENT=0x1
--- a/usbmgmt/usbmgr/device/classdrivers/acm/classcontroller/SRC/CUsbACMClassController.cpp Wed Jul 07 14:16:40 2010 +0800
+++ b/usbmgmt/usbmgr/device/classdrivers/acm/classcontroller/SRC/CUsbACMClassController.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,24 +22,23 @@
@file
*/
-#include "CUsbACMClassController.h"
#include <usb_std.h>
#include <acminterface.h>
-#include <usb/acmserver.h>
+#include <usb/acmserver.h>
+#include "CUsbACMClassController.h"
#include "UsbmanInternalConstants.h"
-#include <usb/usblogger.h>
#include "acmserverconsts.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "CUsbACMClassControllerTraces.h"
+#endif
-#ifdef __FLOG_ACTIVE
-_LIT8(KLogComponent, "ACMCC");
-
+#ifdef _DEBUG
// Panic category
_LIT( KAcmCcPanicCategory, "UsbAcmCc" );
-
#endif
-
/**
* Panic codes for the USB ACM Class Controller.
*/
@@ -67,12 +66,13 @@
*/
CUsbACMClassController* CUsbACMClassController::NewL(MUsbClassControllerNotify& aOwner)
{
- LOG_STATIC_FUNC_ENTRY
+ OstTraceFunctionEntry0( CUSBACMCLASSCONTROLLER_NEWL_ENTRY );
CUsbACMClassController* self = new (ELeave) CUsbACMClassController(aOwner);
CleanupStack::PushL(self);
self->ConstructL();
CleanupStack::Pop(self);
+ OstTraceFunctionExit0( CUSBACMCLASSCONTROLLER_NEWL_EXIT );
return self;
}
@@ -81,6 +81,7 @@
*/
CUsbACMClassController::~CUsbACMClassController()
{
+ OstTraceFunctionEntry0( CUSBACMCLASSCONTROLLER_CUSBACMCLASSCONTROLLER_DES_ENTRY );
Cancel();
#ifdef USE_ACM_REGISTRATION_PORT
@@ -89,6 +90,7 @@
#else
iAcmServer.Close();
#endif // USE_ACM_REGISTRATION_PORT
+ OstTraceFunctionExit0( CUSBACMCLASSCONTROLLER_CUSBACMCLASSCONTROLLER_DES_EXIT );
}
/**
@@ -101,6 +103,8 @@
: CUsbClassControllerPlugIn(aOwner, KAcmStartupPriority),
iNumberOfAcmFunctions(KDefaultNumberOfAcmFunctions)
{
+ OstTraceFunctionEntry0( CUSBACMCLASSCONTROLLER_CUSBACMCLASSCONTROLLER_CONS_ENTRY );
+ OstTraceFunctionExit0( CUSBACMCLASSCONTROLLER_CUSBACMCLASSCONTROLLER_CONS_EXIT );
}
/**
@@ -108,6 +112,8 @@
*/
void CUsbACMClassController::ConstructL()
{
+ OstTraceFunctionEntry0( CUSBACMCLASSCONTROLLER_CONSTRUCTL_ENTRY );
+
iNumberOfAcmFunctions = KUsbAcmNumberOfAcmFunctions;
iAcmProtocolNum[0] = KUsbAcmProtocolNumAcm1;
@@ -118,21 +124,45 @@
// Prepare to use whichever mechanism is enabled to control bringing ACM
// functions up and down.
+ TInt err;
#ifdef USE_ACM_REGISTRATION_PORT
+
+ err = iCommServer.Connect();
+ if (err < 0)
+ {
+ OstTrace1( TRACE_ERROR, CUSBACMCLASSCONTROLLER_CONSTRUCTL, "CUsbACMClassController::ConstructL;leave err=%d", err );
+ User::Leave(err);
+ }
+
+ err = iCommServer.LoadCommModule(KAcmCsyName);
+ if (err < 0)
+ {
+ OstTrace1( TRACE_ERROR, CUSBACMCLASSCONTROLLER_CONSTRUCTL_DUP1, "CUsbACMClassController::ConstructL;leave err=%d", err );
+ User::Leave(err);
+ }
- LEAVEIFERRORL(iCommServer.Connect());
- LEAVEIFERRORL(iCommServer.LoadCommModule(KAcmCsyName));
TName portName(KAcmSerialName);
portName.AppendFormat(_L("::%d"), 666);
// Open the registration port in shared mode in case other ACM CCs want to
// open it.
- LEAVEIFERRORL(iComm.Open(iCommServer, portName, ECommShared));
+ err = iComm.Open(iCommServer, portName, ECommShared);
+ if (err < 0)
+ {
+ OstTrace1( TRACE_ERROR, CUSBACMCLASSCONTROLLER_CONSTRUCTL_DUP2, "CUsbACMClassController::ConstructL;leave err=%d", err );
+ User::Leave(err);
+ }
#else
-
- LEAVEIFERRORL(iAcmServer.Connect());
+
+ err = iAcmServer.Connect();
+ if (err < 0)
+ {
+ OstTrace1( TRACE_ERROR, CUSBACMCLASSCONTROLLER_CONSTRUCTL_DUP3, "CUsbACMClassController::ConstructL;leave err=%d", err );
+ User::Leave(err);
+ }
#endif // USE_ACM_REGISTRATION_PORT
+ OstTraceFunctionExit0( CUSBACMCLASSCONTROLLER_CONSTRUCTL_EXIT );
}
/**
@@ -143,24 +173,30 @@
*/
void CUsbACMClassController::Start(TRequestStatus& aStatus)
{
- LOG_FUNC;
+ OstTraceFunctionEntry0( CUSBACMCLASSCONTROLLER_START_ENTRY );
// We should always be idle when this function is called (guaranteed by
// CUsbSession).
- __ASSERT_DEBUG( iState == EUsbServiceIdle, _USB_PANIC(KAcmCcPanicCategory, EBadApiCallStart) );
+ if (iState != EUsbServiceIdle)
+ {
+ OstTrace1( TRACE_FATAL, CUSBACMCLASSCONTROLLER_START, "CUsbACMClassController::Start;iState=%d", (TInt)iState );
+ __ASSERT_DEBUG( EFalse, User::Panic(KAcmCcPanicCategory, EBadApiCallStart) );
+ }
TRequestStatus* reportStatus = &aStatus;
TRAPD(err, DoStartL());
iState = (err == KErrNone) ? EUsbServiceStarted : EUsbServiceIdle;
User::RequestComplete(reportStatus, err);
+ OstTraceFunctionExit0( CUSBACMCLASSCONTROLLER_START_EXIT );
}
void CUsbACMClassController::DoStartL()
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CUSBACMCLASSCONTROLLER_DOSTARTL_ENTRY );
+
iState = EUsbServiceStarting;
- LOGTEXT2(_L8(" iNumberOfAcmFunctions = %d"), iNumberOfAcmFunctions);
+ OstTrace1( TRACE_NORMAL, CUSBACMCLASSCONTROLLER_DOSTARTL, "CUsbACMClassController::DoStartL;iNumberOfAcmFunctions=%d", iNumberOfAcmFunctions );
#ifdef USE_ACM_REGISTRATION_PORT
@@ -168,21 +204,22 @@
TUint acmSetting;
for (TUint i = 0; i < iNumberOfAcmFunctions; i++)
{
- LOGTEXT2(_L8(" iAcmProtocolNum[i] = %d"), iAcmProtocolNum[i]);
+ OstTrace1( TRACE_NORMAL, CUSBACMCLASSCONTROLLER_DOSTARTL_DUP1, "CUsbACMClassController::DoStartL;iAcmProtocolNum[i]=%u", iAcmProtocolNum[i] );
// indicate the number of ACMs to create, and its protocol number (in the 3rd-lowest byte)
acmSetting = 1 | (static_cast<TUint> (iAcmProtocolNum[i]) << 16);
TInt err = iComm.SetSignalsToMark(acmSetting);
if (err != KErrNone)
{
- LOGTEXT2(_L8(" SetSignalsToMark error = %d"), err);
+ OstTrace1( TRACE_NORMAL, CUSBACMCLASSCONTROLLER_DOSTARTL_DUP2, "CUsbACMClassController::DoStartL;SetSignalsToMark error = %d", err );
if (i != 0)
{
// Must clear any ACMs that have completed.
// only other than KErrNone if C32 Server fails
(void) iComm.SetSignalsToSpace(i);
}
- LEAVEL(err);
+ OstTrace1( TRACE_ERROR, CUSBACMCLASSCONTROLLER_DOSTARTL_DUP6, "CUsbACMClassController::DoStartL;leave err=%d", err );
+ User::Leave(err);
}
}
@@ -198,20 +235,23 @@
if ( err != KErrNone )
{
- LOGTEXT2(_L8("\tFailed to create ACM function. Error: %d"), err);
+ OstTrace1( TRACE_NORMAL, CUSBACMCLASSCONTROLLER_DOSTARTL_DUP3, "CUsbACMClassController::DoStartL;\tFailed to create ACM function. Error: %d", err);
+
if (i != 0)
{
//Must clear any ACMs that have been completed
iAcmServer.DestroyFunctions(i);
- LOGTEXT2(_L8("\tDestroyed %d Interfaces"), i);
+ OstTrace1( TRACE_NORMAL, CUSBACMCLASSCONTROLLER_DOSTARTL_DUP4, "CUsbACMClassController::DoStartL;\tDestroyed %d Interfaces", i );
}
- LEAVEL(err);
+ OstTrace1( TRACE_NORMAL, CUSBACMCLASSCONTROLLER_DOSTARTL_DUP7, "CUsbACMClassController::DoStartL; leave Error: %d", err);
+ User::Leave(err);
}
}
#endif // USE_ACM_REGISTRATION_PORT
- LOGTEXT2(_L8("\tCreated %d ACM Interfaces"), iNumberOfAcmFunctions);
+ OstTrace1( TRACE_NORMAL, CUSBACMCLASSCONTROLLER_DOSTARTL_DUP5, "CUsbACMClassController::DoStartL;\tCreated %d ACM Interfaces", iNumberOfAcmFunctions );
+ OstTraceFunctionExit0( CUSBACMCLASSCONTROLLER_DOSTARTL_EXIT );
}
/**
@@ -221,15 +261,21 @@
*/
void CUsbACMClassController::Stop(TRequestStatus& aStatus)
{
- LOG_FUNC;
+ OstTraceFunctionEntry0( CUSBACMCLASSCONTROLLER_STOP_ENTRY );
// We should always be started when this function is called (guaranteed by
// CUsbSession).
- __ASSERT_DEBUG( iState == EUsbServiceStarted, _USB_PANIC(KAcmCcPanicCategory, EBadApiCallStop) );
+ //User::Panic(KAcmCcPanicCategory, EBadApiCallStop);
+ if (iState != EUsbServiceStarted)
+ {
+ OstTrace1( TRACE_FATAL, CUSBACMCLASSCONTROLLER_STOP, "CUsbACMClassController::Stop;iState=%d", (TInt)iState );
+ __ASSERT_DEBUG( EFalse, User::Panic(KAcmCcPanicCategory, EBadApiCallStop) );
+ }
TRequestStatus* reportStatus = &aStatus;
DoStop();
User::RequestComplete(reportStatus, KErrNone);
+ OstTraceFunctionExit0( CUSBACMCLASSCONTROLLER_STOP_EXIT );
}
/**
@@ -239,10 +285,10 @@
*/
void CUsbACMClassController::GetDescriptorInfo(TUsbDescriptor& aDescriptorInfo) const
{
- LOG_FUNC;
-
+ OstTraceFunctionEntry0( CUSBACMCLASSCONTROLLER_GETDESCRIPTORINFO_ENTRY );
aDescriptorInfo.iLength = KAcmDescriptorLength;
aDescriptorInfo.iNumInterfaces = KAcmNumberOfInterfacesPerAcmFunction*(iNumberOfAcmFunctions);
+ OstTraceFunctionExit0( CUSBACMCLASSCONTROLLER_GETDESCRIPTORINFO_EXIT );
}
/**
@@ -250,13 +296,16 @@
*/
void CUsbACMClassController::DoStop()
{
- LOG_FUNC;
-
+ OstTraceFunctionEntry0( CUSBACMCLASSCONTROLLER_DOSTOP_ENTRY );
if (iState == EUsbServiceStarted)
{
#ifdef USE_ACM_REGISTRATION_PORT
TInt err = iComm.SetSignalsToSpace(iNumberOfAcmFunctions);
- __ASSERT_DEBUG(err == KErrNone, User::Invariant());
+ if (err != KErrNone)
+ {
+ OstTrace1( TRACE_FATAL, CUSBACMCLASSCONTROLLER_DOSTOP_DUP1, "CUsbACMClassController::DoStop;err=%d", err );
+ User::Invariant();
+ }
//the implementation in CRegistrationPort always return KErrNone
(void)err;
// If there is an error here, USBSVR will just ignore it, but
@@ -268,11 +317,10 @@
// Destroy interfaces. Can't do anything with an error here.
static_cast<void>(iAcmServer.DestroyFunctions(iNumberOfAcmFunctions));
#endif // USE_ACM_REGISTRATION_PORT
-
- LOGTEXT2(_L8("\tDestroyed %d Interfaces"), iNumberOfAcmFunctions);
-
+ OstTrace1( TRACE_NORMAL, CUSBACMCLASSCONTROLLER_DOSTOP, "CUsbACMClassController::DoStop;\tDestroyed %d Interfaces", iNumberOfAcmFunctions );
iState = EUsbServiceIdle;
}
+ OstTraceFunctionExit0( CUSBACMCLASSCONTROLLER_DOSTOP_EXIT );
}
/**
@@ -281,7 +329,10 @@
*/
void CUsbACMClassController::RunL()
{
- __ASSERT_DEBUG( EFalse, _USB_PANIC(KAcmCcPanicCategory, EUnusedFunction) );
+ OstTraceFunctionEntry0( CUSBACMCLASSCONTROLLER_RUNL_ENTRY );
+ OstTrace0( TRACE_FATAL, CUSBACMCLASSCONTROLLER_RUNL, "CUsbACMClassController::RunL;EUnusedFunction" );
+ __ASSERT_DEBUG( EFalse, User::Panic(KAcmCcPanicCategory, EUnusedFunction) );
+ OstTraceFunctionExit0( CUSBACMCLASSCONTROLLER_RUNL_EXIT );
}
/**
@@ -290,7 +341,10 @@
*/
void CUsbACMClassController::DoCancel()
{
- __ASSERT_DEBUG( EFalse, _USB_PANIC(KAcmCcPanicCategory, EUnusedFunction) );
+ OstTraceFunctionEntry0( CUSBACMCLASSCONTROLLER_DOCANCEL_ENTRY );
+ OstTrace0( TRACE_FATAL, CUSBACMCLASSCONTROLLER_DOCANCEL, "CUsbACMClassController::DoCancel;EUnusedFunction" );
+ __ASSERT_DEBUG( EFalse, User::Panic(KAcmCcPanicCategory, EUnusedFunction) );
+ OstTraceFunctionExit0( CUSBACMCLASSCONTROLLER_DOCANCEL_EXIT );
}
/**
@@ -302,6 +356,9 @@
*/
TInt CUsbACMClassController::RunError(TInt /*aError*/)
{
- __ASSERT_DEBUG( EFalse, _USB_PANIC(KAcmCcPanicCategory, EUnusedFunction) );
+ OstTraceFunctionEntry0( CUSBACMCLASSCONTROLLER_RUNERROR_ENTRY );
+ OstTrace0( TRACE_FATAL, CUSBACMCLASSCONTROLLER_RUNERROR, "CUsbACMClassController::RunError;EUnusedFunction" );
+ __ASSERT_DEBUG( EFalse, User::Panic(KAcmCcPanicCategory, EUnusedFunction) );
+ OstTraceFunctionExit0( CUSBACMCLASSCONTROLLER_RUNERROR_EXIT );
return KErrNone;
}
--- a/usbmgmt/usbmgr/device/classdrivers/acm/classcontroller/SRC/CUsbAcmClassImpCollection.cpp Wed Jul 07 14:16:40 2010 +0800
+++ b/usbmgmt/usbmgr/device/classdrivers/acm/classcontroller/SRC/CUsbAcmClassImpCollection.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"
@@ -25,6 +25,11 @@
#include <ecom/ecom.h>
#include <ecom/implementationproxy.h>
#include "CUsbACMClassController.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "CUsbAcmClassImpCollectionTraces.h"
+#endif
+
// Define the private interface UIDs
const TImplementationProxy UsbCCImplementationTable[] =
@@ -34,8 +39,9 @@
EXPORT_C const TImplementationProxy* ImplementationGroupProxy(TInt& aTableCount)
{
+ OstTraceFunctionEntry0( USBACMCLASSIMPCONTROLLER_IMPLEMENTATIONGROUPPROXY_ENTRY );
aTableCount = sizeof(UsbCCImplementationTable) / sizeof(TImplementationProxy);
-
+ OstTraceFunctionExit0( USBACMCLASSIMPCONTROLLER_IMPLEMENTATIONGROUPPROXY_EXIT );
return UsbCCImplementationTable;
}
--- a/usbmgmt/usbmgr/device/classdrivers/acm/classcontroller/group/AcmClassController.mmp Wed Jul 07 14:16:40 2010 +0800
+++ b/usbmgmt/usbmgr/device/classdrivers/acm/classcontroller/group/AcmClassController.mmp 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"
@@ -29,4 +29,4 @@
LIBRARY acmserver.lib
-#include "AcmClassControllerBase.mmp"
+#include "AcmClassControllerBase.mmp"
\ No newline at end of file
--- a/usbmgmt/usbmgr/device/classdrivers/acm/classcontroller/group/AcmClassControllerBase.mmp Wed Jul 07 14:16:40 2010 +0800
+++ b/usbmgmt/usbmgr/device/classdrivers/acm/classcontroller/group/AcmClassControllerBase.mmp 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"
@@ -30,12 +30,11 @@
USERINCLUDE ../INC
USERINCLUDE ../../classimplementation/ecacm/public
-USERINCLUDE ../../../../../usbman/server/public
+USERINCLUDE ../../../../../usbman/server/public
+USERINCLUDE ../traces
OS_LAYER_SYSTEMINCLUDE_SYMBIAN
LIBRARY euser.lib
LIBRARY usbclasscontroller.lib
LIBRARY efsrv.lib
-
-#include <usb/usblogger.mmh>
--- a/usbmgmt/usbmgr/device/classdrivers/acm/classcontroller/group/t_regport_AcmClassController.mmp Wed Jul 07 14:16:40 2010 +0800
+++ b/usbmgmt/usbmgr/device/classdrivers/acm/classcontroller/group/t_regport_AcmClassController.mmp Wed Jul 07 15:08:54 2010 +0800
@@ -33,4 +33,4 @@
LIBRARY c32.lib
-#include "AcmClassControllerBase.mmp"
+#include "AcmClassControllerBase.mmp"
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usbmgmt/usbmgr/device/classdrivers/acm/classcontroller/traces/OstTraceDefinitions.h Wed Jul 07 15:08:54 2010 +0800
@@ -0,0 +1,7 @@
+#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
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usbmgmt/usbmgr/device/classdrivers/acm/classcontroller/traces/fixed_id.definitions Wed Jul 07 15:08:54 2010 +0800
@@ -0,0 +1,50 @@
+#Fixed group and trace id definitions. If this file is removed, the identifiers are rebuilt.
+[GROUP]TRACE_ERROR=0x82
+[GROUP]TRACE_FATAL=0x81
+[GROUP]TRACE_FLOW=0x8a
+[GROUP]TRACE_NORMAL=0x86
+[TRACE]TRACE_ERROR[0x82]_CUSBACMCLASSCONTROLLER_CONSTRUCTL=0x1
+[TRACE]TRACE_ERROR[0x82]_CUSBACMCLASSCONTROLLER_CONSTRUCTL_DUP1=0x2
+[TRACE]TRACE_ERROR[0x82]_CUSBACMCLASSCONTROLLER_CONSTRUCTL_DUP2=0x3
+[TRACE]TRACE_ERROR[0x82]_CUSBACMCLASSCONTROLLER_CONSTRUCTL_DUP3=0x4
+[TRACE]TRACE_ERROR[0x82]_CUSBACMCLASSCONTROLLER_DOSTARTL_DUP6=0x5
+[TRACE]TRACE_FATAL[0x81]_CUSBACMCLASSCONTROLLER_DOCANCEL=0x5
+[TRACE]TRACE_FATAL[0x81]_CUSBACMCLASSCONTROLLER_DOSTOP_DUP1=0x3
+[TRACE]TRACE_FATAL[0x81]_CUSBACMCLASSCONTROLLER_RUNERROR=0x6
+[TRACE]TRACE_FATAL[0x81]_CUSBACMCLASSCONTROLLER_RUNL=0x4
+[TRACE]TRACE_FATAL[0x81]_CUSBACMCLASSCONTROLLER_START=0x1
+[TRACE]TRACE_FATAL[0x81]_CUSBACMCLASSCONTROLLER_STOP=0x2
+[TRACE]TRACE_FLOW[0x8A]_CUSBACMCLASSCONTROLLER_CONSTRUCTL_ENTRY=0x7
+[TRACE]TRACE_FLOW[0x8A]_CUSBACMCLASSCONTROLLER_CONSTRUCTL_EXIT=0x8
+[TRACE]TRACE_FLOW[0x8A]_CUSBACMCLASSCONTROLLER_CUSBACMCLASSCONTROLLER_CONS_ENTRY=0x5
+[TRACE]TRACE_FLOW[0x8A]_CUSBACMCLASSCONTROLLER_CUSBACMCLASSCONTROLLER_CONS_EXIT=0x6
+[TRACE]TRACE_FLOW[0x8A]_CUSBACMCLASSCONTROLLER_CUSBACMCLASSCONTROLLER_DES_ENTRY=0x3
+[TRACE]TRACE_FLOW[0x8A]_CUSBACMCLASSCONTROLLER_CUSBACMCLASSCONTROLLER_DES_EXIT=0x4
+[TRACE]TRACE_FLOW[0x8A]_CUSBACMCLASSCONTROLLER_DOCANCEL_ENTRY=0x15
+[TRACE]TRACE_FLOW[0x8A]_CUSBACMCLASSCONTROLLER_DOCANCEL_EXIT=0x16
+[TRACE]TRACE_FLOW[0x8A]_CUSBACMCLASSCONTROLLER_DOSTARTL_ENTRY=0xb
+[TRACE]TRACE_FLOW[0x8A]_CUSBACMCLASSCONTROLLER_DOSTARTL_EXIT=0xc
+[TRACE]TRACE_FLOW[0x8A]_CUSBACMCLASSCONTROLLER_DOSTOP_ENTRY=0x11
+[TRACE]TRACE_FLOW[0x8A]_CUSBACMCLASSCONTROLLER_DOSTOP_EXIT=0x12
+[TRACE]TRACE_FLOW[0x8A]_CUSBACMCLASSCONTROLLER_GETDESCRIPTORINFO_ENTRY=0xf
+[TRACE]TRACE_FLOW[0x8A]_CUSBACMCLASSCONTROLLER_GETDESCRIPTORINFO_EXIT=0x10
+[TRACE]TRACE_FLOW[0x8A]_CUSBACMCLASSCONTROLLER_NEWL_ENTRY=0x1
+[TRACE]TRACE_FLOW[0x8A]_CUSBACMCLASSCONTROLLER_NEWL_EXIT=0x2
+[TRACE]TRACE_FLOW[0x8A]_CUSBACMCLASSCONTROLLER_RUNERROR_ENTRY=0x17
+[TRACE]TRACE_FLOW[0x8A]_CUSBACMCLASSCONTROLLER_RUNERROR_EXIT=0x18
+[TRACE]TRACE_FLOW[0x8A]_CUSBACMCLASSCONTROLLER_RUNL_ENTRY=0x13
+[TRACE]TRACE_FLOW[0x8A]_CUSBACMCLASSCONTROLLER_RUNL_EXIT=0x14
+[TRACE]TRACE_FLOW[0x8A]_CUSBACMCLASSCONTROLLER_START_ENTRY=0x9
+[TRACE]TRACE_FLOW[0x8A]_CUSBACMCLASSCONTROLLER_START_EXIT=0xa
+[TRACE]TRACE_FLOW[0x8A]_CUSBACMCLASSCONTROLLER_STOP_ENTRY=0xd
+[TRACE]TRACE_FLOW[0x8A]_CUSBACMCLASSCONTROLLER_STOP_EXIT=0xe
+[TRACE]TRACE_FLOW[0x8A]_USBACMCLASSIMPCONTROLLER_IMPLEMENTATIONGROUPPROXY_ENTRY=0x19
+[TRACE]TRACE_FLOW[0x8A]_USBACMCLASSIMPCONTROLLER_IMPLEMENTATIONGROUPPROXY_EXIT=0x1a
+[TRACE]TRACE_NORMAL[0x86]_CUSBACMCLASSCONTROLLER_DOSTARTL=0x1
+[TRACE]TRACE_NORMAL[0x86]_CUSBACMCLASSCONTROLLER_DOSTARTL_DUP1=0x2
+[TRACE]TRACE_NORMAL[0x86]_CUSBACMCLASSCONTROLLER_DOSTARTL_DUP2=0x3
+[TRACE]TRACE_NORMAL[0x86]_CUSBACMCLASSCONTROLLER_DOSTARTL_DUP3=0x4
+[TRACE]TRACE_NORMAL[0x86]_CUSBACMCLASSCONTROLLER_DOSTARTL_DUP4=0x5
+[TRACE]TRACE_NORMAL[0x86]_CUSBACMCLASSCONTROLLER_DOSTARTL_DUP5=0x7
+[TRACE]TRACE_NORMAL[0x86]_CUSBACMCLASSCONTROLLER_DOSTARTL_DUP7=0x6
+[TRACE]TRACE_NORMAL[0x86]_CUSBACMCLASSCONTROLLER_DOSTOP=0x8
--- a/usbmgmt/usbmgr/device/classdrivers/acm/classimplementation/acmserver/group/acmserver.mmp Wed Jul 07 14:16:40 2010 +0800
+++ b/usbmgmt/usbmgr/device/classdrivers/acm/classimplementation/acmserver/group/acmserver.mmp Wed Jul 07 15:08:54 2010 +0800
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2005-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"
@@ -36,12 +36,12 @@
SOURCE acmserverclient.cpp
USERINCLUDE ../inc
-USERINCLUDE ../../ecacm/public
+USERINCLUDE ../../ecacm/public
+USERINCLUDE ../traces
+
OS_LAYER_SYSTEMINCLUDE_SYMBIAN
LIBRARY euser.lib
LIBRARY c32.lib
-#include <usb/usblogger.mmh>
-
UNPAGED
--- a/usbmgmt/usbmgr/device/classdrivers/acm/classimplementation/acmserver/src/acmserver.cpp Wed Jul 07 14:16:40 2010 +0800
+++ b/usbmgmt/usbmgr/device/classdrivers/acm/classimplementation/acmserver/src/acmserver.cpp Wed Jul 07 15:08:54 2010 +0800
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2005-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,18 +22,18 @@
#include <e32base.h>
#include <usb/acmserver.h>
#include "acmserverimpl.h"
-#include <usb/usblogger.h>
#include "acmserverconsts.h"
-
-#ifdef __FLOG_ACTIVE
-_LIT8(KLogComponent, "ACMSVRCLI");
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "acmserverTraces.h"
#endif
+#ifdef _DEBUG
/** Panic category for users of RAcmServer. */
-#ifdef _DEBUG
_LIT(KAcmSrvPanicCat, "ACMSVR");
#endif
+
/** Panic codes for users of RAcmServer. */
enum TAcmServerClientPanic
{
@@ -58,68 +58,116 @@
EXPORT_C RAcmServer::RAcmServer()
: iImpl(NULL)
{
- LOG_FUNC
+ OstTraceFunctionEntry0( RACMSERVER_RACMSERVER_CONS_ENTRY );
+
+ OstTraceFunctionExit0( RACMSERVER_RACMSERVER_CONS_EXIT );
}
EXPORT_C RAcmServer::~RAcmServer()
{
- LOG_FUNC
-
- __ASSERT_DEBUG(!iImpl, _USB_PANIC(KAcmSrvPanicCat, EPanicNotClosed));
+ OstTraceFunctionEntry0( RACMSERVER_RACMSERVER_ENTRY_DES );
+ if (iImpl)
+ {
+ OstTraceExt1( TRACE_FATAL, RACMSERVER_RACMSERVER_DESTRUCTURE, "RAcmServer::~RAcmServer;iImpl=%p", iImpl );
+ __ASSERT_DEBUG( EFalse, User::Panic(KAcmSrvPanicCat, EPanicNotClosed) );
+ }
+ OstTraceFunctionExit0( RACMSERVER_RACMSERVER_EXIT_DES );
}
EXPORT_C TInt RAcmServer::Connect()
{
- LOG_FUNC
-
- __ASSERT_DEBUG(!iImpl, _USB_PANIC(KAcmSrvPanicCat, EPanicAlreadyConnected));
+ OstTraceFunctionEntry0( RACMSERVER_CONNECT_ENTRY );
+ if (iImpl)
+ {
+ OstTraceExt1( TRACE_FATAL, RACMSERVER_CONNECT, "RAcmServer::Connect;iImpl=%p", iImpl );
+ __ASSERT_DEBUG( EFalse, User::Panic(KAcmSrvPanicCat, EPanicAlreadyConnected) );
+ }
TRAPD(err, iImpl = CAcmServerImpl::NewL());
+ OstTraceFunctionExit0( RACMSERVER_CONNECT_EXIT );
return err;
}
EXPORT_C void RAcmServer::Close()
{
- LOG_FUNC
-
+ OstTraceFunctionEntry0( RACMSERVER_CLOSE_ENTRY );
+
delete iImpl;
iImpl = NULL;
+ OstTraceFunctionExit0( RACMSERVER_CLOSE_EXIT );
}
EXPORT_C TInt RAcmServer::CreateFunctions(const TUint aNoAcms)
{
- LOG_FUNC
- LOGTEXT2(_L8("\taNoAcms = %d"), aNoAcms);
+ OstTraceFunctionEntry0( RACMSERVER_CREATEFUNCTIONS_ENTRY );
+ OstTrace1( TRACE_NORMAL, RACMSERVER_CREATEFUNCTIONS, "RAcmServer::CreateFunctions;aNoAcms=%d", aNoAcms );
+
+ if (!iImpl)
+ {
+ OstTrace0( TRACE_FATAL, RACMSERVER_CREATEFUNCTIONS_DUP2, "RAcmServer::CreateFunctions;EPanicNotConnected" );
+ __ASSERT_DEBUG( EFalse, User::Panic(KAcmSrvPanicCat, EPanicNotConnected) );
+ }
- __ASSERT_DEBUG(iImpl, _USB_PANIC(KAcmSrvPanicCat, EPanicNotConnected));
- __ASSERT_DEBUG(aNoAcms, _USB_PANIC(KAcmSrvPanicCat, EPanicCantInstantiateZeroAcms));
+ if (!aNoAcms)
+ {
+ OstTrace0( TRACE_FATAL, RACMSERVER_CREATEFUNCTIONS_DUP1, "RAcmServer::CreateFunctions;EPanicCantInstantiateZeroAcms" );
+ __ASSERT_DEBUG( EFalse, User::Panic(KAcmSrvPanicCat, EPanicCantInstantiateZeroAcms) );
+ }
return iImpl->CreateFunctions(aNoAcms, KDefaultAcmProtocolNum, KControlIfcName, KDataIfcName);
}
EXPORT_C TInt RAcmServer::CreateFunctions(const TUint aNoAcms, const TUint8 aProtocolNum)
{
- LOG_FUNC
- LOGTEXT3(_L8("\taNoAcms = %d, aProtocolNum = %d"), aNoAcms, aProtocolNum);
+ OstTraceFunctionEntry0( RACMSERVER_CREATEFUNCTIONS_TUINT_TUINT8_ENTRY );
+ OstTraceExt2( TRACE_NORMAL, RACMSERVER_CREATEFUNCTIONS_TUINT_TUINT8, "RAcmServer::CreateFunctions;aNoAcms=%d;aProtocolNum=%d", aNoAcms, aProtocolNum );
- __ASSERT_DEBUG(iImpl, _USB_PANIC(KAcmSrvPanicCat, EPanicNotConnected));
- __ASSERT_DEBUG(aNoAcms, _USB_PANIC(KAcmSrvPanicCat, EPanicCantInstantiateZeroAcms));
+ if (!iImpl)
+ {
+ OstTrace0( TRACE_FATAL, RACMSERVER_CREATEFUNCTIONS_TUINT_TUINT8_DUP1, "RAcmServer::CreateFunctions;EPanicNotConnected" );
+ __ASSERT_DEBUG( EFalse, User::Panic(KAcmSrvPanicCat, EPanicNotConnected) );
+ }
+
+ if (!aNoAcms)
+ {
+ OstTrace0( TRACE_FATAL, RACMSERVER_CREATEFUNCTIONS_TUINT_TUINT8_DUP2, "RAcmServer::CreateFunctions;EPanicCantInstantiateZeroAcms" );
+ __ASSERT_DEBUG( EFalse, User::Panic(KAcmSrvPanicCat, EPanicCantInstantiateZeroAcms) );
+ }
return iImpl->CreateFunctions(aNoAcms, aProtocolNum, KControlIfcName, KDataIfcName);
}
EXPORT_C TInt RAcmServer::CreateFunctions(const TUint aNoAcms, const TUint8 aProtocolNum, const TDesC& aAcmControlIfcName, const TDesC& aAcmDataIfcName)
{
- LOG_FUNC
+ OstTraceFunctionEntry0( RACMSERVER_CREATEFUNCTIONS_TUINT_TUINT8_TDESCREF_TDESCREF_ENTRY );
+
+ if (!iImpl)
+ {
+ OstTrace0( TRACE_FATAL, RACMSERVER_CREATEFUNCTIONS_TUINT_TUINT8_TDESCREF_TDESCREF, "RAcmServer::CreateFunctions;EPanicNotConnected" );
+ __ASSERT_DEBUG( EFalse, User::Panic(KAcmSrvPanicCat, EPanicNotConnected) );
+ }
- __ASSERT_DEBUG(iImpl, _USB_PANIC(KAcmSrvPanicCat, EPanicNotConnected));
- __ASSERT_DEBUG(aNoAcms, _USB_PANIC(KAcmSrvPanicCat, EPanicCantInstantiateZeroAcms));
+ if (!aNoAcms)
+ {
+ OstTrace0( TRACE_FATAL, RACMSERVER_CREATEFUNCTIONS_TUINT_TUINT8_TDESCREF_TDESCREF_DUP1, "RAcmServer::CreateFunctions;EPanicCantInstantiateZeroAcms" );
+ __ASSERT_DEBUG( EFalse, User::Panic(KAcmSrvPanicCat, EPanicCantInstantiateZeroAcms) );
+ }
return iImpl->CreateFunctions(aNoAcms, aProtocolNum, aAcmControlIfcName, aAcmDataIfcName);
}
EXPORT_C TInt RAcmServer::DestroyFunctions(const TUint aNoAcms)
{
- LOG_FUNC
- LOGTEXT2(_L8("\taNoAcms = %d"), aNoAcms);
+ OstTraceFunctionEntry0( RACMSERVER_DESTROYFUNCTIONS_ENTRY );
+ OstTrace1( TRACE_NORMAL, RACMSERVER_DESTROYFUNCTIONS, "RAcmServer::DestroyFunctions;aNoAcms=%d", aNoAcms );
- __ASSERT_DEBUG(iImpl, _USB_PANIC(KAcmSrvPanicCat, EPanicNotConnected));
- __ASSERT_DEBUG(aNoAcms, _USB_PANIC(KAcmSrvPanicCat, EPanicCantDestroyZeroAcms));
+ if (!iImpl)
+ {
+ OstTrace0( TRACE_FATAL, RACMSERVER_DESTROYFUNCTIONS_DUP1, "RAcmServer::CreateFunctions;EPanicNotConnected" );
+ __ASSERT_DEBUG( EFalse, User::Panic(KAcmSrvPanicCat, EPanicNotConnected) );
+ }
+
+ if (!aNoAcms)
+ {
+ OstTrace0( TRACE_FATAL, RACMSERVER_DESTROYFUNCTIONS_DUP2, "RAcmServer::CreateFunctions;EPanicCantDestroyZeroAcms" );
+ __ASSERT_DEBUG( EFalse, User::Panic(KAcmSrvPanicCat, EPanicCantInstantiateZeroAcms) );
+ }
+
return iImpl->DestroyFunctions(aNoAcms);
}
--- a/usbmgmt/usbmgr/device/classdrivers/acm/classimplementation/acmserver/src/acmserverclient.cpp Wed Jul 07 14:16:40 2010 +0800
+++ b/usbmgmt/usbmgr/device/classdrivers/acm/classimplementation/acmserver/src/acmserverclient.cpp Wed Jul 07 15:08:54 2010 +0800
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2005-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"
@@ -20,25 +20,28 @@
*/
#include <e32base.h>
+#include <usb/acmserver.h>
#include "acmserverclient.h"
#include "acmserverconsts.h"
-#include <usb/usblogger.h>
-#include <usb/acmserver.h>
-
-#ifdef __FLOG_ACTIVE
-_LIT8(KLogComponent, "ACMSVRCLI");
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "acmserverclientTraces.h"
#endif
/** Constructor */
RAcmServerClient::RAcmServerClient()
{
- LOG_FUNC
+ OstTraceFunctionEntry0( RACMSERVERCLIENT_RACMSERVERCLIENT_CONS_ENTRY );
+
+ OstTraceFunctionExit0( RACMSERVERCLIENT_RACMSERVERCLIENT_CONS_EXIT );
}
/** Destructor */
RAcmServerClient::~RAcmServerClient()
{
- LOG_FUNC
+ OstTraceFunctionEntry0( RACMSERVERCLIENT_RACMSERVERCLIENT_DES_ENTRY);
+
+ OstTraceFunctionExit0( RACMSERVERCLIENT_RACMSERVERCLIENT_ENTRY_DES_EXIT );
}
/**
@@ -47,7 +50,8 @@
*/
TVersion RAcmServerClient::Version() const
{
- LOG_FUNC
+ OstTraceFunctionEntry0( RACMSERVERCLIENT_VERSION_ENTRY );
+
return TVersion( KAcmSrvMajorVersionNumber,
KAcmSrvMinorVersionNumber,
@@ -62,17 +66,17 @@
*/
TInt RAcmServerClient::Connect()
{
- LOG_FUNC
+ OstTraceFunctionEntry0( RACMSERVERCLIENT_CONNECT_ENTRY );
+
return CreateSession(KAcmServerName, Version(), 1);
}
TInt RAcmServerClient::CreateFunctions(const TUint aNoAcms, const TUint8 aProtocolNum, const TDesC& aAcmControlIfcName, const TDesC& aAcmDataIfcName)
{
- LOG_FUNC
- LOGTEXT5(_L("\taNoAcms = %d, aProtocolNum = %d, Control Ifc Name = %S, Data Ifc Name = %S"),
- aNoAcms, aProtocolNum, &aAcmControlIfcName, &aAcmDataIfcName);
-
+ OstTraceFunctionEntry0( RACMSERVERCLIENT_CREATEFUNCTIONS_ENTRY );
+ OstTraceExt4( TRACE_NORMAL, RACMSERVERCLIENT_CREATEFUNCTIONS, "RAcmServerClient::CreateFunctions;aNoAcms=%d;aProtocolNum=%d;aAcmControlIfcName=%S;aAcmDataIfcName=%S", aNoAcms, aProtocolNum, aAcmControlIfcName, aAcmDataIfcName );
+
TIpcArgs args;
args.Set(0, aNoAcms);
args.Set(1, aProtocolNum);
@@ -83,8 +87,7 @@
TInt RAcmServerClient::DestroyFunctions(const TUint aNoAcms)
{
- LOG_FUNC
- LOGTEXT2(_L8("\taNoAcms = %d"), aNoAcms);
-
+ OstTraceFunctionEntry0( RACMSERVERCLIENT_DESTROYFUNCTIONS_ENTRY );
+ OstTrace1( TRACE_NORMAL, RACMSERVERCLIENT_DESTROYFUNCTIONS, "RAcmServerClient::DestroyFunctions;aNoAcms=%d", aNoAcms );
return SendReceive(EAcmDestroyAcmFunctions, TIpcArgs(aNoAcms));
}
--- a/usbmgmt/usbmgr/device/classdrivers/acm/classimplementation/acmserver/src/acmserverimpl.cpp Wed Jul 07 14:16:40 2010 +0800
+++ b/usbmgmt/usbmgr/device/classdrivers/acm/classimplementation/acmserver/src/acmserverimpl.cpp Wed Jul 07 15:08:54 2010 +0800
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2005-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"
@@ -20,27 +20,29 @@
*/
#include <e32base.h>
+#include <acminterface.h>
#include "acmserverimpl.h"
-#include <usb/usblogger.h>
-#include <acminterface.h>
-
-#ifdef __FLOG_ACTIVE
-_LIT8(KLogComponent, "ACMSVRCLI");
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "acmserverimplTraces.h"
#endif
/** Constructor */
CAcmServerImpl::CAcmServerImpl()
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CACMSERVERIMPL_CACMSERVERIMPL_CONS_ENTRY );
+
+ OstTraceFunctionExit0( CACMSERVERIMPL_CACMSERVERIMPL_CONS_EXIT );
}
/** Destructor */
CAcmServerImpl::~CAcmServerImpl()
{
- LOG_FUNC
-
+ OstTraceFunctionEntry0( CACMSERVERIMPL_CACMSERVERIMPL_DES_ENTRY);
+
iCommServ.Close();
iAcmServerClient.Close();
+ OstTraceFunctionExit0( CACMSERVERIMPL_CACMSERVERIMPL_ENTRY_DES_EXIT );
}
/**
@@ -49,41 +51,61 @@
*/
CAcmServerImpl* CAcmServerImpl::NewL()
{
- LOG_STATIC_FUNC_ENTRY
-
+ OstTraceFunctionEntry0( CACMSERVERIMPL_NEWL_ENTRY );
+
CAcmServerImpl* self = new(ELeave) CAcmServerImpl;
CleanupStack::PushL(self);
self->ConstructL();
CleanupStack::Pop(self);
+ OstTraceFunctionExit0( CACMSERVERIMPL_NEWL_EXIT );
return self;
}
void CAcmServerImpl::ConstructL()
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CACMSERVERIMPL_CONSTRUCTL_ENTRY );
+
// In order to connect a session, the ECACM CSY must be loaded (it
// contains the server).
- LEAVEIFERRORL(iCommServ.Connect());
- LEAVEIFERRORL(iCommServ.LoadCommModule(KAcmCsyName));
+ TInt err;
+ err = iCommServ.Connect();
+ if (err < 0)
+ {
+ OstTrace1( TRACE_ERROR, CACMSERVERIMPL_CONSTRUCTL, "CAcmServerImpl::ConstructL;err=%d", err );
+ User::Leave(err);
+ }
+
+ err = iCommServ.LoadCommModule(KAcmCsyName);
+ if (err < 0)
+ {
+ OstTrace1( TRACE_ERROR, CACMSERVERIMPL_CONSTRUCTL_DUP1, "CAcmServerImpl::ConstructL;err=%d", err );
+ User::Leave(err);
+ }
+
// NB RCommServ::Close undoes LoadCommModule.
- LEAVEIFERRORL(iAcmServerClient.Connect());
+ err = iAcmServerClient.Connect();
+ if (err < 0)
+ {
+ OstTrace1( TRACE_ERROR, CACMSERVERIMPL_CONSTRUCTL_DUP2, "CAcmServerImpl::ConstructL;err=%d", err );
+ User::Leave(err);
+ }
+
// iCommServ is eventually cleaned up in our destructor. It must be held
// open at least as long as our session on the ACM server, otherwise
// there's a risk the ACM server will be pulled from under our feet.
+ OstTraceFunctionExit0( CACMSERVERIMPL_CONSTRUCTL_EXIT );
}
TInt CAcmServerImpl::CreateFunctions(const TUint aNoAcms, const TUint8 aProtocolNum, const TDesC& aAcmControlIfcName, const TDesC& aAcmDataIfcName)
{
- LOG_FUNC
-
+ OstTraceFunctionEntry0( CACMSERVERIMPL_CREATEFUNCTIONS_ENTRY );
return iAcmServerClient.CreateFunctions(aNoAcms, aProtocolNum, aAcmControlIfcName, aAcmDataIfcName);
}
TInt CAcmServerImpl::DestroyFunctions(const TUint aNoAcms)
{
- LOG_FUNC
- LOGTEXT2(_L8("\taNoAcms = %d"), aNoAcms);
-
+ OstTraceFunctionEntry0( CACMSERVERIMPL_DESTROYFUNCTIONS_ENTRY );
+ OstTrace1( TRACE_NORMAL, CACMSERVERIMPL_DESTROYFUNCTIONS, "CAcmServerImpl::DestroyFunctions;aNoAcms=%d", aNoAcms );
return iAcmServerClient.DestroyFunctions(aNoAcms);
}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usbmgmt/usbmgr/device/classdrivers/acm/classimplementation/acmserver/traces/OstTraceDefinitions.h Wed Jul 07 15:08:54 2010 +0800
@@ -0,0 +1,7 @@
+#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
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usbmgmt/usbmgr/device/classdrivers/acm/classimplementation/acmserver/traces/fixed_id.definitions Wed Jul 07 15:08:54 2010 +0800
@@ -0,0 +1,54 @@
+#Fixed group and trace id definitions. If this file is removed, the identifiers are rebuilt.
+[GROUP]TRACE_ERROR=0x82
+[GROUP]TRACE_FATAL=0x81
+[GROUP]TRACE_FLOW=0x8a
+[GROUP]TRACE_NORMAL=0x86
+[TRACE]TRACE_ERROR[0x82]_CACMSERVERIMPL_CONSTRUCTL=0x1
+[TRACE]TRACE_ERROR[0x82]_CACMSERVERIMPL_CONSTRUCTL_DUP1=0x2
+[TRACE]TRACE_ERROR[0x82]_CACMSERVERIMPL_CONSTRUCTL_DUP2=0x3
+[TRACE]TRACE_FATAL[0x81]_RACMSERVER_CONNECT=0x2
+[TRACE]TRACE_FATAL[0x81]_RACMSERVER_CREATEFUNCTIONS_DUP1=0x4
+[TRACE]TRACE_FATAL[0x81]_RACMSERVER_CREATEFUNCTIONS_DUP2=0x3
+[TRACE]TRACE_FATAL[0x81]_RACMSERVER_CREATEFUNCTIONS_TUINT_TUINT8_DUP1=0x5
+[TRACE]TRACE_FATAL[0x81]_RACMSERVER_CREATEFUNCTIONS_TUINT_TUINT8_DUP2=0x6
+[TRACE]TRACE_FATAL[0x81]_RACMSERVER_CREATEFUNCTIONS_TUINT_TUINT8_TDESCREF_TDESCREF=0x7
+[TRACE]TRACE_FATAL[0x81]_RACMSERVER_CREATEFUNCTIONS_TUINT_TUINT8_TDESCREF_TDESCREF_DUP1=0x8
+[TRACE]TRACE_FATAL[0x81]_RACMSERVER_DESTROYFUNCTIONS_DUP1=0x9
+[TRACE]TRACE_FATAL[0x81]_RACMSERVER_DESTROYFUNCTIONS_DUP2=0xa
+[TRACE]TRACE_FATAL[0x81]_RACMSERVER_RACMSERVER_DESTRUCTURE=0x1
+[TRACE]TRACE_FLOW[0x8A]_CACMSERVERIMPL_CACMSERVERIMPL_CONS_ENTRY=0x15
+[TRACE]TRACE_FLOW[0x8A]_CACMSERVERIMPL_CACMSERVERIMPL_CONS_EXIT=0x16
+[TRACE]TRACE_FLOW[0x8A]_CACMSERVERIMPL_CACMSERVERIMPL_DES_ENTRY=0x17
+[TRACE]TRACE_FLOW[0x8A]_CACMSERVERIMPL_CACMSERVERIMPL_ENTRY_DES_EXIT=0x18
+[TRACE]TRACE_FLOW[0x8A]_CACMSERVERIMPL_CONSTRUCTL_ENTRY=0x1b
+[TRACE]TRACE_FLOW[0x8A]_CACMSERVERIMPL_CONSTRUCTL_EXIT=0x1c
+[TRACE]TRACE_FLOW[0x8A]_CACMSERVERIMPL_CREATEFUNCTIONS_ENTRY=0x1d
+[TRACE]TRACE_FLOW[0x8A]_CACMSERVERIMPL_DESTROYFUNCTIONS_ENTRY=0x1e
+[TRACE]TRACE_FLOW[0x8A]_CACMSERVERIMPL_NEWL_ENTRY=0x19
+[TRACE]TRACE_FLOW[0x8A]_CACMSERVERIMPL_NEWL_EXIT=0x1a
+[TRACE]TRACE_FLOW[0x8A]_RACMSERVERCLIENT_CONNECT_ENTRY=0x12
+[TRACE]TRACE_FLOW[0x8A]_RACMSERVERCLIENT_CREATEFUNCTIONS_ENTRY=0x13
+[TRACE]TRACE_FLOW[0x8A]_RACMSERVERCLIENT_DESTROYFUNCTIONS_ENTRY=0x14
+[TRACE]TRACE_FLOW[0x8A]_RACMSERVERCLIENT_RACMSERVERCLIENT_CONS_ENTRY=0xd
+[TRACE]TRACE_FLOW[0x8A]_RACMSERVERCLIENT_RACMSERVERCLIENT_CONS_EXIT=0xe
+[TRACE]TRACE_FLOW[0x8A]_RACMSERVERCLIENT_RACMSERVERCLIENT_DES_ENTRY=0xf
+[TRACE]TRACE_FLOW[0x8A]_RACMSERVERCLIENT_RACMSERVERCLIENT_ENTRY_DES_EXIT=0x10
+[TRACE]TRACE_FLOW[0x8A]_RACMSERVERCLIENT_VERSION_ENTRY=0x11
+[TRACE]TRACE_FLOW[0x8A]_RACMSERVER_CLOSE_ENTRY=0x7
+[TRACE]TRACE_FLOW[0x8A]_RACMSERVER_CLOSE_EXIT=0x8
+[TRACE]TRACE_FLOW[0x8A]_RACMSERVER_CONNECT_ENTRY=0x5
+[TRACE]TRACE_FLOW[0x8A]_RACMSERVER_CONNECT_EXIT=0x6
+[TRACE]TRACE_FLOW[0x8A]_RACMSERVER_CREATEFUNCTIONS_ENTRY=0x9
+[TRACE]TRACE_FLOW[0x8A]_RACMSERVER_CREATEFUNCTIONS_TUINT_TUINT8_ENTRY=0xa
+[TRACE]TRACE_FLOW[0x8A]_RACMSERVER_CREATEFUNCTIONS_TUINT_TUINT8_TDESCREF_TDESCREF_ENTRY=0xb
+[TRACE]TRACE_FLOW[0x8A]_RACMSERVER_DESTROYFUNCTIONS_ENTRY=0xc
+[TRACE]TRACE_FLOW[0x8A]_RACMSERVER_RACMSERVER_CONS_ENTRY=0x1
+[TRACE]TRACE_FLOW[0x8A]_RACMSERVER_RACMSERVER_CONS_EXIT=0x2
+[TRACE]TRACE_FLOW[0x8A]_RACMSERVER_RACMSERVER_ENTRY_DES=0x3
+[TRACE]TRACE_FLOW[0x8A]_RACMSERVER_RACMSERVER_EXIT_DES=0x4
+[TRACE]TRACE_NORMAL[0x86]_CACMSERVERIMPL_DESTROYFUNCTIONS=0x6
+[TRACE]TRACE_NORMAL[0x86]_RACMSERVERCLIENT_CREATEFUNCTIONS=0x4
+[TRACE]TRACE_NORMAL[0x86]_RACMSERVERCLIENT_DESTROYFUNCTIONS=0x5
+[TRACE]TRACE_NORMAL[0x86]_RACMSERVER_CREATEFUNCTIONS=0x1
+[TRACE]TRACE_NORMAL[0x86]_RACMSERVER_CREATEFUNCTIONS_TUINT_TUINT8=0x2
+[TRACE]TRACE_NORMAL[0x86]_RACMSERVER_DESTROYFUNCTIONS=0x3
--- a/usbmgmt/usbmgr/device/classdrivers/acm/classimplementation/ecacm/group/ECACM.MMP Wed Jul 07 14:16:40 2010 +0800
+++ b/usbmgmt/usbmgr/device/classdrivers/acm/classimplementation/ecacm/group/ECACM.MMP 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"
@@ -60,6 +60,7 @@
USERINCLUDE ../inc
USERINCLUDE ../public
+USERINCLUDE ../traces
OS_LAYER_SYSTEMINCLUDE_SYMBIAN
@@ -67,8 +68,7 @@
LIBRARY c32.lib
LIBRARY efsrv.lib
-#include <usb/usblogger.mmh>
-
VENDORID 0x70000001
UNPAGED
+
--- a/usbmgmt/usbmgr/device/classdrivers/acm/classimplementation/ecacm/src/AcmPort.cpp Wed Jul 07 14:16:40 2010 +0800
+++ b/usbmgmt/usbmgr/device/classdrivers/acm/classimplementation/ecacm/src/AcmPort.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"
@@ -16,16 +16,15 @@
*/
#include <acminterface.h>
-#include <usb/usblogger.h>
#include "AcmPort.h"
#include "AcmPortFactory.h"
#include "AcmUtils.h"
#include "AcmWriter.h"
#include "AcmReader.h"
#include "AcmPanic.h"
-
-#ifdef __FLOG_ACTIVE
-_LIT8(KLogComponent, "ECACM");
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "AcmPortTraces.h"
#endif
const TUint KCapsRate=( KCapsBps50
@@ -94,12 +93,13 @@
* @return Ownership of a newly created CAcmPort object
*/
{
- LOG_STATIC_FUNC_ENTRY
-
+ OstTraceFunctionEntry0( CACMPORT_NEWL_ENTRY );
+
CAcmPort* self = new(ELeave) CAcmPort(aUnit, aFactory);
CleanupClosePushL(*self);
self->ConstructL();
CleanupStack::Pop();
+ OstTraceFunctionExit0( CACMPORT_NEWL_EXIT );
return self;
}
@@ -109,12 +109,20 @@
* port.
*/
{
+ OstTraceFunctionEntry0( CACMPORT_CONSTRUCTL_ENTRY );
+
iReader = CAcmReader::NewL(*this, KDefaultBufferSize);
iWriter = CAcmWriter::NewL(*this, KDefaultBufferSize);
TName name;
+ TInt err;
name.Num(iUnit);
- LEAVEIFERRORL(SetName(&name));
+ err = SetName(&name);
+ if (err < 0)
+ {
+ OstTrace1( TRACE_FATAL, CACMPORT_CONSTRUCTL, "CAcmPort::ConstructL;err=%d", err );
+ User::Leave(err);
+ }
iCommServerConfig.iBufFlags = 0;
iCommServerConfig.iBufSize = iReader->BufSize();
@@ -133,6 +141,7 @@
iCommConfig.iParityErrorChar= 0;
iCommConfig.iSIREnable = ESIRDisable;
iCommConfig.iSIRSettings = 0;
+ OstTraceFunctionExit0( CACMPORT_CONSTRUCTL_EXIT );
}
CAcmPort::CAcmPort(const TUint aUnit, MAcmPortObserver& aObserver)
@@ -147,6 +156,8 @@
* @param aUnit The port number.
*/
{
+ OstTraceFunctionEntry0( CACMPORT_CACMPORT_CONS_ENTRY );
+ OstTraceFunctionExit0( CACMPORT_CACMPORT_DES_EXIT );
}
void CAcmPort::StartRead(const TAny* aClientBuffer, TInt aLength)
@@ -157,26 +168,30 @@
* @param aLength number of bytes to read
*/
{
- LOG_LINE
- LOG_FUNC
- LOGTEXT3(_L8("\taClientBuffer=0x%08x, aLength=%d"),
- aClientBuffer, aLength);
+ OstTraceFunctionEntry0( CACMPORT_STARTREAD_ENTRY );
+ OstTraceExt2( TRACE_NORMAL, CACMPORT_STARTREAD, "CAcmPort::StartRead;aClientBuffer=%p;aLength=%d", aClientBuffer, aLength );
if ( !iAcm )
{
- LOGTEXT(_L8("\t***access denied"));
+ OstTrace0( TRACE_NORMAL, CACMPORT_STARTREAD_DUP1, "CAcmPort::StartRead;\t***access denied" );
ReadCompleted(KErrAccessDenied);
+ OstTraceFunctionExit0( CACMPORT_STARTREAD_EXIT );
return;
}
// Analyse the request and call the relevant API on the data reader. NB We
// do not pass requests for zero bytes to the data reader. They are an
// RComm oddity we should handle here.
- __ASSERT_DEBUG(iReader, _USB_PANIC(KAcmPanicCat, EPanicInternalError));
+ if (!iReader)
+ {
+ OstTraceExt1( TRACE_FATAL, CACMPORT_STARTREAD_DUP3, "CAcmPort::StartRead;iReader=%p", iReader );
+ __ASSERT_DEBUG( EFalse, User::Panic(KAcmPanicCat, EPanicInternalError) );
+ }
if(iReader->IsNotifyDataAvailableQueryPending())
{
ReadCompleted(KErrInUse);
+ OstTraceFunctionExit0( CACMPORT_STARTREAD_EXIT_DUP1 );
return;
}
@@ -192,9 +207,10 @@
{
// Obscure RComm API feature- complete zero-length Read immediately,
// to indicate that the hardware is powered up.
- LOGTEXT(_L8("\tcompleting immediately with KErrNone"));
+ OstTrace0( TRACE_NORMAL, CACMPORT_STARTREAD_DUP2, "CAcmPort::StartRead;\tcompleting immediately with KErrNone" );
ReadCompleted(KErrNone);
}
+ OstTraceFunctionExit0( CACMPORT_STARTREAD_EXIT_DUP2 );
}
void CAcmPort::ReadCancel()
@@ -202,17 +218,21 @@
* Downcall from C32. Cancel a read.
*/
{
- LOG_LINE
- LOG_FUNC
-
+ OstTraceFunctionEntry0( CACMPORT_READCANCEL_ENTRY );
if ( !iAcm )
{
- LOGTEXT(_L8("\t***access denied"));
+ OstTrace0( TRACE_NORMAL, CACMPORT_READCANCEL, "CAcmPort::ReadCancel;\t***access denied" );
+ OstTraceFunctionExit0( CACMPORT_READCANCEL_EXIT );
return;
}
- __ASSERT_DEBUG(iReader, _USB_PANIC(KAcmPanicCat, EPanicInternalError));
+ if (!iReader)
+ {
+ OstTraceExt1( TRACE_FATAL, CACMPORT_READCANCEL_DUP1, "CAcmPort::ReadCancel;iReader=%p", iReader );
+ __ASSERT_DEBUG( EFalse, User::Panic(KAcmPanicCat, EPanicInternalError) );
+ }
iReader->ReadCancel();
+ OstTraceFunctionExit0( CACMPORT_READCANCEL_EXIT_DUP1 );
}
TInt CAcmPort::QueryReceiveBuffer(TInt& aLength) const
@@ -223,18 +243,23 @@
* @return Error.
*/
{
- LOG_LINE
- LOG_FUNC
+ OstTraceFunctionEntry0( CACMPORT_QUERYRECEIVEBUFFER_ENTRY );
if ( !iAcm )
{
- LOGTEXT(_L8("\t***access denied"));
+ OstTrace0( TRACE_NORMAL, CACMPORT_QUERYRECEIVEBUFFER, "CAcmPort::QueryReceiveBuffer;\t***access denied" );
+ OstTraceFunctionExit0( CACMPORT_QUERYRECEIVEBUFFER_EXIT );
return KErrAccessDenied;
}
- __ASSERT_DEBUG(iReader, _USB_PANIC(KAcmPanicCat, EPanicInternalError));
+ if (!iReader)
+ {
+ OstTraceExt1( TRACE_FATAL, CACMPORT_QUERYRECEIVEBUFFER_DUP2, "CAcmPort::QueryReceiveBuffer;iReader=%p", iReader );
+ __ASSERT_DEBUG( EFalse, User::Panic(KAcmPanicCat, EPanicInternalError) );
+ }
aLength = static_cast<TInt>(iReader->BufLen());
- LOGTEXT2(_L8("\tlength=%d"), aLength);
+ OstTrace1( TRACE_NORMAL, CACMPORT_QUERYRECEIVEBUFFER_DUP1, "CAcmPort::QueryReceiveBuffer;aLength=%d", aLength );
+ OstTraceFunctionExit0( CACMPORT_QUERYRECEIVEBUFFER_EXIT_DUP1 );
return KErrNone;
}
@@ -245,24 +270,32 @@
* @param aFlags Flags indicating which buffer(s) to reset.
*/
{
- LOG_LINE
- LOGTEXT2(_L8(">>CAcmPort::ResetBuffers aFlags = %d"), aFlags);
+ OstTraceFunctionEntry0( CACMPORT_RESETBUFFERS_ENTRY );
+ OstTrace1( TRACE_NORMAL, CACMPORT_RESETBUFFERS, "CAcmPort::ResetBuffers;aFlags=%d", aFlags );
if ( aFlags & KCommResetRx )
{
- LOGTEXT(_L8("\tresetting Rx buffer"));
- __ASSERT_DEBUG(iReader, _USB_PANIC(KAcmPanicCat, EPanicInternalError));
+ OstTrace0( TRACE_NORMAL, CACMPORT_RESETBUFFERS_DUP1, "CAcmPort::ResetBuffers;\tresetting Rx buffer" );
+ if (!iReader)
+ {
+ OstTraceExt1( TRACE_FATAL, CACMPORT_RESETBUFFERS_DUP3, "CAcmPort::ResetBuffers;iReader=%p", iReader );
+ __ASSERT_DEBUG( EFalse, User::Panic(KAcmPanicCat, EPanicInternalError) );
+ }
iReader->ResetBuffer();
}
if ( aFlags & KCommResetTx )
{
- LOGTEXT(_L8("\tresetting Tx buffer"));
- __ASSERT_DEBUG(iWriter, _USB_PANIC(KAcmPanicCat, EPanicInternalError));
+ OstTrace0( TRACE_NORMAL, CACMPORT_RESETBUFFERS_DUP2, "CAcmPort::ResetBuffers;\tresetting Tx buffer" );
+ if (!iWriter)
+ {
+ OstTraceExt1( TRACE_FATAL, CACMPORT_RESETBUFFERS_DUP4, "CAcmPort::ResetBuffers;iWriter=%p", iWriter );
+ __ASSERT_DEBUG( EFalse, User::Panic(KAcmPanicCat, EPanicInternalError) );
+ }
iWriter->ResetBuffer();
}
- LOGTEXT(_L8("<<CAcmPort::ResetBuffers"));
+ OstTraceFunctionExit0( CACMPORT_RESETBUFFERS_EXIT );
}
void CAcmPort::StartWrite(const TAny* aClientBuffer, TInt aLength)
@@ -273,32 +306,35 @@
* @param aLength number of bytes to write
*/
{
- LOG_LINE
- LOG_FUNC
- LOGTEXT3(_L8("\taClientBuffer=0x%08x, aLength=%d"),
- aClientBuffer, aLength);
+ OstTraceFunctionEntry0( CACMPORT_STARTWRITE_ENTRY );
+ OstTraceExt2( TRACE_NORMAL, CACMPORT_STARTWRITE, "CAcmPort::StartWrite;aClientBuffer=%p;aLength=%d", aClientBuffer, aLength );
if ( !iAcm )
{
- LOGTEXT(_L8("\t***access denied"));
+ OstTrace0( TRACE_NORMAL, CACMPORT_STARTWRITE_DUP1, "CAcmPort::StartWrite;\t***access denied" );
WriteCompleted(KErrAccessDenied);
+ OstTraceFunctionExit0( CACMPORT_STARTWRITE_EXIT );
return;
}
if ( aLength < 0 )
{
// Negative length makes no sense.
- LOGTEXT(_L8("\taLength is negative- "
- "completing immediately with KErrArgument"));
+ OstTrace0( TRACE_NORMAL, CACMPORT_STARTWRITE_DUP2, "CAcmPort::StartWrite;\taLength is negative-completing immediately with KErrArgument" );
WriteCompleted(KErrArgument);
+ OstTraceFunctionExit0( CACMPORT_STARTWRITE_EXIT_DUP1 );
return;
}
// NB We pass zero-byte writes down to the LDD as normal. This results in
// a zero-length packet being sent to the host.
-
- __ASSERT_DEBUG(iWriter, _USB_PANIC(KAcmPanicCat, EPanicInternalError));
+ if (!iWriter)
+ {
+ OstTraceExt1( TRACE_FATAL, CACMPORT_STARTWRITE_DUP3, "CAcmPort::StartWrite;iWriter=%p", iWriter );
+ __ASSERT_DEBUG( EFalse, User::Panic(KAcmPanicCat, EPanicInternalError) );
+ }
iWriter->Write(aClientBuffer, static_cast<TUint>(aLength));
+ OstTraceFunctionExit0( CACMPORT_STARTWRITE_EXIT_DUP2 );
}
void CAcmPort::WriteCancel()
@@ -306,17 +342,22 @@
* Downcall from C32. Cancel a pending write
*/
{
- LOG_LINE
- LOG_FUNC
+ OstTraceFunctionEntry0( CACMPORT_WRITECANCEL_ENTRY );
if ( !iAcm )
{
- LOGTEXT(_L8("\t***access denied"));
+ OstTrace0( TRACE_NORMAL, CACMPORT_WRITECANCEL, "CAcmPort::WriteCancel;\t***access denied" );
+ OstTraceFunctionExit0( CACMPORT_WRITECANCEL_EXIT );
return;
}
- __ASSERT_DEBUG(iWriter, _USB_PANIC(KAcmPanicCat, EPanicInternalError));
+ if (!iWriter)
+ {
+ OstTraceExt1( TRACE_FATAL,CACMPORT_WRITECANCEL_DUP1, "CAcmPort::WriteCancel;iWriter=%p", iWriter );
+ __ASSERT_DEBUG( EFalse, User::Panic(KAcmPanicCat, EPanicInternalError) );
+ }
iWriter->WriteCancel();
+ OstTraceFunctionExit0( CACMPORT_WRITECANCEL_EXIT_DUP1 );
}
void CAcmPort::Break(TInt aTime)
@@ -328,13 +369,13 @@
* @param aTime Length of break in microseconds
*/
{
- LOG_LINE
- LOG_FUNC
- LOGTEXT2(_L8("\taTime=%d (microseconds)"), aTime);
+ OstTraceFunctionEntry0( CACMPORT_BREAK_ENTRY );
+ OstTrace1( TRACE_NORMAL, CACMPORT_BREAK, "CAcmPort::Break;\taTime=%d (microseconds)", aTime );
if ( !iAcm )
{
- LOGTEXT(_L8("\t***access denied"));
+ OstTrace0( TRACE_NORMAL, CACMPORT_BREAK_DUP1, "CAcmPort::Break;\t***access denied" );
+ OstTraceFunctionExit0( CACMPORT_BREAK_EXIT );
return;
}
@@ -346,15 +387,16 @@
TInt err = iAcm->BreakRequest(CBreakController::EDevice,
CBreakController::ETiming,
TTimeIntervalMicroSeconds32(aTime));
- LOGTEXT2(_L8("\tBreakRequest = %d"), err);
+ OstTrace1( TRACE_NORMAL, CACMPORT_BREAK_DUP2, "CAcmPort::Break;\tBreakRequest = %d", err );
// Note that the break controller may refuse our request if a host-driven
// break is outstanding.
if ( err )
{
- LOGTEXT2(_L8("\tcalling BreakCompleted with %d"), err);
+ OstTrace1( TRACE_NORMAL, CACMPORT_BREAK_DUP3, "CAcmPort::Break;\tcalling BreakCompleted with %d", err );
iBreak = EFalse;
BreakCompleted(err);
}
+ OstTraceFunctionExit0( CACMPORT_BREAK_EXIT_DUP1 );
}
void CAcmPort::BreakCancel()
@@ -362,22 +404,20 @@
* Downcall from C32. Cancel a pending break.
*/
{
- LOG_LINE
- LOG_FUNC
-
+ OstTraceFunctionEntry0( CACMPORT_BREAKCANCEL_ENTRY );
if ( !iAcm )
{
- LOGTEXT(_L8("\t***access denied"));
+ OstTrace0( TRACE_NORMAL, CACMPORT_BREAKCANCEL, "CAcmPort::BreakCancel;\t***access denied" );
+ OstTraceFunctionExit0( CACMPORT_BREAKCANCEL_EXIT );
return;
}
iCancellingBreak = ETrue;
-
TInt err = iAcm->BreakRequest(CBreakController::EDevice,
CBreakController::EInactive);
// Note that the device cannot turn off a break if there's a host-driven
// break in progress.
- LOGTEXT2(_L8("\tBreakRequest = %d"), err);
+ OstTrace1( TRACE_NORMAL, CACMPORT_BREAKCANCEL_DUP1, "CAcmPort::BreakCancel;\tBreakRequest = %d", err );
if ( err )
{
iCancellingBreak = EFalse;
@@ -386,6 +426,7 @@
// Whether BreakOff worked or not, reset our flag saying we're no longer
// interested in any subsequent completion anyway.
iBreak = EFalse;
+ OstTraceFunctionExit0( CACMPORT_BREAKCANCEL_EXIT_DUP1 );
}
TInt CAcmPort::GetConfig(TDes8& aDes) const
@@ -396,43 +437,39 @@
* @return Error.
*/
{
- LOG_LINE
- LOG_FUNC
-
+ OstTraceFunctionEntry0( CACMPORT_GETCONFIG_ENTRY );
if ( !iAcm )
{
- LOGTEXT(_L8("\t***access denied"));
+ OstTrace0( TRACE_NORMAL, CACMPORT_GETCONFIG, "CAcmPort::GetConfig;\t***access denied" );
+ OstTraceFunctionExit0( CACMPORT_GETCONFIG_EXIT );
return KErrAccessDenied;
}
if ( aDes.Length() < static_cast<TInt>(sizeof(TCommConfigV01)) )
{
- LOGTEXT(_L8("\t***not supported"));
+ OstTrace0( TRACE_NORMAL, CACMPORT_GETCONFIG_DUP12, "CAcmPort::GetConfig;\t***not supported" );
+ OstTraceFunctionExit0( CACMPORT_GETCONFIG_EXIT_DUP1 );
return KErrNotSupported;
}
TCommConfig commConfigPckg;
TCommConfigV01& commConfig = commConfigPckg();
commConfig = iCommConfig;
+ aDes.Copy(commConfigPckg);
- aDes.Copy(commConfigPckg);
+ OstTrace1( TRACE_NORMAL, CACMPORT_GETCONFIG_DUP1, "CAcmPort::GetConfig;\tiCommConfig.iRate=%d", iCommConfig.iRate );
+ OstTrace1( TRACE_NORMAL, CACMPORT_GETCONFIG_DUP2, "CAcmPort::GetConfig;\tiCommConfig.iDataBits = %d", iCommConfig.iDataBits );
+ OstTrace1( TRACE_NORMAL, CACMPORT_GETCONFIG_DUP3, "CAcmPort::GetConfig;\tiCommConfig.iStopBits = %d", iCommConfig.iStopBits );
+ OstTrace1( TRACE_NORMAL, CACMPORT_GETCONFIG_DUP4, "CAcmPort::GetConfig;\tiCommConfig.iParity = %d", iCommConfig.iParity );
+ OstTrace1( TRACE_NORMAL, CACMPORT_GETCONFIG_DUP5, "CAcmPort::GetConfig;\tiCommConfig.iHandshake = %d", iCommConfig.iHandshake );
+ OstTrace1( TRACE_NORMAL, CACMPORT_GETCONFIG_DUP6, "CAcmPort::GetConfig;\tiCommConfig.iParityError = %d", iCommConfig.iParityError );
+ OstTrace1( TRACE_NORMAL, CACMPORT_GETCONFIG_DUP7, "CAcmPort::GetConfig;\tiCommConfig.iFifo = %d", iCommConfig.iFifo );
+ OstTrace1( TRACE_NORMAL, CACMPORT_GETCONFIG_DUP8, "CAcmPort::GetConfig;\tiCommConfig.iSpecialRate = %d", iCommConfig.iSpecialRate );
+ OstTrace1( TRACE_NORMAL, CACMPORT_GETCONFIG_DUP9, "CAcmPort::GetConfig;\tiCommConfig.iTerminatorCount = %d", iCommConfig.iTerminatorCount );
+ OstTrace1( TRACE_NORMAL, CACMPORT_GETCONFIG_DUP10, "CAcmPort::GetConfig;\tiCommConfig.iSIREnable = %d", iCommConfig.iSIREnable );
+ OstTrace1( TRACE_NORMAL, CACMPORT_GETCONFIG_DUP11, "CAcmPort::GetConfig;\tiCommConfig.iSIRSettings = %d", iCommConfig.iSIRSettings );
- LOGTEXT2(_L8("\tiCommConfig.iRate = %d"), iCommConfig.iRate);
- LOGTEXT2(_L8("\tiCommConfig.iDataBits = %d"), iCommConfig.iDataBits);
- LOGTEXT2(_L8("\tiCommConfig.iStopBits = %d"), iCommConfig.iStopBits);
- LOGTEXT2(_L8("\tiCommConfig.iParity = %d"), iCommConfig.iParity);
- LOGTEXT2(_L8("\tiCommConfig.iHandshake = %d"), iCommConfig.iHandshake);
- LOGTEXT2(_L8("\tiCommConfig.iParityError = %d"),
- iCommConfig.iParityError);
- LOGTEXT2(_L8("\tiCommConfig.iFifo = %d"), iCommConfig.iFifo);
- LOGTEXT2(_L8("\tiCommConfig.iSpecialRate = %d"),
- iCommConfig.iSpecialRate);
- LOGTEXT2(_L8("\tiCommConfig.iTerminatorCount = %d"),
- iCommConfig.iTerminatorCount);
- LOGTEXT2(_L8("\tiCommConfig.iSIREnable = %d"), iCommConfig.iSIREnable);
- LOGTEXT2(_L8("\tiCommConfig.iSIRSettings = %d"),
- iCommConfig.iSIRSettings);
-
+ OstTraceFunctionExit0( CACMPORT_GETCONFIG_EXIT_DUP2 );
return KErrNone;
}
@@ -444,24 +481,20 @@
* @return Error
*/
{
- LOG_LINE
- LOG_FUNC
-
+ OstTraceFunctionEntry0( CACMPORT_SETCONFIG_ENTRY );
if ( !iAcm )
{
- LOGTEXT(_L8("\t***access denied"));
+ OstTrace0( TRACE_NORMAL, CACMPORT_SETCONFIG, "CAcmPort::SetConfig;\t***access denied" );
+ OstTraceFunctionExit0( CACMPORT_SETCONFIG_EXIT );
return KErrAccessDenied;
}
- LOGTEXT4(_L8("\tlength of argument %d, TCommConfigV01 %d, "
- "TCommConfigV02 %d"),
- aDes.Length(),
- (TInt)sizeof(TCommConfigV01),
- (TInt)sizeof(TCommConfigV02));
-
+ OstTraceExt3( TRACE_NORMAL, CACMPORT_SETCONFIG_DUP1, "CAcmPort::SetConfig;\tlength of argument=%d;TCommConfigV01=%d;TCommConfigV02=%d", aDes.Length(), (TInt)sizeof(TCommConfigV01), (TInt)sizeof(TCommConfigV02) );
+
if ( aDes.Length() < static_cast<TInt>(sizeof(TCommConfigV01)) )
{
- LOGTEXT(_L8("\t***not supported"));
+ OstTrace0( TRACE_NORMAL, CACMPORT_SETCONFIG_DUP2, "CAcmPort::SetConfig;\t***not supported" );
+ OstTraceFunctionExit0( CACMPORT_SETCONFIG_EXIT_DUP1 );
return KErrNotSupported;
}
@@ -469,18 +502,17 @@
configPckg.Copy(aDes);
TCommConfigV01& config = configPckg();
- LOGTEXT2(_L8("\tiCommConfig.iRate = %d"), config.iRate);
- LOGTEXT2(_L8("\tiCommConfig.iDataBits = %d"), config.iDataBits);
- LOGTEXT2(_L8("\tiCommConfig.iStopBits = %d"), config.iStopBits);
- LOGTEXT2(_L8("\tiCommConfig.iParity = %d"), config.iParity);
- LOGTEXT2(_L8("\tiCommConfig.iHandshake = %d"), config.iHandshake);
- LOGTEXT2(_L8("\tiCommConfig.iParityError = %d"), config.iParityError);
- LOGTEXT2(_L8("\tiCommConfig.iFifo = %d"), config.iFifo);
- LOGTEXT2(_L8("\tiCommConfig.iSpecialRate = %d"), config.iSpecialRate);
- LOGTEXT2(_L8("\tiCommConfig.iTerminatorCount = %d"),
- config.iTerminatorCount);
- LOGTEXT2(_L8("\tiCommConfig.iSIREnable = %d"), config.iSIREnable);
- LOGTEXT2(_L8("\tiCommConfig.iSIRSettings = %d"), config.iSIRSettings);
+ OstTrace1( TRACE_DUMP, CACMPORT_SETCONFIG_DUP3, "CAcmPort::SetConfig;\tconfig.iRate=%d", config.iRate );
+ OstTrace1( TRACE_DUMP, CACMPORT_SETCONFIG_DUP4, "CAcmPort::SetConfig;\tconfig.iDataBits=%d", config.iDataBits );
+ OstTrace1( TRACE_DUMP, CACMPORT_SETCONFIG_DUP5, "CAcmPort::SetConfig;\tconfig.iStopBits=%d", config.iStopBits );
+ OstTrace1( TRACE_DUMP, CACMPORT_SETCONFIG_DUP6, "CAcmPort::SetConfig;\tconfig.iParity=%d", config.iParity );
+ OstTrace1( TRACE_DUMP, CACMPORT_SETCONFIG_DUP7, "CAcmPort::SetConfig;\tconfig.iHandshake=%d", config.iHandshake );
+ OstTrace1( TRACE_DUMP, CACMPORT_SETCONFIG_DUP8, "CAcmPort::SetConfig;\tconfig.iParityError=%d", config.iParityError );
+ OstTrace1( TRACE_DUMP, CACMPORT_SETCONFIG_DUP9, "CAcmPort::SetConfig;\tconfig.iFifo=%d", config.iFifo );
+ OstTrace1( TRACE_DUMP, CACMPORT_SETCONFIG_DUP10, "CAcmPort::SetConfig;\tconfig.iSpecialRate=%d", config.iSpecialRate );
+ OstTrace1( TRACE_DUMP, CACMPORT_SETCONFIG_DUP11, "CAcmPort::SetConfig;\tconfig.iTerminatorCount=%d", config.iTerminatorCount );
+ OstTrace1( TRACE_DUMP, CACMPORT_SETCONFIG_DUP12, "CAcmPort::SetConfig;\tconfig.iSIREnable=%d", config.iSIREnable );
+ OstTrace1( TRACE_DUMP, CACMPORT_SETCONFIG_DUP13, "CAcmPort::SetConfig;\tconfig.iSIRSettings=%d", config.iSIRSettings );
// Tell the reader object about the new terminators. Pass the whole config
// struct by reference for ease.
@@ -493,6 +525,7 @@
config.iHandshake);
iCommConfig = config;
+ OstTraceFunctionExit0( CACMPORT_SETCONFIG_EXIT_DUP2 );
return KErrNone;
}
@@ -510,12 +543,14 @@
* @param aHandshake New handshake setting
*/
{
- LOGTEXT(_L8(">>CAcmPort::HandleConfigNotification"));
- LOGTEXT2(_L8("\taRate = %d"), aRate);
- LOGTEXT2(_L8("\taDataBits = %d"), aDataBits);
- LOGTEXT2(_L8("\taStopBits = %d"), aStopBits);
- LOGTEXT2(_L8("\taParity = %d"), aParity);
- LOGTEXT2(_L8("\taHandshake = %d"), aHandshake);
+ OstTraceFunctionEntry0( CACMPORT_HANDLECONFIGNOTIFICATION_ENTRY );
+
+ OstTrace0( TRACE_DUMP, CACMPORT_HANDLECONFIGNOTIFICATION, "CAcmPort::HandleConfigNotification;>>CAcmPort::HandleConfigNotification" );
+ OstTrace1( TRACE_DUMP, CACMPORT_HANDLECONFIGNOTIFICATION_DUP1, "CAcmPort::HandleConfigNotification;aRate=%d", aRate );
+ OstTrace1( TRACE_DUMP, CACMPORT_HANDLECONFIGNOTIFICATION_DUP2, "CAcmPort::HandleConfigNotification;aDataBits=%d", aDataBits );
+ OstTrace1( TRACE_DUMP, CACMPORT_HANDLECONFIGNOTIFICATION_DUP3, "CAcmPort::HandleConfigNotification;aStopBits=%d", aStopBits );
+ OstTrace1( TRACE_DUMP, CACMPORT_HANDLECONFIGNOTIFICATION_DUP4, "CAcmPort::HandleConfigNotification;aParity=%d", aParity );
+ OstTrace1( TRACE_DUMP, CACMPORT_HANDLECONFIGNOTIFICATION_DUP5, "CAcmPort::HandleConfigNotification;aHandshake=%d", aHandshake );
iCommNotification.iChangedMembers = 0;
@@ -551,12 +586,12 @@
if ( iCommNotification.iChangedMembers )
{
- LOGTEXT(_L8("\tcalling ConfigChangeCompleted with KErrNone"));
+ OstTrace0( TRACE_NORMAL, CACMPORT_HANDLECONFIGNOTIFICATION_DUP6, "CAcmPort::HandleConfigNotification;\tcalling ConfigChangeCompleted with KErrNone" );
ConfigChangeCompleted(iCommNotificationDes,KErrNone);
iNotifyConfigChange = EFalse;
}
- LOGTEXT(_L8("<<CAcmPort::HandleConfigNotification"));
+ OstTraceFunctionExit0( CACMPORT_HANDLECONFIGNOTIFICATION_EXIT );
}
TInt CAcmPort::SetServerConfig(const TDesC8& aDes)
@@ -567,18 +602,18 @@
* @return Error.
*/
{
- LOG_LINE
- LOG_FUNC
-
+ OstTraceFunctionEntry0( CACMPORT_SETSERVERCONFIG_ENTRY );
if ( !iAcm )
{
- LOGTEXT(_L8("\t***access denied"));
+ OstTrace0( TRACE_NORMAL, CACMPORT_SETSERVERCONFIG, "CAcmPort::SetServerConfig;\t***access denied" );
+ OstTraceFunctionExit0( CACMPORT_SETSERVERCONFIG_EXIT );
return KErrAccessDenied;
}
if ( aDes.Length() < static_cast<TInt>(sizeof(TCommServerConfigV01)) )
{
- LOGTEXT(_L8("\t***not supported"));
+ OstTrace0( TRACE_NORMAL, CACMPORT_SETSERVERCONFIG_DUP1, "CAcmPort::SetServerConfig;\t***not supported" );
+ OstTraceFunctionExit0( CACMPORT_SETSERVERCONFIG_EXIT_DUP1 );
return KErrNotSupported;
}
@@ -588,7 +623,8 @@
if ( serverConfig.iBufFlags != KCommBufferFull )
{
- LOGTEXT(_L8("\t***not supported"));
+ OstTrace0( TRACE_NORMAL, CACMPORT_SETSERVERCONFIG_DUP2, "CAcmPort::SetServerConfig;\t***not supported" );
+ OstTraceFunctionExit0( CACMPORT_SETSERVERCONFIG_EXIT_DUP2 );
return KErrNotSupported;
}
@@ -598,12 +634,14 @@
{
// Failure- the buffer lengths will have been left as they were, so
// just return error.
- LOGTEXT2(_L8("\t***DoSetBufferLengths=%d"), err);
+ OstTrace1( TRACE_NORMAL, CACMPORT_SETSERVERCONFIG_DUP3, "CAcmPort::SetServerConfig;\t***DoSetBufferLengths=%d", err );
+ OstTraceFunctionExit0( CACMPORT_SETSERVERCONFIG_EXIT_DUP3 );
return err;
}
// Changed buffer sizes OK. Note that new config.
iCommServerConfig = serverConfig;
+ OstTraceFunctionExit0( CACMPORT_SETSERVERCONFIG_EXIT_DUP4 );
return KErrNone;
}
@@ -615,18 +653,18 @@
* @return Error.
*/
{
- LOG_LINE
- LOG_FUNC
-
+ OstTraceFunctionEntry0( CACMPORT_GETSERVERCONFIG_ENTRY );
if ( !iAcm )
{
- LOGTEXT(_L8("\t***access denied"));
+ OstTrace0( TRACE_NORMAL, CACMPORT_GETSERVERCONFIG, "CAcmPort::GetServerConfig;\t***access denied" );
+ OstTraceFunctionExit0( CACMPORT_GETSERVERCONFIG_EXIT );
return KErrAccessDenied;
}
if ( aDes.Length() < static_cast<TInt>(sizeof(TCommServerConfigV01)) )
{
- LOGTEXT(_L8("\t***not supported"));
+ OstTrace0( TRACE_NORMAL, CACMPORT_GETSERVERCONFIG_DUP1, "CAcmPort::GetServerConfig;\t***not supported" );
+ OstTraceFunctionExit0( CACMPORT_GETSERVERCONFIG_EXIT_DUP1 );
return KErrNotSupported;
}
@@ -635,6 +673,7 @@
TCommServerConfigV01& serverConfig = (*serverConfigPckg)();
serverConfig = iCommServerConfig;
+ OstTraceFunctionExit0( CACMPORT_GETSERVERCONFIG_EXIT_DUP2 );
return KErrNone;
}
@@ -646,12 +685,12 @@
* @return Error.
*/
{
- LOG_LINE
- LOG_FUNC
-
+ OstTraceFunctionEntry0( CACMPORT_GETCAPS_ENTRY );
+
if ( !iAcm )
{
- LOGTEXT(_L8("\t***access denied"));
+ OstTrace0( TRACE_NORMAL, CACMPORT_GETCAPS, "CAcmPort::GetCaps;\t***access denied" );
+ OstTraceFunctionExit0( CACMPORT_GETCAPS_EXIT );
return KErrAccessDenied;
}
@@ -681,13 +720,15 @@
break;
default:
{
- LOGTEXT(_L8("\t***bad argument"));
+ OstTrace0( TRACE_NORMAL, CACMPORT_GETCAPS_DUP1, "CAcmPort::GetCaps;\t***bad argument" );
+ OstTraceFunctionExit0( CACMPORT_GETCAPS_EXIT_DUP1 );
return KErrArgument;
}
}
aDes.Copy(capsPckg.Left(aDes.Length()));
+ OstTraceFunctionExit0( CACMPORT_GETCAPS_EXIT_DUP2 );
return KErrNone;
}
@@ -699,19 +740,18 @@
* @return Error.
*/
{
- LOG_LINE
- LOG_FUNC
-
+ OstTraceFunctionEntry0( CACMPORT_GETSIGNALS_ENTRY );
if ( !iAcm )
{
- LOGTEXT(_L8("\t***access denied"));
+ OstTrace0( TRACE_NORMAL, CACMPORT_GETSIGNALS, "CAcmPort::GetSignals;\t***access denied" );
+ OstTraceFunctionExit0( CACMPORT_GETSIGNALS_EXIT );
return KErrAccessDenied;
}
aSignals = ConvertSignals(iSignals);
- LOGTEXT3(_L8("iSignals=0x%x, aSignals=0x%x"),
- iSignals, aSignals);
+ OstTraceExt2( TRACE_NORMAL, CACMPORT_GETSIGNALS_DUP1, "CAcmPort::GetSignals;iSignals=%x;aSignals=%x", iSignals, (TUint32)aSignals );
+ OstTraceFunctionExit0( CACMPORT_GETSIGNALS_EXIT_DUP1 );
return KErrNone;
}
@@ -723,12 +763,11 @@
* @return Error.
*/
{
- LOG_LINE
- LOG_FUNC
-
+ OstTraceFunctionEntry0( CACMPORT_SETSIGNALSTOMARK_ENTRY );
if ( !iAcm )
{
- LOGTEXT(_L8("\t***access denied"));
+ OstTrace0( TRACE_NORMAL, CACMPORT_SETSIGNALSTOMARK, "CAcmPort::SetSignalsToMark;\t***access denied" );
+ OstTraceFunctionExit0( CACMPORT_SETSIGNALSTOMARK_EXIT );
return KErrAccessDenied;
}
@@ -736,12 +775,13 @@
TInt err = SetSignals(newSignals);
if ( err )
{
- LOGTEXT2(_L8("***SetSignals = %d"), err);
+ OstTrace1( TRACE_NORMAL, CACMPORT_SETSIGNALSTOMARK_DUP1, "CAcmPort::SetSignalsToMark;***SetSignals = %d", err );
+ OstTraceFunctionExit0( CACMPORT_SETSIGNALSTOMARK_EXIT_DUP1 );
return err;
}
- LOGTEXT3(_L8("iSignals=0x%x, aSignals=0x%x"),
- iSignals, aSignals);
+ OstTraceExt2( TRACE_NORMAL, CACMPORT_SETSIGNALSTOMARK_DUP2, "CAcmPort::SetSignalsToMark;iSignals=%x;aSignals=%x", iSignals, (TUint32)aSignals );
+ OstTraceFunctionExit0( CACMPORT_SETSIGNALSTOMARK_EXIT_DUP2 );
return KErrNone;
}
@@ -753,12 +793,11 @@
* @return Error.
*/
{
- LOG_LINE
- LOG_FUNC
-
+ OstTraceFunctionEntry0( CACMPORT_SETSIGNALSTOSPACE_ENTRY );
if ( !iAcm )
{
- LOGTEXT(_L8("\t***access denied"));
+ OstTrace0( TRACE_NORMAL, CACMPORT_SETSIGNALSTOSPACE, "CAcmPort::SetSignalsToSpace;\t***access denied" );
+ OstTraceFunctionExit0( CACMPORT_SETSIGNALSTOSPACE_EXIT );
return KErrAccessDenied;
}
@@ -766,12 +805,13 @@
TInt err = SetSignals(newSignals);
if ( err )
{
- LOGTEXT2(_L8("***SetSignals = %d"), err);
+ OstTrace1( TRACE_NORMAL, CACMPORT_SETSIGNALSTOSPACE_DUP1, "CAcmPort::SetSignalsToSpace;***SetSignals = %d", err );
+ OstTraceFunctionExit0( CACMPORT_SETSIGNALSTOSPACE_EXIT_DUP1 );
return err;
}
- LOGTEXT3(_L8("iSignals=0x%x, aSignals=0x%x"),
- iSignals, aSignals);
+ OstTraceExt2( TRACE_NORMAL, CACMPORT_SETSIGNALSTOSPACE_DUP2, "CAcmPort::SetSignalsToSpace;iSignals=%x;aSignals=%x", iSignals, (TUint32)aSignals );
+ OstTraceFunctionExit0( CACMPORT_SETSIGNALSTOSPACE_EXIT_DUP2 );
return KErrNone;
}
@@ -785,23 +825,24 @@
* @return Error.
*/
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CACMPORT_SETSIGNALS_ENTRY );
TBool ring =((aNewSignals & KSignalRNG)==KSignalRNG);
TBool dsr =((aNewSignals & KSignalDSR)==KSignalDSR);
TBool dcd =((aNewSignals & KSignalDCD)==KSignalDCD);
-
if ( !iAcm )
{
- LOGTEXT(_L8("\t***access denied"));
+ OstTrace0( TRACE_NORMAL, CACMPORT_SETSIGNALS, "CAcmPort::SetSignals;\t***access denied" );
+ OstTraceFunctionExit0( CACMPORT_SETSIGNALS_EXIT );
return KErrAccessDenied;
}
TInt err = iAcm->SendSerialState(ring,dsr,dcd);
if ( err )
{
- LOGTEXT2(_L8("\t***SendSerialState = %d- returning"), err);
+ OstTrace1( TRACE_NORMAL, CACMPORT_SETSIGNALS_DUP1, "CAcmPort::SetSignals;\t***SendSerialState = %d- returning", err );
+ OstTraceFunctionExit0( CACMPORT_SETSIGNALS_EXIT_DUP1 );
return err;
}
@@ -831,7 +872,7 @@
}
// Report correctly mapped signals that client asked for
- LOGTEXT(_L8("\tcalling SignalChangeCompleted with KErrNone"));
+ OstTrace0( TRACE_NORMAL, CACMPORT_SETSIGNALS_DUP2, "CAcmPort::SetSignals;\tcalling SignalChangeCompleted with KErrNone" );
TUint32 signals = ConvertSignals ( changedSignalsMask | ( aNewSignals & iNotifySignalMask ) );
SignalChangeCompleted ( signals, KErrNone );
iNotifySignalChange = EFalse;
@@ -840,7 +881,7 @@
// Store new signals in iSignals
iSignals = aNewSignals;
-
+ OstTraceFunctionExit0( CACMPORT_SETSIGNALS_EXIT_DUP2 );
return KErrNone;
}
@@ -859,10 +900,9 @@
* role.
*/
{
- LOG_FUNC
-
+ OstTraceFunctionEntry0( CACMPORT_CONVERTANDFILTERSIGNALS_ENTRY );
+
TUint32 signals = 0;
-
// note that this never allows the client to use this method
// to diddle the BREAK state
@@ -894,6 +934,7 @@
| KSignalRNG);
}
+ OstTraceFunctionExit0( CACMPORT_CONVERTANDFILTERSIGNALS_EXIT );
return signals;
}
@@ -916,8 +957,8 @@
* port is.
*/
{
- LOG_FUNC
-
+ OstTraceFunctionEntry0( CACMPORT_CONVERTSIGNALS_ENTRY );
+
// Swap signals around if the client is expecting DTE signalling
if ( iRole == ECommRoleDTE )
{
@@ -965,6 +1006,7 @@
aSignals = ( aSignals & ~KSwapSignals ) | swappedSignals;
}
+ OstTraceFunctionExit0( CACMPORT_CONVERTSIGNALS_EXIT );
return aSignals;
}
@@ -979,18 +1021,23 @@
* @return Error.
*/
{
- LOG_LINE
- LOG_FUNC
-
+ OstTraceFunctionEntry0( CACMPORT_GETRECEIVEBUFFERLENGTH_ENTRY );
+
if ( !iAcm )
{
- LOGTEXT(_L8("\t***access denied"));
+ OstTrace0( TRACE_NORMAL, CACMPORT_GETRECEIVEBUFFERLENGTH, "CAcmPort::GetReceiveBufferLength;\t***access denied" );
+ OstTraceFunctionExit0( CACMPORT_GETRECEIVEBUFFERLENGTH_EXIT );
return KErrAccessDenied;
}
- __ASSERT_DEBUG(iReader, _USB_PANIC(KAcmPanicCat, EPanicInternalError));
+ if (!iReader)
+ {
+ OstTraceExt1( TRACE_FATAL, CACMPORT_GETRECEIVEBUFFERLENGTH_DUP2, "CAcmPort::GetReceiveBufferLength;iReader=%p", iReader );
+ __ASSERT_DEBUG( EFalse, User::Panic(KAcmPanicCat, EPanicInternalError) );
+ }
aLength = static_cast<TInt>(iReader->BufSize());
- LOGTEXT2(_L8("\tlength=%d"), aLength);
+ OstTrace1( TRACE_NORMAL, CACMPORT_GETRECEIVEBUFFERLENGTH_DUP1, "CAcmPort::GetReceiveBufferLength;aLength=%d", aLength );
+ OstTraceFunctionExit0( CACMPORT_GETRECEIVEBUFFERLENGTH_EXIT_DUP1 );
return KErrNone;
}
@@ -1003,10 +1050,14 @@
* @return Error.
*/
{
- LOG_FUNC
- LOGTEXT2(_L8("\taLength=%d"), aLength);
+ OstTraceFunctionEntry0( CACMPORT_DOSETBUFFERLENGTHS_ENTRY );
+ OstTrace1( TRACE_NORMAL, CACMPORT_DOSETBUFFERLENGTHS, "CAcmPort::DoSetBufferLengths;aLength=%d", aLength );
- __ASSERT_DEBUG(iReader, _USB_PANIC(KAcmPanicCat, EPanicInternalError));
+ if (!iReader)
+ {
+ OstTraceExt1( TRACE_FATAL, CACMPORT_DOSETBUFFERLENGTHS_DUP5, "CAcmPort::DoSetBufferLengths;iReader=%p", iReader );
+ __ASSERT_DEBUG( EFalse, User::Panic(KAcmPanicCat, EPanicInternalError) );
+ }
// Sart trying to resize buffers. Start with the reader.
// Before we start though, set some stuff up we may need later (see
// comments below).
@@ -1017,8 +1068,8 @@
// If we can't allocate the dummy buffer, we can't guarantee that we
// can roll back this API safely if it fails halfway through. So abort
// the entire operation.
- LOGTEXT(_L8("\t***failed to allocate dummy buffer- "
- "returning KErrNoMemory"));
+ OstTrace0( TRACE_NORMAL, CACMPORT_DOSETBUFFERLENGTHS_DUP1, "CAcmPort::DoSetBufferLengths;\t***failed to allocate dummy buffer- returning KErrNoMemory" );
+ OstTraceFunctionExit0( CACMPORT_DOSETBUFFERLENGTHS_EXIT );
return KErrNoMemory;
}
@@ -1029,12 +1080,17 @@
// (i.e. at its old size). This is a safe failure case- simply
// clean up and return the error to the client.
delete dummyBuffer;
- LOGTEXT2(_L8("\t***SetBufSize on reader failed with %d"), ret);
+ OstTrace1( TRACE_NORMAL, CACMPORT_DOSETBUFFERLENGTHS_DUP2, "CAcmPort::DoSetBufferLengths;\t***SetBufSize on reader failed with %d", ret );
+ OstTraceFunctionExit0( CACMPORT_DOSETBUFFERLENGTHS_EXIT_DUP1 );
return ret;
}
// OK, the Rx buffer has been resized, now for the Tx buffer...
- __ASSERT_DEBUG(iWriter, _USB_PANIC(KAcmPanicCat, EPanicInternalError));
+ if (!iWriter)
+ {
+ OstTraceExt1( TRACE_FATAL, CACMPORT_DOSETBUFFERLENGTHS_DUP6, "CAcmPort::DoSetBufferLengths;iWriter=%p", iWriter );
+ __ASSERT_DEBUG( EFalse, User::Panic(KAcmPanicCat, EPanicInternalError) );
+ }
ret = iWriter->SetBufSize(aLength);
if ( ret )
{
@@ -1043,20 +1099,25 @@
// buffer back to the old size. To make sure that this will work, free
// the dummy buffer we initially allocated.
delete dummyBuffer;
- LOGTEXT2(_L8("\t***SetBufSize on writer failed with %d"), ret);
+ OstTrace1( TRACE_NORMAL, CACMPORT_DOSETBUFFERLENGTHS_DUP3, "CAcmPort::DoSetBufferLengths;\t***SetBufSize on writer failed with %d", ret );
TInt err = iReader->SetBufSize(oldSize);
- __ASSERT_DEBUG(!err, _USB_PANIC(KAcmPanicCat, EPanicInternalError));
+ if (err)
+ {
+ OstTrace1( TRACE_FATAL, CACMPORT_DOSETBUFFERLENGTHS_DUP7, "CAcmPort::DoSetBufferLengths;err=%d", err );
+ __ASSERT_DEBUG( EFalse, User::Panic(KAcmPanicCat, EPanicInternalError) );
+ }
static_cast<void>(err);
// Now both buffers are at the size they started at, and the
// request failed with error code 'ret'.
+ OstTraceFunctionExit0( CACMPORT_DOSETBUFFERLENGTHS_EXIT_DUP2 );
return ret;
}
// We seem to have successfully resized both buffers... clean up and
// return.
delete dummyBuffer;
-
- LOGTEXT(_L8("\treturning KErrNone"));
+ OstTrace0( TRACE_NORMAL, CACMPORT_DOSETBUFFERLENGTHS_DUP4, "CAcmPort::DoSetBufferLengths;\treturning KErrNone" );
+ OstTraceFunctionExit0( CACMPORT_DOSETBUFFERLENGTHS_EXIT_DUP3 );
return KErrNone;
}
@@ -1070,19 +1131,18 @@
* @return Error.
*/
{
- LOG_LINE
- LOG_FUNC
- LOGTEXT2(_L8("\taLength=%d"), aLength);
-
+ OstTraceFunctionEntry0( CACMPORT_SETRECEIVEBUFFERLENGTH_ENTRY );
+ OstTrace1( TRACE_NORMAL, CACMPORT_SETRECEIVEBUFFERLENGTH, "CAcmPort::SetReceiveBufferLength;aLength=%d", aLength );
if ( !iAcm )
{
- LOGTEXT(_L8("\t***access denied"));
+ OstTrace0( TRACE_NORMAL, CACMPORT_SETRECEIVEBUFFERLENGTH_DUP1, "CAcmPort::SetReceiveBufferLength;\t***access denied" );
+ OstTraceFunctionExit0( CACMPORT_SETRECEIVEBUFFERLENGTH_EXIT );
return KErrAccessDenied;
}
TInt ret = DoSetBufferLengths(static_cast<TUint>(aLength));
- LOGTEXT2(_L8("\tDoSetBufferLengths=%d"), ret);
- LOGTEXT2(_L8("\treturning %d"), ret);
+ OstTrace1( TRACE_NORMAL, CACMPORT_SETRECEIVEBUFFERLENGTH_DUP2, "CAcmPort::SetReceiveBufferLength;\tDoSetBufferLengths = return value = %d", ret );
+ OstTraceFunctionExit0( CACMPORT_SETRECEIVEBUFFERLENGTH_EXIT_DUP1 );
return ret;
}
@@ -1091,9 +1151,9 @@
* Downcall from C32. Destruct - we must (eventually) call delete this
*/
{
- LOG_FUNC
-
+ OstTraceFunctionEntry0( CACMPORT_DESTRUCT_ENTRY );
delete this;
+ OstTraceFunctionExit0( CACMPORT_DESTRUCT_EXIT );
}
void CAcmPort::FreeMemory()
@@ -1102,8 +1162,8 @@
* Implemented to do nothing.
*/
{
- LOG_LINE
- LOG_FUNC
+ OstTraceFunctionEntry0( CACMPORT_FREEMEMORY_ENTRY );
+ OstTraceFunctionExit0( CACMPORT_FREEMEMORY_EXIT );
}
void CAcmPort::NotifyDataAvailable()
@@ -1111,18 +1171,22 @@
* Downcall from C32. Notify client when data is available.
*/
{
- LOG_LINE
- LOG_FUNC
-
+ OstTraceFunctionEntry0( CACMPORT_NOTIFYDATAAVAILABLE_ENTRY );
if ( !iAcm )
{
- LOGTEXT(_L8("\t***access denied"));
+ OstTrace0( TRACE_NORMAL, CACMPORT_NOTIFYDATAAVAILABLE, "CAcmPort::NotifyDataAvailable;\t***access denied" );
NotifyDataAvailableCompleted(KErrAccessDenied);
+ OstTraceFunctionExit0( CACMPORT_NOTIFYDATAAVAILABLE_EXIT );
return;
}
- __ASSERT_DEBUG(iReader, _USB_PANIC(KAcmPanicCat, EPanicInternalError));
-
+
+ if (!iReader)
+ {
+ OstTraceExt1( TRACE_FATAL, CACMPORT_NOTIFYDATAAVAILABLE_DUP1, "CAcmPort::NotifyDataAvailable;iReader=%p", iReader );
+ __ASSERT_DEBUG( EFalse, User::Panic(KAcmPanicCat, EPanicInternalError) );
+ }
iReader->NotifyDataAvailable();
+ OstTraceFunctionExit0( CACMPORT_NOTIFYDATAAVAILABLE_EXIT_DUP1 );
}
void CAcmPort::NotifyDataAvailableCancel()
@@ -1131,17 +1195,22 @@
* that C32 actually completes the client's request for us.
*/
{
- LOG_LINE
- LOG_FUNC
-
+ OstTraceFunctionEntry0( CACMPORT_NOTIFYDATAAVAILABLECANCEL_ENTRY );
+
if ( !iAcm )
{
- LOGTEXT(_L8("\t***access denied"));
+ OstTrace0( TRACE_NORMAL, CACMPORT_NOTIFYDATAAVAILABLECANCEL, "CAcmPort::NotifyDataAvailableCancel;\t***access denied" );
+ OstTraceFunctionExit0( CACMPORT_NOTIFYDATAAVAILABLECANCEL_EXIT );
return;
}
- __ASSERT_DEBUG(iReader, _USB_PANIC(KAcmPanicCat, EPanicInternalError));
+ if (!iReader)
+ {
+ OstTraceExt1( TRACE_FATAL, CACMPORT_NOTIFYDATAAVAILABLECANCEL_DUP1, "CAcmPort::NotifyDataAvailableCancel;iReader=%p", iReader );
+ __ASSERT_DEBUG( EFalse, User::Panic(KAcmPanicCat, EPanicInternalError) );
+ }
iReader->NotifyDataAvailableCancel();
+ OstTraceFunctionExit0( CACMPORT_NOTIFYDATAAVAILABLECANCEL_EXIT_DUP1 );
}
TInt CAcmPort::GetFlowControlStatus(TFlowControl& /*aFlowControl*/)
@@ -1152,16 +1221,17 @@
* @return Error.
*/
{
- LOG_LINE
- LOG_FUNC
-
+ OstTraceFunctionEntry0( CACMPORT_GETFLOWCONTROLSTATUS_ENTRY );
+
if ( !iAcm )
{
- LOGTEXT(_L8("\t***access denied"));
+ OstTrace0( TRACE_NORMAL, CACMPORT_GETFLOWCONTROLSTATUS, "CAcmPort::GetFlowControlStatus;\t***access denied" );
+ OstTraceFunctionExit0( CACMPORT_GETFLOWCONTROLSTATUS_EXIT );
return KErrAccessDenied;
}
- LOGTEXT(_L8("\t***not supported"));
+ OstTrace0( TRACE_NORMAL, CACMPORT_GETFLOWCONTROLSTATUS_DUP1, "CAcmPort::GetFlowControlStatus;\t***not supported" );
+ OstTraceFunctionExit0( CACMPORT_GETFLOWCONTROLSTATUS_EXIT_DUP1 );
return KErrNotSupported;
}
@@ -1173,18 +1243,19 @@
* it's not very useful.
*/
{
- LOG_LINE
- LOG_FUNC
-
+ OstTraceFunctionEntry0( CACMPORT_NOTIFYOUTPUTEMPTY_ENTRY );
+
if ( !iAcm )
{
- LOGTEXT(_L8("\t***access denied"));
+ OstTrace0( TRACE_NORMAL, CACMPORT_NOTIFYOUTPUTEMPTY, "CAcmPort::NotifyOutputEmpty;\t***access denied" );
NotifyOutputEmptyCompleted(KErrAccessDenied);
+ OstTraceFunctionExit0( CACMPORT_NOTIFYOUTPUTEMPTY_EXIT );
return;
}
- LOGTEXT(_L8("\t***not supported"));
+ OstTrace0( TRACE_NORMAL, CACMPORT_NOTIFYOUTPUTEMPTY_DUP1, "CAcmPort::NotifyOutputEmpty;\t***not supported" );
NotifyOutputEmptyCompleted(KErrNotSupported);
+ OstTraceFunctionExit0( CACMPORT_NOTIFYOUTPUTEMPTY_EXIT_DUP1 );
}
void CAcmPort::NotifyOutputEmptyCancel()
@@ -1194,8 +1265,8 @@
* us.
*/
{
- LOG_LINE
- LOG_FUNC
+ OstTraceFunctionEntry0( CACMPORT_NOTIFYOUTPUTEMPTYCANCEL_ENTRY );
+ OstTraceFunctionExit0( CACMPORT_NOTIFYOUTPUTEMPTYCANCEL_EXIT );
}
void CAcmPort::NotifyBreak()
@@ -1204,21 +1275,25 @@
* line.
*/
{
- LOG_LINE
- LOG_FUNC
-
+ OstTraceFunctionEntry0( CACMPORT_NOTIFYBREAK_ENTRY );
+
if ( !iAcm )
{
- LOGTEXT(_L8("\t***access denied"));
+ OstTrace0( TRACE_NORMAL, CACMPORT_NOTIFYBREAK, "CAcmPort::NotifyBreak;\t***access denied" );
BreakNotifyCompleted(KErrAccessDenied);
+ OstTraceFunctionExit0( CACMPORT_NOTIFYBREAK_EXIT );
return;
}
// C32 protects us against this.
- __ASSERT_DEBUG(!iNotifyBreak,
- _USB_PANIC(KAcmPanicCat, EPanicInternalError));
+ if (iNotifyBreak)
+ {
+ OstTrace1( TRACE_FATAL, CACMPORT_NOTIFYBREAK_DUP1, "CAcmPort::NotifyBreak;iNotifyBreak=%d", (TInt)iNotifyBreak );
+ __ASSERT_DEBUG( EFalse, User::Panic(KAcmPanicCat, EPanicInternalError) );
+ }
iNotifyBreak = ETrue;
+ OstTraceFunctionExit0( CACMPORT_NOTIFYBREAK_EXIT_DUP1 );
}
void CAcmPort::NotifyBreakCancel()
@@ -1227,16 +1302,16 @@
* Note that C32 actually completes the client's request for us.
*/
{
- LOG_LINE
- LOG_FUNC
-
+ OstTraceFunctionEntry0( CACMPORT_NOTIFYBREAKCANCEL_ENTRY );
if ( !iAcm )
{
- LOGTEXT(_L8("\t***access denied"));
+ OstTrace0( TRACE_NORMAL, CACMPORT_NOTIFYBREAKCANCEL, "CAcmPort::NotifyBreakCancel;\t***access denied" );
+ OstTraceFunctionExit0( CACMPORT_NOTIFYBREAKCANCEL_EXIT );
return;
}
iNotifyBreak = EFalse;
+ OstTraceFunctionExit0( CACMPORT_NOTIFYBREAKCANCEL_EXIT_DUP1 );
}
void CAcmPort::BreakRequestCompleted()
@@ -1247,17 +1322,17 @@
* This is implemented to complete the RComm client's Break request.
*/
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CACMPORT_BREAKREQUESTCOMPLETED_ENTRY );
+
if ( !iCancellingBreak )
{
- LOGTEXT(_L8("\tcalling BreakCompleted with KErrNone"));
+ OstTrace0( TRACE_NORMAL, CACMPORT_BREAKREQUESTCOMPLETED, "CAcmPort::BreakRequestCompleted;\tcalling BreakCompleted with KErrNone" );
BreakCompleted(KErrNone);
}
else
{
- LOGTEXT(_L8("\tbreak is being cancelled- "
- "letting C32 complete the request"));
+ OstTrace0( TRACE_NORMAL, CACMPORT_BREAKREQUESTCOMPLETED_DUP1, "CAcmPort::BreakRequestCompleted;\tbreak is being cancelled-letting C32 complete the request" );
}
// In the event of an RComm::BreakCancel, this function is called
// sychronously with CAcmPort::BreakCancel, and C32 will complete the
@@ -1265,6 +1340,7 @@
// only need to complete it if there isn't a cancel going on.
iBreak = EFalse;
iCancellingBreak = EFalse;
+ OstTraceFunctionExit0( CACMPORT_BREAKREQUESTCOMPLETED_EXIT );
}
void CAcmPort::BreakStateChange()
@@ -1277,8 +1353,7 @@
* NotifySignalChange requests, and complete NotifyBreak requests.
*/
{
- LOG_FUNC
-
+ OstTraceFunctionEntry0( CACMPORT_BREAKSTATECHANGE_ENTRY );
// TODO: what if no iAcm?
// Take a copy of the current signal state for comparison later
@@ -1288,12 +1363,12 @@
// it and apply the appropriate flag state to the local iSignals
if ( iAcm && iAcm->BreakActive() )
{
- LOGTEXT(_L8("\tbreak is active"));
+ OstTrace0( TRACE_NORMAL, CACMPORT_BREAKSTATECHANGE, "CAcmPort::BreakStateChange;\tbreak is active" );
iSignals |= KSignalBreak;
}
else
{
- LOGTEXT(_L8("\tbreak is inactive"));
+ OstTrace0( TRACE_NORMAL, CACMPORT_BREAKSTATECHANGE_DUP1, "CAcmPort::BreakStateChange;\tbreak is inactive" );
iSignals &= ~KSignalBreak;
}
@@ -1302,7 +1377,7 @@
// out of the break-active condition...
if ( iNotifyBreak && !iBreak )
{
- LOGTEXT(_L8("\tcalling BreakNotifyCompleted with KErrNone"));
+ OstTrace0( TRACE_NORMAL, CACMPORT_BREAKSTATECHANGE_DUP2, "CAcmPort::BreakStateChange;\tcalling BreakNotifyCompleted with KErrNone" );
BreakNotifyCompleted(KErrNone);
iNotifyBreak = EFalse;
}
@@ -1313,11 +1388,12 @@
&& ( ( iNotifySignalMask & ( iSignals ^ oldSignals ) ) != 0 ) )
{
// Report correctly mapped signals that client asked for
- LOGTEXT(_L8("\tcalling SignalChangeCompleted with KErrNone"));
+ OstTrace0( TRACE_NORMAL, CACMPORT_BREAKSTATECHANGE_DUP3, "CAcmPort::BreakStateChange;\tcalling SignalChangeCompleted with KErrNone" );
TUint32 signals = ConvertSignals ( KBreakChanged | ( iSignals & iNotifySignalMask ) );
SignalChangeCompleted( signals, KErrNone);
iNotifySignalChange = EFalse;
}
+ OstTraceFunctionExit0( CACMPORT_BREAKSTATECHANGE_EXIT );
}
void CAcmPort::NotifyFlowControlChange()
@@ -1326,18 +1402,19 @@
* Note that this is not supported.
*/
{
- LOG_LINE
- LOG_FUNC
-
+ OstTraceFunctionEntry0( CACMPORT_NOTIFYFLOWCONTROLCHANGE_ENTRY );
+
if ( !iAcm )
{
- LOGTEXT(_L8("\t***access denied"));
+ OstTrace0( TRACE_NORMAL, CACMPORT_NOTIFYFLOWCONTROLCHANGE, "CAcmPort::NotifyFlowControlChange;\t***access denied" );
FlowControlChangeCompleted(EFlowControlOn, KErrAccessDenied);
+ OstTraceFunctionExit0( CACMPORT_NOTIFYFLOWCONTROLCHANGE_EXIT );
return;
}
- LOGTEXT(_L8("\t***not supported"));
+ OstTrace0( TRACE_NORMAL, CACMPORT_NOTIFYFLOWCONTROLCHANGE_DUP1, "CAcmPort::NotifyFlowControlChange;\t***not supported" );
FlowControlChangeCompleted(EFlowControlOn,KErrNotSupported);
+ OstTraceFunctionExit0( CACMPORT_NOTIFYFLOWCONTROLCHANGE_EXIT_DUP1 );
}
void CAcmPort::NotifyFlowControlChangeCancel()
@@ -1347,8 +1424,8 @@
* request for us.
*/
{
- LOG_LINE
- LOG_FUNC
+ OstTraceFunctionEntry0( CACMPORT_NOTIFYFLOWCONTROLCHANGECANCEL_ENTRY );
+ OstTraceFunctionExit0( CACMPORT_NOTIFYFLOWCONTROLCHANGECANCEL_EXIT );
}
void CAcmPort::NotifyConfigChange()
@@ -1357,25 +1434,26 @@
* configuration.
*/
{
- LOG_LINE
- LOG_FUNC
-
+ OstTraceFunctionEntry0( CACMPORT_NOTIFYCONFIGCHANGE_ENTRY );
+
if ( !iAcm )
{
- LOGTEXT(_L8("\t***access denied"));
+ OstTrace0( TRACE_NORMAL, CACMPORT_NOTIFYCONFIGCHANGE, "CAcmPort::NotifyConfigChange;\t***access denied" );
ConfigChangeCompleted(iCommNotificationDes, KErrAccessDenied);
+ OstTraceFunctionExit0( CACMPORT_NOTIFYCONFIGCHANGE_EXIT );
return;
}
if ( iNotifyConfigChange )
{
- LOGTEXT(_L8("\t***in use"));
+ OstTrace0( TRACE_NORMAL, CACMPORT_NOTIFYCONFIGCHANGE_DUP1, "CAcmPort::NotifyConfigChange;\t***in use" );
ConfigChangeCompleted(iCommNotificationDes,KErrInUse);
}
else
{
iNotifyConfigChange = ETrue;
}
+ OstTraceFunctionExit0( CACMPORT_NOTIFYCONFIGCHANGE_EXIT_DUP1 );
}
void CAcmPort::NotifyConfigChangeCancel()
@@ -1385,16 +1463,17 @@
* client's request for us.
*/
{
- LOG_LINE
- LOG_FUNC
-
+ OstTraceFunctionEntry0( CACMPORT_NOTIFYCONFIGCHANGECANCEL_ENTRY );
+
if ( !iAcm )
{
- LOGTEXT(_L8("\t***access denied"));
+ OstTrace0( TRACE_NORMAL, CACMPORT_NOTIFYCONFIGCHANGECANCEL, "CAcmPort::NotifyConfigChangeCancel;\t***access denied" );
+ OstTraceFunctionExit0( CACMPORT_NOTIFYCONFIGCHANGECANCEL_EXIT );
return;
}
iNotifyConfigChange = EFalse;
+ OstTraceFunctionExit0( CACMPORT_NOTIFYCONFIGCHANGECANCEL_EXIT_DUP1 );
}
void CAcmPort::HostConfigChange(const TCommConfigV01& aConfig)
@@ -1404,8 +1483,7 @@
* @param aConfig New configuration data.
*/
{
- LOG_FUNC
-
+ OstTraceFunctionEntry0( CACMPORT_HOSTCONFIGCHANGE_ENTRY );
HandleConfigNotification(aConfig.iRate,
aConfig.iDataBits,
aConfig.iParity,
@@ -1415,6 +1493,7 @@
iCommConfig.iDataBits = aConfig.iDataBits;
iCommConfig.iParity = aConfig.iParity;
iCommConfig.iStopBits = aConfig.iStopBits;
+ OstTraceFunctionExit0( CACMPORT_HOSTCONFIGCHANGE_EXIT );
}
void CAcmPort::NotifySignalChange(TUint aSignalMask)
@@ -1422,20 +1501,18 @@
* Downcall from C32. Notify a client of a change to the signal lines.
*/
{
- LOG_LINE
- LOGTEXT2(_L8(">>CAcmPort::NotifySignalChange aSignalMask=0x%08x"),
- aSignalMask);
-
+ OstTraceFunctionEntry0( CACMPORT_NOTIFYSIGNALCHANGE_ENTRY );
+ OstTrace1( TRACE_NORMAL, CACMPORT_NOTIFYSIGNALCHANGE, "CAcmPort::NotifySignalChange;>>CAcmPort::NotifySignalChange aSignalMask=0x%08x", aSignalMask );
if ( iNotifySignalChange )
{
if ( !iAcm )
{
- LOGTEXT(_L8("\t***access denied"));
+ OstTrace0( TRACE_NORMAL, CACMPORT_NOTIFYSIGNALCHANGE_DUP1, "CAcmPort::NotifySignalChange;\t***access denied" );
SignalChangeCompleted(0, KErrAccessDenied);
}
else
{
- LOGTEXT(_L8("\t***in use"));
+ OstTrace0( TRACE_NORMAL, CACMPORT_NOTIFYSIGNALCHANGE_DUP2, "CAcmPort::NotifySignalChange;\t***in use" );
SignalChangeCompleted(0, KErrInUse);
}
}
@@ -1447,7 +1524,8 @@
iNotifySignalMask = ConvertSignals(aSignalMask);
}
- LOGTEXT(_L8("<<CAcmPort::NotifySignalChange"));
+ OstTrace0( TRACE_NORMAL, CACMPORT_NOTIFYSIGNALCHANGE_DUP3, "CAcmPort::NotifySignalChange;<<CAcmPort::NotifySignalChange" );
+ OstTraceFunctionExit0( CACMPORT_NOTIFYSIGNALCHANGE_EXIT );
}
void CAcmPort::NotifySignalChangeCancel()
@@ -1457,16 +1535,17 @@
* request for us.
*/
{
- LOG_LINE
- LOG_FUNC
-
+ OstTraceFunctionEntry0( CACMPORT_NOTIFYSIGNALCHANGECANCEL_ENTRY );
+
if ( !iAcm )
{
- LOGTEXT(_L8("\t***access denied"));
+ OstTrace0( TRACE_NORMAL, CACMPORT_NOTIFYSIGNALCHANGECANCEL, "CAcmPort::NotifySignalChangeCancel;\t***access denied" );
+ OstTraceFunctionExit0( CACMPORT_NOTIFYSIGNALCHANGECANCEL_EXIT );
return;
}
iNotifySignalChange = EFalse;
+ OstTraceFunctionExit0( CACMPORT_NOTIFYSIGNALCHANGECANCEL_EXIT_DUP1 );
}
void CAcmPort::HostSignalChange(TBool aDtr, TBool aRts)
@@ -1477,8 +1556,9 @@
* @param aRts The state of the RTS signal.
*/
{
- LOGTEXT3(_L8(">>CAcmPort::HostSignalChange aDtr=%d, aRts=%d"), aDtr, aRts);
-
+ OstTraceFunctionEntry0( CACMPORT_HOSTSIGNALCHANGE_ENTRY );
+ OstTraceExt2( TRACE_NORMAL, CACMPORT_HOSTSIGNALCHANGE, "CAcmPort::HostSignalChange;>>CAcmPort::HostSignalChange aDtr=%d, aRts=%d", aDtr, aRts );
+
// Take a copy of the current signal state for comparison later
TUint32 oldSignals = iSignals;
@@ -1506,8 +1586,7 @@
{
// Create bitfield of changed signals that client is interested in
TUint32 changedSignals = ( iSignals ^ oldSignals ) & iNotifySignalMask;
- LOGTEXT5(_L8("\tiSignals=%x, oldSignals=%x, changedSignals=%x, iNotifySignalMask=%x")
- ,iSignals, oldSignals, changedSignals, iNotifySignalMask);
+ OstTraceExt4( TRACE_NORMAL, CACMPORT_HOSTSIGNALCHANGE_DUP1, "CAcmPort::HostSignalChange;iSignals=%x;oldSignals=%x;changedSignals=%x;iNotifySignalMask=%x", iSignals, oldSignals, changedSignals, (TUint32)iNotifySignalMask );
if ( changedSignals != 0 )
{
// Mark which signals have changed
@@ -1520,17 +1599,18 @@
{
changedSignalsMask |= KRTSChanged;
}
- LOGTEXT2(_L8("\tchangedSignalsMask=%x"), changedSignalsMask);
-
+
+ OstTrace1( TRACE_NORMAL, CACMPORT_HOSTSIGNALCHANGE_DUP2, "CAcmPort::HostSignalChange;changedSignalsMask=%x", changedSignalsMask );
// Report correctly mapped signals that client asked for
TUint32 signals = ConvertSignals ( changedSignalsMask | ( iSignals & iNotifySignalMask ) );
- LOGTEXT2(_L8("\tcalling SignalChangeCompleted with KErrNone, signals=%x"), signals);
+ OstTrace1( TRACE_NORMAL, CACMPORT_HOSTSIGNALCHANGE_DUP3, "CAcmPort::HostSignalChange;signals=%x", signals );
SignalChangeCompleted( signals, KErrNone);
iNotifySignalChange = EFalse;
}
}
- LOGTEXT(_L8("<<CAcmPort::HostSignalChange"));
+ OstTrace0( TRACE_NORMAL, CACMPORT_HOSTSIGNALCHANGE_DUP4, "CAcmPort::HostSignalChange;<<CAcmPort::HostSignalChange" );
+ OstTraceFunctionExit0( CACMPORT_HOSTSIGNALCHANGE_EXIT );
}
TInt CAcmPort::GetRole(TCommRole& aRole)
@@ -1541,17 +1621,18 @@
* @return Error.
*/
{
- LOG_LINE
- LOG_FUNC
-
+ OstTraceFunctionEntry0( CACMPORT_GETROLE_ENTRY );
+
if ( !iAcm )
{
- LOGTEXT(_L8("\t***access denied"));
+ OstTrace0( TRACE_NORMAL, CACMPORT_GETROLE, "CAcmPort::GetRole;\t***access denied" );
+ OstTraceFunctionExit0( CACMPORT_GETROLE_EXIT );
return KErrAccessDenied;
}
aRole = iRole;
- LOGTEXT2(_L8("\trole=%d"), aRole);
+ OstTrace1( TRACE_NORMAL, CACMPORT_GETROLE_DUP1, "CAcmPort::GetRole;\trole=%d", aRole );
+ OstTraceFunctionExit0( DUP1_CACMPORT_GETROLE_EXIT );
return KErrNone;
}
@@ -1563,10 +1644,10 @@
* @return Error.
*/
{
- LOG_LINE
- LOGTEXT2(_L8(">>CAcmPort::SetRole aRole=%d"), aRole);
-
+ OstTraceFunctionEntry0( CACMPORT_SETROLE_ENTRY );
+ OstTrace1( TRACE_NORMAL, CACMPORT_SETROLE, "CAcmPort::SetRole;>>CAcmPort::SetRole aRole=%d", aRole );
TInt ret = KErrNone;
+
if ( !iAcm )
{
ret = KErrAccessDenied;
@@ -1576,7 +1657,8 @@
iRole = aRole;
}
- LOGTEXT2(_L8("<<CAcmPort::SetRole ret=%d"), ret);
+ OstTrace1( TRACE_NORMAL, CACMPORT_SETROLE_DUP1, "CAcmPort::SetRole;<<CAcmPort::SetRole ret=%d", ret );
+ OstTraceFunctionExit0( CACMPORT_SETROLE_EXIT );
return ret;
}
@@ -1594,18 +1676,29 @@
* @param aAcm The new ACM (may be NULL).
*/
{
- LOGTEXT3(_L8(">>CAcmPort::SetAcm aAcm = 0x%08x, iAcm = 0x%08x"), aAcm, iAcm);
+ OstTraceFunctionEntry0( CACMPORT_SETACM_ENTRY );
+ OstTrace1( TRACE_NORMAL, CACMPORT_SETACM, "CAcmPort::SetAcm;>>CAcmPort::SetAcm aAcm = 0x%08x", aAcm );
+ OstTrace1( TRACE_NORMAL, CACMPORT_SETACM_DUP3, "CAcmPort::SetAcm;iAcm=0x%08x", iAcm );
+
if ( !aAcm )
{
// Cancel any outstanding operations on the reader and writer.
- __ASSERT_DEBUG(iReader, _USB_PANIC(KAcmPanicCat, EPanicInternalError));
+ if (!iReader)
+ {
+ OstTraceExt1( TRACE_FATAL, CACMPORT_SETACM_DUP4, "CAcmPort::SetAcm;iReader=%p", iReader );
+ __ASSERT_DEBUG( EFalse, User::Panic(KAcmPanicCat, EPanicInternalError) );
+ }
iReader->ReadCancel();
- __ASSERT_DEBUG(iWriter, _USB_PANIC(KAcmPanicCat, EPanicInternalError));
+ if (!iWriter)
+ {
+ OstTraceExt1( TRACE_FATAL, CACMPORT_SETACM_DUP5, "CAcmPort::SetAcm;iWriter=%p", iWriter );
+ __ASSERT_DEBUG( EFalse, User::Panic(KAcmPanicCat, EPanicInternalError) );
+ }
iWriter->WriteCancel();
// Complete any outstanding requests
- LOGTEXT(_L8("\tcompleting outstanding requests with KErrAccessDenied"));
+ OstTrace0( TRACE_NORMAL, CACMPORT_SETACM_DUP1, "CAcmPort::SetAcm;\tcompleting outstanding requests with KErrAccessDenied" );
SignalChangeCompleted(iSignals,KErrAccessDenied);
ReadCompleted(KErrAccessDenied);
WriteCompleted(KErrAccessDenied);
@@ -1617,15 +1710,19 @@
}
else
{
- __ASSERT_DEBUG(!iAcm, _USB_PANIC(KAcmPanicCat, EPanicInternalError));
+ if (iAcm)
+ {
+ OstTraceExt1( TRACE_FATAL, CACMPORT_SETACM_DUP6, "CAcmPort::SetAcm;iAcm=%p", iAcm );
+ __ASSERT_DEBUG( EFalse, User::Panic(KAcmPanicCat, EPanicInternalError) );
+ }
aAcm->SetCallback(this);
// Set the port as the observer of break events.
aAcm->SetBreakCallback(this);
}
iAcm = aAcm;
-
- LOGTEXT(_L8("<<CAcmPort::SetAcm"));
+ OstTrace0( TRACE_NORMAL, CACMPORT_SETACM_DUP2, "CAcmPort::SetAcm;<<CAcmPort::SetAcm" );
+ OstTraceFunctionExit0( CACMPORT_SETACM_EXIT );
}
CAcmPort::~CAcmPort()
@@ -1633,8 +1730,8 @@
* Destructor.
*/
{
- LOG_FUNC
-
+ OstTraceFunctionEntry0( CACMPORT_CACMPORT_DESTRUCTRURE_ENTRY );
+
delete iReader;
delete iWriter;
@@ -1642,12 +1739,13 @@
// changes.
if ( iAcm )
{
- LOGTEXT(_L8("\tiAcm exists- calling SetCallback(NULL)"));
+ OstTrace0( TRACE_NORMAL, CACMPORT_CACMPORT_DESTRUCTRURE, "CAcmPort::~CAcmPort;\tiAcm exists- calling SetCallback(NULL)" );
iAcm->SetCallback(NULL);
}
- LOGTEXT(_L8("\tcalling AcmPortClosed on observer"));
+ OstTrace0( TRACE_NORMAL, CACMPORT_CACMPORT_DESTRUCTRURE_DUP1, "CAcmPort::~CAcmPort;\tcalling AcmPortClosed on observer" );
iObserver.AcmPortClosed(iUnit);
+ OstTraceFunctionExit0( CACMPORT_CACMPORT_DESTRUCTRURE_EXIT );
}
//
--- a/usbmgmt/usbmgr/device/classdrivers/acm/classimplementation/ecacm/src/AcmPortFactory.cpp Wed Jul 07 14:16:40 2010 +0800
+++ b/usbmgmt/usbmgr/device/classdrivers/acm/classimplementation/ecacm/src/AcmPortFactory.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"
@@ -15,19 +15,19 @@
*
*/
+#include <acminterface.h>
#include "AcmPortFactory.h"
#include "AcmUtils.h"
-#include <acminterface.h>
#include "AcmPort.h"
#include "AcmPanic.h"
#include "acmserver.h"
#include "CdcAcmClass.h"
-#include <usb/usblogger.h>
#include "c32comm_internal.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "AcmPortFactoryTraces.h"
+#endif
-#ifdef __FLOG_ACTIVE
-_LIT8(KLogComponent, "ECACM");
-#endif
// Do not move this into a header file. It must be kept private to the CSY. It
// is the secret information that enables the old (registration port)
@@ -41,12 +41,12 @@
* @return Ownership of a newly created CAcmPortFactory object
*/
{
- LOG_STATIC_FUNC_ENTRY
-
+ OstTraceFunctionEntry0( CACMPORTFACTORY_NEWL_ENTRY );
CAcmPortFactory* self = new(ELeave) CAcmPortFactory;
CleanupClosePushL(*self);
self->ConstructL();
CleanupStack::Pop();
+ OstTraceFunctionExit0( CACMPORTFACTORY_NEWL_EXIT );
return self;
}
@@ -55,12 +55,14 @@
* Constructor.
*/
{
+ OstTraceFunctionEntry0( CACMPORTFACTORY_CACMPORTFACTORY_ENTRY );
iVersion = TVersion(
KEC32MajorVersionNumber,
KEC32MinorVersionNumber,
KEC32BuildVersionNumber);
iConfigBuf().iAcmConfigVersion = 1;
iOwned = EFalse;
+ OstTraceFunctionExit0( CACMPORTFACTORY_CACMPORTFACTORY_EXIT );
}
void CAcmPortFactory::ConstructL()
@@ -68,29 +70,58 @@
* Second phase constructor.
*/
{
- LEAVEIFERRORL(SetName(&KAcmSerialName));
+ OstTraceFunctionEntry0( CACMPORTFACTORY_CONSTRUCTL_ENTRY );
+ TInt aReason = SetName(&KAcmSerialName);
+ if (aReason < 0)
+ {
+ OstTrace1( TRACE_NORMAL, CACMPORTFACTORY_CONSTRUCTL, "CAcmPortFactory::ConstructL;aReason=%d", aReason );
+ User::Leave(aReason);
+ }
+
iAcmServer = CAcmServer::NewL(*this);
TInt err = RProperty::Define(KUidSystemCategory, KAcmKey, RProperty::EByteArray, TPublishedAcmConfigs::KAcmMaxFunctions);
if(err == KErrAlreadyExists)
{
- LEAVEIFERRORL(iAcmProperty.Attach(KUidSystemCategory, KAcmKey, EOwnerThread));
+ aReason = iAcmProperty.Attach(KUidSystemCategory, KAcmKey, EOwnerThread);
+ if (aReason < 0)
+ {
+ OstTrace1( TRACE_NORMAL, CACMPORTFACTORY_CONSTRUCTL_DUP1, "CAcmPortFactory::ConstructL;aReason=%d", aReason );
+ User::Leave(aReason);
+ }
+
//Since the P&S data already exists we need to retrieve it
- LEAVEIFERRORL(iAcmProperty.Get(iConfigBuf));
+ aReason = iAcmProperty.Get(iConfigBuf);
+ if (aReason < 0)
+ {
+ OstTrace1( TRACE_NORMAL, CACMPORTFACTORY_CONSTRUCTL_DUP2, "CAcmPortFactory::ConstructL;aReason=%d", aReason );
+ User::Leave(aReason);
+ }
}
else if(err == KErrNone)
{
//A blank iConfigBuf already exists at this point to we don't need to do anything to it
//before publishing the P&S data
- LEAVEIFERRORL(iAcmProperty.Attach(KUidSystemCategory, KAcmKey, EOwnerThread));
+ aReason = iAcmProperty.Attach(KUidSystemCategory, KAcmKey, EOwnerThread);
+ if (aReason < 0)
+ {
+ OstTrace1( TRACE_NORMAL, CACMPORTFACTORY_CONSTRUCTL_DUP3, "CAcmPortFactory::ConstructL;aReason=%d", aReason );
+ User::Leave(aReason);
+ }
PublishAcmConfig();
iOwned = ETrue;
}
else
{
- LEAVEIFERRORL(err); //This will always leave, but a log will be created at least.
+ if (err < 0)
+ {
+ OstTrace1( TRACE_NORMAL, CACMPORTFACTORY_CONSTRUCTL_DUP4, "CAcmPortFactory::ConstructL;err=%d", err );
+ User::Leave(err);
+ }
+ //Here will always leave, but a log will be created at least.
}
+ OstTraceFunctionExit0( CACMPORTFACTORY_CONSTRUCTL_EXIT );
}
/**
@@ -101,7 +132,14 @@
{
// Update the publish and subscribe info
TInt err = iAcmProperty.Set(iConfigBuf);
- __ASSERT_DEBUG(err == KErrNone, _USB_PANIC(KAcmPanicCat, EPanicInternalError));
+ if (err != KErrNone)
+ {
+ OstTraceExt3( TRACE_NORMAL, CACMPORTFACTORY_PUBLISHACMCONFIG,
+ "CAcmPortFactory::PublishAcmConfig;code=%d;name=%S;line = %d",
+ (TInt)EPanicInternalError, KAcmPanicCat, (TInt)__LINE__);
+ __ASSERT_DEBUG( EFalse, User::Panic(KAcmPanicCat, EPanicInternalError) );
+ }
+
(void)err;
}
@@ -115,8 +153,7 @@
*/
//return the security policy for the given port number, aPort.
{
- LOG_FUNC
-
+ OstTraceFunctionEntry0( CACMPORTFACTORY_PORTPLATSECCAPABILITY_ENTRY );
TSecurityPolicy securityPolicy;
if ( aPort == KRegistrationPortUnit )
{
@@ -126,6 +163,7 @@
{
securityPolicy = TSecurityPolicy(ECapabilityLocalServices);
}
+ OstTraceFunctionExit0( CACMPORTFACTORY_PORTPLATSECCAPABILITY_EXIT );
return securityPolicy;
}
@@ -136,9 +174,8 @@
* @param aUnit The port number of the closing port.
*/
{
- LOG_FUNC
- LOGTEXT2(_L8("\taUnit = %d"), aUnit);
-
+ OstTraceFunctionEntry0( CACMPORTFACTORY_ACMPORTCLOSED_ENTRY );
+ OstTrace1( TRACE_NORMAL, CACMPORTFACTORY_ACMPORTCLOSED, "CAcmPortFactory::AcmPortClosed;aUnit=%d", aUnit );
// I would assert that the calling port is stored in our array, but if we
// ran out of memory during CAcmPort::NewL, this function would be called
// from the port's destructor, but the slot in the port array would still
@@ -151,6 +188,7 @@
#ifdef _DEBUG
LogPortsAndFunctions();
#endif
+ OstTraceFunctionExit0( CACMPORTFACTORY_ACMPORTCLOSED_EXIT );
}
CAcmPortFactory::~CAcmPortFactory()
@@ -158,8 +196,7 @@
* Destructor.
*/
{
- LOG_FUNC
-
+ OstTraceFunctionEntry0( DUP1_CACMPORTFACTORY_CACMPORTFACTORY_ENTRY );
// Delete ACM instances. We could assert that the ACM Class Controller has
// caused them all to be destroyed, but if we do that, and USBSVR panics
// while it's Started, it will result in C32 panicking too, which is
@@ -180,6 +217,7 @@
}
delete iAcmServer;
+ OstTraceFunctionExit0( DUP1_CACMPORTFACTORY_CACMPORTFACTORY_EXIT );
}
CPort* CAcmPortFactory::NewPortL(const TUint aUnit)
@@ -189,11 +227,9 @@
* @param aUnit Port unit number
*/
{
- LOG_LINE
- LOGTEXT2(_L8(">>CAcmPortFactory::NewPortL aUnit=%d"), aUnit);
-
+ OstTraceFunctionEntry0( CACMPORTFACTORY_NEWPORTL_ENTRY );
+ OstTrace1( TRACE_NORMAL, CACMPORTFACTORY_NEWPORTL, "CAcmPortFactory::NewPortL;aUnit=%d", aUnit );
CPort* port = NULL;
-
TUint lowerLimit = KAcmLowUnit; // This non-const TUint avoids compiler remarks (low-level warnings) for the following comparisons..
// ACM ports
if ( (aUnit >= lowerLimit) && aUnit < static_cast<TUint>( iAcmClassArray.Count()) + KAcmLowUnit)
@@ -204,7 +240,12 @@
const TUint index = aUnit - KAcmLowUnit;
if ( iAcmPortArray[index] )
{
- LEAVEIFERRORL(KErrInUse); // TODO: is this ever executed?
+ if (KErrInUse < 0)
+ {
+ OstTrace1( TRACE_ERROR, CACMPORTFACTORY_NEWPORTL_DUP2, "CAcmPortFactory::NewPortL;KErrInUse=%d", KErrInUse );
+ User::Leave(KErrInUse);
+ }
+ // TODO: is this ever executed?
}
iAcmPortArray[index] = CAcmPort::NewL(aUnit, *this);
iAcmPortArray[index]->SetAcm( iAcmClassArray[index]);
@@ -217,14 +258,18 @@
}
else
{
- LEAVEIFERRORL(KErrAccessDenied);
+ if (KErrAccessDenied < 0)
+ {
+ OstTrace1( TRACE_ERROR, CACMPORTFACTORY_NEWPORTL_DUP3, "CAcmPortFactory::NewPortL;KErrAccessDenied=%d", KErrAccessDenied );
+ User::Leave(KErrAccessDenied);
+ }
}
#ifdef _DEBUG
LogPortsAndFunctions();
#endif
-
- LOGTEXT2(_L8("<<CAcmPortFactory::NewPortL port=0x%08x"), port);
+ OstTrace1( TRACE_NORMAL, CACMPORTFACTORY_NEWPORTL_DUP1, "CAcmPortFactory::NewPortL;port=0x%08x", port );
+ OstTraceFunctionExit0( CACMPORTFACTORY_NEWPORTL_EXIT );
return port;
}
@@ -237,8 +282,8 @@
* @param aNoAcms Number of ACM interfaces to destroy.
*/
{
- LOGTEXT2(_L8(">>CAcmPortFactory::DestroyFunctions aNoAcms = %d"), aNoAcms);
-
+ OstTraceFunctionEntry0( CACMPORTFACTORY_DESTROYFUNCTIONS_ENTRY );
+ OstTrace1( TRACE_NORMAL, CACMPORTFACTORY_DESTROYFUNCTIONS, "CAcmPortFactory::DestroyFunctions;aNoAcms=%d", aNoAcms );
#ifdef _DEBUG
CheckAcmArray();
#endif
@@ -270,8 +315,8 @@
CheckAcmArray();
LogPortsAndFunctions();
#endif
-
- LOGTEXT(_L8("<<CAcmPortFactory::DestroyFunctions"));
+ OstTrace0( TRACE_NORMAL, CACMPORTFACTORY_DESTROYFUNCTIONS_DUP1, "CAcmPortFactory::DestroyFunctions;<<CAcmPortFactory::DestroyFunctions" );
+ OstTraceFunctionExit0( CACMPORTFACTORY_DESTROYFUNCTIONS_EXIT );
}
void CAcmPortFactory::CheckAcmArray()
@@ -280,12 +325,16 @@
* something valid. NB It is the ACM port array which may contain empty slots.
*/
{
- LOG_FUNC
-
+ OstTraceFunctionEntry0( CACMPORTFACTORY_CHECKACMARRAY_ENTRY );
for ( TUint ii = 0; ii < static_cast<TUint>( iAcmClassArray.Count()) ; ii++ )
{
- __ASSERT_DEBUG( iAcmClassArray[ii], _USB_PANIC(KAcmPanicCat, EPanicInternalError));
+ if (!iAcmClassArray[ii])
+ {
+ OstTraceExt2( TRACE_NORMAL, CACMPORTFACTORY_CHECKACMARRAY, "CAcmPortFactory::CheckAcmArray;code=%d;name=%S", (TInt)EPanicInternalError, KAcmPanicCat);
+ __ASSERT_DEBUG( EFalse, User::Panic(KAcmPanicCat, EPanicInternalError) );
+ }
}
+ OstTraceFunctionExit0( CACMPORTFACTORY_CHECKACMARRAY_EXIT );
}
TInt CAcmPortFactory::CreateFunctions(const TUint aNoAcms, const TUint8 aProtocolNum, const TDesC16& aAcmControlIfcName, const TDesC16& aAcmDataIfcName)
@@ -298,8 +347,8 @@
* @param aAcmDataIfcName Data Interface Name or a null descriptor
*/
{
- LOGTEXT5(_L("\taNoAcms = %d, aProtocolNum = %d, Control Ifc Name = %S, Data Ifc Name = %S"),
- aNoAcms, aProtocolNum, &aAcmControlIfcName, &aAcmDataIfcName);
+ OstTraceFunctionEntry0( CACMPORTFACTORY_CREATEFUNCTIONS_ENTRY );
+ OstTraceExt4( TRACE_NORMAL, CACMPORTFACTORY_CREATEFUNCTIONS, "CAcmPortFactory::CreateFunctions;aNoAcms=%d;aProtocolNum=%d;aAcmControlIfcName=%S;aAcmDataIfcName=%S", (TInt)aNoAcms, (TInt)aProtocolNum, aAcmControlIfcName, aAcmDataIfcName );
#ifdef _DEBUG
CheckAcmArray();
@@ -310,7 +359,7 @@
// Create the ACM class instances.
for ( TUint ii = 0 ; ii < aNoAcms ; ii++ )
{
- LOGTEXT2(_L8("\tabout to create ACM instance %d"), ii);
+ OstTrace1( TRACE_NORMAL, CACMPORTFACTORY_CREATEFUNCTIONS_DUP1, "CAcmPortFactory::CreateFunctions;\tabout to create ACM instance %d", ii );
TRAP(ret, CreateFunctionL(aProtocolNum, aAcmControlIfcName, aAcmDataIfcName));
if ( ret != KErrNone )
{
@@ -328,7 +377,8 @@
LogPortsAndFunctions();
#endif
- LOGTEXT2(_L8("<<CAcmPortFactory::CreateFunctions ret = %d"), ret);
+ OstTrace1( TRACE_NORMAL, CACMPORTFACTORY_CREATEFUNCTIONS_DUP2, "CAcmPortFactory::CreateFunctions;ret=%d", ret );
+ OstTraceFunctionExit0( CACMPORTFACTORY_CREATEFUNCTIONS_EXIT );
return ret;
}
@@ -337,26 +387,40 @@
* Creates a single ACM function, appending it to the iAcmClassArray array.
*/
{
- LOG_FUNC
-
- LOGTEXT3(_L8("\tiAcmPortArray.Count() = %d, iAcmClassArray.Count() = %d"),
- iAcmPortArray.Count(), iAcmClassArray.Count());
-
- LOGTEXT4(_L("\taProtocolNum = %d, Control Ifc Name = %S, Data Ifc Name = %S"),
- aProtocolNum, &aAcmControlIfcName, &aAcmDataIfcName);
+ OstTraceFunctionEntry0( CACMPORTFACTORY_CREATEFUNCTIONL_ENTRY );
+ OstTraceExt2( TRACE_NORMAL, CACMPORTFACTORY_CREATEFUNCTIONL,
+ "CAcmPortFactory::CreateFunctionL;\tiAcmPortArray.Count()=%d;iAcmClassArray.Count()=%d",
+ iAcmPortArray.Count(), iAcmClassArray.Count() );
+
+ OstTraceExt3( TRACE_NORMAL, CACMPORTFACTORY_CREATEFUNCTIONL_DUP1,
+ "CAcmPortFactory::CreateFunctionL;aProtocolNum=%d;aAcmControlIfcName=%S;aAcmDataIfcName=%S",
+ aProtocolNum, aAcmControlIfcName, aAcmDataIfcName );
CCdcAcmClass* acm = CCdcAcmClass::NewL(aProtocolNum, aAcmControlIfcName, aAcmDataIfcName);
CleanupStack::PushL(acm);
// If there isn't already a slot in the ACM port array corresponding to
// this ACM interface instance, create one.
+ TInt err;
if ( iAcmPortArray.Count() < iAcmClassArray.Count() + 1 )
{
- LOGTEXT(_L8("\tappending a slot to the ACM port array"));
- LEAVEIFERRORL(iAcmPortArray.Append(NULL));
+ OstTrace0( TRACE_NORMAL, CACMPORTFACTORY_CREATEFUNCTIONL_DUP2,
+ "CAcmPortFactory::CreateFunctionL;\tappending a slot to the ACM port array" );
+ err = iAcmPortArray.Append(NULL);
+ if (err < 0)
+ {
+ OstTrace1( TRACE_ERROR, CACMPORTFACTORY_CREATEFUNCTIONL_DUP4, "CAcmPortFactory::CreateFunctionL;err=%d", err );
+ User::Leave(err);
+ }
}
- LEAVEIFERRORL(iAcmClassArray.Append(acm));
+ err = iAcmClassArray.Append(acm);
+ if (err < 0)
+ {
+ OstTrace1( TRACE_ERROR, CACMPORTFACTORY_CREATEFUNCTIONL_DUP5, "CAcmPortFactory::CreateFunctionL;err=%d", err );
+ User::Leave(err);
+ }
+
CleanupStack::Pop(acm);
// If there's an ACM port at the relevant index (held open from when USB
@@ -364,7 +428,9 @@
// interface.
if ( iAcmPortArray[iAcmClassArray.Count() - 1] )
{
- LOGTEXT3(_L8("\tinforming CAcmPort instance %d of acm 0x%08x"), iAcmClassArray.Count() - 1, acm);
+ OstTraceExt2( TRACE_NORMAL, CACMPORTFACTORY_CREATEFUNCTIONL_DUP3,
+ "CAcmPortFactory::CreateFunctionL;\tinforming CAcmPort instance %d of acm 0x%p",
+ iAcmClassArray.Count() - 1, acm );
iAcmPortArray[iAcmClassArray.Count() - 1]->SetAcm(acm);
}
@@ -373,6 +439,7 @@
iConfigBuf().iAcmCount++;
//don't update the p&s data here, do it in CreateFunctions after the construction of
//all the requested functions
+ OstTraceFunctionExit0( CACMPORTFACTORY_CREATEFUNCTIONL_EXIT );
}
void CAcmPortFactory::Info(TSerialInfo& aSerialInfo)
@@ -382,16 +449,17 @@
* @param aSerialInfo where info will be written to
*/
{
+ OstTraceFunctionEntry0( CACMPORTFACTORY_INFO_ENTRY );
// NB Our TSerialInfo does not advertise the existence of the registration
// port.
- LOG_FUNC
-
+
_LIT(KSerialDescription, "USB Serial Port Emulation via ACM");
aSerialInfo.iDescription = KSerialDescription;
aSerialInfo.iName = KAcmSerialName;
aSerialInfo.iLowUnit = KAcmLowUnit;
aSerialInfo.iHighUnit = (iAcmPortArray.Count()==0) ? 0 : (iAcmPortArray.Count()-1);
// See comments in AcmInterface.h
+ OstTraceFunctionExit0( CACMPORTFACTORY_INFO_EXIT );
}
void CAcmPortFactory::LogPortsAndFunctions()
@@ -411,18 +479,24 @@
* port open/closed history of the CSY.
*/
{
+ OstTraceFunctionEntry0( CACMPORTFACTORY_LOGPORTSANDFUNCTIONS_ENTRY );
TUint ii;
// Log ACM functions and corresponding ports.
for ( ii = 0 ; ii < static_cast<TUint>( iAcmClassArray.Count()) ; ii++ )
{
- LOGTEXT5(_L8("\t iAcmClassArray[%d] = 0x%08x, iAcmPortArray[%d] = 0x%08x"), ii, iAcmClassArray[ii], ii, iAcmPortArray[ii]);
+ OstTraceExt4( TRACE_NORMAL, CACMPORTFACTORY_LOGPORTSANDFUNCTIONS,
+ "CAcmPortFactory::LogPortsAndFunctions;\t iAcmClassArray[%d] = %p, iAcmPortArray[%d] = %p",
+ (TInt)ii, iAcmClassArray[ii], (TInt)ii, iAcmPortArray[ii] );
}
// Log any ports extending beyond where we currently have ACM interfaces.
for ( ; ii < static_cast<TUint>(iAcmPortArray.Count()) ; ii++ )
{
- LOGTEXT4(_L8("\t iAcmClassArray[%d] = <no slot>, iAcmPortArray[%d] = 0x%08x"), ii, ii, iAcmPortArray[ii]);
+ OstTraceExt3( TRACE_NORMAL, CACMPORTFACTORY_LOGPORTSANDFUNCTIONS_DUP1,
+ "CAcmPortFactory::LogPortsAndFunctions;\t iAcmClassArray[%d] = <no slot>, iAcmPortArray[%d] = %p",
+ (TInt)ii, (TInt)ii, iAcmPortArray[ii] );
}
+ OstTraceFunctionExit0( CACMPORTFACTORY_LOGPORTSANDFUNCTIONS_EXIT );
}
//
--- a/usbmgmt/usbmgr/device/classdrivers/acm/classimplementation/ecacm/src/AcmReader.cpp Wed Jul 07 14:16:40 2010 +0800
+++ b/usbmgmt/usbmgr/device/classdrivers/acm/classimplementation/ecacm/src/AcmReader.cpp Wed Jul 07 15:08:54 2010 +0800
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2003-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2003-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"
@@ -23,11 +23,11 @@
#include "CdcAcmClass.h"
#include "AcmPanic.h"
#include "AcmPort.h"
-#include <usb/usblogger.h>
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "AcmReaderTraces.h"
+#endif
-#ifdef __FLOG_ACTIVE
-_LIT8(KLogComponent, "ECACM");
-#endif
CAcmReader* CAcmReader::NewL(CAcmPort& aPort,
TUint aBufSize)
@@ -39,12 +39,12 @@
* @return Ownership of a new CAcmReader.
*/
{
- LOG_STATIC_FUNC_ENTRY
-
+ OstTraceFunctionEntry0( CACMREADER_NEWL_ENTRY );
CAcmReader* self = new(ELeave) CAcmReader(aPort, aBufSize);
CleanupStack::PushL(self);
self->ConstructL();
CLEANUPSTACK_POP(self);
+ OstTraceFunctionExit0( CACMREADER_NEWL_EXIT );
return self;
}
@@ -53,11 +53,10 @@
* Destructor.
*/
{
- LOG_FUNC
-
+ OstTraceFunctionEntry0( CACMREADER_CACMREADER_DES_ENTRY );
ReadCancel();
-
delete iBuffer;
+ OstTraceFunctionExit0( CACMREADER_CACMREADER_DES_EXIT );
}
CAcmReader::CAcmReader(CAcmPort& aPort,
@@ -72,6 +71,8 @@
iInBuf(NULL,0,0),
iPort(aPort)
{
+ OstTraceFunctionEntry0( CACMREADER_CACMREADER_CONS_ENTRY );
+ OstTraceFunctionExit0( CACMREADER_CACMREADER_CONS_EXIT );
}
void CAcmReader::ConstructL()
@@ -79,9 +80,16 @@
* 2nd-phase construction.
*/
{
+ OstTraceFunctionEntry0( CACMREADER_CONSTRUCTL_ENTRY );
// Create iBuffer.
- LOGTEXT(_L8("\tabout to create iBuffer"));
- LEAVEIFERRORL(SetBufSize(iBufSize));
+ OstTrace0( TRACE_NORMAL, CACMREADER_CONSTRUCTL, "CAcmReader::ConstructL;\tabout to create iBuffer" );
+ TInt err = SetBufSize(iBufSize);
+ if (err < 0)
+ {
+ OstTrace1( TRACE_ERROR, CACMREADER_CONSTRUCTL_DUP1, "CAcmReader::ConstructL;err=%d", err );
+ User::Leave(err);
+ }
+ OstTraceFunctionExit0( CACMREADER_CONSTRUCTL_EXIT );
}
void CAcmReader::Read(const TAny* aClientBuffer, TUint aMaxLen)
@@ -92,9 +100,8 @@
* @param aMaxLen Maximum length to read.
*/
{
- LOG_FUNC
- LOGTEXT3(_L8("\taClientBuffer=0x%08x, aMaxLen=%d"),
- aClientBuffer, aMaxLen);
+ OstTraceFunctionEntry0( CACMREADER_READ_ENTRY );
+ OstTraceExt2( TRACE_NORMAL, CACMREADER_READ, "CAcmReader::Read;\taClientBuffer=%p, aMaxLen=%d", aClientBuffer, (TInt)aMaxLen );
// Check we're open to requests and make a note of interesting data.
// including iLengthToGo
@@ -112,6 +119,7 @@
{
ReadWithTerminators();
}
+ OstTraceFunctionExit0( CACMREADER_READ_EXIT );
}
void CAcmReader::ReadWithoutTerminators()
@@ -119,18 +127,22 @@
* Process a read request given that no terminator characters are set.
*/
{
- LOG_FUNC
-
+ OstTraceFunctionEntry0( CACMREADER_READWITHOUTTERMINATORS_ENTRY );
// Can we complete immediately from the buffer?
const TUint bufLen = BufLen();
- LOGTEXT2(_L8("\thave %d bytes in buffer"), bufLen);
- LOGTEXT2(_L8("\tLength to go is %d bytes"), iLengthToGo);
+ OstTraceExt2( TRACE_NORMAL, CACMREADER_READWITHOUTTERMINATORS,
+ "CAcmReader::ReadWithoutTerminators;\thave %d bytes in buffer;\tLength to go is %d bytes",
+ (TInt)bufLen, (TInt)iLengthToGo );
if ( iLengthToGo <= bufLen )
{
- LOGTEXT2(_L8("\tcompleting request immediately from buffer with %d "
- "bytes"), iLengthToGo);
+ OstTrace1( TRACE_NORMAL, CACMREADER_READWITHOUTTERMINATORS_DUP1,
+ "CAcmReader::ReadWithoutTerminators;\tcompleting "
+ "request immediately from buffer with %d bytes",
+ (TInt)iLengthToGo );
+
WriteBackData(iLengthToGo);
CompleteRequest(KErrNone);
+ OstTraceFunctionExit0( CACMREADER_READWITHOUTTERMINATORS_EXIT );
return;
}
@@ -138,14 +150,17 @@
// back as much as we have, and issue a Read for more.
if ( bufLen )
{
- LOGTEXT2(_L8("\twriting back %d bytes"), bufLen);
+ OstTrace1( TRACE_NORMAL, CACMREADER_READWITHOUTTERMINATORS_DUP2,
+ "CAcmReader::ReadWithoutTerminators;\twriting back %d bytes", (TInt)bufLen );
// Write back as much data as we've got already.
WriteBackData(bufLen);
}
// Issue a read for the data we still need.
- LOGTEXT2(_L8("\tRequesting read - require %d bytes"),iLengthToGo);
+ OstTrace1( TRACE_NORMAL, CACMREADER_READWITHOUTTERMINATORS_DUP3,
+ "CAcmReader::ReadWithoutTerminators;iLengthToGo=%d", (TInt)iLengthToGo );
IssueRead();
+ OstTraceFunctionExit0( CACMREADER_READWITHOUTTERMINATORS_EXIT_DUP1 );
}
void CAcmReader::ReadWithTerminators()
@@ -153,23 +168,24 @@
* Process a read request given that terminator characters are set.
*/
{
- LOG_FUNC
-
+ OstTraceFunctionEntry0( CACMREADER_READWITHTERMINATORS_ENTRY );
// Can we complete immediately from the buffer? Search the buffer we have
// for any terminators. If found, complete back to the client. If not
// found, start issuing ReadOneOrMores until we either find one or run out
// of client buffer.
const TUint bufLen = BufLen();
- LOGTEXT2(_L8("\tbufLen = %d"), bufLen);
+ OstTrace1( TRACE_NORMAL, CACMREADER_READWITHTERMINATORS, "CAcmReader::ReadWithTerminators;bufLen=%d", (TInt)bufLen );
if ( bufLen )
{
CheckForBufferedTerminatorsAndProceed();
+ OstTraceFunctionExit0( CACMREADER_READWITHTERMINATORS_EXIT );
return;
}
// There's no buffered data. Get some.
IssueReadOneOrMore();
+ OstTraceFunctionExit0( CACMREADER_READWITHTERMINATORS_EXIT_DUP1 );
}
void CAcmReader::ReadOneOrMore(const TAny* aClientBuffer, TUint aMaxLen)
@@ -181,31 +197,31 @@
* @param aMaxLen Maximum length to read.
*/
{
- LOG_FUNC
- LOGTEXT3(_L8("\taClientBuffer=0x%08x, aMaxLen=%d"),
- aClientBuffer, aMaxLen);
-
+ OstTraceFunctionEntry0( CACMREADER_READONEORMORE_ENTRY );
+ OstTraceExt2( TRACE_NORMAL, CACMREADER_READONEORMORE,
+ "CAcmReader::ReadOneOrMore;aClientBuffer=%p;aMaxLen=%d", aClientBuffer, (TInt)aMaxLen );
// Check we're open to requests and make a note of interesting data.
CheckNewRequest(aClientBuffer, aMaxLen);
+ iCurrentRequest.iRequestType = EReadOneOrMore;
- iCurrentRequest.iRequestType = EReadOneOrMore;
-
// Check to see if there's anything in our buffer- if there is, we can
// complete immediately.
const TUint bufLen = BufLen();
- LOGTEXT2(_L8("\tbufLen = %d"), bufLen);
+ OstTrace1( TRACE_NORMAL, CACMREADER_READONEORMORE_DUP1, "CAcmReader::ReadOneOrMore;bufLen=%d", (TInt)bufLen );
if ( bufLen )
{
// Complete request with what's in the buffer
- LOGTEXT2(_L8("\tcompleting request immediately from buffer with %d "
- "bytes"), bufLen);
+ OstTrace1( TRACE_FLOW, CACMREADER_READONEORMORE_DUP2,
+ "CAcmReader::ReadOneOrMore;\tcompleting request immediately from buffer with %d bytes", (TInt)bufLen );
WriteBackData(bufLen);
CompleteRequest(KErrNone);
+ OstTraceFunctionExit0( CACMREADER_READONEORMORE_EXIT );
return;
}
// Get some more data.
IssueReadOneOrMore();
+ OstTraceFunctionExit0( CACMREADER_READONEORMORE_EXIT_DUP1 );
}
void CAcmReader::NotifyDataAvailable()
@@ -213,15 +229,17 @@
* NotifyDataAvailable API. If a request is pending completes the client with KErrInUse.
*/
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CACMREADER_NOTIFYDATAAVAILABLE_ENTRY );
if(iCurrentRequest.iClientPtr) // a request is pending
{
iPort.NotifyDataAvailableCompleted(KErrInUse);
+ OstTraceFunctionExit0( CACMREADER_NOTIFYDATAAVAILABLE_EXIT );
return;
}
iCurrentRequest.iClientPtr = iBuffer;
iCurrentRequest.iRequestType = ENotifyDataAvailable;
iPort.Acm()->NotifyDataAvailable(*this);
+ OstTraceFunctionExit0( CACMREADER_NOTIFYDATAAVAILABLE_EXIT_DUP1 );
}
void CAcmReader::NotifyDataAvailableCancel()
@@ -230,19 +248,21 @@
*
*/
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CACMREADER_NOTIFYDATAAVAILABLECANCEL_ENTRY );
if (ENotifyDataAvailable == iCurrentRequest.iRequestType)
{
// Cancel any outstanding request on the LDD.
if (iPort.Acm())
{
- LOGTEXT(_L8("\tiPort.Acm() exists- calling NotifyDataAvailableCancel() on it"));
+ OstTrace0( TRACE_NORMAL, CACMREADER_NOTIFYDATAAVAILABLECANCEL,
+ "CAcmReader::NotifyDataAvailableCancel;\tiPort.Acm() exists- calling NotifyDataAvailableCancel() on it" );
iPort.Acm()->NotifyDataAvailableCancel();
}
// Reset our flag to say there's no current outstanding request. What's
// already in our buffer can stay there.
iCurrentRequest.iClientPtr = NULL;
}
+ OstTraceFunctionExit0( CACMREADER_NOTIFYDATAAVAILABLECANCEL_EXIT );
}
void CAcmReader::ReadCancel()
@@ -250,14 +270,14 @@
* Cancel API. Cancels any outstanding (Read or ReadOneOrMore) request.
*/
{
- LOG_FUNC
-
+ OstTraceFunctionEntry0( CACMREADER_READCANCEL_ENTRY );
if (ENotifyDataAvailable != iCurrentRequest.iRequestType)
{
// Cancel any outstanding request on the LDD.
if (iPort.Acm())
{
- LOGTEXT(_L8("\tiPort.Acm() exists- calling ReadCancel on it"));
+ OstTrace0( TRACE_NORMAL, CACMREADER_READCANCEL,
+ "CAcmReader::ReadCancel;\tiPort.Acm() exists- calling ReadCancel on it" );
iPort.Acm()->ReadCancel();
}
@@ -265,6 +285,7 @@
// already in our buffer can stay there.
iCurrentRequest.iClientPtr = NULL;
}
+ OstTraceFunctionExit0( CACMREADER_READCANCEL_EXIT );
}
TUint CAcmReader::BufLen() const
@@ -275,21 +296,22 @@
* @return Length of data in buffer.
*/
{
- LOGTEXT(_L8(">>CAcmReader::BufLen"));
-
+ OstTraceFunctionEntry0( CACMREADER_BUFLEN_ENTRY );
+ OstTrace0( TRACE_NORMAL, CACMREADER_BUFLEN, "CAcmReader::BufLen;>>CAcmReader::BufLen" );
TUint len = 0;
if ( BufWrap() )
{
- LOGTEXT(_L8("\tbuf wrapped"));
+ OstTrace0( TRACE_NORMAL, CACMREADER_BUFLEN_DUP1, "CAcmReader::BufLen;\tbuf wrapped" );
len = iBufSize - ( iOutPtr - iInPtr );
}
else
{
- LOGTEXT(_L8("\tbuf not wrapped"));
+ OstTrace0( TRACE_NORMAL, CACMREADER_BUFLEN_DUP2, "CAcmReader::BufLen;\tbuf not wrapped" );
len = iInPtr - iOutPtr;
}
- LOGTEXT2(_L8("<<CAcmReader::BufLen len=%d"), len);
+ OstTrace1( TRACE_NORMAL, CACMREADER_BUFLEN_DUP3, "CAcmReader::BufLen;len=%d", (TInt)len );
+ OstTraceFunctionExit0( CACMREADER_BUFLEN_EXIT );
return len;
}
@@ -298,14 +320,18 @@
* Called by the port to clear the buffer.
*/
{
- LOG_FUNC
-
+ OstTraceFunctionEntry0( CACMREADER_RESETBUFFER_ENTRY );
// A request is outstanding- C32 should protect against this.
- __ASSERT_DEBUG(!iCurrentRequest.iClientPtr,
- _USB_PANIC(KAcmPanicCat, EPanicInternalError));
+ if (iCurrentRequest.iClientPtr)
+ {
+ OstTraceExt1( TRACE_FATAL, CACMREADER_RESETBUFFER,
+ "CAcmReader::ResetBuffer;iCurrentRequest.iClientPtr=%p", iCurrentRequest.iClientPtr );
+ __ASSERT_DEBUG( EFalse, User::Panic(KAcmPanicCat, EPanicInternalError) );
+ }
// Reset the pointers. All data is 'lost'.
iOutPtr = iInPtr = iBufStart;
+ OstTraceFunctionExit0( CACMREADER_RESETBUFFER_EXIT );
}
TInt CAcmReader::SetBufSize(TUint aSize)
@@ -317,13 +343,14 @@
* @param aSize The required size of the buffer.
*/
{
- LOG_FUNC
- LOGTEXT2(_L8("\taSize=%d"), aSize);
-
+ OstTraceFunctionEntry0( CACMREADER_SETBUFSIZE_ENTRY );
+ OstTrace1( TRACE_NORMAL, CACMREADER_SETBUFSIZE, "CAcmReader::SetBufSize;aSize=%d", (TInt)aSize );
if ( iCurrentRequest.iClientPtr )
{
// A request is outstanding. C32 does not protect us against this.
- LOGTEXT(_L8("\t***a request is outstanding- returning KErrInUse"));
+ OstTrace0( TRACE_NORMAL, CACMREADER_SETBUFSIZE_DUP1,
+ "CAcmReader::SetBufSize;\t***a request is outstanding- returning KErrInUse" );
+ OstTraceFunctionExit0( CACMREADER_SETBUFSIZE_EXIT );
return KErrInUse;
}
@@ -331,7 +358,9 @@
HBufC8* newBuf = HBufC8::New(aSize);
if ( !newBuf )
{
- LOGTEXT(_L8("\tfailed to create new buffer- returning KErrNoMemory"));
+ OstTrace0( TRACE_NORMAL, CACMREADER_SETBUFSIZE_DUP2,
+ "CAcmReader::SetBufSize;\tfailed to create new buffer- returning KErrNoMemory" );
+ OstTraceFunctionExit0( CACMREADER_SETBUFSIZE_EXIT_DUP1 );
return KErrNoMemory;
}
delete iBuffer;
@@ -343,6 +372,7 @@
iBufSize = aSize;
CheckBufferEmptyAndResetPtrs();
+ OstTraceFunctionExit0( CACMREADER_SETBUFSIZE_EXIT_DUP2 );
return KErrNone;
}
@@ -353,20 +383,28 @@
* @param aConfig The new configuration.
*/
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CACMREADER_SETTERMINATORS_ENTRY );
// C32 protects the port against having config set while there's a request
// outstanding.
- __ASSERT_DEBUG(!iCurrentRequest.iClientPtr,
- _USB_PANIC(KAcmPanicCat, EPanicInternalError));
+ if (iCurrentRequest.iClientPtr)
+ {
+ OstTraceExt1( TRACE_FATAL, CACMREADER_SETTERMINATORS_DUP2,
+ "CAcmReader::SetTerminators;iCurrentRequest.iClientPtr=%p", iCurrentRequest.iClientPtr );
+ __ASSERT_DEBUG( EFalse, User::Panic(KAcmPanicCat, EPanicInternalError) );
+ }
iTerminatorCount = aConfig.iTerminatorCount;
- LOGTEXT2(_L8("\tnow %d terminators:"), iTerminatorCount);
+ OstTrace1( TRACE_NORMAL, CACMREADER_SETTERMINATORS,
+ "CAcmReader::SetTerminators;\tnow %d terminators:", (TInt)iTerminatorCount );
+
for ( TUint ii = 0; ii < static_cast<TUint>(KConfigMaxTerminators) ; ii++ )
{
iTerminator[ii] = aConfig.iTerminator[ii];
- LOGTEXT2(_L8("\t\t%d"), iTerminator[ii]);
+ OstTrace1( TRACE_NORMAL, CACMREADER_SETTERMINATORS_DUP1,
+ "CAcmReader::SetTerminators;\t\t%d", iTerminator[ii]);
}
+ OstTraceFunctionExit0( CACMREADER_SETTERMINATORS_EXIT );
}
void CAcmReader::ReadCompleted(TInt aError)
@@ -376,18 +414,20 @@
* @param aError Error.
*/
{
- LOGTEXT2(_L8(">>CAcmReader::ReadCompleted aError=%d"), aError);
+ OstTraceFunctionEntry0( CACMREADER_READCOMPLETED_ENTRY );
+ OstTrace1( TRACE_NORMAL, CACMREADER_READCOMPLETED,
+ "CAcmReader::ReadCompleted;>>CAcmReader::ReadCompleted aError=%d", aError );
const TUint justRead = static_cast<TUint>(iInBuf.Length());
- LOGTEXT3(_L8("\tiInBuf length=%d, iLengthToGo=%d"),
- justRead,
- iLengthToGo);
+ OstTraceExt2( TRACE_NORMAL, CACMREADER_READCOMPLETED_DUP1,
+ "CAcmReader::ReadCompleted;\tiInBuf length=%d, iLengthToGo=%d", (TInt)justRead, (TInt)iLengthToGo );
// This protects against a regression in the LDD- read requests shouldn't
// ever complete with zero bytes and KErrNone.
if ( justRead == 0 && aError == KErrNone )
{
- _USB_PANIC(KAcmPanicCat, EPanicInternalError);
+ OstTrace0( TRACE_FATAL, CACMREADER_READCOMPLETED_DUP3, "CAcmReader::ReadCompleted;ustRead == 0 && aError == KErrNone" );
+ __ASSERT_DEBUG( EFalse, User::Panic(KAcmPanicCat, EPanicInternalError) );
}
// The new data will have been added to our buffer. Move iInPtr up by the
@@ -401,6 +441,7 @@
// multi-stage Read the client will get any data already written back
// to them with IPCWrite.
CompleteRequest(aError);
+ OstTraceFunctionExit0( CACMREADER_READCOMPLETED_EXIT );
return;
}
@@ -408,8 +449,8 @@
// it will also complete the request if we've given the client enough data
// or will reissue another read if not
ReadWithoutTerminators();
-
- LOGTEXT(_L8("<<CAcmReader::ReadCompleted"));
+ OstTrace0( TRACE_NORMAL, CACMREADER_READCOMPLETED_DUP2, "CAcmReader::ReadCompleted;<<CAcmReader::ReadCompleted" );
+ OstTraceFunctionExit0( CACMREADER_READCOMPLETED_EXIT_DUP1 );
}
void CAcmReader::ReadOneOrMoreCompleted(TInt aError)
@@ -419,21 +460,24 @@
* @param aError Error.
*/
{
- LOGTEXT2(_L8(">>CAcmReader::ReadOneOrMoreCompleted aError=%d"), aError);
+ OstTraceFunctionEntry0( CACMREADER_READONEORMORECOMPLETED_ENTRY );
+ OstTrace1( TRACE_NORMAL, CACMREADER_READONEORMORECOMPLETED,
+ "CAcmReader::ReadOneOrMoreCompleted;>>CAcmReader::ReadOneOrMoreCompleted aError=%d", aError );
const TUint justRead = static_cast<TUint>(iInBuf.Length());
- LOGTEXT2(_L8("\tjustRead = %d"), justRead);
+ OstTrace1( TRACE_NORMAL, CACMREADER_READONEORMORECOMPLETED_DUP1,
+ "CAcmReader::ReadOneOrMoreCompleted;\tjustRead = %d", (TInt)justRead );
// The new data will have been added to our buffer. Move iInPtr
// up by the length just read.
iInPtr += justRead;
-
if ( aError )
{
// If the ReadOneOrMore failed, we complete back to the client and
// don't do anything more. The client will get any data already
// written back to them with IPCWrite.
CompleteRequest(aError);
+ OstTraceFunctionExit0( CACMREADER_READONEORMORECOMPLETED_EXIT );
return;
}
@@ -444,8 +488,10 @@
// data.
if ( justRead == 0 )
{
- LOGTEXT(_L8("\twe appear to have a ZLP- reissuing ReadOneOrMore"));
+ OstTrace0( TRACE_NORMAL, CACMREADER_READONEORMORECOMPLETED_DUP2,
+ "CAcmReader::ReadOneOrMoreCompleted;\twe appear to have a ZLP- reissuing ReadOneOrMore" );
IssueReadOneOrMore();
+ OstTraceFunctionExit0( CACMREADER_READONEORMORECOMPLETED_EXIT_DUP1 );
return;
}
@@ -454,8 +500,8 @@
// Complete the client's request with as much data as we can. NB
// Opinion may be divided over whether to do this, or complete with
// just 1 byte. We implement the more generous approach.
- LOGTEXT2(_L8("\tcurrent request is ReadOneOrMore- completing with "
- "%d bytes"), justRead);
+ OstTrace1( TRACE_NORMAL, CACMREADER_READONEORMORECOMPLETED_DUP3,
+ "CAcmReader::ReadOneOrMoreCompleted;\tcurrent request is ReadOneOrMore- completing with %d bytes", (TInt)justRead );
WriteBackData(justRead);
CompleteRequest(KErrNone);
}
@@ -465,28 +511,33 @@
// ReadOneOrMore, we only request LDD::ReadOneOrMore in this case.)
// Process the buffer for terminators.
- LOGTEXT(_L8("\tcurrent request is Read with terminators"));
+ OstTrace0( TRACE_NORMAL, CACMREADER_READONEORMORECOMPLETED_DUP4,
+ "CAcmReader::ReadOneOrMoreCompleted;\tcurrent request is Read with terminators" );
CheckForBufferedTerminatorsAndProceed();
}
- LOGTEXT(_L8("<<CAcmReader::ReadOneOrMoreCompleted"));
+ OstTrace0( TRACE_NORMAL, CACMREADER_READONEORMORECOMPLETED_DUP5,
+ "CAcmReader::ReadOneOrMoreCompleted;<<CAcmReader::ReadOneOrMoreCompleted" );
+ OstTraceFunctionExit0( CACMREADER_READONEORMORECOMPLETED_EXIT_DUP2 );
}
void CAcmReader::NotifyDataAvailableCompleted(TInt aError)
{
+ OstTraceFunctionEntry0( CACMREADER_NOTIFYDATAAVAILABLECOMPLETED_ENTRY );
/**
* Called by lower classes when data has arrived at the LDD after a
* NotifyDataAvailable request has been posted on the port.
*
* @param aError Error.
*/
- LOGTEXT2(_L8(">>CAcmReader::NotifyDataAvailableCompleted aError=%d"), aError);
-
+ OstTrace1( TRACE_NORMAL, CACMREADER_NOTIFYDATAAVAILABLECOMPLETED,
+ "CAcmReader::NotifyDataAvailableCompleted;aError=%d", aError );
+
// If the NotifyDataAvailable request failed, we complete back
// to the client and don't do anything more.
- CompleteRequest(aError);
-
- LOGTEXT(_L8("<<CAcmReader::NotifyDataAvailableCompleted"));
+ CompleteRequest(aError);
+ OstTrace0( TRACE_NORMAL, CACMREADER_NOTIFYDATAAVAILABLECOMPLETED_DUP2, "<<CAcmReader::NotifyDataAvailableCompleted" );
+ OstTraceFunctionExit0( CACMREADER_NOTIFYDATAAVAILABLECOMPLETED_EXIT );
}
void CAcmReader::CheckBufferEmptyAndResetPtrs()
@@ -496,14 +547,16 @@
* fiddling around wrapping at the end of the buffer.
*/
{
- LOGTEXT(_L8("CAcmReader::CheckBufferEmptyAndResetPtrs"));
-
- if ( BufLen() != 0 )
+ OstTraceFunctionEntry0( CACMREADER_CHECKBUFFEREMPTYANDRESETPTRS_ENTRY );
+ TInt blen = BufLen();
+ if ( blen != 0 )
{
- _USB_PANIC(KAcmPanicCat, EPanicInternalError);
+ OstTrace1( TRACE_FATAL, CACMREADER_CHECKBUFFEREMPTYANDRESETPTRS, "CAcmReader::CheckBufferEmptyAndResetPtrs;blen=%d", blen );
+ __ASSERT_DEBUG( EFalse, User::Panic(KAcmPanicCat, EPanicInternalError) );
}
iOutPtr = iInPtr = iBufStart;
+ OstTraceFunctionExit0( CACMREADER_CHECKBUFFEREMPTYANDRESETPTRS_EXIT );
}
void CAcmReader::CheckNewRequest(const TAny* aClientBuffer, TUint aMaxLen)
@@ -516,25 +569,41 @@
* @param aMaxLen Maximum length to read.
*/
{
+ OstTraceFunctionEntry0( CACMREADER_CHECKNEWREQUEST_ENTRY );
+
// The port should handle zero-length reads, not us.
- __ASSERT_DEBUG(aMaxLen > 0, _USB_PANIC(KAcmPanicCat, EPanicInternalError));
- __ASSERT_DEBUG(aMaxLen <= static_cast<TUint>(KMaxTInt),
- _USB_PANIC(KAcmPanicCat, EPanicInternalError));
+ if (aMaxLen <= 0)
+ {
+ OstTrace0( TRACE_FATAL, CACMREADER_CHECKNEWREQUEST, "CAcmReader::CheckNewRequest;aMaxLen <= 0" );
+
+ __ASSERT_DEBUG( EFalse, User::Panic(KAcmPanicCat, EPanicInternalError) );
+ }
+ if (aMaxLen > static_cast<TUint>(KMaxTInt))
+ {
+ OstTrace0( TRACE_FATAL, CACMREADER_CHECKNEWREQUEST_DUP1, "CAcmReader::CheckNewRequest;aMaxLen > static_cast<TUint>(KMaxTInt)" );
+ __ASSERT_DEBUG( EFalse, User::Panic(KAcmPanicCat, EPanicInternalError) );
+ }
// Check we have no outstanding request already.
if ( iCurrentRequest.iClientPtr )// just panic in case of concurrent Read or ReadOneOrMore queries.
{ // in case of NotifyDataAvailable queries, we already have completed the client with KErrInUse.
// This code is kept for legacy purpose. That justifies the existence of IsNotifyDataAvailableQueryPending
- _USB_PANIC(KAcmPanicCat, EPanicInternalError);
+ OstTraceExt1( TRACE_FATAL, CACMREADER_CHECKNEWREQUEST_DUP3,
+ "CAcmReader::CheckNewRequest;iCurrentRequest.iClientPtr=%p", iCurrentRequest.iClientPtr );
+ __ASSERT_DEBUG( EFalse, User::Panic(KAcmPanicCat, EPanicInternalError) );
}
// Sanity check on what C32 gave us.
- __ASSERT_DEBUG(aClientBuffer,
- _USB_PANIC(KAcmPanicCat, EPanicInternalError));
+ if (!aClientBuffer)
+ {
+ OstTrace0( TRACE_FATAL, CACMREADER_CHECKNEWREQUEST_DUP2, "CAcmReader::CheckNewRequest;aClientBuffer = NULL" );
+ __ASSERT_DEBUG( EFalse, User::Panic(KAcmPanicCat, EPanicInternalError) );
+ }
// Make a note of interesting data.
iCurrentRequest.iClientPtr = aClientBuffer;
iLengthToGo = aMaxLen;
iOffsetIntoClientsMemory = 0;
+ OstTraceFunctionExit0( CACMREADER_CHECKNEWREQUEST_EXIT );
}
void CAcmReader::CheckForBufferedTerminatorsAndProceed()
@@ -544,23 +613,29 @@
* amount if not.
*/
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CACMREADER_CHECKFORBUFFEREDTERMINATORSANDPROCEED_ENTRY );
+
+ TInt ret = FindTerminator();
+ OstTrace1( TRACE_NORMAL, CACMREADER_CHECKFORBUFFEREDTERMINATORSANDPROCEED_DUP6,
+ "CAcmReader::CheckForBufferedTerminatorsAndProceed;\tFindTerminator = %d", ret );
- TInt ret = FindTerminator();
- LOGTEXT2(_L8("\tFindTerminator = %d"), ret);
if ( ret < KErrNone )
{
- LOGTEXT(_L8("\tno terminator found"));
+ OstTrace0( TRACE_NORMAL, CACMREADER_CHECKFORBUFFEREDTERMINATORSANDPROCEED,
+ "CAcmReader::CheckForBufferedTerminatorsAndProceed;\tno terminator found" );
+
const TUint bufLen = BufLen();
- LOGTEXT2(_L8("\tbufLen = %d"), bufLen);
+ OstTrace1( TRACE_NORMAL, CACMREADER_CHECKFORBUFFEREDTERMINATORSANDPROCEED_DUP1,
+ "CAcmReader::CheckForBufferedTerminatorsAndProceed;\tbufLen = %d", (TInt)bufLen );
+
// No terminator was found. Does the buffer already exceed the
// client's descriptor?
if ( bufLen >= iLengthToGo )
{
// Yes- complete as much data to the client as their
// descriptor can handle.
- LOGTEXT2(_L8("\tbuffer >= client descriptor- "
- "writing back %d bytes"), iLengthToGo);
+ OstTrace1( TRACE_NORMAL, CACMREADER_CHECKFORBUFFEREDTERMINATORSANDPROCEED_DUP2,
+ "CAcmReader::CheckForBufferedTerminatorsAndProceed;iLengthToGo=%d", (TInt)iLengthToGo );
WriteBackData(iLengthToGo);
CompleteRequest(KErrNone);
}
@@ -574,13 +649,15 @@
}
else
{
- LOGTEXT(_L8("\tterminator found!"));
+ OstTrace0( TRACE_NORMAL, CACMREADER_CHECKFORBUFFEREDTERMINATORSANDPROCEED_DUP3,
+ "CAcmReader::CheckForBufferedTerminatorsAndProceed;\tterminator found!" );
// Will the terminator position fit within the client's descriptor?
if ( static_cast<TUint>(ret) <= iLengthToGo )
{
// Yes- complete (up to the terminator) back to the client.
- LOGTEXT2(_L8("\tterminator will fit in client's descriptor- "
- "writing back %d bytes"), ret);
+ OstTrace1( TRACE_NORMAL, CACMREADER_CHECKFORBUFFEREDTERMINATORSANDPROCEED_DUP4,
+ "CAcmReader::CheckForBufferedTerminatorsAndProceed;\tterminator will fit "
+ "in client's descriptor- writing back %d bytes ", (TInt)ret );
WriteBackData(static_cast<TUint>(ret));
CompleteRequest(KErrNone);
}
@@ -588,12 +665,14 @@
{
// No- complete as much data to the client as their descriptor can
// handle.
- LOGTEXT2(_L8("\tterminator won't fit in client's descriptor- "
- "writing back %d bytes"), iLengthToGo);
+ OstTrace1( TRACE_NORMAL, CACMREADER_CHECKFORBUFFEREDTERMINATORSANDPROCEED_DUP5,
+ "CAcmReader::CheckForBufferedTerminatorsAndProceed; "
+ "\tterminator won't fit in client's descriptor- writing back %d bytes", (TInt)iLengthToGo );
WriteBackData(iLengthToGo);
CompleteRequest(KErrNone);
}
}
+ OstTraceFunctionExit0( CACMREADER_CHECKFORBUFFEREDTERMINATORSANDPROCEED_EXIT );
}
void CAcmReader::WriteBackData(TUint aLength)
@@ -608,36 +687,44 @@
* @param aLength Amount of data to write back.
*/
{
- LOGTEXT2(_L8("CAcmReader::WriteBackData aLength = %d"), aLength);
- LOGTEXT2(_L8("\tBufLen() = %d"), BufLen());
+ OstTraceFunctionEntry0( CACMREADER_WRITEBACKDATA_ENTRY );
+ OstTrace1( TRACE_DUMP, CACMREADER_WRITEBACKDATA, "CAcmReader::WriteBackData;aLength=%d", (TInt)aLength );
+ OstTrace1( TRACE_DUMP, CACMREADER_WRITEBACKDATA_DUP1, "CAcmReader::WriteBackData;\tBufLen() = %d", (TInt)BufLen() );
- LOGTEXT2(_L8("\tBufLen() = %d"), BufLen());
-
- __ASSERT_DEBUG(aLength <= BufLen(),
- _USB_PANIC(KAcmPanicCat, EPanicInternalError));
+ if (aLength > BufLen())
+ {
+ OstTrace0( TRACE_FATAL, CACMREADER_WRITEBACKDATA_DUP15, "CAcmReader::WriteBackData;aLength > BufLen()" );
+ __ASSERT_DEBUG( EFalse, User::Panic(KAcmPanicCat, EPanicInternalError) );
+ }
const TUint lenBeforeWrap = iBufStart + iBufSize - iOutPtr;
- LOGTEXT2(_L8("\tiOutPtr=%d"), iOutPtr - iBufStart);
- LOGTEXT2(_L8("\tiInPtr=%d"), iInPtr - iBufStart);
- LOGTEXT2(_L8("\tiOffsetIntoClientsMemory=%d"), iOffsetIntoClientsMemory);
- LOGTEXT2(_L8("\tlenBeforeWrap=%d"), lenBeforeWrap);
+ OstTrace1( TRACE_DUMP, CACMREADER_WRITEBACKDATA_DUP2, "CAcmReader::WriteBackData;\tiOutPtr=%d", (TInt)(iOutPtr - iBufStart) );
+ OstTrace1( TRACE_DUMP, CACMREADER_WRITEBACKDATA_DUP3, "CAcmReader::WriteBackData;\tiInPtr=%d", (TInt)(iInPtr - iBufStart) );
+ OstTrace1( TRACE_DUMP, CACMREADER_WRITEBACKDATA_DUP4, "CAcmReader::WriteBackData;\tiOffsetIntoClientsMemory=%d", (TInt)iOffsetIntoClientsMemory );
+ OstTrace1( TRACE_DUMP, CACMREADER_WRITEBACKDATA_DUP5, "CAcmReader::WriteBackData;\tlenBeforeWrap=%d", (TInt)lenBeforeWrap );
if ( aLength > lenBeforeWrap )
{
// We'll have to do this in two stages...
- LOGTEXT(_L8("\twriting back in two stages"));
-
- __ASSERT_DEBUG(BufWrap(),
- _USB_PANIC(KAcmPanicCat, EPanicInternalError));
+ OstTrace0( TRACE_NORMAL, CACMREADER_WRITEBACKDATA_DUP6, "CAcmReader::WriteBackData;\twriting back in two stages" );
+ if (!BufWrap())
+ {
+ OstTrace0( TRACE_FATAL, CACMREADER_WRITEBACKDATA_DUP16, "CAcmReader::WriteBackData;BufWrap() is NULL" );
+ __ASSERT_DEBUG( EFalse, User::Panic(KAcmPanicCat, EPanicInternalError) );
+ }
// Stage 1...
TPtrC8 ptrBeforeWrap(iOutPtr, lenBeforeWrap);
TInt err = iPort.IPCWrite(iCurrentRequest.iClientPtr,
ptrBeforeWrap,
iOffsetIntoClientsMemory);
- LOGTEXT2(_L8("\tIPCWrite = %d"), err);
- __ASSERT_DEBUG(!err, _USB_PANIC(KAcmPanicCat, EPanicInternalError));
+ OstTrace1( TRACE_NORMAL, CACMREADER_WRITEBACKDATA_DUP7, "CAcmReader::WriteBackData;\tIPCWrite = %d", (TInt)err );
+ if (err)
+ {
+ OstTrace1( TRACE_FATAL, CACMREADER_WRITEBACKDATA_DUP17, "CAcmReader::WriteBackData;err=%d", err );
+ __ASSERT_DEBUG( EFalse, User::Panic(KAcmPanicCat, EPanicInternalError) );
+ }
static_cast<void>(err);
iOffsetIntoClientsMemory += lenBeforeWrap;
@@ -647,39 +734,54 @@
err = iPort.IPCWrite(iCurrentRequest.iClientPtr,
ptrAfterWrap,
iOffsetIntoClientsMemory);
- LOGTEXT2(_L8("\tIPCWrite = %d"), err);
- __ASSERT_DEBUG(!err, _USB_PANIC(KAcmPanicCat, EPanicInternalError));
+ OstTrace1( TRACE_NORMAL, CACMREADER_WRITEBACKDATA_DUP8, "CAcmReader::WriteBackData;\tIPCWrite = %d", (TInt)err );
+ if (err)
+ {
+ OstTrace1( TRACE_FATAL, CACMREADER_WRITEBACKDATA_DUP18, "CAcmReader::WriteBackData;err=%d", err );
+ __ASSERT_DEBUG( EFalse, User::Panic(KAcmPanicCat, EPanicInternalError) );
+ }
iOffsetIntoClientsMemory += seg2Len;
// and set the pointers to show that we've consumed the data...
iOutPtr = iBufStart + seg2Len;
- LOGTEXT(_L8("\twrite in two segments completed"));
+ OstTrace0( TRACE_NORMAL, CACMREADER_WRITEBACKDATA_DUP9, "CAcmReader::WriteBackData;\twrite in two segments completed" );
}
else // We can do it in one go...
{
- LOGTEXT(_L8("\twriting in one segment"));
+ OstTrace0( TRACE_NORMAL, CACMREADER_WRITEBACKDATA_DUP10, "CAcmReader::WriteBackData;\twriting in one segment" );
TPtrC8 ptr(iOutPtr, aLength);
TInt err = iPort.IPCWrite(iCurrentRequest.iClientPtr,
ptr,
iOffsetIntoClientsMemory);
- LOGTEXT2(_L8("\tIPCWrite = %d"), err);
- __ASSERT_DEBUG(!err, _USB_PANIC(KAcmPanicCat, EPanicInternalError));
+ OstTrace1( TRACE_NORMAL, CACMREADER_WRITEBACKDATA_DUP11, "CAcmReader::WriteBackData;\tIPCWrite = %d", (TInt)err );
+ if (err)
+ {
+ OstTrace1( TRACE_FATAL, CACMREADER_WRITEBACKDATA_DUP19, "CAcmReader::WriteBackData;err=%d", err );
+ __ASSERT_DEBUG( EFalse, User::Panic(KAcmPanicCat, EPanicInternalError) );
+ }
static_cast<void>(err);
iOffsetIntoClientsMemory += aLength;
// Set the pointers to show that we've consumed the data...
iOutPtr += aLength;
- LOGTEXT(_L8("\twrite in one segment completed"));
+ OstTrace0( TRACE_NORMAL, CACMREADER_WRITEBACKDATA_DUP12, "CAcmReader::WriteBackData;\twrite in one segments completed" );
}
- LOGTEXT2(_L8("\tiOutPtr=%d"), iOutPtr - iBufStart);
- LOGTEXT2(_L8("\tiOffsetIntoClientsMemory=%d"), iOffsetIntoClientsMemory);
+ OstTrace1( TRACE_NORMAL, CACMREADER_WRITEBACKDATA_DUP13,
+ "CAcmReader::WriteBackData;\tiOutPtr=%d", (TInt)(iOutPtr - iBufStart) );
+ OstTrace1( TRACE_NORMAL, CACMREADER_WRITEBACKDATA_DUP14,
+ "CAcmReader::WriteBackData;\tiOffsetIntoClientsMemory=%d", (TInt)iOffsetIntoClientsMemory );
// Adjust iLengthToGo
- __ASSERT_DEBUG(iLengthToGo >= aLength,
- _USB_PANIC(KAcmPanicCat, EPanicInternalError));
+ if (iLengthToGo < aLength)
+ {
+ OstTraceExt2( TRACE_FATAL, CACMREADER_WRITEBACKDATA_DUP20,
+ "CAcmReader::WriteBackData;iLengthToGo=%d;aLength=%d", (TInt)iLengthToGo, (TInt)aLength );
+ __ASSERT_DEBUG( EFalse, User::Panic(KAcmPanicCat, EPanicInternalError) );
+ }
iLengthToGo -= aLength;
+ OstTraceFunctionExit0( CACMREADER_WRITEBACKDATA_EXIT );
}
void CAcmReader::CompleteRequest(TInt aError)
@@ -691,21 +793,24 @@
* @param aError The error code to complete with.
*/
{
- LOGTEXT2(_L8("CAcmReader::CompleteRequest aError=%d"), aError);
+ OstTraceFunctionEntry0( CACMREADER_COMPLETEREQUEST_ENTRY );
+ OstTrace1( TRACE_NORMAL, CACMREADER_COMPLETEREQUEST, "CAcmReader::CompleteRequest;aError=%d", (TInt)aError );
// Set our flag to say that we no longer have an outstanding request.
iCurrentRequest.iClientPtr = NULL;
-
if(ENotifyDataAvailable==iCurrentRequest.iRequestType)
{
- LOGTEXT2(_L8("\tcalling NotifyDataAvailableCompleted with error %d"), aError);
+ OstTrace1( TRACE_NORMAL, CACMREADER_COMPLETEREQUEST_DUP1,
+ "CAcmReader::CompleteRequest;\tcalling NotifyDataAvailableCompleted with error %d", aError );
iPort.NotifyDataAvailableCompleted(aError);
}
else // read and readoneormore
{
- LOGTEXT2(_L8("\tcalling ReadCompleted with error %d"), aError);
+ OstTrace1( TRACE_NORMAL, CACMREADER_COMPLETEREQUEST_DUP2,
+ "CAcmReader::CompleteRequest;\tcalling ReadCompleted with error %d", aError );
iPort.ReadCompleted(aError);
}
+ OstTraceFunctionExit0( CACMREADER_COMPLETEREQUEST_EXIT );
}
void CAcmReader::IssueRead()
@@ -717,25 +822,27 @@
* buffer being wrapped and the consequent risk of overwriting.
*/
{
- LOG_FUNC
-
+ OstTraceFunctionEntry0( CACMREADER_ISSUEREAD_ENTRY );
CheckBufferEmptyAndResetPtrs();
- LOGTEXT2(_L8("\tiBufSize = %d"), iBufSize);
- LOGTEXT2(_L8("\tiInPtr = %d"), iInPtr - iBufStart);
-
+ OstTrace1( TRACE_DUMP, CACMREADER_ISSUEREAD, "CAcmReader::IssueRead;iBufSize=%d", (TInt)iBufSize );
+ OstTrace1( TRACE_DUMP, CACMREADER_ISSUEREAD_DUP1, "CAcmReader::IssueRead;\tiInPtr = %d", (TInt)(iInPtr - iBufStart) );
const TUint lenBeforeWrap = iBufStart + iBufSize - iInPtr;
- LOGTEXT2(_L8("\tiLengthToGo = %d"), iLengthToGo);
- LOGTEXT2(_L8("\tlenBeforeWrap = %d"), lenBeforeWrap);
+ OstTrace1( TRACE_DUMP, CACMREADER_ISSUEREAD_DUP2, "CAcmReader::IssueRead;\tiLengthToGo = %d", (TInt)iLengthToGo );
+ OstTrace1( TRACE_DUMP, CACMREADER_ISSUEREAD_DUP3, "CAcmReader::IssueRead;\tlenBeforeWrap = %d", (TInt)lenBeforeWrap );
const TUint limit = Min(static_cast<TInt>(iLengthToGo),
static_cast<TInt>(lenBeforeWrap));
- LOGTEXT2(_L8("\tissuing read for %d bytes"), limit);
+ OstTrace1( TRACE_DUMP, CACMREADER_ISSUEREAD_DUP4, "CAcmReader::IssueRead;\tissuing read for %d bytes", (TInt)limit );
iInBuf.Set(iInPtr, 0, limit);
- __ASSERT_DEBUG(iPort.Acm(),
- _USB_PANIC(KAcmPanicCat, EPanicInternalError));
+ if (!iPort.Acm())
+ {
+ OstTrace0( TRACE_FATAL, CACMREADER_ISSUEREAD_DUP5, "CAcmReader::IssueRead;iPort.Acm() is null" );
+ __ASSERT_DEBUG( EFalse, User::Panic(KAcmPanicCat, EPanicInternalError) );
+ }
iPort.Acm()->Read(*this, iInBuf, limit);
+ OstTraceFunctionExit0( CACMREADER_ISSUEREAD_EXIT );
}
void CAcmReader::IssueReadOneOrMore()
@@ -747,25 +854,29 @@
* buffer being wrapped and the consequent risk of overwriting.
*/
{
- LOG_FUNC
-
+ OstTraceFunctionEntry0( CACMREADER_ISSUEREADONEORMORE_ENTRY );
CheckBufferEmptyAndResetPtrs();
- LOGTEXT2(_L8("\tiBufSize = %d"), iBufSize);
- LOGTEXT2(_L8("\tiInPtr = %d"), iInPtr - iBufStart);
-
+ OstTrace1( TRACE_DUMP, CACMREADER_ISSUEREADONEORMORE, "CAcmReader::IssueReadOneOrMore;iBufSize=%d", (TInt)iBufSize );
+ OstTrace1( TRACE_DUMP, CACMREADER_ISSUEREADONEORMORE_DUP1,
+ "CAcmReader::IssueReadOneOrMore;\tiInPtr = %d",(TInt)(iInPtr - iBufStart) );
const TUint lenBeforeWrap = iBufStart + iBufSize - iInPtr;
- LOGTEXT2(_L8("\tiLengthToGo = %d"), iLengthToGo);
- LOGTEXT2(_L8("\tlenBeforeWrap = %d"), lenBeforeWrap);
+ OstTrace1( TRACE_DUMP, CACMREADER_ISSUEREADONEORMORE_DUP2, "CAcmReader::IssueReadOneOrMore;iLengthToGo=%d", (TInt)iLengthToGo );
+ OstTrace1( TRACE_DUMP, CACMREADER_ISSUEREADONEORMORE_DUP3, "CAcmReader::IssueReadOneOrMore;lenBeforeWrap=%d", (TInt)lenBeforeWrap );
const TUint limit1 = Min(static_cast<TInt>(lenBeforeWrap), iLengthToGo);
-
- LOGTEXT2(_L8("\tissuing read one or more for %d bytes"), limit1);
+ OstTrace1( TRACE_DUMP, CACMREADER_ISSUEREADONEORMORE_DUP4,
+ "CAcmReader::IssueReadOneOrMore;\tissuing read one or more for %d bytes", (TInt)limit1 );
+
iInBuf.Set(iInPtr, 0, limit1);
- __ASSERT_DEBUG(iPort.Acm(),
- _USB_PANIC(KAcmPanicCat, EPanicInternalError));
+ if (!iPort.Acm())
+ {
+ OstTrace0( TRACE_FATAL, CACMREADER_ISSUEREADONEORMORE_DUP5, "CAcmReader::IssueReadOneOrMore;iPort.Acm() is null" );
+ __ASSERT_DEBUG( EFalse, User::Panic(KAcmPanicCat, EPanicInternalError) );
+ }
iPort.Acm()->ReadOneOrMore(*this, iInBuf, limit1);
+ OstTraceFunctionExit0( CACMREADER_ISSUEREADONEORMORE_EXIT );
}
TInt CAcmReader::FindTerminator() const
@@ -780,8 +891,8 @@
* account. If negative: error.
*/
{
- LOGTEXT(_L8(">>CAcmReader::FindTerminator"));
-
+ OstTraceFunctionEntry0( CACMREADER_FINDTERMINATOR_ENTRY );
+
TInt pos = 0;
TInt ret = KErrNone;
if ( !BufWrap() )
@@ -816,10 +927,14 @@
}
// Check we're returning what we said we would.
- __ASSERT_DEBUG(ret != KErrNone,
- _USB_PANIC(KAcmPanicCat, EPanicInternalError));
+ if (ret == KErrNone)
+ {
+ OstTrace0( TRACE_FATAL, CACMREADER_FINDTERMINATOR_DUP1, "CAcmReader::FindTerminator;ret == KErrNone" );
+ __ASSERT_DEBUG( EFalse, User::Panic(KAcmPanicCat, EPanicInternalError) );
+ }
- LOGTEXT2(_L8("<<CAcmReader::FindTerminator ret=%d"), ret);
+ OstTrace1( TRACE_NORMAL, CACMREADER_FINDTERMINATOR, "CAcmReader::FindTerminator;ret=%d", ret );
+ OstTraceFunctionExit0( CACMREADER_FINDTERMINATOR_EXIT );
return ret;
}
@@ -843,26 +958,33 @@
* found.
*/
{
- LOG_FUNC
-
+ OstTraceFunctionEntry0( CACMREADER_PARTIALFINDTERMINATOR_ENTRY );
+
aPos = 1;
- LOGTEXT3(_L8("\taFrom=%d, aTo=%d"), aFrom-iBufStart, aTo-iBufStart);
-
+ OstTraceExt2( TRACE_NORMAL, CACMREADER_PARTIALFINDTERMINATOR,
+ "CAcmReader::PartialFindTerminator;\taFrom=%d, aTo=%d", (TInt)(aFrom-iBufStart), (TInt)(aTo-iBufStart) );
+
for ( TUint8* p = aFrom ; p < aTo ; p++, aPos++ )
{
for ( TUint i = 0 ; i < iTerminatorCount ; i++ )
{
- __ASSERT_DEBUG(p, _USB_PANIC(KAcmPanicCat, EPanicInternalError));
+ if (!p)
+ {
+ OstTraceExt1( TRACE_FATAL, CACMREADER_PARTIALFINDTERMINATOR_DUP3, "CAcmReader::PartialFindTerminator;p=%p", p );
+ __ASSERT_DEBUG( EFalse, User::Panic(KAcmPanicCat, EPanicInternalError) );
+ }
if ( *p == iTerminator[i] )
{
- LOGTEXT3(_L8("\tterminator %d found at aPos %d"),
- iTerminator[i], aPos);
+ OstTraceExt2( TRACE_FLOW, CACMREADER_PARTIALFINDTERMINATOR_DUP1,
+ "CAcmReader::PartialFindTerminator;\tterminator %d found at aPos %d", (TInt)iTerminator[i], (TInt)aPos );
+ OstTraceFunctionExit0( CACMREADER_PARTIALFINDTERMINATOR_EXIT );
return KErrNone;
}
}
}
- LOGTEXT(_L8("\tno terminator found"));
+ OstTrace0( TRACE_NORMAL, CACMREADER_PARTIALFINDTERMINATOR_DUP2, "CAcmReader::PartialFindTerminator;\tno terminator found" );
+ OstTraceFunctionExit0( CACMREADER_PARTIALFINDTERMINATOR_EXIT_DUP2 );
return KErrNotFound;
}
--- a/usbmgmt/usbmgr/device/classdrivers/acm/classimplementation/ecacm/src/AcmWriter.cpp Wed Jul 07 14:16:40 2010 +0800
+++ b/usbmgmt/usbmgr/device/classdrivers/acm/classimplementation/ecacm/src/AcmWriter.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"
@@ -15,14 +15,13 @@
*
*/
-#include <usb/usblogger.h>
#include "AcmWriter.h"
#include "AcmPort.h"
#include "AcmPanic.h"
#include "AcmUtils.h"
-
-#ifdef __FLOG_ACTIVE
-_LIT8(KLogComponent, "ECACM");
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "AcmWriterTraces.h"
#endif
CAcmWriter* CAcmWriter::NewL(CAcmPort& aPort,
@@ -35,12 +34,12 @@
* @return Ownership of a newly created CAcmWriter object
*/
{
- LOG_STATIC_FUNC_ENTRY
-
+ OstTraceFunctionEntry0( CACMWRITER_NEWL_ENTRY );
CAcmWriter* self = new(ELeave) CAcmWriter(aPort, aBufSize);
CleanupStack::PushL(self);
self->ConstructL();
CLEANUPSTACK_POP(self);
+ OstTraceFunctionExit0( CACMWRITER_NEWL_EXIT );
return self;
}
@@ -49,11 +48,10 @@
* Destructor.
*/
{
- LOG_FUNC
-
+ OstTraceFunctionEntry0( CACMWRITER_CACMWRITER_DES_ENTRY );
WriteCancel();
-
delete iBuffer;
+ OstTraceFunctionExit0( CACMWRITER_CACMWRITER_DES_EXIT );
}
void CAcmWriter::Write(const TAny* aClientBuffer, TUint aLength)
@@ -64,8 +62,8 @@
* @param aLength Number of bytes to write
*/
{
- LOGTEXT3(_L8("CAcmWriter::Write aClientBuffer=0x%08x, aLength=%d"),
- aClientBuffer, aLength);
+ OstTraceFunctionEntry0( CACMWRITER_WRITE_ENTRY );
+ OstTraceExt2( TRACE_NORMAL, CACMWRITER_WRITE, "CAcmWriter::Write;aClientBuffer=%p;aLength=%d", aClientBuffer, (TInt)aLength );
// Check we're open to requests and make a note of interesting data.
CheckNewRequest(aClientBuffer, aLength);
@@ -78,6 +76,7 @@
ReadDataFromClient();
// ...and write as much as we've got to the LDD
IssueWrite();
+ OstTraceFunctionExit0( CACMWRITER_WRITE_EXIT );
}
void CAcmWriter::WriteCancel()
@@ -85,18 +84,18 @@
* Cancel a write.
*/
{
- LOG_FUNC
-
+ OstTraceFunctionEntry0( CACMWRITER_WRITECANCEL_ENTRY );
// Cancel any outstanding request on the LDD.
if ( iPort.Acm() )
{
- LOGTEXT(_L8("\tiPort.Acm() exists- calling WriteCancel on it"));
+ OstTrace0( TRACE_NORMAL, CACMWRITER_WRITECANCEL, "CAcmWriter::WriteCancel;\tiPort.Acm() exists- calling WriteCancel on it" );
iPort.Acm()->WriteCancel();
}
// Reset our flag to say there's no current outstanding request. What's
// already in our buffer can stay there.
iCurrentRequest.iClientPtr = NULL;
+ OstTraceFunctionExit0( CACMWRITER_WRITECANCEL_EXIT );
}
void CAcmWriter::ResetBuffer()
@@ -104,15 +103,20 @@
* Called by the port to clear the buffer.
*/
{
- LOG_FUNC
-
+ OstTraceFunctionEntry0( CACMWRITER_RESETBUFFER_ENTRY );
// A request is outstanding- C32 should protect against this.
- __ASSERT_DEBUG(!iCurrentRequest.iClientPtr,
- _USB_PANIC(KAcmPanicCat, EPanicInternalError));
+ if (iCurrentRequest.iClientPtr != NULL)
+ {
+ OstTrace1( TRACE_FATAL, CACMWRITER_RESETBUFFER,
+ "CAcmWriter::ResetBuffer;EPanicInternalError=%d",
+ (TInt)EPanicInternalError );
+ __ASSERT_DEBUG( EFalse, User::Panic(KAcmPanicCat, EPanicInternalError) );
+ }
// Don't have anything to do. There are no pointers to reset. This
// function may in the future (if we support KConfigWriteBufferedComplete)
// do work, so leave the above assertion in.
+ OstTraceFunctionExit0( CACMWRITER_RESETBUFFER_EXIT );
}
TInt CAcmWriter::SetBufSize(TUint aSize)
@@ -123,13 +127,15 @@
* @param aSize The required size of the buffer.
*/
{
- LOG_FUNC
- LOGTEXT2(_L8("\taSize=%d"), aSize);
+ OstTraceFunctionEntry0( CACMWRITER_SETBUFSIZE_ENTRY );
+ OstTrace1( TRACE_NORMAL, CACMWRITER_SETBUFSIZE, "CAcmWriter::SetBufSize;aSize=%d", (TInt)aSize );
if ( iCurrentRequest.iClientPtr )
{
// A request is outstanding. C32 does not protect us against this.
- LOGTEXT(_L8("\t***a request is outstanding- returning KErrInUse"));
+ OstTrace0( TRACE_NORMAL, CACMWRITER_SETBUFSIZE_DUP1,
+ "CAcmWriter::SetBufSize;\t***a request is outstanding- returning KErrInUse" );
+ OstTraceFunctionExit0( CACMWRITER_SETBUFSIZE_EXIT );
return KErrInUse;
}
@@ -137,7 +143,9 @@
HBufC8* newBuf = HBufC8::New(static_cast<TInt>(aSize));
if ( !newBuf )
{
- LOGTEXT(_L8("\tfailed to create new buffer- returning KErrNoMemory"));
+ OstTrace0( TRACE_NORMAL, CACMWRITER_SETBUFSIZE_DUP2,
+ "CAcmWriter::SetBufSize;\tfailed to create new buffer- returning KErrNoMemory" );
+ OstTraceFunctionExit0( CACMWRITER_SETBUFSIZE_EXIT_DUP1 );
return KErrNoMemory;
}
delete iBuffer;
@@ -145,6 +153,7 @@
iBuf.Set(iBuffer->Des());
iBufSize = aSize;
+ OstTraceFunctionExit0( CACMWRITER_SETBUFSIZE_EXIT_DUP2 );
return KErrNone;
}
@@ -160,6 +169,8 @@
iBuf(NULL,0,0),
iPort(aPort)
{
+ OstTraceFunctionEntry0( CACMWRITER_CACMWRITER_CONS_ENTRY );
+ OstTraceFunctionExit0( CACMWRITER_CACMWRITER_CONS_EXIT );
}
void CAcmWriter::ConstructL()
@@ -167,9 +178,16 @@
* 2nd-phase constructor.
*/
{
+ OstTraceFunctionEntry0( CACMWRITER_CONSTRUCTL_ENTRY );
// Create the required buffer.
- LOGTEXT(_L8("\tabout to create iBuffer"));
- LEAVEIFERRORL(SetBufSize(iBufSize));
+ OstTrace0( TRACE_NORMAL, CACMWRITER_CONSTRUCTL, "CAcmWriter::ConstructL;\tabout to create iBuffer" );
+ TInt err = SetBufSize(iBufSize);
+ if (err < 0)
+ {
+ OstTrace1( TRACE_ERROR, CACMWRITER_CONSTRUCTL_DUP1, "CAcmWriter::ConstructL;err=%d", err );
+ User::Leave(err);
+ }
+ OstTraceFunctionExit0( CACMWRITER_CONSTRUCTL_EXIT );
}
void CAcmWriter::WriteCompleted(TInt aError)
@@ -182,12 +200,12 @@
* @param aError Error with which the write completed.
*/
{
- LOG_FUNC
- LOGTEXT2(_L8("\taError=%d"), aError);
-
+ OstTraceFunctionEntry0( CACMWRITER_WRITECOMPLETED_ENTRY );
+ OstTrace1( TRACE_NORMAL, CACMWRITER_WRITECOMPLETED, "CAcmWriter::WriteCompleted;aError=%d", (TInt)aError );
if(iLengthToGo == 0 || aError != KErrNone)
{
- LOGTEXT2(_L8("\tcompleting request with %d"), aError);
+ OstTrace1( TRACE_NORMAL, CACMWRITER_WRITECOMPLETED_DUP1,
+ "CAcmWriter::WriteCompleted;\tcompleting request with %d", aError );
CompleteRequest(aError);
}
else
@@ -197,6 +215,7 @@
ReadDataFromClient();
IssueWrite();
}
+ OstTraceFunctionExit0( CACMWRITER_WRITECOMPLETED_EXIT );
}
void CAcmWriter::ReadDataFromClient()
@@ -204,22 +223,28 @@
* Read data from the client space into the internal buffer, prior to writing.
*/
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CACMWRITER_READDATAFROMCLIENT_ENTRY );
TPtr8 ptr((TUint8*)iBuf.Ptr(),
0,
Min(iBuf.MaxLength(), iLengthToGo));
TInt err = iPort.IPCRead(iCurrentRequest.iClientPtr,
ptr,
- static_cast<TInt>(iOffsetIntoClientsMemory));
- LOGTEXT2(_L8("\tIPCRead = %d"), err);
+ static_cast<TInt>(iOffsetIntoClientsMemory));
+ OstTrace1( TRACE_NORMAL, CACMWRITER_READDATAFROMCLIENT, "CAcmWriter::ReadDataFromClient;\tIPCRead = %d", err );
+
iBuf.SetLength(ptr.Length());
- __ASSERT_DEBUG(!err, _USB_PANIC(KAcmPanicCat, EPanicInternalError));
-
+ if (err != 0)
+ {
+ OstTrace1( TRACE_FATAL, CACMWRITER_READDATAFROMCLIENT_DUP1,
+ "CAcmWriter::ReadDataFromClient;EPanicInternalError=%d",
+ (TInt)EPanicInternalError );
+ __ASSERT_DEBUG( EFalse, User::Panic(KAcmPanicCat, EPanicInternalError) );
+ }
static_cast<void>(err);
-
// Increase our pointer (into the client's space) of already-read data.
iOffsetIntoClientsMemory += iBuf.Length();
+ OstTraceFunctionExit0( CACMWRITER_READDATAFROMCLIENT_EXIT );
}
@@ -234,26 +259,38 @@
* @param aLength Length to write.
*/
{
- LOG_FUNC
-
- __ASSERT_DEBUG(aLength <= static_cast<TUint>(KMaxTInt),
- _USB_PANIC(KAcmPanicCat, EPanicInternalError));
-
+ OstTraceFunctionEntry0( CACMWRITER_CHECKNEWREQUEST_ENTRY );
+
+ if (aLength > static_cast<TUint>(KMaxTInt))
+ {
+ OstTrace1( TRACE_FATAL, CACMWRITER_CHECKNEWREQUEST,
+ "CAcmWriter::CheckNewRequest;aLength > static_cast<TUint>(KMaxTInt), EPanicInternalError=%d",
+ (TInt)EPanicInternalError );
+ __ASSERT_DEBUG( EFalse, User::Panic(KAcmPanicCat, EPanicInternalError) );
+ }
// Check we have no outstanding request already.
if ( iCurrentRequest.iClientPtr )
{
- _USB_PANIC(KAcmPanicCat, EPanicInternalError);
+ OstTrace1( TRACE_FATAL, CACMWRITER_CHECKNEWREQUEST_DUP1,
+ "CAcmWriter::CheckNewRequest;iCurrentRequest.iClientPtr != NULL, EPanicInternalError=%d",
+ (TInt)EPanicInternalError );
+ __ASSERT_DEBUG( EFalse, User::Panic(KAcmPanicCat, EPanicInternalError) );
}
// Sanity check on what C32 gave us.
- __ASSERT_DEBUG(aClientBuffer,
- _USB_PANIC(KAcmPanicCat, EPanicInternalError));
-
+ if (aClientBuffer == NULL)
+ {
+ OstTrace1( TRACE_FATAL, CACMWRITER_CHECKNEWREQUEST_DUP2,
+ "CAcmWriter::CheckNewRequest;aClientBuffer == NULL, EPanicInternalError=%d",
+ (TInt)EPanicInternalError );
+ __ASSERT_DEBUG( EFalse, User::Panic(KAcmPanicCat, EPanicInternalError) );
+ }
// Make a note of interesting data.
iCurrentRequest.iLength = aLength;
iCurrentRequest.iClientPtr = aClientBuffer;
iLengthToGo = aLength;
iOffsetIntoClientsMemory = 0;
+ OstTraceFunctionExit0( CACMWRITER_CHECKNEWREQUEST_EXIT );
}
void CAcmWriter::CompleteRequest(TInt aError)
@@ -264,13 +301,17 @@
* @param aError The error code to complete with.
*/
{
- LOGTEXT2(_L8("CAcmWriter::CompleteRequest aError=%d"), aError);
-
+ OstTraceFunctionEntry0( CACMWRITER_COMPLETEREQUEST_ENTRY );
+ OstTrace1( TRACE_NORMAL, CACMWRITER_COMPLETEREQUEST,
+ "CAcmWriter::CompleteRequest;CAcmWriter::CompleteRequest aError=%d", (TInt)aError );
+
// Set our flag to say that we no longer have an outstanding request.
iCurrentRequest.iClientPtr = NULL;
-
- LOGTEXT2(_L8("\tcalling WriteCompleted with %d"), aError);
+ OstTrace1( TRACE_NORMAL, CACMWRITER_COMPLETEREQUEST_DUP1,
+ "CAcmWriter::CompleteRequest;\tcalling WriteCompleted with %d", aError );
+
iPort.WriteCompleted(aError);
+ OstTraceFunctionExit0( CACMWRITER_COMPLETEREQUEST_EXIT );
}
void CAcmWriter::IssueWrite()
@@ -279,11 +320,15 @@
* entire load of buffered data in one go.
*/
{
- LOG_FUNC
-
- LOGTEXT2(_L8("\tissuing Write of %d bytes"), iBuf.Length());
- __ASSERT_DEBUG(iPort.Acm(),
- _USB_PANIC(KAcmPanicCat, EPanicInternalError));
+ OstTraceFunctionEntry0( CACMWRITER_ISSUEWRITE_ENTRY );
+
+ OstTrace1( TRACE_NORMAL, CACMWRITER_ISSUEWRITE, "CAcmWriter::IssueWrite;\tissuing Write of %d bytes", (TInt)(iBuf.Length()) );
+ if (iPort.Acm() == NULL)
+ {
+ OstTrace1( TRACE_FATAL, CACMWRITER_ISSUEWRITE_DUP1,
+ "CAcmWriter::IssueWrite;EPanicInternalError=%d", (TInt)EPanicInternalError);
+ __ASSERT_DEBUG( EFalse, User::Panic(KAcmPanicCat, EPanicInternalError) );
+ }
iPort.Acm()->Write(*this,
iBuf,
iBuf.Length());
@@ -296,11 +341,14 @@
// This is not expected to occur but the test is in here just to be safe.
if(iBuf.Length() == 0 && iCurrentRequest.Length() != 0 && iLengthToGo != 0)
{
- _USB_PANIC(KAcmPanicCat, EPanicInternalError);
+ OstTrace1( TRACE_FATAL, CACMWRITER_ISSUEWRITE_DUP2,
+ "CAcmWriter::IssueWrite;EPanicInternalError=%d", (TInt)EPanicInternalError);
+ __ASSERT_DEBUG( EFalse, User::Panic(KAcmPanicCat, EPanicInternalError) );
}
#endif
// Update our counter of remaining data to write.
iLengthToGo -= iBuf.Length();
+ OstTraceFunctionExit0( CACMWRITER_ISSUEWRITE_EXIT );
}
//
--- a/usbmgmt/usbmgr/device/classdrivers/acm/classimplementation/ecacm/src/ActiveDataAvailableNotifier.cpp Wed Jul 07 14:16:40 2010 +0800
+++ b/usbmgmt/usbmgr/device/classdrivers/acm/classimplementation/ecacm/src/ActiveDataAvailableNotifier.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"
@@ -22,11 +22,12 @@
#include "AcmPanic.h"
#include "AcmUtils.h"
#include "NotifyDataAvailableObserver.h"
-#include <usb/usblogger.h>
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "ActiveDataAvailableNotifierTraces.h"
+#endif
-#ifdef __FLOG_ACTIVE
-_LIT8(KLogComponent, "ECACM");
-#endif
+
CActiveDataAvailableNotifier::CActiveDataAvailableNotifier(
MNotifyDataAvailableObserver& aParent,
@@ -46,7 +47,9 @@
* @param aEndpoint The endpoint to read from.
*/
{
+ OstTraceFunctionEntry0( CACTIVEDATAAVAILABLENOTIFIER_CACTIVEDATAAVAILABLENOTIFIER_CONS_ENTRY );
CActiveScheduler::Add(this);
+ OstTraceFunctionExit0( CACTIVEDATAAVAILABLENOTIFIER_CACTIVEDATAAVAILABLENOTIFIER_CONS_EXIT );
}
CActiveDataAvailableNotifier::~CActiveDataAvailableNotifier()
@@ -54,9 +57,9 @@
* Destructor.
*/
{
- LOG_FUNC
-
+ OstTraceFunctionEntry0( CACTIVEDATAAVAILABLENOTIFIER_CACTIVEDATAAVAILABLENOTIFIER_DES_ENTRY );
Cancel();
+ OstTraceFunctionExit0( CACTIVEDATAAVAILABLENOTIFIER_CACTIVEDATAAVAILABLENOTIFIER_DES_EXIT );
}
CActiveDataAvailableNotifier* CActiveDataAvailableNotifier::NewL(
@@ -74,10 +77,10 @@
* @return Ownership of a new CActiveReadOneOrMoreReader object.
*/
{
- LOG_STATIC_FUNC_ENTRY
-
+ OstTraceFunctionEntry0( CACTIVEDATAAVAILABLENOTIFIER_NEWL_ENTRY );
CActiveDataAvailableNotifier* self =
new(ELeave) CActiveDataAvailableNotifier(aParent, aLdd, aEndpoint);
+ OstTraceFunctionExit0( CACTIVEDATAAVAILABLENOTIFIER_NEWL_EXIT );
return self;
}
@@ -86,12 +89,10 @@
* When incoming data arrives at the LDD notify the caller.
*/
{
- LOGTEXT(_L8(">>CActiveDataAvailableNotifier::NotifyDataAvailable"));
-
+ OstTraceFunctionEntry0( CACTIVEDATAAVAILABLENOTIFIER_NOTIFYDATAAVAILABLE_ENTRY );
iLdd.ReadOneOrMore(iStatus, iEndpoint, iUnusedBuf, 0);
SetActive();
-
- LOGTEXT(_L8("<<CActiveDataAvailableNotifier::NotifyDataAvailable"));
+ OstTraceFunctionExit0( CACTIVEDATAAVAILABLENOTIFIER_NOTIFYDATAAVAILABLE_EXIT );
}
void CActiveDataAvailableNotifier::DoCancel()
@@ -99,9 +100,9 @@
* Cancel an outstanding request.
*/
{
- LOG_FUNC
-
+ OstTraceFunctionEntry0( CACTIVEDATAAVAILABLENOTIFIER_DOCANCEL_ENTRY );
iLdd.ReadCancel(iEndpoint);
+ OstTraceFunctionExit0( CACTIVEDATAAVAILABLENOTIFIER_DOCANCEL_EXIT );
}
void CActiveDataAvailableNotifier::RunL()
@@ -114,10 +115,8 @@
* been detached.
*/
{
- LOG_LINE
- LOG_FUNC
- LOGTEXT2(_L8("\tiStatus = %d"), iStatus.Int());
-
+ OstTraceFunctionEntry0( CACTIVEDATAAVAILABLENOTIFIER_RUNL_ENTRY );
+ OstTrace1( TRACE_NORMAL, CACTIVEDATAAVAILABLENOTIFIER_RUNL, "CActiveDataAvailableNotifier::RunL;iStatus=%d", iStatus.Int() );
TBool complete = EFalse;
TInt completeErr = KErrNone;
@@ -162,6 +161,7 @@
{
iParent.NotifyDataAvailableCompleted(completeErr);
}
+ OstTraceFunctionExit0( CACTIVEDATAAVAILABLENOTIFIER_RUNL_EXIT );
}
//
--- 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 );
}
//
--- a/usbmgmt/usbmgr/device/classdrivers/acm/classimplementation/ecacm/src/ActiveReader.cpp Wed Jul 07 14:16:40 2010 +0800
+++ b/usbmgmt/usbmgr/device/classdrivers/acm/classimplementation/ecacm/src/ActiveReader.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 "ReadObserver.h"
#include "AcmUtils.h"
-#include <usb/usblogger.h>
-
-#ifdef __FLOG_ACTIVE
-_LIT8(KLogComponent, "ECACM");
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "ActiveReaderTraces.h"
#endif
CActiveReader::CActiveReader(MReadObserver& aParent, RDevUsbcClient& aLdd, TEndpointNumber aEndpoint)
@@ -42,7 +41,9 @@
* @param aEndpoint The endpoint to read from.
*/
{
+ OstTraceFunctionEntry0( CACTIVEREADER_CACTIVEREADER_CONS_ENTRY );
CActiveScheduler::Add(this);
+ OstTraceFunctionExit0( CACTIVEREADER_CACTIVEREADER_CONS_EXIT );
}
CActiveReader::~CActiveReader()
@@ -50,9 +51,9 @@
* Destructor.
*/
{
- LOG_FUNC
-
+ OstTraceFunctionEntry0( CACTIVEREADER_CACTIVEREADER_DES_ENTRY );
Cancel();
+ OstTraceFunctionExit0( CACTIVEREADER_CACTIVEREADER_DES_EXIT );
}
CActiveReader* CActiveReader::NewL(MReadObserver& aParent,
@@ -68,9 +69,9 @@
* @return Ownership of a new CActiveReader object.
*/
{
- LOG_STATIC_FUNC_ENTRY
-
+ OstTraceFunctionEntry0( CACTIVEREADER_NEWL_ENTRY );
CActiveReader* self = new(ELeave) CActiveReader(aParent, aLdd, aEndpoint);
+ OstTraceFunctionExit0( CACTIVEREADER_NEWL_EXIT );
return self;
}
@@ -82,10 +83,10 @@
* @param aLen The length to read.
*/
{
- LOG_FUNC
-
+ OstTraceFunctionEntry0( CACTIVEREADER_READ_ENTRY );
iLdd.Read(iStatus, iEndpoint, aDes, aLen);
SetActive();
+ OstTraceFunctionExit0( CACTIVEREADER_READ_EXIT );
}
void CActiveReader::DoCancel()
@@ -93,9 +94,9 @@
* Cancel an outstanding read.
*/
{
- LOG_FUNC
-
+ OstTraceFunctionEntry0( CACTIVEREADER_DOCANCEL_ENTRY );
iLdd.ReadCancel(iEndpoint);
+ OstTraceFunctionExit0( CACTIVEREADER_DOCANCEL_EXIT );
}
void CActiveReader::RunL()
@@ -104,12 +105,10 @@
* parent class of the completion.
*/
{
- LOG_LINE
- LOGTEXT2(_L8(">>CActiveReader::RunL iStatus=%d"), iStatus.Int());
-
+ OstTraceFunctionEntry0( CACTIVEREADER_RUNL_ENTRY );
+ OstTrace1( TRACE_NORMAL, CACTIVEREADER_RUNL, "CActiveReader::RunL;RunL iStatus=%d", iStatus.Int() );
iParent.ReadCompleted(iStatus.Int());
-
- LOGTEXT(_L8("<<CActiveReader::RunL"));
+ OstTraceFunctionExit0( CACTIVEREADER_RUNL_EXIT );
}
//
--- a/usbmgmt/usbmgr/device/classdrivers/acm/classimplementation/ecacm/src/ActiveWriter.cpp Wed Jul 07 14:16:40 2010 +0800
+++ b/usbmgmt/usbmgr/device/classdrivers/acm/classimplementation/ecacm/src/ActiveWriter.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,11 +22,11 @@
#include "AcmPanic.h"
#include "WriteObserver.h"
#include "AcmUtils.h"
-#include <usb/usblogger.h>
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "ActiveWriterTraces.h"
+#endif
-#ifdef __FLOG_ACTIVE
-_LIT8(KLogComponent, "ECACM");
-#endif
CActiveWriter::CActiveWriter(MWriteObserver& aParent, RDevUsbcClient& aLdd, TEndpointNumber aEndpoint)
: CActive(KEcacmAOPriority),
@@ -44,7 +44,9 @@
* @param aEndpoint The endpoint to write to.
*/
{
+ OstTraceFunctionEntry0( CACTIVEWRITER_CACTIVEWRITER_CONS_ENTRY );
CActiveScheduler::Add(this);
+ OstTraceFunctionExit0( CACTIVEWRITER_CACTIVEWRITER_CONS_EXIT );
}
CActiveWriter::~CActiveWriter()
@@ -52,9 +54,9 @@
* Destructor.
*/
{
- LOG_FUNC
-
+ OstTraceFunctionEntry0( CACTIVEWRITER_CACTIVEWRITER_DES_ENTRY );
Cancel();
+ OstTraceFunctionExit0( CACTIVEWRITER_CACTIVEWRITER_DES_EXIT );
}
CActiveWriter* CActiveWriter::NewL(MWriteObserver& aParent,
@@ -70,9 +72,9 @@
* @return Ownership of a new CActiveWriter object.
*/
{
- LOG_STATIC_FUNC_ENTRY
-
+ OstTraceFunctionEntry0( CACTIVEWRITER_NEWL_ENTRY );
CActiveWriter* self = new(ELeave) CActiveWriter(aParent, aLdd, aEndpoint);
+ OstTraceFunctionExit0( CACTIVEWRITER_NEWL_EXIT );
return self;
}
@@ -87,8 +89,8 @@
* @param aZlp Whether ZLP termination may be required.
*/
{
- LOGTEXT(_L8(">>CActiveWriter::Write"));
-
+ OstTraceFunctionEntry0( CACTIVEWRITER_WRITE_ENTRY );
+
if ( aZlp )
{
// the driver can be relied on to correctly handle appended ZLPs
@@ -109,7 +111,7 @@
{
iLdd.Write(iStatus, iEndpoint, aDes, aLen, EFalse);
iWritingState = ECompleteMessage;
- LOGTEXT2(_L8("CActiveWriter::Writing %d bytes"), aLen);
+ OstTrace1( TRACE_NORMAL, CACTIVEWRITER_WRITE, "CActiveWriter::Write;Writing %d bytes", aLen );
}
else
{
@@ -125,12 +127,12 @@
iLdd.Write(iStatus, iEndpoint, iFirstPortion, aLen-1, EFalse);
iWritingState = EFirstMessagePart;
- LOGTEXT3(_L8("CActiveWriter::Writing %d bytes of the %d"), aLen-1, aLen);
+ OstTraceExt2( TRACE_NORMAL, CACTIVEWRITER_WRITE_DUP1,
+ "CActiveWriter::Write;Writing %d bytes of the %d", aLen-1, aLen );
}
}
SetActive();
-
- LOGTEXT(_L8("<<CActiveWriter::Write"));
+ OstTraceFunctionExit0( CACTIVEWRITER_WRITE_EXIT );
}
void CActiveWriter::DoCancel()
@@ -138,9 +140,9 @@
* Cancel an outstanding write.
*/
{
- LOG_FUNC
-
+ OstTraceFunctionEntry0( CACTIVEWRITER_DOCANCEL_ENTRY );
iLdd.WriteCancel(iEndpoint);
+ OstTraceFunctionExit0( CACTIVEWRITER_DOCANCEL_EXIT );
}
void CActiveWriter::RunL()
@@ -149,8 +151,8 @@
* parent class of the completion.
*/
{
- LOG_LINE
- LOGTEXT2(_L8(">>CActiveWriter::RunL iStatus=%d"), iStatus.Int());
+ OstTraceFunctionEntry0( CACTIVEWRITER_RUNL_ENTRY );
+ OstTrace1( TRACE_NORMAL, CACTIVEWRITER_RUNL, "CActiveWriter::RunL;iStatus=%d", iStatus.Int() );
if ( iWritingState == EFirstMessagePart )
{
@@ -159,8 +161,8 @@
// now send the second part..
iLdd.Write(iStatus, iEndpoint, iSecondPortion, iSecondPortion.Length(), EFalse);
iWritingState = EFinalMessagePart;
- LOGTEXT(_L8("CActiveWriter::Writing 1 byte to complete original nx64 byte message"));
-
+ OstTrace0( TRACE_NORMAL, CACTIVEWRITER_RUNL_DUP1,
+ "CActiveWriter::RunL;Writing 1 byte to complete original nx64 byte message" );
SetActive();
}
else
@@ -175,7 +177,7 @@
iParent.WriteCompleted(iStatus.Int());
}
- LOGTEXT(_L8("<<CActiveWriter::RunL"));
+ OstTraceFunctionExit0( CACTIVEWRITER_RUNL_EXIT );
}
//
--- a/usbmgmt/usbmgr/device/classdrivers/acm/classimplementation/ecacm/src/BreakController.cpp Wed Jul 07 14:16:40 2010 +0800
+++ b/usbmgmt/usbmgr/device/classdrivers/acm/classimplementation/ecacm/src/BreakController.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"
@@ -21,11 +21,11 @@
#include "HostPushedChangeObserver.h"
#include "AcmPanic.h"
#include "BreakObserver.h"
-#include <usb/usblogger.h>
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "BreakControllerTraces.h"
+#endif
-#ifdef __FLOG_ACTIVE
-_LIT8(KLogComponent, "ECACM");
-#endif
CBreakController::CBreakController(CCdcAcmClass& aParentAcm)
/**
@@ -37,6 +37,7 @@
iBreakState(EInactive),
iParentAcm(aParentAcm)
{
+ OstTraceFunctionEntry0( CBREAKCONTROLLER_CBREAKCONTROLLER_CONS_ENTRY );
CActiveScheduler::Add(this);
// now populate the state machine that manages the transfers between
@@ -66,6 +67,7 @@
StateDispatcher[ELocked ][EInactive ] = &ScInactive;
StateDispatcher[ELocked ][ETiming ] = &ScSetTimer;
+ OstTraceFunctionExit0( CBREAKCONTROLLER_CBREAKCONTROLLER_CONS_EXIT );
}
CBreakController* CBreakController::NewL(CCdcAcmClass& aParentAcm)
@@ -76,12 +78,12 @@
* @return Ownership of a new CBreakController object.
*/
{
- LOG_STATIC_FUNC_ENTRY
-
+ OstTraceFunctionEntry0( CBREAKCONTROLLER_NEWL_ENTRY );
CBreakController* self = new(ELeave) CBreakController(aParentAcm);
CleanupStack::PushL(self);
self->ConstructL();
CLEANUPSTACK_POP(self);
+ OstTraceFunctionExit0( CBREAKCONTROLLER_NEWL_EXIT );
return self;
}
@@ -90,7 +92,13 @@
* 2nd-phase constructor.
*/
{
- LEAVEIFERRORL(iTimer.CreateLocal());
+ TInt err;
+ err = iTimer.CreateLocal();
+ if (err < 0)
+ {
+ OstTrace1( TRACE_NORMAL, CBREAKCONTROLLER_CONSTRUCTL, "CBreakController::ConstructL;err=%d", err );
+ User::Leave(err);
+ }
}
CBreakController::~CBreakController()
@@ -98,10 +106,10 @@
* Destructor.
*/
{
- LOG_FUNC
-
+ OstTraceFunctionEntry0( CBREAKCONTROLLER_CBREAKCONTROLLER_DES_ENTRY );
Cancel();
iTimer.Close();
+ OstTraceFunctionExit0( CBREAKCONTROLLER_CBREAKCONTROLLER_DES_EXIT );
}
void CBreakController::RunL()
@@ -109,9 +117,8 @@
* Called by the active scheduler; handles timer completion.
*/
{
- LOG_LINE
- LOG_FUNC
-
+ OstTraceFunctionEntry0( CBREAKCONTROLLER_RUNL_ENTRY );
+
// check the status to see if the timer has matured, if so go straight
// to INACTIVE state (and publish new state)
if ( iStatus == KErrNone )
@@ -119,9 +126,13 @@
// Use iRequester to turn the break off. This should not fail.
TInt err = BreakRequest(iRequester, EInactive);
static_cast<void>(err);
- __ASSERT_DEBUG(!err,
- _USB_PANIC(KAcmPanicCat, EPanicInternalError));
+ if (err)
+ {
+ OstTrace1( TRACE_FATAL, CBREAKCONTROLLER_RUNL, "CBreakController::RunL;err=%d", err );
+ __ASSERT_DEBUG( EFalse, User::Panic(KAcmPanicCat, EPanicInternalError) );
+ }
}
+ OstTraceFunctionExit0( CBREAKCONTROLLER_RUNL_EXIT );
}
void CBreakController::DoCancel()
@@ -129,9 +140,9 @@
* Called by the framework; handles cancelling the outstanding timer request.
*/
{
- LOG_FUNC
-
+ OstTraceFunctionEntry0( CBREAKCONTROLLER_DOCANCEL_ENTRY );
iTimer.Cancel();
+ OstTraceFunctionExit0( CBREAKCONTROLLER_DOCANCEL_EXIT );
}
TInt CBreakController::BreakRequest(TRequester aRequester,
@@ -147,28 +158,30 @@
* @return Error, for instance if a different entity already owns the break.
*/
{
- LOG_FUNC
- LOGTEXT4(_L8("\taRequester = %d, aState = %d, aDelay = %d"),
- aRequester, aState, aDelay.Int());
+ OstTraceFunctionEntry0( CBREAKCONTROLLER_BREAKREQUEST_ENTRY );
+ OstTraceExt3( TRACE_NORMAL, CBREAKCONTROLLER_BREAKREQUEST,
+ "CBreakController::BreakRequest;aRequester=%d;aState=%d;aDelay=%d", (TInt)aRequester, (TInt)aState, aDelay.Int() );
// Check the validity of the request.
if ( aRequester != iRequester && iRequester != ENone )
{
- LOGTEXT3(_L8("\t*** %d is in charge- cannot service request "
- "from %d- returning KErrInUse"), iRequester, aRequester);
+ OstTraceExt2( TRACE_FLOW, CBREAKCONTROLLER_BREAKREQUEST_DUP1,
+ "CBreakController::BreakRequest;%d is in charge- cannot service request from %d- returning KErrInUse",
+ (TInt)iRequester, (TInt)aRequester );
+
+ OstTraceFunctionExit0( CBREAKCONTROLLER_BREAKREQUEST_EXIT );
return KErrInUse;
}
iRequester = aRequester;
-
StateMachine(aState, aDelay);
-
// Reset the owner member if relevant.
if ( aState == EInactive )
{
iRequester = ENone;
}
+ OstTraceFunctionExit0( CBREAKCONTROLLER_BREAKREQUEST_EXIT_DUP1 );
return KErrNone;
}
@@ -181,20 +194,23 @@
* @param aDelay Only used if going to a breaking state, the delay.
*/
{
- LOG_FUNC
-
+ OstTraceFunctionEntry0( CBREAKCONTROLLER_STATEMACHINE_ENTRY );
TBool resultOK = EFalse;
// Invoke the desired function.
PBFNT pfsDispatch = StateDispatcher[iBreakState][aBreakState];
- __ASSERT_DEBUG(pfsDispatch,
- _USB_PANIC(KAcmPanicCat, EPanicInternalError));
+ if (!pfsDispatch)
+ {
+ OstTraceExt1( TRACE_FATAL, CBREAKCONTROLLER_STATEMACHINE, "CBreakController::StateMachine;pfsDispatch=%p", (TAny*)pfsDispatch );
+ __ASSERT_DEBUG( EFalse, User::Panic(KAcmPanicCat, EPanicInternalError) );
+ }
resultOK = ( *pfsDispatch )(this, aDelay);
if ( resultOK )
{
- LOGTEXT(_L8("\tbreak state dispatcher returned *SUCCESS*"));
-
+ OstTrace0( TRACE_NORMAL, CBREAKCONTROLLER_STATEMACHINE_DUP1,
+ "CBreakController::StateMachine;\tbreak state dispatcher returned *SUCCESS*" );
+
// check to see if the state change will need to result
// in a modification to the public state of BREAK which is
// either NO-BREAK == EBreakInactive
@@ -214,8 +230,10 @@
}
else
{
- LOGTEXT(_L8("\tbreak state dispatcher returned *FAILURE*"));
+ OstTrace0( TRACE_NORMAL, CBREAKCONTROLLER_STATEMACHINE_DUP2,
+ "CBreakController::StateMachine;\tbreak state dispatcher returned *FAILURE*" );
}
+ OstTraceFunctionExit0( CBREAKCONTROLLER_STATEMACHINE_EXIT );
}
void CBreakController::Publish(TState aNewState)
@@ -226,11 +244,13 @@
* @param aNewState The next state we're about to go to.
*/
{
- LOG_FUNC
- LOGTEXT2(_L8("\taNewState = %d"), aNewState);
+ OstTraceFunctionEntry0( CBREAKCONTROLLER_PUBLISH_ENTRY );
- __ASSERT_DEBUG(aNewState != iBreakState,
- _USB_PANIC(KAcmPanicCat, EPanicInternalError));
+ if (aNewState == iBreakState)
+ {
+ OstTrace1( TRACE_FATAL, CBREAKCONTROLLER_PUBLISH, "CBreakController::Publish;aNewState=%d", (TInt)aNewState );
+ __ASSERT_DEBUG( EFalse, User::Panic(KAcmPanicCat, EPanicInternalError) );
+ }
// send the new BREAK state off to the USB Host
// this function is normally used so that ACMCSY can send client
@@ -247,7 +267,7 @@
// this should cause it to be toggled there.
if( iParentAcm.BreakCallback() )
{
- LOGTEXT(_L8("\tabout to call back break state change"));
+ OstTrace0( TRACE_NORMAL, CBREAKCONTROLLER_PUBLISH_DUP1, "CBreakController::Publish;\tabout to call back break state change" );
iParentAcm.BreakCallback()->BreakStateChange();
}
@@ -255,13 +275,13 @@
// we tell the MBreakObserver (ACM port) that the break has completed.
if ( aNewState == EInactive )
{
- LOGTEXT(_L8("\tnew state is break-inactive"));
+ OstTrace0( TRACE_NORMAL, CBREAKCONTROLLER_PUBLISH_DUP2, "CBreakController::Publish;\tnew state is break-inactive" );
if ( iRequester == EDevice )
{
- LOGTEXT(_L8("\tdevice is interested"));
+ OstTrace0( TRACE_NORMAL, CBREAKCONTROLLER_PUBLISH_DUP3, "CBreakController::Publish;\tdevice is interested" );
if( iParentAcm.BreakCallback() )
{
- LOGTEXT(_L8("\tabout to call back break completion"));
+ OstTrace0( TRACE_NORMAL, CBREAKCONTROLLER_PUBLISH_DUP4, "CBreakController::Publish;\tabout to call back break completion" );
iParentAcm.BreakCallback()->BreakRequestCompleted();
}
}
@@ -269,6 +289,7 @@
// We just got to break-inactive state. Blank the requester record.
iRequester = ENone;
}
+ OstTraceFunctionExit0( CBREAKCONTROLLER_PUBLISH_EXIT );
}
/**
@@ -281,18 +302,17 @@
TBool CBreakController::ScInvalid(CBreakController *aThis,
TTimeIntervalMicroSeconds32 aDelay)
{
- LOG_STATIC_FUNC_ENTRY
-
+ OstTraceFunctionEntry0( CBREAKCONTROLLER_SCINVALID_ENTRY );
static_cast<void>(aThis); // remove warning
static_cast<void>(aDelay); // remove warning
-
+ OstTraceFunctionExit0( CBREAKCONTROLLER_SCINVALID_EXIT );
return( EFalse );
}
TBool CBreakController::ScInactive(CBreakController *aThis,
TTimeIntervalMicroSeconds32 aDelay)
{
- LOG_STATIC_FUNC_ENTRY
+ OstTraceFunctionEntry0( CBREAKCONTROLLER_SCINACTIVE_ENTRY );
static_cast<void>(aDelay); // remove warning
@@ -302,17 +322,19 @@
aThis->iParentAcm.SetBreakActive(EFalse);
+ OstTraceFunctionExit0( CBREAKCONTROLLER_SCINACTIVE_EXIT );
return( ETrue );
}
TBool CBreakController::ScSetTimer(CBreakController *aThis,
TTimeIntervalMicroSeconds32 aDelay)
{
- LOG_STATIC_FUNC_ENTRY
+ OstTraceFunctionEntry0( CBREAKCONTROLLER_SCSETTIMER_ENTRY );
// don't try to set any delay if the caller wants something impossible
if ( aDelay.Int() <= 0 )
{
+ OstTraceFunctionExit0( CBREAKCONTROLLER_SCSETTIMER_EXIT );
return( EFalse );
}
@@ -323,14 +345,14 @@
aThis->iParentAcm.SetBreakActive(ETrue);
+ OstTraceFunctionExit0( CBREAKCONTROLLER_SCSETTIMER_EXIT_DUP1 );
return( ETrue );
}
TBool CBreakController::ScLocked(CBreakController *aThis,
TTimeIntervalMicroSeconds32 aDelay)
{
- LOG_STATIC_FUNC_ENTRY
-
+ OstTraceFunctionEntry0( CBREAKCONTROLLER_SCLOCKED_ENTRY );
static_cast<void>(aDelay); // remove warning
// this may have been called while a BREAK is already current, so cancel
@@ -339,6 +361,7 @@
aThis->iParentAcm.SetBreakActive(ETrue);
+ OstTraceFunctionExit0( CBREAKCONTROLLER_SCLOCKED_EXIT );
return( ETrue );
}
--- a/usbmgmt/usbmgr/device/classdrivers/acm/classimplementation/ecacm/src/CdcAcmClass.cpp Wed Jul 07 14:16:40 2010 +0800
+++ b/usbmgmt/usbmgr/device/classdrivers/acm/classimplementation/ecacm/src/CdcAcmClass.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 "AcmUtils.h"
#include "HostPushedChangeObserver.h"
#include "BreakController.h"
-#include <usb/usblogger.h>
-
-#ifdef __FLOG_ACTIVE
-_LIT8(KLogComponent, "ECACM");
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "CdcAcmClassTraces.h"
#endif
extern const TInt32 KUsbAcmHostCanHandleZLPs = 0;
@@ -35,7 +34,9 @@
* Constructor.
*/
{
+ OstTraceFunctionEntry0( CCDCACMCLASS_CCDCACMCLASS_CONS_ENTRY );
SetDefaultAcm();
+ OstTraceFunctionExit0( CCDCACMCLASS_CCDCACMCLASS_CONS_EXIT );
}
CCdcAcmClass* CCdcAcmClass::NewL(const TUint8 aProtocolNum, const TDesC16& aAcmControlIfcName, const TDesC16& aAcmDataIfcName)
@@ -45,12 +46,12 @@
* @return Ownership of a new CCdcAcmClass object
*/
{
- LOG_STATIC_FUNC_ENTRY
-
+ OstTraceFunctionEntry0( CCDCACMCLASS_NEWL_ENTRY );
CCdcAcmClass* self = new(ELeave) CCdcAcmClass;
CleanupStack::PushL(self);
self->ConstructL(aProtocolNum, aAcmControlIfcName, aAcmDataIfcName);
CLEANUPSTACK_POP(self);
+ OstTraceFunctionExit0( CCDCACMCLASS_NEWL_EXIT );
return self;
}
@@ -62,32 +63,41 @@
* @param aDataIfcName contains the interface name
*/
{
+ OstTraceFunctionEntry0( CCDCACMCLASS_CONSTRUCTL_ENTRY );
+
TUint8 interfaceNumber;
TInt res;
- LOGTEXT(_L8("\tabout to create control interface with name"));
+ OstTrace0( TRACE_NORMAL, CCDCACMCLASS_CONSTRUCTL, "CCdcAcmClass::ConstructL;\tabout to create control interface with name" );
iControl = CCdcControlInterface::NewL(*this, aProtocolNum, aControlIfcName);
- LOGTEXT(_L8("\tabout to create data interface with name"));
+ OstTrace0( TRACE_NORMAL, CCDCACMCLASS_CONSTRUCTL_DUP1, "CCdcAcmClass::ConstructL;\tabout to create data interface with name" );
iData = CCdcDataInterface::NewL(aDataIfcName);
iBreakController = CBreakController::NewL(*this);
- LOGTEXT(_L8("\tabout to call GetInterfaceNumber"));
+ OstTrace0( TRACE_NORMAL, CCDCACMCLASS_CONSTRUCTL_DUP2, "CCdcAcmClass::ConstructL;\tabout to call GetInterfaceNumber" );
res = iData->GetInterfaceNumber(interfaceNumber);
if ( res )
{
- LOGTEXT2(_L8("\tGetInterfaceNumber=%d"), res);
- LEAVEIFERRORL(res);
+ OstTrace1( TRACE_NORMAL, CCDCACMCLASS_CONSTRUCTL_DUP3, "CCdcAcmClass::ConstructL;\tGetInterfaceNumber=%d", res );
+ if (res < 0)
+ {
+ User::Leave(res);
+ }
}
- LOGTEXT(_L8("\tabout to call SetupClassSpecificDescriptor"));
+ OstTrace0( TRACE_NORMAL, CCDCACMCLASS_CONSTRUCTL_DUP4, "CCdcAcmClass::ConstructL;\tabout to call SetupClassSpecificDescriptor" );
res = iControl->SetupClassSpecificDescriptor(interfaceNumber);
if ( res )
{
- LOGTEXT2(_L8("\tSetupClassSpecificDescriptor=%d"), res);
- LEAVEIFERRORL(res);
+ OstTrace1( TRACE_NORMAL, CCDCACMCLASS_CONSTRUCTL_DUP5, "CCdcAcmClass::ConstructL;\tSetupClassSpecificDescriptor=%d", res );
+ if (res < 0)
+ {
+ User::Leave(res);
+ }
}
+ OstTraceFunctionExit0( CCDCACMCLASS_CONSTRUCTL_EXIT );
}
CCdcAcmClass::~CCdcAcmClass()
@@ -95,11 +105,11 @@
* Destructor.
*/
{
- LOG_FUNC
-
+ OstTraceFunctionEntry0( CCDCACMCLASS_CCDCACMCLASS_DES_ENTRY );
delete iControl;
delete iData;
delete iBreakController;
+ OstTraceFunctionExit0( CCDCACMCLASS_CCDCACMCLASS_DES_EXIT );
}
void CCdcAcmClass::SetCallback(MHostPushedChangeObserver* aCallback)
@@ -108,8 +118,8 @@
* because the ACM class and the port have different lifetimes.
*/
{
- LOGTEXT2(_L8(">>CCdcAcmClass::SetCallback aCallback=0x%08x"), aCallback);
-
+ OstTraceFunctionEntry0( CCDCACMCLASS_SETCALLBACK_ENTRY );
+ OstTraceExt1( TRACE_NORMAL, CCDCACMCLASS_SETCALLBACK, "CCdcAcmClass::SetCallback;aCallback=%p", aCallback );
iCallback = aCallback;
// remember that this function can also be called to
@@ -127,7 +137,7 @@
iCallback->HostSignalChange(iDtrState,iRtsState);
}
- LOGTEXT(_L8("<<CCdcAcmClass::SetCallback"));
+ OstTraceFunctionExit0( CCDCACMCLASS_SETCALLBACK_EXIT );
}
void CCdcAcmClass::SetBreakCallback(MBreakObserver* aBreakCallback)
@@ -136,12 +146,10 @@
* because the ACM class and the port have different lifetimes.
*/
{
- LOGTEXT2(_L8(">>CCdcAcmClass::SetBreakCallback aBreakCallback=0x%08x"),
- aBreakCallback);
-
+ OstTraceFunctionEntry0( CCDCACMCLASS_SETBREAKCALLBACK_ENTRY );
+ OstTraceExt1( TRACE_NORMAL, CCDCACMCLASS_SETBREAKCALLBACK, "CCdcAcmClass::SetBreakCallback;aBreakCallback=%p", aBreakCallback );
iBreakCallback = aBreakCallback;
-
- LOGTEXT(_L8("<<CCdcAcmClass::SetBreakCallback"));
+ OstTraceFunctionExit0( CCDCACMCLASS_SETBREAKCALLBACK_EXIT );
}
void CCdcAcmClass::ReadOneOrMore(MReadOneOrMoreObserver& aObserver, TDes8& aDes)
@@ -152,12 +160,10 @@
* @param aDes Descriptor to read into
*/
{
- LOGTEXT2(_L8(">>CCdcAcmClass::ReadOneOrMore aObserver=0x%08x"),
- &aObserver);
-
+ OstTraceFunctionEntry0( CCDCACMCLASS_READONEORMORE_ENTRY );
+ OstTraceExt1( TRACE_NORMAL, CCDCACMCLASS_READONEORMORE, "CCdcAcmClass::ReadOneOrMore;aObserver=%p", &aObserver );
ReadOneOrMore(aObserver, aDes, aDes.Length());
-
- LOGTEXT(_L8("<<CCdcAcmClass::ReadOneOrMore"));
+ OstTraceFunctionExit0( CCDCACMCLASS_READONEORMORE_EXIT );
}
void CCdcAcmClass::ReadOneOrMore(MReadOneOrMoreObserver& aObserver,
@@ -171,14 +177,18 @@
* @param aLength Amount of data to read
*/
{
- LOGTEXT3(_L8(">>CCdcAcmClass::ReadOneOrMore aObserver=0x%08x, "
- "aLength=%d"),
- &aObserver, aLength);
+ OstTraceFunctionEntry0( CCDCACMCLASS_READONEORMORE_MREADONEORMOREOBSERVERREF_TDES8REF_TINT_ENTRY );
+ OstTraceExt2( TRACE_NORMAL, CCDCACMCLASS_READONEORMORE_MREADONEORMOREOBSERVERREF_TDES8REF_TINT,
+ "CCdcAcmClass::ReadOneOrMore;aObserver=%p;aLength=%d", &aObserver, aLength );
- __ASSERT_DEBUG(iData, _USB_PANIC(KAcmPanicCat, EPanicInternalError));
+ if (!iData)
+ {
+ OstTrace1( TRACE_FATAL, CCDCACMCLASS_READONEORMORE_MREADONEORMOREOBSERVERREF_TDES8REF_TINT_DUP1, "CCdcAcmClass::ReadOneOrMore;iData=%d", (TInt)iData );
+ __ASSERT_DEBUG( EFalse, User::Panic(KAcmPanicCat, EPanicInternalError) );
+ }
iData->ReadOneOrMore(aObserver, aDes, aLength);
- LOGTEXT(_L8("<<CCdcAcmClass::ReadOneOrMore"));
+ OstTraceFunctionExit0( CCDCACMCLASS_READONEORMORE_MREADONEORMOREOBSERVERREF_TDES8REF_TINT_EXIT );
}
void CCdcAcmClass::Read(MReadObserver& aObserver, TDes8& aDes)
@@ -189,11 +199,10 @@
* @param aDes Descriptor to read into.
*/
{
- LOGTEXT2(_L8(">>CCdcAcmClass::Read aObserver=0x%08x"), &aObserver);
-
+ OstTraceFunctionEntry0( CCDCACMCLASS_READ_ENTRY );
+ OstTraceExt1( TRACE_NORMAL, CCDCACMCLASS_READ, "CCdcAcmClass::Read;aObserver=%p", &aObserver );
Read(aObserver, aDes, aDes.Length());
-
- LOGTEXT(_L8("<<CCdcAcmClass::Read"));
+ OstTraceFunctionExit0( CCDCACMCLASS_READ_EXIT );
}
void CCdcAcmClass::Read(MReadObserver& aObserver, TDes8& aDes, TInt aLength)
@@ -205,13 +214,15 @@
* @param aLength Amount of data to read.
*/
{
- LOGTEXT3(_L8(">>CCdcAcmClass::Read aObserver=0x%08x, aLength=%d"),
- &aObserver, aLength);
-
- __ASSERT_DEBUG(iData, _USB_PANIC(KAcmPanicCat, EPanicInternalError));
+ OstTraceFunctionEntry0( CCDCACMCLASS_READ_ENTRY_DUP1 );
+ OstTraceExt2( TRACE_NORMAL, CCDCACMCLASS_READ_DUP1, "CCdcAcmClass::Read;aObserver=%p;aLength=%d", &aObserver, aLength );
+ if (!iData)
+ {
+ OstTraceExt1( TRACE_FATAL, CCDCACMCLASS_READ_DUP2, "CCdcAcmClass::Read;iData=%p", iData );
+ __ASSERT_DEBUG( EFalse, User::Panic(KAcmPanicCat, EPanicInternalError) );
+ }
iData->Read(aObserver, aDes, aLength);
-
- LOGTEXT(_L8("<<CCdcAcmClass::Read"));
+ OstTraceFunctionExit0( CCDCACMCLASS_READ_ENTRY_DUP1_EXIT );
}
void CCdcAcmClass::ReadCancel()
@@ -219,10 +230,15 @@
* Cancel a read request.
*/
{
- LOG_FUNC
-
- __ASSERT_DEBUG(iData, _USB_PANIC(KAcmPanicCat, EPanicInternalError));
+ OstTraceFunctionEntry0( CCDCACMCLASS_READCANCEL_ENTRY );
+
+ if (!iData)
+ {
+ OstTraceExt1( TRACE_FATAL, CCDCACMCLASS_READCANCEL, "CCdcAcmClass::ReadCancel;iData=%p", iData );
+ __ASSERT_DEBUG( EFalse, User::Panic(KAcmPanicCat, EPanicInternalError) );
+ }
iData->CancelRead();
+ OstTraceFunctionExit0( CCDCACMCLASS_READCANCEL_EXIT );
}
void CCdcAcmClass::Write(MWriteObserver& aObserver, const TDesC8& aDes)
@@ -233,12 +249,10 @@
* @param aDes Descriptor containing the data to be written.
*/
{
- LOGTEXT2(_L8(">>CCdcAcmClass::Write aObserver=0x%08x"),
- &aObserver);
-
+ OstTraceFunctionEntry0( CCDCACMCLASS_WRITE_ENTRY );
+ OstTraceExt1( TRACE_NORMAL, CCDCACMCLASS_WRITE, "CCdcAcmClass::Write;aObserver=%p", &aObserver );
Write(aObserver, aDes, aDes.Length());
-
- LOGTEXT(_L8("<<CCdcAcmClass::Write"));
+ OstTraceFunctionExit0( CCDCACMCLASS_WRITE_EXIT );
}
void CCdcAcmClass::Write(MWriteObserver& aObserver,
@@ -252,13 +266,15 @@
* @param aLength The amount of data to write.
*/
{
- LOGTEXT3(_L8(">>CCdcAcmClass::Write aObserver=0x%08x, aLength=%d"),
- &aObserver, aLength);
-
- __ASSERT_DEBUG(iData, _USB_PANIC(KAcmPanicCat, EPanicInternalError));
+ OstTraceFunctionEntry0( CCDCACMCLASS_WRITE_ENTRY_DUP1 );
+ OstTraceExt2( TRACE_NORMAL, CCDCACMCLASS_WRITE_DUP1, "CCdcAcmClass::Write;aObserver=%p;aLength=%d", &aObserver, aLength );
+ if (!iData)
+ {
+ OstTraceExt1( TRACE_FATAL, CCDCACMCLASS_WRITE_DUP2, "CCdcAcmClass::Write;iData=%p", iData );
+ __ASSERT_DEBUG( EFalse, User::Panic(KAcmPanicCat, EPanicInternalError) );
+ }
iData->Write(aObserver, aDes, aLength);
-
- LOGTEXT(_L8("<<CCdcAcmClass::Write"));
+ OstTraceFunctionExit0( CCDCACMCLASS_WRITE_ENTRY_DUP1_EXIT );
}
void CCdcAcmClass::WriteCancel()
@@ -266,10 +282,14 @@
* Cancel the write request.
*/
{
- LOG_FUNC
-
- __ASSERT_DEBUG(iData, _USB_PANIC(KAcmPanicCat, EPanicInternalError));
+ OstTraceFunctionEntry0( CCDCACMCLASS_WRITECANCEL_ENTRY );
+ if (!iData)
+ {
+ OstTraceExt1( TRACE_FATAL, CCDCACMCLASS_WRITECANCEL, "CCdcAcmClass::WriteCancel;iData=%p", iData );
+ __ASSERT_DEBUG( EFalse, User::Panic(KAcmPanicCat, EPanicInternalError) );
+ }
iData->CancelWrite();
+ OstTraceFunctionExit0( CCDCACMCLASS_WRITECANCEL_EXIT );
}
TInt CCdcAcmClass::HandleGetCommFeature(const TUint16 aSelector,
@@ -282,9 +302,8 @@
* the ACM device or the country code from ISO 3166.
*/
{
- LOGTEXT2(_L8(">>CCdcAcmClass::HandleGetCommFeature aSelector=%d"),
- aSelector);
-
+ OstTraceFunctionEntry0( CCDCACMCLASS_HANDLEGETCOMMFEATURE_ENTRY );
+ OstTrace1( TRACE_NORMAL, CCDCACMCLASS_HANDLEGETCOMMFEATURE, "CCdcAcmClass::HandleGetCommFeature;aSelector=%d", (TInt)aSelector );
TInt ret = KErrNone;
// check the feature selector from the header and reject if invalid,
@@ -301,8 +320,8 @@
ppbuffer = &pbuffer;
CCdcControlInterface::PutU16(ppbuffer,iAcmState);
-
- LOGTEXT2(_L8("\tAbstract State [0x%04X]"), iAcmState);
+ OstTraceExt1( TRACE_NORMAL, CCDCACMCLASS_HANDLEGETCOMMFEATURE_DUP1,
+ "CCdcAcmClass::HandleGetCommFeature;\tAbstract State [0x%hx]", iAcmState );
}
break;
@@ -311,7 +330,8 @@
#if defined(DISABLE_ACM_CF_COUNTRY_SETTING)
aReturnData.SetLength(0);
- LOGTEXT(_L8("\tCountry Code Not Supported"));
+ OstTrace0( TRACE_NORMAL, CCDCACMCLASS_HANDLEGETCOMMFEATURE_DUP2,
+ "CCdcAcmClass::HandleGetCommFeature;\tCountry Code Not Supported" );
ret = KErrNotSupported;
#elif defined(ENABLE_ACM_CF_COUNTRY_SETTING)
@@ -324,20 +344,21 @@
ppbuffer = &pbuffer;
CCdcControlInterface::PutU16(ppbuffer,iCountryCode);
-
- LOGTEXT2(_L8("\tCountry Code [0x%04X]"), iCountryCode);
-
+ OstTraceExt1( TRACE_NORMAL, CCDCACMCLASS_HANDLEGETCOMMFEATURE_DUP3,
+ "CCdcAcmClass::HandleGetCommFeature;\tCountry Code [0x%hx]", iCountryCode );
#endif
}
break;
default:
aReturnData.SetLength(0);
- LOGTEXT(_L8("\tBad Selector"));
+ OstTrace0( TRACE_NORMAL, CCDCACMCLASS_HANDLEGETCOMMFEATURE_DUP4, "CCdcAcmClass::HandleGetCommFeature;\tBad Selector" );
ret = KErrUnknown;
}
- LOGTEXT2(_L8("<<CCdcAcmClass::HandleGetCommFeature ret=%d"), ret);
+ OstTrace1( TRACE_NORMAL, CCDCACMCLASS_HANDLEGETCOMMFEATURE_DUP5,
+ "CCdcAcmClass::HandleGetCommFeature;ret=%d", ret );
+ OstTraceFunctionExit0( CCDCACMCLASS_HANDLEGETCOMMFEATURE_EXIT );
return ret;
}
@@ -347,9 +368,8 @@
* @param aSelector Multiplex control for the feature is held in wValue field
*/
{
- LOGTEXT2(_L8(">>CCdcAcmClass::HandleClearCommFeature aSelector=%d"),
- aSelector);
-
+ OstTraceFunctionEntry0( CCDCACMCLASS_HANDLECLEARCOMMFEATURE_ENTRY );
+ OstTrace1( TRACE_NORMAL, CCDCACMCLASS_HANDLECLEARCOMMFEATURE, "CCdcAcmClass::HandleClearCommFeature;aSelector=%d", (TInt)aSelector );
TInt ret = KErrNone;
// check the feature selector from the header and reject if invalid,
@@ -360,21 +380,24 @@
{
// reset to guaranteed-success default, so ignore return value
static_cast<void>(HandleNewAbstractState(EUsbAbstractStateDataMultiplex));
- LOGTEXT2(_L8("\tAbstract State [0x%04X]"), iAcmState);
+ OstTraceExt1( TRACE_NORMAL, CCDCACMCLASS_HANDLECLEARCOMMFEATURE_DUP1,
+ "CCdcAcmClass::HandleClearCommFeature;\tAbstract State [0x%hx]", iAcmState );
}
break;
case EUsbCommFeatureSelectCountryCode:
{
#if defined(DISABLE_ACM_CF_COUNTRY_SETTING)
-
- LOGTEXT(_L8("\tCountry Code Not Supported"));
+
+ OstTrace0( TRACE_NORMAL, CCDCACMCLASS_HANDLECLEARCOMMFEATURE_DUP2,
+ "CCdcAcmClass::HandleClearCommFeature;\tCountry Code Not Supported" );
ret = KErrNotSupported;
#elif defined(ENABLE_ACM_CF_COUNTRY_SETTING)
HandleNewCountryCode(KUsbCommCountryCode0);
- LOGTEXT2(_L8("\tCountry Code [0x%04X]"), iCountryCode);
+ OstTraceExt1( TRACE_NORMAL, CCDCACMCLASS_HANDLECLEARCOMMFEATURE_DUP3,
+ "CCdcAcmClass::HandleClearCommFeature;\tCountry Code [0x%hx]", iCountryCode );
#endif
}
@@ -382,12 +405,13 @@
default:
{
- LOGTEXT(_L8("\tBad Selector"));
+ OstTrace0( TRACE_NORMAL, CCDCACMCLASS_HANDLECLEARCOMMFEATURE_DUP4, "CCdcAcmClass::HandleClearCommFeature;\tBad Selector" );
ret = KErrUnknown;
}
}
- LOGTEXT2(_L8("<<CCdcAcmClass::HandleClearCommFeature ret=%d"), ret);
+ OstTrace1( TRACE_NORMAL, CCDCACMCLASS_HANDLECLEARCOMMFEATURE_DUP5, "CCdcAcmClass::HandleClearCommFeature;ret=%d", ret );
+ OstTraceFunctionExit0( CCDCACMCLASS_HANDLECLEARCOMMFEATURE_EXIT );
return ret;
}
@@ -408,11 +432,13 @@
* data bit settings.
*/
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CCDCACMCLASS_HANDLESETLINECODING_ENTRY );
+
if (aData.Length() != 7) // TODO: magic number?
{
- LOGTEXT(_L8("\t***buffer too small"));
+ OstTrace0( TRACE_NORMAL, CCDCACMCLASS_HANDLESETLINECODING, "CCdcAcmClass::HandleSetLineCoding;\t***buffer too small" );
+ OstTraceFunctionExit0( CCDCACMCLASS_HANDLESETLINECODING_EXIT );
return KErrGeneral;
}
@@ -435,6 +461,7 @@
iCallback->HostConfigChange(epocConfig);
}
+ OstTraceFunctionExit0( CCDCACMCLASS_HANDLESETLINECODING_EXIT_DUP1 );
return KErrNone;
}
@@ -446,6 +473,8 @@
* defaults.
*/
{
+ OstTraceFunctionEntry0( CCDCACMCLASS_SETDEFAULTACM_ENTRY );
+
iUsbConfig.iRate = 115200;
iUsbConfig.iStopBits = EUsbStopBitOne;
iUsbConfig.iParity = EUsbParityNone;
@@ -467,6 +496,7 @@
iDcdState = EFalse;
iBreakActive = EFalse;
+ OstTraceFunctionExit0( CCDCACMCLASS_SETDEFAULTACM_EXIT );
}
void CCdcAcmClass::ConvertUsbConfigCodingToEpoc(const TUsbConfig& aUsbConfig,
@@ -479,6 +509,8 @@
* @param aEpocConfig The EPOC configuration to be converted to.
*/
{
+ OstTraceFunctionEntry0( CCDCACMCLASS_CONVERTUSBCONFIGCODINGTOEPOC_ENTRY );
+
switch ( aUsbConfig.iDataBits )
{
case EUsbDataBitsFive:
@@ -585,6 +617,7 @@
break;
}
}
+ OstTraceFunctionExit0( CCDCACMCLASS_CONVERTUSBCONFIGCODINGTOEPOC_EXIT );
}
TInt CCdcAcmClass::HandleNewAbstractState(const TUint16 aAbstractState)
@@ -598,14 +631,12 @@
* D1 controls 'data multiplexed state' -> iAcmDataMultiplex
*/
{
- LOGTEXT2(_L8(">>CCdcAcmClass::HandleNewAbstractState aAbstractState=%d"),
- aAbstractState);
+ OstTraceFunctionEntry0( CCDCACMCLASS_HANDLENEWABSTRACTSTATE_ENTRY );
+ OstTrace1( TRACE_NORMAL, CCDCACMCLASS_HANDLENEWABSTRACTSTATE, "CCdcAcmClass::HandleNewAbstractState;aAbstractState=%d", (TInt)aAbstractState );
TBool multiplex;
TBool idle;
-
TUint16 newstate;
-
TInt ret;
// collect local booleans from incoming combo ready to do local
@@ -656,21 +687,23 @@
// informed, note that the callback may not have been placed.
if( iAcmState != newstate )
{
- LOGTEXT2(_L8("\tNew Combo [0x%04X]"), newstate);
+ OstTraceExt1( TRACE_NORMAL, CCDCACMCLASS_HANDLENEWABSTRACTSTATE_DUP1,
+ "CCdcAcmClass::HandleNewAbstractState;\tNew Combo [0x%hx]", newstate );
if ( iCallback )
{
// If there was such a function in class
// MHostPushedChangeObserver, notify
// via iCallback->HostAbstractStateChange(newstate);
- LOGTEXT(_L8("\tHas No Notification Method in class MHostPushedChangeObserver"));
+ OstTrace0( TRACE_NORMAL, CCDCACMCLASS_HANDLENEWABSTRACTSTATE_DUP2,
+ "CCdcAcmClass::HandleNewAbstractState;\tHas No Notification Method in class MHostPushedChangeObserver" );
}
}
// and save the new state ready for next check
iAcmState = newstate;
-
- LOGTEXT2(_L8("<<CCdcAcmClass::HandleNewAbstractState ret=%d"), ret);
+ OstTrace1( TRACE_NORMAL, CCDCACMCLASS_HANDLENEWABSTRACTSTATE_DUP3, "CCdcAcmClass::HandleNewAbstractState;ret=%d", ret );
+ OstTraceFunctionExit0( CCDCACMCLASS_HANDLENEWABSTRACTSTATE_EXIT );
return ret;
}
@@ -682,9 +715,8 @@
* @param aCountryCode The new Country Code as defined in ISO-3166
*/
{
- LOGTEXT2(_L8(">>CCdcAcmClass::HandleNewCountryCode aCountryCode=%d"),
- aCountryCode);
-
+ OstTraceFunctionEntry0( CCDCACMCLASS_HANDLENEWCOUNTRYCODE_ENTRY );
+ OstTrace1( TRACE_NORMAL, CCDCACMCLASS_HANDLENEWCOUNTRYCODE, "CCdcAcmClass::HandleNewCountryCode;aCountryCode=%d", (TInt)aCountryCode );
TInt ret;
#if defined(DISABLE_ACM_CF_COUNTRY_SETTING)
@@ -707,7 +739,8 @@
#endif
- LOGTEXT2(_L8("<<CCdcAcmClass::HandleNewCountryCode ret=%d"), ret);
+ OstTrace1( TRACE_NORMAL, CCDCACMCLASS_HANDLENEWCOUNTRYCODE_DUP1, "CCdcAcmClass::HandleNewCountryCode;ret=%d", ret );
+ OstTraceFunctionExit0( CCDCACMCLASS_HANDLENEWCOUNTRYCODE_EXIT );
return ret;
}
@@ -718,10 +751,9 @@
* @param aData Pointer to the Encapsulated message
*/
{
- LOG_FUNC
-
- LOGTEXT(_L8("\t***not supported"));
-
+ OstTraceFunctionEntry0( CCDCACMCLASS_HANDLESENDENCAPCOMMAND_ENTRY );
+ OstTrace0( TRACE_NORMAL, CCDCACMCLASS_HANDLESENDENCAPCOMMAND, "CCdcAcmClass::HandleSendEncapCommand;\t***not supported" );
+ OstTraceFunctionExit0( CCDCACMCLASS_HANDLESENDENCAPCOMMAND_EXIT );
return KErrNotSupported;
}
@@ -732,10 +764,9 @@
* @param aReturnData Pointer to the Response field
*/
{
- LOG_FUNC
-
- LOGTEXT(_L8("\t***not supported"));
-
+ OstTraceFunctionEntry0( CCDCACMCLASS_HANDLEGETENCAPRESPONSE_ENTRY );
+ OstTrace0( TRACE_NORMAL, CCDCACMCLASS_HANDLEGETENCAPRESPONSE, "CCdcAcmClass::HandleGetEncapResponse;\t***not supported" );
+ OstTraceFunctionExit0( CCDCACMCLASS_HANDLEGETENCAPRESPONSE_EXIT );
return KErrNotSupported;
}
@@ -749,15 +780,17 @@
* the ACM device or the country code from ISO 3166.
*/
{
- LOGTEXT2(_L8(">>CCdcAcmClass::HandleSetCommFeature aSelector=%d"),
- aSelector);
+ OstTraceFunctionEntry0( CCDCACMCLASS_HANDLESETCOMMFEATURE_ENTRY );
+ OstTrace1( TRACE_NORMAL, CCDCACMCLASS_HANDLESETCOMMFEATURE, "CCdcAcmClass::HandleSetCommFeature;aSelector=%d", (TInt)aSelector );
// reject any message that has malformed data
if ( aData.Length() != 2 )
{
- LOGTEXT2(_L8("\t***aData.Length (%d) incorrect"), aData.Length());
- LOGTEXT2(_L8("<<CCdcAcmClass::HandleSetCommFeature ret=%d"),
- KErrArgument);
+ OstTrace1( TRACE_NORMAL, CCDCACMCLASS_HANDLESETCOMMFEATURE_DUP1,
+ "CCdcAcmClass::HandleSetCommFeature;\t***aData.Length (%d) incorrect", aData.Length() );
+ OstTrace1( TRACE_NORMAL, CCDCACMCLASS_HANDLESETCOMMFEATURE_DUP2,
+ "CCdcAcmClass::HandleSetCommFeature;ret=%d", KErrArgument );
+ OstTraceFunctionExit0( CCDCACMCLASS_HANDLESETCOMMFEATURE_EXIT );
return KErrArgument;
}
@@ -781,9 +814,9 @@
if ( newstate != iAcmState )
{
ret = HandleNewAbstractState(newstate);
-
- LOGTEXT4(_L8("\tHandleNewAbstractState=%d [0x%04X]->[0x%04X]"),
- ret, iAcmState, newstate);
+ OstTraceExt3( TRACE_NORMAL, CCDCACMCLASS_HANDLESETCOMMFEATURE_DUP3,
+ "CCdcAcmClass::HandleSetCommFeature;\tHandleNewAbstractState=%d [%hu]->[%hu]",
+ ret, iAcmState, newstate );
}
}
break;
@@ -792,7 +825,7 @@
{
#if defined(DISABLE_ACM_CF_COUNTRY_SETTING)
- LOGTEXT(_L8("Country Code Not Supported"));
+ OstTrace0( TRACE_NORMAL, CCDCACMCLASS_HANDLESETCOMMFEATURE_DUP4, "CCdcAcmClass::HandleSetCommFeature;Country Code Not Supported" );
ret = KErrNotSupported;
#elif defined(ENABLE_ACM_CF_COUNTRY_SETTING)
@@ -809,9 +842,8 @@
if( newcountry != iCountryCode )
{
ret = HandleNewCountryCode(newcountry);
-
- LOGTEXT4(_L8("\tHandleNewCountryCode=%d [0x%04X]->[0x%04X]"),
- ret, iCountryCode, newcountry);
+ OstTraceExt3( TRACE_NORMAL, CCDCACMCLASS_HANDLESETCOMMFEATURE_DUP5,
+ "CCdcAcmClass::HandleSetCommFeature;\tHandleNewCountryCode=%d [%u]->[%u]", ret, iCountryCode, newcountry );
}
#endif
@@ -820,12 +852,12 @@
default:
{
- LOGTEXT(_L8("\tBad Selector"));
+ OstTrace0( TRACE_NORMAL, CCDCACMCLASS_HANDLESETCOMMFEATURE_DUP6, "CCdcAcmClass::HandleSetCommFeature;\tBad Selector" );
ret = KErrUnknown;
}
}
-
- LOGTEXT2(_L8("<<CCdcAcmClass::HandleSetCommFeature ret=%d"), ret);
+ OstTrace1( TRACE_NORMAL, CCDCACMCLASS_HANDLESETCOMMFEATURE_DUP7, "CCdcAcmClass::HandleSetCommFeature;ret=%d", ret );
+ OstTraceFunctionExit0( CCDCACMCLASS_HANDLESETCOMMFEATURE_EXIT_DUP1 );
return ret;
}
@@ -839,8 +871,7 @@
* bits, parity and data bits.
*/
{
- LOG_FUNC
-
+ OstTraceFunctionEntry0( CCDCACMCLASS_HANDLEGETLINECODING_ENTRY );
aReturnData.SetLength(7);
TUint8* pbuffer;
@@ -853,6 +884,7 @@
CCdcControlInterface::PutU08(ppbuffer, static_cast<TUint8>(iUsbConfig.iParity ));
CCdcControlInterface::PutU08(ppbuffer, static_cast<TUint8>(iUsbConfig.iDataBits));
+ OstTraceFunctionExit0( CCDCACMCLASS_HANDLEGETLINECODING_EXIT );
return KErrNone;
}
@@ -864,9 +896,9 @@
* @param aDtrState DTR state.
*/
{
- LOGTEXT3(_L8(">>CCdcAcmClass::HandleSetControlLineState aRtsState=%d, "
- "aDtrState=%d"),
- aRtsState, aDtrState);
+ OstTraceFunctionEntry0( CCDCACMCLASS_HANDLESETCONTROLLINESTATE_ENTRY );
+ OstTraceExt2( TRACE_NORMAL, CCDCACMCLASS_HANDLESETCONTROLLINESTATE,
+ "CCdcAcmClass::HandleSetControlLineState;aRtsState=%d;aDtrState=%d", (TInt)aRtsState, (TInt)aDtrState );
iRtsState = aRtsState;
iDtrState = aDtrState;
@@ -875,7 +907,8 @@
iCallback->HostSignalChange(iDtrState,iRtsState);
}
- LOGTEXT(_L8("<<CCdcAcmClass::HandleSetControlLineState ret=0"));
+ OstTrace0( TRACE_NORMAL, CCDCACMCLASS_HANDLESETCONTROLLINESTATE_DUP1, "CCdcAcmClass::HandleSetControlLineState;ret=0" );
+ OstTraceFunctionExit0( CCDCACMCLASS_HANDLESETCONTROLLINESTATE_EXIT );
return KErrNone;
}
@@ -886,9 +919,8 @@
* @param aDuration Duration of the break in milliseconds.
*/
{
- LOG_FUNC
- LOGTEXT2(_L8("\taDuration = %d"), aDuration);
-
+ OstTraceFunctionEntry0( CCDCACMCLASS_HANDLESENDBREAK_ENTRY );
+ OstTrace1( TRACE_NORMAL, CCDCACMCLASS_HANDLESENDBREAK, "CCdcAcmClass::HandleSendBreak;aDuration=%d", (TInt)aDuration );
TInt ret = KErrNone;
// timing value as given is checked for 'special' values
@@ -911,7 +943,8 @@
aDuration*1000);
}
- LOGTEXT2(_L8("\tret = %d"), ret);
+ OstTrace1( TRACE_NORMAL, CCDCACMCLASS_HANDLESENDBREAK_DUP1, "CCdcAcmClass::HandleSendBreak;ret=%d", ret );
+ OstTraceFunctionExit0( CCDCACMCLASS_HANDLESENDBREAK_EXIT );
return ret;
}
@@ -926,9 +959,9 @@
* Active Object.
*/
{
- LOGTEXT4(_L8(">>CCdcAcmClass::SendSerialState aRing=%d, "
- "aDsr=%d, aDcd=%d"),
- aRing, aDsr, aDcd);
+ OstTraceFunctionEntry0( CCDCACMCLASS_SENDSERIALSTATE_ENTRY );
+ OstTraceExt3( TRACE_NORMAL, CCDCACMCLASS_SENDSERIALSTATE,
+ "CCdcAcmClass::SendSerialState;aRing=%d;aDsr=%d;aDcd=%d", (TInt)aRing, (TInt)aDsr, (TInt)aDcd );
// stub non-supported flags
TBool overrun = EFalse;
@@ -952,7 +985,8 @@
aDsr,
aDcd);
- LOGTEXT2(_L8("<<CCdcAcmClass::SendSerialState ret=%d"), ret);
+ OstTrace1( TRACE_NORMAL, CCDCACMCLASS_SENDSERIALSTATE_DUP1, "CCdcAcmClass::SendSerialState;ret=%d", ret );
+ OstTraceFunctionExit0( CCDCACMCLASS_SENDSERIALSTATE_EXIT );
return ret;
}
@@ -963,6 +997,8 @@
* @return Break flag.
*/
{
+ OstTraceFunctionEntry0( CCDCACMCLASS_BREAKACTIVE_ENTRY );
+ OstTraceFunctionExit0( CCDCACMCLASS_BREAKACTIVE_EXIT );
return iBreakActive;
}
@@ -973,6 +1009,8 @@
* @return Whether RNG is set or not.
*/
{
+ OstTraceFunctionEntry0( CCDCACMCLASS_RINGSTATE_ENTRY );
+ OstTraceFunctionExit0( CCDCACMCLASS_RINGSTATE_EXIT );
return iRingState;
}
@@ -983,6 +1021,8 @@
* @return Whether DSR is set or not.
*/
{
+ OstTraceFunctionEntry0( CCDCACMCLASS_DSRSTATE_ENTRY );
+ OstTraceFunctionExit0( CCDCACMCLASS_DSRSTATE_EXIT );
return iDsrState;
}
@@ -993,6 +1033,8 @@
* @return Whether DCD is set or not.
*/
{
+ OstTraceFunctionEntry0( CCDCACMCLASS_DCDSTATE_ENTRY );
+ OstTraceFunctionExit0( CCDCACMCLASS_DCDSTATE_EXIT );
return iDcdState;
}
@@ -1003,7 +1045,9 @@
* @param aBreakActive The break flag is set to this value.
*/
{
+ OstTraceFunctionEntry0( CCDCACMCLASS_SETBREAKACTIVE_ENTRY );
iBreakActive = aBreakActive;
+ OstTraceFunctionExit0( CCDCACMCLASS_SETBREAKACTIVE_EXIT );
}
MHostPushedChangeObserver* CCdcAcmClass::Callback()
@@ -1013,6 +1057,8 @@
* @return The observer of host-pushed changes.
*/
{
+ OstTraceFunctionEntry0( CCDCACMCLASS_CALLBACK_ENTRY );
+ OstTraceFunctionExit0( CCDCACMCLASS_CALLBACK_EXIT );
return iCallback;
}
@@ -1023,6 +1069,8 @@
* @return The observer of break changes.
*/
{
+ OstTraceFunctionEntry0( CCDCACMCLASS_BREAKCALLBACK_ENTRY );
+ OstTraceFunctionExit0( CCDCACMCLASS_BREAKCALLBACK_EXIT );
return iBreakCallback;
}
@@ -1039,13 +1087,17 @@
* @return Error, for instance if a different entity already owns the break.
*/
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CCDCACMCLASS_BREAKREQUEST_ENTRY );
- __ASSERT_DEBUG(iBreakController,
- _USB_PANIC(KAcmPanicCat, EPanicInternalError));
+ if (!iBreakController)
+ {
+ OstTraceExt1( TRACE_FATAL, CCDCACMCLASS_BREAKREQUEST, "CCdcAcmClass::BreakRequest;iBreakController=%p", iBreakController );
+ __ASSERT_DEBUG( EFalse, User::Panic(KAcmPanicCat, EPanicInternalError) );
+ }
TInt err = iBreakController->BreakRequest(aRequester, aState, aDelay);
- LOGTEXT2(_L8("\tBreakRequest = %d"), err);
+ OstTrace1( TRACE_NORMAL, CCDCACMCLASS_BREAKREQUEST_DUP1, "CCdcAcmClass::BreakRequest;err=%d", err );
+ OstTraceFunctionExit0( CCDCACMCLASS_BREAKREQUEST_EXIT );
return err;
}
@@ -1056,12 +1108,16 @@
* @param aObserver The observer to notify completion to.
*/
{
- LOGTEXT2(_L8(">>CCdcAcmClass::NotifyDataAvailable aObserver=0x%08x"), &aObserver);
+ OstTraceFunctionEntry0( CCDCACMCLASS_NOTIFYDATAAVAILABLE_ENTRY );
+ OstTraceExt1( TRACE_NORMAL, CCDCACMCLASS_NOTIFYDATAAVAILABLE, "CCdcAcmClass::NotifyDataAvailable;aObserver=%p", &aObserver );
- __ASSERT_DEBUG(iData, _USB_PANIC(KAcmPanicCat, EPanicInternalError));
+ if (!iData)
+ {
+ OstTraceExt1( TRACE_FATAL, CCDCACMCLASS_NOTIFYDATAAVAILABLE_DUP1, "CCdcAcmClass::NotifyDataAvailable;iData=%p", iData );
+ __ASSERT_DEBUG( EFalse, User::Panic(KAcmPanicCat, EPanicInternalError) );
+ }
iData->NotifyDataAvailable(aObserver);
-
- LOGTEXT(_L8("<<CCdcAcmClass::NotifyDataAvailable"));
+ OstTraceFunctionExit0( CCDCACMCLASS_NOTIFYDATAAVAILABLE_EXIT );
}
void CCdcAcmClass::NotifyDataAvailableCancel()
@@ -1069,10 +1125,14 @@
* Cancel the request to be notified (when data is available to be read from the LDD).
*/
{
- LOG_FUNC
-
- __ASSERT_DEBUG(iData, _USB_PANIC(KAcmPanicCat, EPanicInternalError));
+ OstTraceFunctionEntry0( CCDCACMCLASS_NOTIFYDATAAVAILABLECANCEL_ENTRY );
+ if (!iData)
+ {
+ OstTraceExt1( TRACE_FATAL, CCDCACMCLASS_NOTIFYDATAAVAILABLECANCEL, "CCdcAcmClass::NotifyDataAvailableCancel;iData=%p", iData );
+ __ASSERT_DEBUG( EFalse, User::Panic(KAcmPanicCat, EPanicInternalError) );
+ }
iData->CancelNotifyDataAvailable();
+ OstTraceFunctionExit0( CCDCACMCLASS_NOTIFYDATAAVAILABLECANCEL_EXIT );
}
//
--- a/usbmgmt/usbmgr/device/classdrivers/acm/classimplementation/ecacm/src/CdcControlInterface.cpp Wed Jul 07 14:16:40 2010 +0800
+++ b/usbmgmt/usbmgr/device/classdrivers/acm/classimplementation/ecacm/src/CdcControlInterface.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"
@@ -25,11 +25,11 @@
#include "CdcAcmClass.h"
#include "AcmPanic.h"
#include "AcmUtils.h"
-#include <usb/usblogger.h>
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "CdcControlInterfaceTraces.h"
+#endif
-#ifdef __FLOG_ACTIVE
-_LIT8(KLogComponent, "ECACM");
-#endif
CCdcControlInterface::CCdcControlInterface(const TUint8 aProtocolNum, const TDesC16& aIfcName)
/**
@@ -41,6 +41,8 @@
iSerialState(0xFFFF),
iProtocolNum(aProtocolNum)
{
+ OstTraceFunctionEntry0( CCDCCONTROLINTERFACE_CCDCCONTROLINTERFACE_CONS_ENTRY );
+ OstTraceFunctionExit0( CCDCCONTROLINTERFACE_CCDCCONTROLINTERFACE_CONS_EXIT );
}
CCdcControlInterface* CCdcControlInterface::NewL(CCdcAcmClass& aParent, const TUint8 aProtocolNum, const TDesC16& aIfcName)
@@ -54,14 +56,14 @@
* @return A pointer to the new object
*/
{
- LOG_STATIC_FUNC_ENTRY
-
- LOGTEXT2(_L("\tControl Ifc Name = %S"), &aIfcName);
+ OstTraceFunctionEntry0( CCDCCONTROLINTERFACE_NEWL_ENTRY );
+ OstTraceExt1( TRACE_NORMAL, CCDCCONTROLINTERFACE_NEWL, "CCdcControlInterface::NewL;\tControl Ifc Name = %S", aIfcName );
CCdcControlInterface* self = new(ELeave) CCdcControlInterface(aProtocolNum, aIfcName);
CleanupStack::PushL(self);
self->ConstructL(aParent);
CLEANUPSTACK_POP(self);
+ OstTraceFunctionExit0( CCDCCONTROLINTERFACE_NEWL_EXIT );
return self;
}
@@ -73,11 +75,13 @@
* @param aParent The ACM class.
*/
{
+ OstTraceFunctionEntry0( CCDCCONTROLINTERFACE_CONSTRUCTL_ENTRY );
+
BaseConstructL();
iReader = CCdcControlInterfaceReader::NewL(aParent, iLdd);
-
- LOGTEXT2(_L8("\tcreated CdcControlInterface iProtocolNum = %d"), iProtocolNum);
+ OstTrace1( TRACE_NORMAL, CCDCCONTROLINTERFACE_CONSTRUCTL, "CCdcControlInterface::ConstructL;iProtocolNum=%d", (TInt)iProtocolNum );
+ OstTraceFunctionExit0( CCDCCONTROLINTERFACE_CONSTRUCTL_EXIT );
}
TInt CCdcControlInterface::SetUpInterface()
@@ -86,25 +90,29 @@
* endpoint and, if found, configuring the interface.
*/
{
- LOGTEXT(_L8(">>CCdcControlInterface::SetUpInterface"));
+ OstTraceFunctionEntry0( CCDCCONTROLINTERFACE_SETUPINTERFACE_ENTRY );
TUsbDeviceCaps dCaps;
TInt ret = iLdd.DeviceCaps(dCaps);
- LOGTEXT(_L8("\tchecking result of DeviceCaps"));
+ OstTrace0( TRACE_NORMAL, CCDCCONTROLINTERFACE_SETUPINTERFACE, "CCdcControlInterface::SetUpInterface;\tchecking result of DeviceCaps" );
if ( ret )
{
- LOGTEXT2(_L8("<<CCdcControlInterface::SetUpInterface ret=%d"), ret);
+ OstTrace1( TRACE_NORMAL, CCDCCONTROLINTERFACE_SETUPINTERFACE_DUP1, "CCdcControlInterface::SetUpInterface;ret=%d", ret );
+ OstTraceFunctionExit0( CCDCCONTROLINTERFACE_SETUPINTERFACE_EXIT );
return ret;
}
const TUint KRequiredNumberOfEndpoints = 1; // in addition to endpoint 0.
const TUint totalEndpoints = static_cast<TUint>(dCaps().iTotalEndpoints);
- LOGTEXT2(_L8("\tiTotalEndpoints = %d"), totalEndpoints);
+ OstTrace1( TRACE_NORMAL, CCDCCONTROLINTERFACE_SETUPINTERFACE_DUP2,
+ "CCdcControlInterface::SetUpInterface;totalEndpoints=%d", (TInt)totalEndpoints );
+
if ( totalEndpoints < KRequiredNumberOfEndpoints )
{
- LOGTEXT2(_L8("<<CCdcControlInterface::SetUpInterface ret=%d"),
- KErrGeneral);
+ OstTrace1( TRACE_NORMAL, CCDCCONTROLINTERFACE_SETUPINTERFACE_DUP3,
+ "CCdcControlInterface::SetUpInterface;ret=%d", KErrGeneral );
+ OstTraceFunctionExit0( CCDCCONTROLINTERFACE_SETUPINTERFACE_EXIT_DUP1 );
return KErrGeneral;
}
@@ -112,10 +120,13 @@
TUsbcEndpointData data[KUsbcMaxEndpoints];
TPtr8 dataptr(reinterpret_cast<TUint8*>(data), sizeof(data), sizeof(data));
ret = iLdd.EndpointCaps(dataptr);
- LOGTEXT(_L8("\tchecking result of EndpointCaps"));
+ OstTrace0( TRACE_NORMAL, CCDCCONTROLINTERFACE_SETUPINTERFACE_DUP4,
+ "CCdcControlInterface::SetUpInterface;\tchecking result of EndpointCaps" );
+
if ( ret )
{
- LOGTEXT2(_L8("<<CCdcControlInterface::SetUpInterface ret=%d"), ret);
+ OstTrace1( TRACE_NORMAL, CCDCCONTROLINTERFACE_SETUPINTERFACE_DUP5, "CCdcControlInterface::SetUpInterface;ret=%d", ret );
+ OstTraceFunctionExit0( CCDCCONTROLINTERFACE_SETUPINTERFACE_EXIT_DUP2 );
return ret;
}
@@ -125,8 +136,11 @@
for ( TUint i = 0 ; i < totalEndpoints ; i++ )
{
const TUsbcEndpointCaps* caps = &data[i].iCaps;
- __ASSERT_DEBUG(caps,
- _USB_PANIC(KAcmPanicCat, EPanicInternalError));
+ if (!caps)
+ {
+ OstTraceExt1( TRACE_FATAL, CCDCCONTROLINTERFACE_SETUPINTERFACE_DUP6, "CCdcControlInterface::SetUpInterface;caps=%p", caps );
+ __ASSERT_DEBUG( EFalse, User::Panic(KAcmPanicCat, EPanicInternalError) );
+ }
if (data[i].iInUse)
{
@@ -152,11 +166,13 @@
break;
}
}
- LOGTEXT(_L8("\tchecking epFound"));
+
+
+ OstTrace0( TRACE_NORMAL, CCDCCONTROLINTERFACE_SETUPINTERFACE_DUP8, "CCdcControlInterface::SetUpInterface;\tchecking epFound" );
if ( !epFound )
{
- LOGTEXT2(_L8("<<CCdcControlInterface::SetUpInterface ret=%d"),
- KErrGeneral);
+ OstTrace1( TRACE_NORMAL, CCDCCONTROLINTERFACE_SETUPINTERFACE_DUP9, "CCdcControlInterface::SetUpInterface;ret=%d", KErrGeneral );
+ OstTraceFunctionExit0( CCDCCONTROLINTERFACE_SETUPINTERFACE_EXIT_DUP3 );
return KErrGeneral;
}
@@ -167,11 +183,12 @@
ifc().iClass.iSubClassNum = 0x02; // Table 16- Abstract Control Model
ifc().iClass.iProtocolNum = iProtocolNum; // Table 17
- LOGTEXT(_L8("\tabout to call SetInterface"));
+ OstTrace0( TRACE_NORMAL, CCDCCONTROLINTERFACE_SETUPINTERFACE_DUP10,
+ "CCdcControlInterface::SetUpInterface;\tabout to call SetInterface" );
// Zero effectively indicates that alternate interfaces are not used.
ret = iLdd.SetInterface(0, ifc);
-
- LOGTEXT2(_L8("<<CCdcControlInterface::SetUpInterface ret=%d"), ret);
+ OstTrace1( TRACE_NORMAL, CCDCCONTROLINTERFACE_SETUPINTERFACE_DUP11, "CCdcControlInterface::SetUpInterface;ret=%d", ret );
+ OstTraceFunctionExit0( CCDCCONTROLINTERFACE_SETUPINTERFACE_EXIT_DUP4 );
return ret;
}
@@ -184,8 +201,9 @@
* @return Error.
*/
{
- LOG_FUNC
- LOGTEXT2(_L8("\taDataInterfaceNumber = %d"), aDataInterfaceNumber);
+ OstTraceFunctionEntry0( CCDCCONTROLINTERFACE_SETUPCLASSSPECIFICDESCRIPTOR_ENTRY );
+ OstTrace1( TRACE_NORMAL, CCDCCONTROLINTERFACE_SETUPCLASSSPECIFICDESCRIPTOR,
+ "CCdcControlInterface::SetupClassSpecificDescriptor;aDataInterfaceNumber=%d", (TInt)aDataInterfaceNumber );
TInt res;
@@ -229,18 +247,26 @@
if ( res )
{
- LOGTEXT2(_L8("\t***GetInterfaceNumber=%d"), res);
+ OstTrace1( TRACE_NORMAL, CCDCCONTROLINTERFACE_SETUPCLASSSPECIFICDESCRIPTOR_DUP1,
+ "CCdcControlInterface::SetupClassSpecificDescriptor;\t***GetInterfaceNumber=%d", res );
+ OstTraceFunctionExit0( CCDCCONTROLINTERFACE_SETUPCLASSSPECIFICDESCRIPTOR_EXIT );
return res;
}
- LOGTEXT(_L8("\tabout to call SetCSInterfaceDescriptorBlock"));
+ OstTrace0( TRACE_NORMAL, CCDCCONTROLINTERFACE_SETUPCLASSSPECIFICDESCRIPTOR_DUP2,
+ "CCdcControlInterface::SetupClassSpecificDescriptor;\tabout to call SetCSInterfaceDescriptorBlock" );
+
res = iLdd.SetCSInterfaceDescriptorBlock(0, descriptor.Des());
if ( res )
{
- LOGTEXT2(_L8("\t***SetCSInterfaceDescriptorBlock=%d"), res);
+ OstTrace1( TRACE_NORMAL, CCDCCONTROLINTERFACE_SETUPCLASSSPECIFICDESCRIPTOR_DUP3,
+ "CCdcControlInterface::SetupClassSpecificDescriptor;\t***SetCSInterfaceDescriptorBlock=%d", res );
+
+ OstTraceFunctionExit0( CCDCCONTROLINTERFACE_SETUPCLASSSPECIFICDESCRIPTOR_EXIT_DUP1 );
return res;
}
+ OstTraceFunctionExit0( CCDCCONTROLINTERFACE_SETUPCLASSSPECIFICDESCRIPTOR_EXIT_DUP2 );
return KErrNone;
}
@@ -249,9 +275,9 @@
* Destructor
*/
{
- LOG_FUNC
-
+ OstTraceFunctionEntry0( DUP1_CCDCCONTROLINTERFACE_CCDCCONTROLINTERFACE_ENTRY );
delete iReader;
+ OstTraceFunctionExit0( DUP1_CCDCCONTROLINTERFACE_CCDCCONTROLINTERFACE_EXIT );
}
/**
@@ -283,6 +309,8 @@
* the little-endian USB bus.
*/
{
+ OstTraceFunctionEntry0( TUSBNOTIFICATIONNETWORKCONNECTION_PACKBUFFER_ENTRY );
+
iBuffer.SetLength(KUSBNotificationNetworkConnectionSize);
iBuffer[0] = bmRequestType;
@@ -294,6 +322,7 @@
iBuffer[6] = static_cast<TUint8>( wLength & 0x00ff);
iBuffer[7] = static_cast<TUint8>((wLength & 0xff00) >> 8);
+ OstTraceFunctionExit0( TUSBNOTIFICATIONNETWORKCONNECTION_PACKBUFFER_EXIT );
return iBuffer;
}
@@ -309,8 +338,9 @@
* @return Error.
*/
{
- LOGTEXT2(_L8(">>CCdcControlInterface::SendNetworkConnection aValue=%d"),
- aValue);
+ OstTraceFunctionEntry0( CCDCCONTROLINTERFACE_SENDNETWORKCONNECTION_ENTRY );
+ OstTrace1( TRACE_NORMAL, CCDCCONTROLINTERFACE_SENDNETWORKCONNECTION,
+ "CCdcControlInterface::SendNetworkConnection;aValue=%d", (TInt)aValue );
// form the message and prime it down to the interrupt handler
// (that is 'interrupt' in the USB sense)
@@ -329,7 +359,9 @@
notification.PackBuffer(),
notification.PackBuffer().Length());
- LOGTEXT2(_L8("<<CCdcControlInterface::SendNetworkConnection ret=%d"), ret);
+ OstTrace1( TRACE_NORMAL, CCDCCONTROLINTERFACE_SENDNETWORKCONNECTION_DUP1,
+ "CCdcControlInterface::SendNetworkConnection;ret=%d", ret );
+ OstTraceFunctionExit0( CCDCCONTROLINTERFACE_SENDNETWORKCONNECTION_EXIT );
return ret;
}
@@ -363,6 +395,8 @@
* the little-endian USB bus.
*/
{
+ OstTraceFunctionEntry0( TUSBNOTIFICATIONSERIALSTATE_PACKBUFFER_ENTRY );
+
iBuffer.SetLength(KUSBNotificationSerialStateSize);
iBuffer[0] = bmRequestType;
@@ -376,6 +410,7 @@
iBuffer[8] = static_cast<TUint8>( wData & 0x00ff);
iBuffer[9] = static_cast<TUint8>((wData & 0xff00) >> 8);
+ OstTraceFunctionExit0( TUSBNOTIFICATIONSERIALSTATE_PACKBUFFER_EXIT );
return iBuffer;
}
@@ -399,14 +434,22 @@
* @return Error.
*/
{
- LOG_FUNC
- LOGTEXT2(_L8("\taOverRun=%d"), aOverRun);
- LOGTEXT2(_L8("\taParity=%d"), aParity);
- LOGTEXT2(_L8("\taFraming=%d"), aFraming);
- LOGTEXT2(_L8("\taRing=%d"), aRing);
- LOGTEXT2(_L8("\taBreak=%d"), aBreak);
- LOGTEXT2(_L8("\taTxCarrier=%d"), aTxCarrier);
- LOGTEXT2(_L8("\taRxCarrier=%d"), aRxCarrier);
+ OstTraceFunctionEntry0( CCDCCONTROLINTERFACE_SENDSERIALSTATE_ENTRY );
+
+ OstTrace1( TRACE_DUMP, CCDCCONTROLINTERFACE_SENDSERIALSTATE,
+ "CCdcControlInterface::SendSerialState;aOverRun=%d", (TInt)aOverRun );
+ OstTrace1( TRACE_DUMP, CCDCCONTROLINTERFACE_SENDSERIALSTATE_DUP1,
+ "CCdcControlInterface::SendSerialState;aParity=%d", (TInt)aParity );
+ OstTrace1( TRACE_DUMP, CCDCCONTROLINTERFACE_SENDSERIALSTATE_DUP2,
+ "CCdcControlInterface::SendSerialState;aFraming=%d", (TInt)aFraming );
+ OstTrace1( TRACE_DUMP, CCDCCONTROLINTERFACE_SENDSERIALSTATE_DUP3,
+ "CCdcControlInterface::SendSerialState;aRing=%d", (TInt)aRing );
+ OstTrace1( TRACE_DUMP, CCDCCONTROLINTERFACE_SENDSERIALSTATE_DUP4,
+ "CCdcControlInterface::SendSerialState;aBreak=%d", (TInt)aBreak );
+ OstTrace1( TRACE_DUMP, CCDCCONTROLINTERFACE_SENDSERIALSTATE_DUP5,
+ "CCdcControlInterface::SendSerialState;aTxCarrier=%d", (TInt)aTxCarrier );
+ OstTrace1( TRACE_DUMP, CCDCCONTROLINTERFACE_SENDSERIALSTATE_DUP6,
+ "CCdcControlInterface::SendSerialState;aRxCarrier=%d", (TInt)aRxCarrier );
// First work out what might need to be sent by assembling the bits into
// the correct places. See CDC spec table 69 (UART state bitmap values).
@@ -426,7 +469,9 @@
// send it off.
if ( data == iSerialState )
{
- LOGTEXT(_L8("\tdata == iSerialState"));
+ OstTrace0( TRACE_NORMAL, CCDCCONTROLINTERFACE_SENDSERIALSTATE_DUP7,
+ "CCdcControlInterface::SendSerialState;\tdata == iSerialState" );
+ OstTraceFunctionExit0( CCDCCONTROLINTERFACE_SENDSERIALSTATE_EXIT );
return KErrNone;
}
@@ -451,8 +496,8 @@
TInt ret = WriteData( EEndpoint1,
notification.PackBuffer(),
notification.PackBuffer().Length());
- LOGTEXT2(_L8("\tWriteData = %d"), ret);
-
+ OstTrace1( TRACE_NORMAL, CCDCCONTROLINTERFACE_SENDSERIALSTATE_DUP8, "CCdcControlInterface::SendSerialState;ret=%d", ret );
+ OstTraceFunctionExit0( DUP1_CCDCCONTROLINTERFACE_SENDSERIALSTATE_EXIT );
return ret;
}
@@ -467,20 +512,25 @@
* @param aLength
*/
{
- LOG_FUNC
- LOGTEXT2(_L8("\taEndpoint=%d"), aEndPoint);
+ OstTraceFunctionEntry0( CCDCCONTROLINTERFACE_WRITEDATA_ENTRY );
+ OstTrace1( TRACE_NORMAL, CCDCCONTROLINTERFACE_WRITEDATA, "CCdcControlInterface::WriteData;aEndPoint=%d", (TInt)aEndPoint );
TInt ret;
RTimer timer;
ret = timer.CreateLocal();
if ( ret )
{
- LOGTEXT2(_L8("\ttimer.CreateLocal = %d- returning"), ret);
+ OstTrace1( TRACE_NORMAL, CCDCCONTROLINTERFACE_WRITEDATA_DUP1,
+ "CCdcControlInterface::WriteData;\ttimer.CreateLocal = %d- returning", ret );
+
+ OstTraceFunctionExit0( CCDCCONTROLINTERFACE_WRITEDATA_EXIT );
return ret;
}
TRequestStatus status;
TRequestStatus timerStatus;
- LOGTEXT(_L8("\tAttempting to write data to control interface"));
+ OstTrace0( TRACE_NORMAL, CCDCCONTROLINTERFACE_WRITEDATA_DUP2,
+ "CCdcControlInterface::WriteData;\tAttempting to write data to control interface" );
+
iLdd.Write(status, aEndPoint, aDes, aLength);
timer.After(timerStatus, KWriteDataTimeout);
User::WaitForRequest(status, timerStatus);
@@ -488,20 +538,25 @@
{
// Timeout occurred, silently ignore error condition.
// Assuming that the line has been disconnected
- LOGTEXT(_L8("CCdcControlInterface::WriteData() - Timeout occurred"));
+ OstTrace0( TRACE_NORMAL, CCDCCONTROLINTERFACE_WRITEDATA_DUP3,
+ "CCdcControlInterface::WriteData;CCdcControlInterface::WriteData() - Timeout occurred" );
+
iLdd.WriteCancel(aEndPoint);
User::WaitForRequest(status);
ret = timerStatus.Int();
}
else
{
- LOGTEXT(_L8("CCdcControlInterface::WriteData() - Write completed"));
+ OstTrace0( TRACE_NORMAL, CCDCCONTROLINTERFACE_WRITEDATA_DUP4,
+ "CCdcControlInterface::WriteData;CCdcControlInterface::WriteData() - Write completed" );
+
timer.Cancel();
User::WaitForRequest(timerStatus);
ret = status.Int();
}
- LOGTEXT2(_L8("\treturning %d"), ret);
+ OstTrace1( TRACE_NORMAL, CCDCCONTROLINTERFACE_WRITEDATA_DUP5, "CCdcControlInterface::WriteData;ret=%d", ret );
+ OstTraceFunctionExit0( CCDCCONTROLINTERFACE_WRITEDATA_EXIT_DUP1 );
return ret;
}
--- a/usbmgmt/usbmgr/device/classdrivers/acm/classimplementation/ecacm/src/CdcControlInterfaceReader.cpp Wed Jul 07 14:16:40 2010 +0800
+++ b/usbmgmt/usbmgr/device/classdrivers/acm/classimplementation/ecacm/src/CdcControlInterfaceReader.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,11 +22,11 @@
#include "AcmUtils.h"
#include "CdcControlInterfaceRequestHandler.h"
#include "AcmConstants.h"
-#include <usb/usblogger.h>
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "CdcControlInterfaceReaderTraces.h"
+#endif
-#ifdef __FLOG_ACTIVE
-_LIT8(KLogComponent, "ECACM");
-#endif
CCdcControlInterfaceReader::CCdcControlInterfaceReader(
MCdcCommsClassRequestHandler& aParent,
@@ -41,8 +41,10 @@
* @param aLdd The USB LDD handle to be used.
*/
{
+ OstTraceFunctionEntry0( CCDCCONTROLINTERFACEREADER_CCDCCONTROLINTERFACEREADER_CONS_ENTRY );
CActiveScheduler::Add(this);
ReadMessageHeader();
+ OstTraceFunctionExit0( CCDCCONTROLINTERFACEREADER_CCDCCONTROLINTERFACEREADER_CONS_EXIT );
}
CCdcControlInterfaceReader::~CCdcControlInterfaceReader()
@@ -50,9 +52,9 @@
* Destructor
*/
{
- LOG_FUNC
-
+ OstTraceFunctionEntry0( CCDCCONTROLINTERFACEREADER_CCDCCONTROLINTERFACEREADER_DES_ENTRY );
Cancel(); //Call CActive::Cancel()
+ OstTraceFunctionExit0( CCDCCONTROLINTERFACEREADER_CCDCCONTROLINTERFACEREADER_DES_EXIT );
}
CCdcControlInterfaceReader* CCdcControlInterfaceReader::NewL(
@@ -65,11 +67,11 @@
* @param aLdd The USB LDD handle to be used.
*/
{
- LOG_STATIC_FUNC_ENTRY
-
+ OstTraceFunctionEntry0( CCDCCONTROLINTERFACEREADER_NEWL_ENTRY );
CCdcControlInterfaceReader* self = new(ELeave) CCdcControlInterfaceReader(
aParent,
aLdd);
+ OstTraceFunctionExit0( CCDCCONTROLINTERFACEREADER_NEWL_EXIT );
return self;
}
@@ -78,9 +80,10 @@
* This function will be called when a read completes.
*/
{
- LOGTEXT2(_L8(">>CCdcControlInterfaceReader::RunL iStatus=%d"), iStatus.Int());
+ OstTraceFunctionEntry0( CCDCCONTROLINTERFACEREADER_RUNL_ENTRY );
+ OstTrace1( TRACE_NORMAL, CCDCCONTROLINTERFACEREADER_RUNL, "CCdcControlInterfaceReader::RunL;iStatus=%d", iStatus.Int() );
HandleReadCompletion(iStatus.Int());
- LOGTEXT(_L8("<<CCdcControlInterfaceReader::RunL"));
+ OstTraceFunctionExit0( CCDCCONTROLINTERFACEREADER_RUNL_EXIT );
}
void CCdcControlInterfaceReader::DoCancel()
@@ -88,8 +91,9 @@
* Cancel an outstanding read.
*/
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CCDCCONTROLINTERFACEREADER_DOCANCEL_ENTRY );
iLdd.ReadCancel(EEndpoint0);
+ OstTraceFunctionExit0( CCDCCONTROLINTERFACEREADER_DOCANCEL_EXIT );
}
void CCdcControlInterfaceReader::HandleReadCompletion(TInt aError)
@@ -103,17 +107,22 @@
* @param aError Error
*/
{
- LOGTEXT2(_L8(">>CCdcControlInterfaceReader::HandleReadCompletion "
- "aError=%d"), aError);
+ OstTraceFunctionEntry0( CCDCCONTROLINTERFACEREADER_HANDLEREADCOMPLETION_ENTRY );
+ OstTrace1( TRACE_NORMAL, CCDCCONTROLINTERFACEREADER_HANDLEREADCOMPLETION,
+ "CCdcControlInterfaceReader::HandleReadCompletion;aError=%d", aError );
if ( aError )
{
- ReadMessageHeader();
- LOGTEXT(_L8("<<CCdcControlInterfaceReader::HandleReadCompletion"));
+ ReadMessageHeader();
+ OstTrace0( TRACE_NORMAL, CCDCCONTROLINTERFACEREADER_HANDLEREADCOMPLETION_DUP1,
+ "CCdcControlInterfaceReader::HandleReadCompletion" );
+ OstTraceFunctionExit0( CCDCCONTROLINTERFACEREADER_HANDLEREADCOMPLETION_EXIT );
return;
}
- LOGTEXT2(_L8("\tcompleted with iState=%d"),iState);
+ OstTrace1( TRACE_NORMAL, CCDCCONTROLINTERFACEREADER_HANDLEREADCOMPLETION_DUP2,
+ "CCdcControlInterfaceReader::HandleReadCompletion;iState=%d", (TInt)iState );
+
switch ( iState)
{
case EWaitingForHeader:
@@ -130,12 +139,14 @@
default:
{
- _USB_PANIC(KAcmPanicCat, EPanicIllegalState);
+ OstTrace1( TRACE_FATAL, CCDCCONTROLINTERFACEREADER_HANDLEREADCOMPLETION_DUP3,
+ "CCdcControlInterfaceReader::HandleReadCompletion;iState=%d", (TInt)iState );
+ User::Panic(KAcmPanicCat, EPanicIllegalState);
}
break;
}
- LOGTEXT(_L8("<<CCdcControlInterfaceReader::HandleReadCompletion"));
+ OstTraceFunctionExit0( CCDCCONTROLINTERFACEREADER_HANDLEREADCOMPLETION_EXIT_DUP1 );
}
void CCdcControlInterfaceReader::DecodeMessageHeader()
@@ -144,20 +155,23 @@
* requires some data in response and dispatches the request appropriately.
*/
{
- LOG_FUNC
-
+ OstTraceFunctionEntry0( CCDCCONTROLINTERFACEREADER_DECODEMESSAGEHEADER_ENTRY );
if ( TUsbRequestHdr::Decode(iMessageHeader, iRequestHeader) != KErrNone )
{
- LOGTEXT(_L8("\t- Unable to decode request header!"));
+ OstTrace0( TRACE_NORMAL, CCDCCONTROLINTERFACEREADER_DECODEMESSAGEHEADER,
+ "CCdcControlInterfaceReader::DecodeMessageHeader;\t- Unable to decode request header!" );
+
// Stall bus- unknown message. If this fails, there's nothing we can
// do.
static_cast<void>(iLdd.EndpointZeroRequestError());
ReadMessageHeader();
+ OstTraceFunctionExit0( CCDCCONTROLINTERFACEREADER_DECODEMESSAGEHEADER_EXIT );
return;
}
- LOGTEXT2(_L8("\t- New read! Request 0x%x"), iRequestHeader.iRequest);
-
+ OstTrace1( TRACE_NORMAL, CCDCCONTROLINTERFACEREADER_DECODEMESSAGEHEADER_DUP1,
+ "CCdcControlInterfaceReader::DecodeMessageHeader;\t- New read! Request %d", (TInt)iRequestHeader.iRequest );
+
if ( iRequestHeader.IsDataResponseRequired() )
{
DecodeMessageDataWithResponseRequired();
@@ -171,6 +185,7 @@
{
ReadMessageData(iRequestHeader.iLength);
}
+ OstTraceFunctionExit0( DUP1_CCDCCONTROLINTERFACEREADER_DECODEMESSAGEHEADER_EXIT );
}
void CCdcControlInterfaceReader::DecodeMessageDataWithResponseRequired()
@@ -178,11 +193,11 @@
* Decode a message which requires data to be sent to the host in response.
*/
{
- LOG_FUNC
-
- LOGTEXT2(_L8("\t- New read! Request 0x%x"), iRequestHeader.iRequest);
+ OstTraceFunctionEntry0( CCDCCONTROLINTERFACEREADER_DECODEMESSAGEDATAWITHRESPONSEREQUIRED_ENTRY );
+ OstTraceExt1( TRACE_NORMAL, CCDCCONTROLINTERFACEREADER_DECODEMESSAGEDATAWITHRESPONSEREQUIRED,
+ "CCdcControlInterfaceReader::DecodeMessageDataWithResponseRequired;\t- New read! Request=%hhx", iRequestHeader.iRequest );
+
TBuf8<KAcmControlReadBufferLength> returnBuffer;
-
switch ( iRequestHeader.iRequest )
{
case KGetEncapsulated:
@@ -248,8 +263,10 @@
default:
{
- LOGTEXT2(_L8("\t- request number not recognised (%d)"),
- iRequestHeader.iRequest);
+ OstTrace1( TRACE_NORMAL, CCDCCONTROLINTERFACEREADER_DECODEMESSAGEDATAWITHRESPONSEREQUIRED_DUP1,
+ "CCdcControlInterfaceReader::DecodeMessageDataWithResponseRequired;\t- request number not recognised (%d)",
+ (TInt)(iRequestHeader.iRequest) );
+
// Stall bus- unknown message. If this fails, there's nothing we can
// do.
static_cast<void>(iLdd.EndpointZeroRequestError());
@@ -258,6 +275,7 @@
}
ReadMessageHeader();
+ OstTraceFunctionExit0( CCDCCONTROLINTERFACEREADER_DECODEMESSAGEDATAWITHRESPONSEREQUIRED_EXIT );
}
void CCdcControlInterfaceReader::DecodeMessageData()
@@ -268,17 +286,20 @@
* can be nack'ed by signalling an endpoint zero request error.
*/
{
- LOG_FUNC
-
+ OstTraceFunctionEntry0( CCDCCONTROLINTERFACEREADER_DECODEMESSAGEDATA_ENTRY );
if ( iMessageData.Length() != iRequestHeader.iLength )
{
- LOGTEXT(_L8("\t- Data length is incorrect"));
+ OstTrace0( TRACE_NORMAL, CCDCCONTROLINTERFACEREADER_DECODEMESSAGEDATA,
+ "CCdcControlInterfaceReader::DecodeMessageData;\t- Data length is incorrect" );
+
ReadMessageHeader();
+ OstTraceFunctionExit0( CCDCCONTROLINTERFACEREADER_DECODEMESSAGEDATA_EXIT );
return;
}
- LOGTEXT2(_L8("\tNew read! Request %d"), iRequestHeader.iRequest);
-
+ OstTrace1( TRACE_NORMAL, CCDCCONTROLINTERFACEREADER_DECODEMESSAGEDATA_DUP1,
+ "CCdcControlInterfaceReader::DecodeMessageData;\tNew read! Request %d", (TInt)(iRequestHeader.iRequest) );
+
switch ( iRequestHeader.iRequest )
{
case KSendEncapsulated:
@@ -366,8 +387,9 @@
}
break;
default:
- LOGTEXT2(_L8("\t***request number not recognised (%d)"),
- iRequestHeader.iRequest);
+ OstTrace1( TRACE_NORMAL, CCDCCONTROLINTERFACEREADER_DECODEMESSAGEDATA_DUP2,
+ "CCdcControlInterfaceReader::DecodeMessageData;\t***request number not recognised (%d)", (TInt)(iRequestHeader.iRequest) );
+
// Stall bus- unknown message. If this fails, there's nothing we can
// do.
static_cast<void>(iLdd.EndpointZeroRequestError());
@@ -375,6 +397,7 @@
}
ReadMessageHeader();
+ OstTraceFunctionExit0( CCDCCONTROLINTERFACEREADER_DECODEMESSAGEDATA_EXIT_DUP1 );
}
void CCdcControlInterfaceReader::ReadMessageHeader()
@@ -383,12 +406,11 @@
* message header.
*/
{
- LOG_FUNC
-
+ OstTraceFunctionEntry0( CCDCCONTROLINTERFACEREADER_READMESSAGEHEADER_ENTRY );
iState = EWaitingForHeader;
-
iLdd.ReadPacket(iStatus, EEndpoint0, iMessageHeader, KUsbRequestHdrSize);
SetActive();
+ OstTraceFunctionExit0( CCDCCONTROLINTERFACEREADER_READMESSAGEHEADER_EXIT );
}
void CCdcControlInterfaceReader::ReadMessageData(TUint aLength)
@@ -399,14 +421,14 @@
* @param aLength Length of data to read.
*/
{
- LOG_FUNC
-
- LOGTEXT2(_L8("\tqueuing read, length = %d"),aLength);
+ OstTraceFunctionEntry0( CCDCCONTROLINTERFACEREADER_READMESSAGEDATA_ENTRY );
+ OstTrace1( TRACE_NORMAL, CCDCCONTROLINTERFACEREADER_READMESSAGEDATA,
+ "CCdcControlInterfaceReader::ReadMessageData;\tqueuing read, length = %d", (TInt)aLength );
iState = EWaitingForData;
-
iLdd.Read(iStatus, EEndpoint0, iMessageData, static_cast<TInt>(aLength));
SetActive();
+ OstTraceFunctionExit0( CCDCCONTROLINTERFACEREADER_READMESSAGEDATA_EXIT );
}
//
--- a/usbmgmt/usbmgr/device/classdrivers/acm/classimplementation/ecacm/src/CdcDataInterface.cpp Wed Jul 07 14:16:40 2010 +0800
+++ b/usbmgmt/usbmgr/device/classdrivers/acm/classimplementation/ecacm/src/CdcDataInterface.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"
@@ -23,11 +23,11 @@
#include "AcmUtils.h"
#include "ActiveReadOneOrMoreReader.h"
#include "ActiveDataAvailableNotifier.h"
-#include <usb/usblogger.h>
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "CdcDataInterfaceTraces.h"
+#endif
-#ifdef __FLOG_ACTIVE
-_LIT8(KLogComponent, "ECACM");
-#endif
#ifdef __HEADLESS_ACM_TEST_CODE__
#pragma message ("Building headless ACM (performance test code for RDevUsbcClient)")
@@ -41,6 +41,8 @@
: CCdcInterfaceBase(aIfcName),
iPacketSize(KDefaultMaxPacketTypeBulk)
{
+ OstTraceFunctionEntry0( CCDCDATAINTERFACE_CCDCDATAINTERFACE_CONS_ENTRY );
+ OstTraceFunctionExit0( CCDCDATAINTERFACE_CCDCDATAINTERFACE_CONS_EXIT );
}
CCdcDataInterface* CCdcDataInterface::NewL(const TDesC16& aIfcName)
@@ -53,14 +55,13 @@
* @return A pointer to the new object
*/
{
- LOG_STATIC_FUNC_ENTRY
-
- LOGTEXT2(_L("\tData Ifc Name = %S"), &aIfcName);
-
+ OstTraceFunctionEntry0( CCDCDATAINTERFACE_NEWL_ENTRY );
+ OstTraceExt1( TRACE_NORMAL, CCDCDATAINTERFACE_NEWL, "CCdcDataInterface::NewL;\tData Ifc Name = %S", aIfcName );
CCdcDataInterface* self = new (ELeave) CCdcDataInterface(aIfcName);
CleanupStack::PushL(self);
self->ConstructL();
CLEANUPSTACK_POP(self);
+ OstTraceFunctionExit0( CCDCDATAINTERFACE_NEWL_EXIT );
return self;
}
@@ -72,8 +73,9 @@
* @param aParent Observer.
*/
{
+ OstTraceFunctionEntry0( CCDCDATAINTERFACE_CONSTRUCTL_ENTRY );
+
BaseConstructL();
-
iReadOneOrMoreReader = CActiveReadOneOrMoreReader::NewL(*this, iLdd, EEndpoint2);
iReader = CActiveReader::NewL(*this, iLdd, EEndpoint2);
iDataAvailableNotifier = CActiveDataAvailableNotifier::NewL(*this, iLdd, EEndpoint2);
@@ -84,6 +86,7 @@
iHostCanHandleZLPs = (KUsbAcmHostCanHandleZLPs != 0);
+ OstTraceFunctionExit0( CCDCDATAINTERFACE_CONSTRUCTL_EXIT );
}
TInt CCdcDataInterface::SetUpInterface()
@@ -93,14 +96,15 @@
* descriptor for the endpoints is registered with the LDD.
*/
{
- LOGTEXT(_L8(">>CCdcDataInterface::SetUpInterface"));
+ OstTraceFunctionEntry0( CCDCDATAINTERFACE_SETUPINTERFACE_ENTRY );
TUsbDeviceCaps dCaps;
TInt ret = iLdd.DeviceCaps(dCaps);
- LOGTEXT(_L8("\tchecking result of DeviceCaps"));
+ OstTrace0( TRACE_NORMAL, CCDCDATAINTERFACE_SETUPINTERFACE, "CCdcDataInterface::SetUpInterface;\tchecking result of DeviceCaps" );
if ( ret )
{
- LOGTEXT2(_L8("<<CCdcDataInterface::SetUpInterface ret=%d"), ret);
+ OstTrace1( TRACE_NORMAL, CCDCDATAINTERFACE_SETUPINTERFACE_DUP1, "CCdcDataInterface::SetUpInterface;ret=%d", ret );
+ OstTraceFunctionExit0( CCDCDATAINTERFACE_SETUPINTERFACE_EXIT );
return ret;
}
@@ -108,11 +112,13 @@
const TUint KRequiredNumberOfEndpoints = 2;
const TUint totalEndpoints = static_cast<TUint>(dCaps().iTotalEndpoints);
- LOGTEXT2(_L8("\tiTotalEndpoints = %d"), totalEndpoints);
+ OstTrace1( TRACE_NORMAL, CCDCDATAINTERFACE_SETUPINTERFACE_DUP2,
+ "CCdcDataInterface::SetUpInterface;totalEndpoints=%d", (TInt)totalEndpoints );
+
if ( totalEndpoints < KRequiredNumberOfEndpoints )
{
- LOGTEXT2(_L8("<<CCdcDataInterface::SetUpInterface ret=%d"),
- KErrGeneral);
+ OstTrace1( TRACE_NORMAL, CCDCDATAINTERFACE_SETUPINTERFACE_DUP3, "CCdcDataInterface::SetUpInterface;ret=%d", KErrGeneral );
+ OstTraceFunctionExit0( CCDCDATAINTERFACE_SETUPINTERFACE_EXIT_DUP1 );
return KErrGeneral;
}
@@ -120,10 +126,11 @@
TUsbcEndpointData data[KUsbcMaxEndpoints];
TPtr8 dataptr(reinterpret_cast<TUint8*>(data), sizeof(data), sizeof(data));
ret = iLdd.EndpointCaps(dataptr);
- LOGTEXT(_L8("\tchecking result of EndpointCaps"));
+ OstTrace0( TRACE_NORMAL, CCDCDATAINTERFACE_SETUPINTERFACE_DUP9, "CCdcDataInterface::SetUpInterface;\tchecking result of EndpointCaps" );
if ( ret )
{
- LOGTEXT2(_L8("<<CCdcDataInterface::SetUpInterface ret=%d"), ret);
+ OstTrace1( TRACE_NORMAL, CCDCDATAINTERFACE_SETUPINTERFACE_DUP4, "CCdcDataInterface::SetUpInterface;ret=%d", ret );
+ OstTraceFunctionExit0( CCDCDATAINTERFACE_SETUPINTERFACE_EXIT_DUP2 );
return ret;
}
@@ -131,12 +138,15 @@
TUsbcInterfaceInfoBuf ifc;
TBool foundIn = EFalse;
TBool foundOut = EFalse;
-
+
for ( TUint i = 0; !(foundIn && foundOut) && i < totalEndpoints; i++ )
{
const TUsbcEndpointCaps* caps = &data[i].iCaps;
- __ASSERT_DEBUG(caps,
- _USB_PANIC(KAcmPanicCat, EPanicInternalError));
+ if (!caps)
+ {
+ OstTraceExt1( TRACE_FATAL, CCDCDATAINTERFACE_SETUPINTERFACE_DUP5, "CCdcDataInterface::SetUpInterface;caps=%p", caps );
+ __ASSERT_DEBUG( EFalse, User::Panic(KAcmPanicCat, EPanicInternalError) );
+ }
if (data[i].iInUse)
continue;
@@ -181,8 +191,8 @@
if (! (foundIn && foundOut))
{
- LOGTEXT2(_L8("<<CCdcDataInterface::SetUpInterface ret=%d"),
- KErrGeneral);
+ OstTrace1( TRACE_NORMAL, CCDCDATAINTERFACE_SETUPINTERFACE_DUP6, "CCdcDataInterface::SetUpInterface;ret=%d", KErrGeneral );
+ OstTraceFunctionExit0( CCDCDATAINTERFACE_SETUPINTERFACE_EXIT_DUP3 );
return KErrGeneral;
}
@@ -205,18 +215,21 @@
// from EP0.
ifc().iFeatureWord |= KUsbcInterfaceInfo_NoEp0RequestsPlease;
- LOGTEXT(_L8("\tcalling SetInterface"));
+ OstTrace0( TRACE_NORMAL, CCDCDATAINTERFACE_SETUPINTERFACE_DUP7, "CCdcDataInterface::SetUpInterface;\tcalling SetInterface" );
// Zero effectively indicates that alternate interfaces are not used.
ret = iLdd.SetInterface(0, ifc, bandwidthPriority);
- LOGTEXT2(_L8("<<CCdcDataInterface::SetUpInterface ret=%d"), ret);
+ OstTrace1( TRACE_NORMAL, CCDCDATAINTERFACE_SETUPINTERFACE_DUP8, "CCdcDataInterface::SetUpInterface;ret=%d", ret );
+ OstTraceFunctionExit0( CCDCDATAINTERFACE_SETUPINTERFACE_EXIT_DUP4 );
return ret;
}
void CCdcDataInterface::MLSOStateChange(TInt aPacketSize)
{
+ OstTraceFunctionEntry0( CCDCDATAINTERFACE_MLSOSTATECHANGE_ENTRY );
iPacketSize = aPacketSize;
+ OstTraceFunctionExit0( CCDCDATAINTERFACE_MLSOSTATECHANGE_EXIT );
}
@@ -225,13 +238,13 @@
* Destructor. Cancel and destroy the child classes.
*/
{
- LOG_FUNC
-
+ OstTraceFunctionEntry0( CCDCDATAINTERFACE_CCDCDATAINTERFACE_DES_ENTRY );
delete iLinkState;
delete iReadOneOrMoreReader;
delete iReader;
delete iWriter;
delete iDataAvailableNotifier;
+ OstTraceFunctionExit0( CCDCDATAINTERFACE_CCDCDATAINTERFACE_DES_EXIT );
}
void CCdcDataInterface::Write(MWriteObserver& aObserver,
@@ -245,14 +258,18 @@
* @param aLen Length of the data to be sent
*/
{
- LOG_FUNC
-
- __ASSERT_DEBUG(!iWriteObserver,
- _USB_PANIC(KAcmPanicCat, EPanicInternalError));
-
+ OstTraceFunctionEntry0( CCDCDATAINTERFACE_WRITE_ENTRY );
+ if (iWriteObserver)
+ {
+ OstTraceExt1( TRACE_FATAL, CCDCDATAINTERFACE_WRITE, "CCdcDataInterface::Write;iWriteObserver=%p", iWriteObserver );
+ __ASSERT_DEBUG( EFalse, User::Panic(KAcmPanicCat, EPanicInternalError) );
+ }
iWriteObserver = &aObserver;
-
- __ASSERT_DEBUG(iWriter, _USB_PANIC(KAcmPanicCat, EPanicInternalError));
+ if (!iWriter)
+ {
+ OstTraceExt1( TRACE_FATAL, CCDCDATAINTERFACE_WRITE_DUP1, "CCdcDataInterface::Write;iWriter=%p", iWriter );
+ __ASSERT_DEBUG( EFalse, User::Panic(KAcmPanicCat, EPanicInternalError) );
+ }
if ( iHostCanHandleZLPs )
{
@@ -267,7 +284,7 @@
iWriter->Write(aDes, aLen, EFalse);
}
- LOGTEXT(_L8("<<CCdcDataInterface::Write"));
+ OstTraceFunctionExit0( CCDCDATAINTERFACE_WRITE_EXIT );
}
void CCdcDataInterface::WriteCompleted(TInt aError)
@@ -277,46 +294,67 @@
* @param aError Error.
*/
{
- LOGTEXT2(_L8(">>CCdcDataInterface::WriteCompleted aError=%d"), aError);
+ OstTraceFunctionEntry0( CCDCDATAINTERFACE_WRITECOMPLETED_ENTRY );
+ OstTrace1( TRACE_NORMAL, CCDCDATAINTERFACE_WRITECOMPLETED, "CCdcDataInterface::WriteCompleted;aError=%d", aError );
#ifdef __HEADLESS_ACM_TEST_CODE__
// Issue another Read or ReadOneOrMore as appropriate.
// If the Write completed with an error, we panic, as it's invalidating
// the test.
- __ASSERT_DEBUG(aError == KErrNone,
- _USB_PANIC(KAcmPanicCat, EPanicInternalError));
+ if (aError != KErrNone)
+ {
+ OstTrace1( TRACE_FATAL, CCDCDATAINTERFACE_WRITECOMPLETED_DUP1, "CCdcDataInterface::WriteCompleted;aError=%d", aError );
+ __ASSERT_DEBUG( EFalse, User::Panic(KAcmPanicCat, EPanicInternalError) );
+ }
switch ( iHeadlessReadType )
{
case ERead:
- LOGTEXT2(_L8("__HEADLESS_ACM_TEST_CODE__- issuing Read for %d bytes"),
- iHeadlessReadLength);
- __ASSERT_DEBUG(iReader, _USB_PANIC(KAcmPanicCat, EPanicInternalError));
+ OstTrace1( TRACE_NORMAL, CCDCDATAINTERFACE_WRITECOMPLETED_DUP2,
+ "CCdcDataInterface::WriteCompleted;__HEADLESS_ACM_TEST_CODE__- issuing Read for %d bytes", iHeadlessReadLength );
+
+ if (!iReader)
+ {
+ OstTraceExt1( TRACE_FATAL, CCDCDATAINTERFACE_WRITECOMPLETED_DUP3, "CCdcDataInterface::WriteCompleted;iReader=%p", iReader );
+ __ASSERT_DEBUG( EFalse, User::Panic(KAcmPanicCat, EPanicInternalError) );
+ }
iReader->Read(iHeadlessAcmBuffer, iHeadlessReadLength);
break;
case EReadOneOrMore:
- LOGTEXT2(_L8("__HEADLESS_ACM_TEST_CODE__- issuing ReadOneOrMore for %d bytes"),
- iHeadlessReadLength);
- __ASSERT_DEBUG(iReadOneOrMoreReader, _USB_PANIC(KAcmPanicCat, EPanicInternalError));
+ OstTrace1( TRACE_NORMAL, CCDCDATAINTERFACE_WRITECOMPLETED_DUP4,
+ "CCdcDataInterface::WriteCompleted;__HEADLESS_ACM_TEST_CODE__- issuing ReadOneOrMore for %d bytes", iHeadlessReadLength );
+
+ if (!iReadOneOrMoreReader)
+ {
+ OstTraceExt1( TRACE_FATAL, CCDCDATAINTERFACE_WRITECOMPLETED_DUP5,
+ "CCdcDataInterface::WriteCompleted;iReadOneOrMoreReader=%p", iReadOneOrMoreReader );
+ __ASSERT_DEBUG( EFalse, User::Panic(KAcmPanicCat, EPanicInternalError) );
+ }
iReadOneOrMoreReader->ReadOneOrMore(iHeadlessAcmBuffer, iHeadlessReadLength);
break;
case EUnknown:
default:
- _USB_PANIC(KAcmPanicCat, EPanicInternalError);
+ OstTrace0( TRACE_FATAL, CCDCDATAINTERFACE_WRITECOMPLETED_DUP6, "CCdcDataInterface::WriteCompleted;EPanicInternalError" );
+ __ASSERT_DEBUG( EFalse, User::Panic(KAcmPanicCat, EPanicInternalError) );
break;
}
#else
// In case the write observer wants to post another write synchronously on
// being informed that this write has completed, use this little 'temp'
// fiddle.
- __ASSERT_DEBUG(iWriteObserver,
- _USB_PANIC(KAcmPanicCat, EPanicInternalError));
+ if (!iWriteObserver)
+ {
+ OstTraceExt1( TRACE_FATAL, CCDCDATAINTERFACE_WRITECOMPLETED_DUP7,
+ "CCdcDataInterface::WriteCompleted;iWriteObserver=%p", iWriteObserver );
+ __ASSERT_DEBUG( EFalse, User::Panic(KAcmPanicCat, EPanicInternalError) );
+ }
MWriteObserver* temp = iWriteObserver;
iWriteObserver = NULL;
- LOGTEXT(_L8("\tcalling WriteCompleted on observer"));
+ OstTrace0( TRACE_NORMAL, CCDCDATAINTERFACE_WRITECOMPLETED_DUP8,
+ "CCdcDataInterface::WriteCompleted;\tcalling WriteCompleted on observer" );
temp->WriteCompleted(aError);
#endif // __HEADLESS_ACM_TEST_CODE__
- LOGTEXT(_L8("<<CCdcDataInterface::WriteCompleted"));
+ OstTraceFunctionExit0( CCDCDATAINTERFACE_WRITECOMPLETED_EXIT );
}
void CCdcDataInterface::CancelWrite()
@@ -324,13 +362,15 @@
* Cancel an outstanding write request
*/
{
- LOG_FUNC
-
- __ASSERT_DEBUG(iWriter, _USB_PANIC(KAcmPanicCat, EPanicInternalError));
-
+ OstTraceFunctionEntry0( CCDCDATAINTERFACE_CANCELWRITE_ENTRY );
+ if (!iWriter)
+ {
+ OstTraceExt1( TRACE_FATAL, CCDCDATAINTERFACE_CANCELWRITE, "CCdcDataInterface::CancelWrite;iWriter=%p", iWriter );
+ __ASSERT_DEBUG( EFalse, User::Panic(KAcmPanicCat, EPanicInternalError) );
+ }
iWriter->Cancel();
-
iWriteObserver = NULL;
+ OstTraceFunctionExit0( CCDCDATAINTERFACE_CANCELWRITE_EXIT );
}
void CCdcDataInterface::Read(MReadObserver& aObserver,
@@ -345,27 +385,42 @@
* @param aMaxLen Number of bytes to read
*/
{
- LOG_FUNC
-
+ OstTraceFunctionEntry0( CCDCDATAINTERFACE_READ_ENTRY );
+
#ifdef __HEADLESS_ACM_TEST_CODE__
- LOGTEXT(_L8("__HEADLESS_ACM_TEST_CODE__"));
+ OstTrace0( TRACE_NORMAL, CCDCDATAINTERFACE_READ, "CCdcDataInterface::Read;__HEADLESS_ACM_TEST_CODE__" );
// Issue a Read using our special internal buffer.
iHeadlessReadType = ERead;
iHeadlessReadLength = aMaxLen;
static_cast<void>(&aObserver);
static_cast<void>(&aDes);
- __ASSERT_DEBUG(aMaxLen <= iHeadlessAcmBuffer.MaxLength(),
- _USB_PANIC(KAcmPanicCat, EPanicInternalError));
- __ASSERT_DEBUG(iReader, _USB_PANIC(KAcmPanicCat, EPanicInternalError));
+ if (aMaxLen > iHeadlessAcmBuffer.MaxLength())
+ {
+ OstTrace1( TRACE_FATAL, CCDCDATAINTERFACE_READ_DUP1, "CCdcDataInterface::Read;aMaxLen=%d", aMaxLen );
+ __ASSERT_DEBUG( EFalse, User::Panic(KAcmPanicCat, EPanicInternalError) );
+ }
+ if (!iReader)
+ {
+ OstTraceExt1( TRACE_FATAL, CCDCDATAINTERFACE_READ_DUP2, "CCdcDataInterface::Read;iReader=%p", iReader );
+ __ASSERT_DEBUG( EFalse, User::Panic(KAcmPanicCat, EPanicInternalError) );
+ }
iReader->Read(iHeadlessAcmBuffer, aMaxLen);
#else
- __ASSERT_DEBUG(!iReadObserver,
- _USB_PANIC(KAcmPanicCat, EPanicInternalError));
+ if (iReadObserver)
+ {
+ OstTraceExt1( TRACE_FATAL, CCDCDATAINTERFACE_READ_DUP3, "CCdcDataInterface::Read;iReadObserver=%p", iReadObserver );
+ __ASSERT_DEBUG( EFalse, User::Panic(KAcmPanicCat, EPanicInternalError) );
+ }
iReadObserver = &aObserver;
-
- __ASSERT_DEBUG(iReader, _USB_PANIC(KAcmPanicCat, EPanicInternalError));
+ if (!iReader)
+ {
+ OstTraceExt1( TRACE_FATAL, CCDCDATAINTERFACE_READ_DUP4, "CCdcDataInterface::Read;iReader=%p", iReader );
+ __ASSERT_DEBUG( EFalse, User::Panic(KAcmPanicCat, EPanicInternalError) );
+ }
+
iReader->Read(aDes, aMaxLen);
#endif // __HEADLESS_ACM_TEST_CODE__
+ OstTraceFunctionExit0( CCDCDATAINTERFACE_READ_EXIT );
}
void CCdcDataInterface::ReadOneOrMore(MReadOneOrMoreObserver& aObserver,
@@ -380,29 +435,45 @@
* @param aMaxLen Number of bytes to read
*/
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CCDCDATAINTERFACE_READONEORMORE_ENTRY );
+
#ifdef __HEADLESS_ACM_TEST_CODE__
- LOGTEXT(_L8("__HEADLESS_ACM_TEST_CODE__"));
+ OstTrace0( TRACE_NORMAL, CCDCDATAINTERFACE_READONEORMORE, "CCdcDataInterface::ReadOneOrMore;__HEADLESS_ACM_TEST_CODE__" );
// Issue a ReadOneOrMore using our special internal buffer.
iHeadlessReadType = EReadOneOrMore;
iHeadlessReadLength = aMaxLen;
static_cast<void>(&aObserver);
static_cast<void>(&aDes);
- __ASSERT_DEBUG(aMaxLen <= iHeadlessAcmBuffer.MaxLength(),
- _USB_PANIC(KAcmPanicCat, EPanicInternalError));
- __ASSERT_DEBUG(iReadOneOrMoreReader,
- _USB_PANIC(KAcmPanicCat, EPanicInternalError));
+ if (aMaxLen > iHeadlessAcmBuffer.MaxLength())
+ {
+ OstTrace1( TRACE_FATAL, CCDCDATAINTERFACE_READONEORMORE_DUP1, "CCdcDataInterface::ReadOneOrMore;aMaxLen=%d", aMaxLen );
+ __ASSERT_DEBUG( EFalse, User::Panic(KAcmPanicCat, EPanicInternalError) );
+ }
+ if (!iReadOneOrMoreReader)
+ {
+ OstTraceExt1( TRACE_FATAL, CCDCDATAINTERFACE_READONEORMORE_DUP2,
+ "CCdcDataInterface::ReadOneOrMore;iReadOneOrMoreReader=%p", iReadOneOrMoreReader );
+ __ASSERT_DEBUG( EFalse, User::Panic(KAcmPanicCat, EPanicInternalError) );
+ }
iReadOneOrMoreReader->ReadOneOrMore(iHeadlessAcmBuffer, aMaxLen);
#else
- __ASSERT_DEBUG(!iReadOneOrMoreObserver,
- _USB_PANIC(KAcmPanicCat, EPanicInternalError));
+ if (iReadOneOrMoreObserver)
+ {
+ OstTraceExt1( TRACE_FATAL, CCDCDATAINTERFACE_READONEORMORE_DUP3,
+ "CCdcDataInterface::ReadOneOrMore;iReadOneOrMoreObserver=%p", iReadOneOrMoreObserver );
+ __ASSERT_DEBUG( EFalse, User::Panic(KAcmPanicCat, EPanicInternalError) );
+ }
iReadOneOrMoreObserver = &aObserver;
-
- __ASSERT_DEBUG(iReadOneOrMoreReader,
- _USB_PANIC(KAcmPanicCat, EPanicInternalError));
+ if (!iReadOneOrMoreReader)
+ {
+ OstTraceExt1( TRACE_FATAL, CCDCDATAINTERFACE_READONEORMORE_DUP4,
+ "CCdcDataInterface::ReadOneOrMore;iReadOneOrMoreObserver=%p", iReadOneOrMoreObserver );
+ __ASSERT_DEBUG( EFalse, User::Panic(KAcmPanicCat, EPanicInternalError) );
+ }
iReadOneOrMoreReader->ReadOneOrMore(aDes, aMaxLen);
#endif // __HEADLESS_ACM_TEST_CODE__
+ OstTraceFunctionExit0( CCDCDATAINTERFACE_READONEORMORE_EXIT );
}
void CCdcDataInterface::ReadOneOrMoreCompleted(TInt aError)
@@ -413,31 +484,47 @@
* @param aError The result of the read request.
*/
{
- LOGTEXT2(_L8(">>CCdcDataInterface::ReadOneOrMoreCompleted aError=%d"),
- aError);
+ OstTraceFunctionEntry0( CCDCDATAINTERFACE_READONEORMORECOMPLETED_ENTRY );
+ OstTrace1( TRACE_NORMAL, CCDCDATAINTERFACE_READONEORMORECOMPLETED, "CCdcDataInterface::ReadOneOrMoreCompleted;aError=%d", aError );
#ifdef __HEADLESS_ACM_TEST_CODE__
- LOGTEXT2(_L8("__HEADLESS_ACM_TEST_CODE__- issuing Write for %d bytes"),
- iHeadlessAcmBuffer.Length());
+ OstTrace1( TRACE_NORMAL, CCDCDATAINTERFACE_READONEORMORECOMPLETED_DUP1,
+ "CCdcDataInterface::ReadOneOrMoreCompleted;__HEADLESS_ACM_TEST_CODE__- issuing Write for %d bytes", iHeadlessAcmBuffer.Length() );
+
// Write back the data just read.
// If the ReadOneOrMore completed with an error, we panic, as it's
// invalidating the test.
- __ASSERT_DEBUG(aError == KErrNone,
- _USB_PANIC(KAcmPanicCat, EPanicInternalError));
- __ASSERT_DEBUG(iWriter, _USB_PANIC(KAcmPanicCat, EPanicInternalError));
+ if (aError != KErrNone)
+ {
+ OstTrace1( TRACE_FATAL, CCDCDATAINTERFACE_READONEORMORECOMPLETED_DUP2,
+ "CCdcDataInterface::ReadOneOrMoreCompleted;aError=%d", aError );
+ __ASSERT_DEBUG( EFalse, User::Panic(KAcmPanicCat, EPanicInternalError) );
+ }
+
+ if (!iWriter)
+ {
+ OstTraceExt1( TRACE_FATAL, CCDCDATAINTERFACE_READONEORMORECOMPLETED_DUP3,
+ "CCdcDataInterface::ReadOneOrMoreCompleted;iWriter=%p", iWriter );
+ __ASSERT_DEBUG( EFalse, User::Panic(KAcmPanicCat, EPanicInternalError) );
+ }
iWriter->Write(iHeadlessAcmBuffer, iHeadlessAcmBuffer.Length(), EFalse);
#else
- __ASSERT_DEBUG(iReadOneOrMoreObserver,
- _USB_PANIC(KAcmPanicCat, EPanicInternalError));
+ if (!iReadOneOrMoreObserver)
+ {
+ OstTraceExt1( TRACE_FATAL, CCDCDATAINTERFACE_READONEORMORECOMPLETED_DUP4,
+ "CCdcDataInterface::ReadOneOrMoreCompleted;iReadOneOrMoreObserver=%p", iReadOneOrMoreObserver );
+ __ASSERT_DEBUG( EFalse, User::Panic(KAcmPanicCat, EPanicInternalError) );
+ }
// See comment in WriteCompleted.
MReadOneOrMoreObserver* temp = iReadOneOrMoreObserver;
iReadOneOrMoreObserver = NULL;
- LOGTEXT(_L8("\tcalling ReadOneOrMoreCompleted on observer"));
+ OstTrace0( TRACE_NORMAL, CCDCDATAINTERFACE_READONEORMORECOMPLETED_DUP5,
+ "CCdcDataInterface::ReadOneOrMoreCompleted;\tcalling ReadOneOrMoreCompleted on observer" );
temp->ReadOneOrMoreCompleted(aError);
#endif // __HEADLESS_ACM_TEST_CODE__
- LOGTEXT(_L8("<<CCdcDataInterface::ReadOneOrMoreCompleted"));
+ OstTraceFunctionExit0( CCDCDATAINTERFACE_READONEORMORECOMPLETED_EXIT );
}
void CCdcDataInterface::ReadCompleted(TInt aError)
@@ -447,30 +534,44 @@
* @param aError Error.
*/
{
- LOGTEXT2(_L8(">>CCdcDataInterface::ReadCompleted aError=%d"), aError);
+ OstTraceFunctionEntry0( CCDCDATAINTERFACE_READCOMPLETED_ENTRY );
+ OstTrace1( TRACE_NORMAL, CCDCDATAINTERFACE_READCOMPLETED, "CCdcDataInterface::ReadCompleted;aError=%d", aError );
#ifdef __HEADLESS_ACM_TEST_CODE__
- LOGTEXT2(_L8("__HEADLESS_ACM_TEST_CODE__- issuing Write for %d bytes"),
- iHeadlessAcmBuffer.Length());
+ OstTrace1( TRACE_NORMAL, CCDCDATAINTERFACE_READCOMPLETED_DUP1,
+ "CCdcDataInterface::ReadCompleted;__HEADLESS_ACM_TEST_CODE__- issuing Write for %d bytes", iHeadlessAcmBuffer.Length() );
+
// Write back the data just read.
// If the Read completed with an error, we panic, as it's invalidating the
// test.
- __ASSERT_DEBUG(aError == KErrNone,
- _USB_PANIC(KAcmPanicCat, EPanicInternalError));
- __ASSERT_DEBUG(iWriter, _USB_PANIC(KAcmPanicCat, EPanicInternalError));
+ if (aError != KErrNone)
+ {
+ OstTrace1( TRACE_FATAL, CCDCDATAINTERFACE_READCOMPLETED_DUP2, "CCdcDataInterface::ReadCompleted;aError=%d", aError );
+ __ASSERT_DEBUG( EFalse, User::Panic(KAcmPanicCat, EPanicInternalError) );
+ }
+
+ if (!iWriter)
+ {
+ OstTraceExt1( TRACE_NORMAL, CCDCDATAINTERFACE_READCOMPLETED_DUP3, "CCdcDataInterface::ReadCompleted;iWriter=%p", iWriter );
+ __ASSERT_DEBUG( EFalse, User::Panic(KAcmPanicCat, EPanicInternalError) );
+ }
iWriter->Write(iHeadlessAcmBuffer, iHeadlessAcmBuffer.Length(), EFalse);
#else
- __ASSERT_DEBUG(iReadObserver,
- _USB_PANIC(KAcmPanicCat, EPanicInternalError));
+ if (!iReadObserver)
+ {
+ OstTraceExt1( TRACE_FATAL, CCDCDATAINTERFACE_READCOMPLETED_DUP4,
+ "CCdcDataInterface::ReadCompleted;iReadObserver=%p", iReadObserver );
+ __ASSERT_DEBUG( EFalse, User::Panic(KAcmPanicCat, EPanicInternalError) );
+ }
// See comment in WriteCompleted.
MReadObserver* temp = iReadObserver;
iReadObserver = NULL;
- LOGTEXT(_L8("\tcalled ReadCompleted on observer"));
+ OstTrace0( TRACE_NORMAL, CCDCDATAINTERFACE_READCOMPLETED_DUP5, "CCdcDataInterface::ReadCompleted;\tcalled ReadCompleted on observer" );
temp->ReadCompleted(aError);
#endif // __HEADLESS_ACM_TEST_CODE__
- LOGTEXT(_L8("<<CCdcDataInterface::ReadCompleted"));
+ OstTraceFunctionExit0( CCDCDATAINTERFACE_READCOMPLETED_EXIT );
}
void CCdcDataInterface::CancelRead()
@@ -478,16 +579,24 @@
* Cancel an outstanding read request
*/
{
- LOG_FUNC
-
- __ASSERT_DEBUG(iReader, _USB_PANIC(KAcmPanicCat, EPanicInternalError));
- __ASSERT_DEBUG(iReadOneOrMoreReader,
- _USB_PANIC(KAcmPanicCat, EPanicInternalError));
+ OstTraceFunctionEntry0( CCDCDATAINTERFACE_CANCELREAD_ENTRY );
+ if (!iReader)
+ {
+ OstTraceExt1( TRACE_FATAL, CCDCDATAINTERFACE_CANCELREAD, "CCdcDataInterface::CancelRead;iReader=%p", iReader );
+ __ASSERT_DEBUG( EFalse, User::Panic(KAcmPanicCat, EPanicInternalError) );
+ }
+ if (!iReadOneOrMoreReader)
+ {
+ OstTraceExt1( TRACE_FATAL, CCDCDATAINTERFACE_CANCELREAD_DUP1,
+ "CCdcDataInterface::CancelRead;iReadOneOrMoreReader=%p", iReadOneOrMoreReader );
+ __ASSERT_DEBUG( EFalse, User::Panic(KAcmPanicCat, EPanicInternalError) );
+ }
iReader->Cancel();
iReadOneOrMoreReader->Cancel();
iReadObserver = NULL;
iReadOneOrMoreObserver = NULL;
+ OstTraceFunctionExit0( CCDCDATAINTERFACE_CANCELREAD_EXIT );
}
@@ -498,15 +607,17 @@
* @param aError Error.
*/
{
- LOGTEXT2(_L8(">>CCdcDataInterface::NotifyDataAvailableCompleted aError=%d"), aError);
+ OstTraceFunctionEntry0( CCDCDATAINTERFACE_NOTIFYDATAAVAILABLECOMPLETED_ENTRY );
+ OstTrace1( TRACE_NORMAL, CCDCDATAINTERFACE_NOTIFYDATAAVAILABLECOMPLETED,
+ "CCdcDataInterface::NotifyDataAvailableCompleted;aError=%d", aError );
// See comment in WriteCompleted.
MNotifyDataAvailableObserver* temp = iNotifyDataAvailableObserver;
iNotifyDataAvailableObserver = NULL;
- LOGTEXT(_L8("\tcalled NotifyDataAvailableCompleted on observer"));
+ OstTrace0( TRACE_NORMAL, CCDCDATAINTERFACE_NOTIFYDATAAVAILABLECOMPLETED_DUP1,
+ "CCdcDataInterface::NotifyDataAvailableCompleted;\tcalled NotifyDataAvailableCompleted on observer" );
temp->NotifyDataAvailableCompleted(aError);
-
- LOGTEXT(_L8("<<CCdcDataInterface::NotifyDataAvailableCompleted"));
+ OstTraceFunctionExit0( CCDCDATAINTERFACE_NOTIFYDATAAVAILABLECOMPLETED_EXIT );
}
void CCdcDataInterface::NotifyDataAvailable(MNotifyDataAvailableObserver& aObserver)
@@ -516,14 +627,23 @@
* @param aObserver The observer to notify of completion.
*/
{
- LOG_FUNC
-
- __ASSERT_DEBUG(!iNotifyDataAvailableObserver, _USB_PANIC(KAcmPanicCat, EPanicInternalError));
+ OstTraceFunctionEntry0( CCDCDATAINTERFACE_NOTIFYDATAAVAILABLE_ENTRY );
+
+ if (iNotifyDataAvailableObserver)
+ {
+ OstTraceExt1( TRACE_FATAL, CCDCDATAINTERFACE_NOTIFYDATAAVAILABLE,
+ "CCdcDataInterface::NotifyDataAvailable;iNotifyDataAvailableObserver=%p", iNotifyDataAvailableObserver );
+ __ASSERT_DEBUG( EFalse, User::Panic(KAcmPanicCat, EPanicInternalError) );
+ }
iNotifyDataAvailableObserver = &aObserver;
-
- __ASSERT_DEBUG(iDataAvailableNotifier,
- _USB_PANIC(KAcmPanicCat, EPanicInternalError));
+ if (!iDataAvailableNotifier)
+ {
+ OstTraceExt1( TRACE_FATAL, CCDCDATAINTERFACE_NOTIFYDATAAVAILABLE_DUP1,
+ "CCdcDataInterface::NotifyDataAvailable;iDataAvailableNotifier=%p", iDataAvailableNotifier );
+ __ASSERT_DEBUG( EFalse, User::Panic(KAcmPanicCat, EPanicInternalError) );
+ }
iDataAvailableNotifier->NotifyDataAvailable();
+ OstTraceFunctionExit0( CCDCDATAINTERFACE_NOTIFYDATAAVAILABLE_EXIT );
}
void CCdcDataInterface::CancelNotifyDataAvailable()
@@ -531,12 +651,16 @@
* Cancel notification of arrival of data.
*/
{
- LOG_FUNC
-
- __ASSERT_DEBUG(iDataAvailableNotifier, _USB_PANIC(KAcmPanicCat, EPanicInternalError));
-
+ OstTraceFunctionEntry0( CCDCDATAINTERFACE_CANCELNOTIFYDATAAVAILABLE_ENTRY );
+ if (!iDataAvailableNotifier)
+ {
+ OstTraceExt1( TRACE_FATAL, CCDCDATAINTERFACE_CANCELNOTIFYDATAAVAILABLE,
+ "CCdcDataInterface::CancelNotifyDataAvailable;iDataAvailableNotifier=%p", iDataAvailableNotifier );
+ __ASSERT_DEBUG( EFalse, User::Panic(KAcmPanicCat, EPanicInternalError) );
+ }
iDataAvailableNotifier->Cancel();
iNotifyDataAvailableObserver = NULL;
+ OstTraceFunctionExit0( CCDCDATAINTERFACE_CANCELNOTIFYDATAAVAILABLE_EXIT );
}
//
--- a/usbmgmt/usbmgr/device/classdrivers/acm/classimplementation/ecacm/src/CdcInterfaceBase.cpp Wed Jul 07 14:16:40 2010 +0800
+++ b/usbmgmt/usbmgr/device/classdrivers/acm/classimplementation/ecacm/src/CdcInterfaceBase.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"
@@ -17,11 +17,11 @@
#include <e32std.h>
#include "CdcInterfaceBase.h"
-#include <usb/usblogger.h>
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "CdcInterfaceBaseTraces.h"
+#endif
-#ifdef __FLOG_ACTIVE
-_LIT8(KLogComponent, "ECACM");
-#endif
CCdcInterfaceBase::CCdcInterfaceBase(const TDesC16& aIfcName)
/**
@@ -30,7 +30,9 @@
* @param aIfcName The name of the interface.
*/
{
+ OstTraceFunctionEntry0( CCDCINTERFACEBASE_CCDCINTERFACEBASE_CONS_ENTRY );
iIfcName.Set(aIfcName);
+ OstTraceFunctionExit0( CCDCINTERFACEBASE_CCDCINTERFACEBASE_CONS_EXIT );
}
void CCdcInterfaceBase::BaseConstructL()
@@ -39,21 +41,31 @@
* This call registers the object with the USB device driver
*/
{
- LOGTEXT(_L8("\tcalling RDevUsbcClient::Open"));
+ OstTraceFunctionEntry0( CCDCINTERFACEBASE_BASECONSTRUCTL_ENTRY );
+ OstTrace0( TRACE_NORMAL, CCDCINTERFACEBASE_BASECONSTRUCTL, "CCdcInterfaceBase::BaseConstructL;\tcalling RDevUsbcClient::Open" );
// 0 is assumed to mean ep0
TInt ret = iLdd.Open(0);
if ( ret )
- {
- LOGTEXT2(_L8("\tRDevUsbcClient::Open = %d"), ret);
- LEAVEIFERRORL(ret);
+ {
+ OstTrace1( TRACE_NORMAL, CCDCINTERFACEBASE_BASECONSTRUCTL_DUP1,
+ "CCdcInterfaceBase::BaseConstructL;\tRDevUsbcClient::Open = %d", ret );
+ if (ret < 0)
+ {
+ User::Leave(ret);
+ }
}
ret = SetUpInterface();
if ( ret )
{
- LOGTEXT2(_L8("\tSetUpInterface = %d"), ret);
- LEAVEIFERRORL(ret);
+ OstTrace1( TRACE_NORMAL, CCDCINTERFACEBASE_BASECONSTRUCTL_DUP2,
+ "CCdcInterfaceBase::BaseConstructL;\tSetUpInterface = %d", ret );
+ if (ret < 0)
+ {
+ User::Leave(ret);
+ }
}
+ OstTraceFunctionExit0( CCDCINTERFACEBASE_BASECONSTRUCTL_EXIT );
}
CCdcInterfaceBase::~CCdcInterfaceBase()
@@ -61,18 +73,18 @@
* Destructor.
*/
{
- LOG_FUNC
-
+ OstTraceFunctionEntry0( CCDCINTERFACEBASE_CCDCINTERFACEBASE_DES_ENTRY );
if ( iLdd.Handle() )
{
- LOGTEXT(_L8("\tLDD handle exists"));
-
+ OstTrace0( TRACE_NORMAL, CCDCINTERFACEBASE_CCDCINTERFACEBASE_DES,
+ "CCdcInterfaceBase::~CCdcInterfaceBase;\tLDD handle exists" );
// Don't bother calling ReleaseInterface- the base driver spec says
// that Close does it for us.
-
- LOGTEXT(_L8("\tclosing LDD session"));
+ OstTrace0( TRACE_NORMAL, CCDCINTERFACEBASE_CCDCINTERFACEBASE_DES_DUP1,
+ "CCdcInterfaceBase::~CCdcInterfaceBase;\tclosing LDD session" );
iLdd.Close();
}
+ OstTraceFunctionExit0( CCDCINTERFACEBASE_CCDCINTERFACEBASE_DES_EXIT );
}
TInt CCdcInterfaceBase::GetInterfaceNumber(TUint8& aIntNumber)
@@ -83,24 +95,25 @@
* @return Error.
*/
{
- LOG_FUNC
-
+ OstTraceFunctionEntry0( CCDCINTERFACEBASE_GETINTERFACENUMBER_ENTRY );
TInt interfaceSize = 0;
-
// 0 means the main interface in the LDD API
TInt res = iLdd.GetInterfaceDescriptorSize(0, interfaceSize);
if ( res )
{
- LOGTEXT2(_L8("\t***GetInterfaceDescriptorSize()=%d"), res);
+ OstTrace1( TRACE_NORMAL, CCDCINTERFACEBASE_GETINTERFACENUMBER,
+ "CCdcInterfaceBase::GetInterfaceNumber;\t***GetInterfaceDescriptorSize()=%d", res );
+ OstTraceFunctionExit0( CCDCINTERFACEBASE_GETINTERFACENUMBER_EXIT );
return res;
}
HBufC8* interfaceBuf = HBufC8::New(interfaceSize);
if ( !interfaceBuf )
{
- LOGTEXT(_L8("\t***failed to create interfaceBuf- "
- "returning KErrNoMemory"));
+ OstTrace0( TRACE_NORMAL, CCDCINTERFACEBASE_GETINTERFACENUMBER_DUP1,
+ "CCdcInterfaceBase::GetInterfaceNumber;\t***failed to create interfaceBuf-returning KErrNoMemory" );
+ OstTraceFunctionExit0( CCDCINTERFACEBASE_GETINTERFACENUMBER_EXIT_DUP1 );
return KErrNoMemory;
}
@@ -112,26 +125,27 @@
if ( res )
{
delete interfaceBuf;
- LOGTEXT2(_L8("\t***GetInterfaceDescriptor()=%d"), res);
+ OstTrace1( TRACE_NORMAL, CCDCINTERFACEBASE_GETINTERFACENUMBER_DUP2, "CCdcInterfaceBase::GetInterfaceNumber;res=%d", res );
+ OstTraceFunctionExit0( CCDCINTERFACEBASE_GETINTERFACENUMBER_EXIT_DUP2 );
return res;
}
-#ifdef __FLOG_ACTIVE
- LOGTEXT2(_L8("\t***interface length = %d"), interfacePtr.Length());
+ OstTrace1( TRACE_NORMAL, CCDCINTERFACEBASE_GETINTERFACENUMBER_DUP3,
+ "CCdcInterfaceBase::GetInterfaceNumber;\t***interface length = %d", interfacePtr.Length() );
for ( TInt i = 0 ; i < interfacePtr.Length() ; i++ )
{
- LOGTEXT2(_L8("\t***** %x"),interfacePtr[i]);
+ OstTraceExt1( TRACE_NORMAL, CCDCINTERFACEBASE_GETINTERFACENUMBER_DUP4,
+ "\t***** %hhx", interfacePtr[i] );
}
-#endif
const TUint8* buffer = reinterpret_cast<const TUint8*>(interfacePtr.Ptr());
// 2 is where the interface number is, according to the LDD API
aIntNumber = buffer[2];
-
- LOGTEXT2(_L8("\tinterface number = %d"), aIntNumber);
-
+ OstTrace1( TRACE_NORMAL, CCDCINTERFACEBASE_GETINTERFACENUMBER_DUP5,
+ "CCdcInterfaceBase::GetInterfaceNumber;\tinterface number = %d", (TInt)aIntNumber );
+
delete interfaceBuf;
-
+ OstTraceFunctionExit0( CCDCINTERFACEBASE_GETINTERFACENUMBER_EXIT_DUP3 );
return KErrNone;
}
--- a/usbmgmt/usbmgr/device/classdrivers/acm/classimplementation/ecacm/src/ClassDescriptor.cpp Wed Jul 07 14:16:40 2010 +0800
+++ b/usbmgmt/usbmgr/device/classdrivers/acm/classimplementation/ecacm/src/ClassDescriptor.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"
@@ -17,11 +17,11 @@
#include "ClassDescriptor.h"
#include "AcmPanic.h"
-#include <usb/usblogger.h>
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "ClassDescriptorTraces.h"
+#endif
-#ifdef __FLOG_ACTIVE
-_LIT8(KLogComponent, "ECACM");
-#endif
TDes8& TUsbCsClassDescriptor::Des()
/**
@@ -32,6 +32,8 @@
* this class and has the same lifetime.
*/
{
+ OstTraceFunctionEntry0( TUSBCSCLASSDESCRIPTOR_DES_ENTRY );
+
TUint index = 0;
iBuffer.SetLength(KUsbClassSpecificBufferSize);
@@ -71,9 +73,13 @@
#endif
- __ASSERT_DEBUG(index == KUsbClassSpecificBufferSize,
- _USB_PANIC(KAcmPanicCat, EPanicInternalError));
+ if (index != KUsbClassSpecificBufferSize)
+ {
+ OstTrace1( TRACE_FATAL, TUSBCSCLASSDESCRIPTOR_DES, "TUsbCsClassDescriptor::Des;index=%d", (TInt)index );
+ __ASSERT_DEBUG( EFalse, User::Panic(KAcmPanicCat, EPanicInternalError) );
+ }
+ OstTraceFunctionExit0( TUSBCSCLASSDESCRIPTOR_DES_EXIT );
return iBuffer;
}
--- a/usbmgmt/usbmgr/device/classdrivers/acm/classimplementation/ecacm/src/DllMain.cpp Wed Jul 07 14:16:40 2010 +0800
+++ b/usbmgmt/usbmgr/device/classdrivers/acm/classimplementation/ecacm/src/DllMain.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"
@@ -18,6 +18,11 @@
#include <e32std.h>
#include <cs_port.h>
#include "AcmPortFactory.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "DllMainTraces.h"
+#endif
+
extern "C" IMPORT_C CSerial* LibEntryL(void);
@@ -26,6 +31,7 @@
* Lib main entry point
*/
{
+ OstTraceFunctionEntry0( DLLMAIN_LIBENTRYL_ECACM_ENTRY );
return (CAcmPortFactory::NewL());
}
--- a/usbmgmt/usbmgr/device/classdrivers/acm/classimplementation/ecacm/src/RegistrationPort.cpp Wed Jul 07 14:16:40 2010 +0800
+++ b/usbmgmt/usbmgr/device/classdrivers/acm/classimplementation/ecacm/src/RegistrationPort.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"
@@ -15,17 +15,17 @@
*
*/
+#include <usb/acmserver.h>
#include "RegistrationPort.h"
#include "AcmConstants.h"
#include "AcmUtils.h"
-#include <usb/acmserver.h>
#include "acmcontroller.h"
-#include <usb/usblogger.h>
#include "acmserverconsts.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "RegistrationPortTraces.h"
+#endif
-#ifdef __FLOG_ACTIVE
-_LIT8(KLogComponent, "ECACM");
-#endif
CRegistrationPort* CRegistrationPort::NewL(MAcmController& aAcmController,
TUint aUnit)
@@ -37,12 +37,12 @@
* @return Ownership of a newly created CRegistrationPort object
*/
{
- LOG_STATIC_FUNC_ENTRY
-
+ OstTraceFunctionEntry0( CREGISTRATIONPORT_NEWL_ENTRY );
CRegistrationPort* self = new(ELeave) CRegistrationPort(aAcmController);
CleanupClosePushL(*self);
self->ConstructL(aUnit);
CleanupStack::Pop();
+ OstTraceFunctionExit0( CREGISTRATIONPORT_NEWL_EXIT );
return self;
}
@@ -53,11 +53,16 @@
* @param aUnit The port number.
*/
{
- LOG_FUNC
-
+ OstTraceFunctionEntry0( CREGISTRATIONPORT_CONSTRUCTL_ENTRY );
TName name;
name.Num(aUnit);
- LEAVEIFERRORL(SetName(&name));
+ TInt err = SetName(&name);
+ if (err < 0)
+ {
+ OstTrace1( TRACE_NORMAL, CREGISTRATIONPORT_CONSTRUCTL, "CRegistrationPort::ConstructL;err=%d", err );
+ User::Leave(err);
+ }
+ OstTraceFunctionExit0( CREGISTRATIONPORT_CONSTRUCTL_EXIT );
}
CRegistrationPort::CRegistrationPort(MAcmController& aAcmController)
@@ -68,6 +73,8 @@
*/
: iAcmController(aAcmController)
{
+ OstTraceFunctionEntry0( CREGISTRATIONPORT_CREGISTRATIONPORT_CONS_ENTRY );
+ OstTraceFunctionExit0( CREGISTRATIONPORT_CREGISTRATIONPORT_CONS_EXIT );
}
void CRegistrationPort::StartRead(const TAny* /*aClientBuffer*/,
@@ -79,9 +86,9 @@
* @param aLength number of bytes to read
*/
{
- LOG_FUNC
-
+ OstTraceFunctionEntry0( CREGISTRATIONPORT_STARTREAD_ENTRY );
ReadCompleted(KErrNotSupported);
+ OstTraceFunctionExit0( CREGISTRATIONPORT_STARTREAD_EXIT );
}
void CRegistrationPort::ReadCancel()
@@ -89,9 +96,9 @@
* Cancel a read
*/
{
- LOG_FUNC
-
+ OstTraceFunctionEntry0( CREGISTRATIONPORT_READCANCEL_ENTRY );
ReadCompleted(KErrNotSupported);
+ OstTraceFunctionExit0( CREGISTRATIONPORT_READCANCEL_EXIT );
}
@@ -103,8 +110,8 @@
* @return KErrNotSupported always.
*/
{
- LOG_FUNC
-
+ OstTraceFunctionEntry0( CREGISTRATIONPORT_QUERYRECEIVEBUFFER_ENTRY );
+ OstTraceFunctionExit0( CREGISTRATIONPORT_QUERYRECEIVEBUFFER_EXIT );
return KErrNotSupported;
}
@@ -114,7 +121,8 @@
* Not supported.
*/
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CREGISTRATIONPORT_RESETBUFFERS_ENTRY );
+ OstTraceFunctionExit0( CREGISTRATIONPORT_RESETBUFFERS_EXIT );
}
void CRegistrationPort::StartWrite(const TAny* /*aClientBuffer*/,
@@ -126,9 +134,9 @@
* @param aLength number of bytes to write
*/
{
- LOG_FUNC
-
+ OstTraceFunctionEntry0( CREGISTRATIONPORT_STARTWRITE_ENTRY );
WriteCompleted(KErrNotSupported);
+ OstTraceFunctionExit0( CREGISTRATIONPORT_STARTWRITE_EXIT );
}
void CRegistrationPort::WriteCancel()
@@ -136,9 +144,9 @@
* Cancel a pending write
*/
{
- LOG_FUNC
-
+ OstTraceFunctionEntry0( CREGISTRATIONPORT_WRITECANCEL_ENTRY );
WriteCompleted(KErrNotSupported);
+ OstTraceFunctionExit0( CREGISTRATIONPORT_WRITECANCEL_EXIT );
}
void CRegistrationPort::Break(TInt /*aTime*/)
@@ -148,9 +156,9 @@
* @param aTime Length of break in microseconds
*/
{
- LOG_FUNC
-
+ OstTraceFunctionEntry0( CREGISTRATIONPORT_BREAK_ENTRY );
BreakCompleted(KErrNotSupported);
+ OstTraceFunctionExit0( CREGISTRATIONPORT_BREAK_EXIT );
}
void CRegistrationPort::BreakCancel()
@@ -158,7 +166,8 @@
* Cancel a pending break.
*/
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CREGISTRATIONPORT_BREAKCANCEL_ENTRY );
+ OstTraceFunctionExit0( CREGISTRATIONPORT_BREAKCANCEL_EXIT );
}
TInt CRegistrationPort::GetConfig(TDes8& /*aDes*/) const
@@ -169,8 +178,8 @@
* @return Error
*/
{
- LOG_FUNC
-
+ OstTraceFunctionEntry0( CREGISTRATIONPORT_GETCONFIG_ENTRY );
+ OstTraceFunctionExit0( CREGISTRATIONPORT_GETCONFIG_EXIT );
return KErrNotSupported;
}
@@ -182,8 +191,8 @@
* @return Error
*/
{
- LOG_FUNC
-
+ OstTraceFunctionEntry0( CREGISTRATIONPORT_SETCONFIG_ENTRY );
+ OstTraceFunctionExit0( CREGISTRATIONPORT_SETCONFIG_EXIT );
return KErrNotSupported;
}
@@ -195,8 +204,8 @@
* @return Error
*/
{
- LOG_FUNC
-
+ OstTraceFunctionEntry0( CREGISTRATIONPORT_SETSERVERCONFIG_ENTRY );
+ OstTraceFunctionExit0( CREGISTRATIONPORT_SETSERVERCONFIG_EXIT );
return KErrNotSupported;
}
@@ -208,8 +217,8 @@
* @return Error
*/
{
- LOG_FUNC
-
+ OstTraceFunctionEntry0( CREGISTRATIONPORT_GETSERVERCONFIG_ENTRY );
+ OstTraceFunctionExit0( CREGISTRATIONPORT_GETSERVERCONFIG_EXIT );
return KErrNotSupported;
}
@@ -221,8 +230,8 @@
* @return Error
*/
{
- LOG_FUNC
-
+ OstTraceFunctionEntry0( CREGISTRATIONPORT_GETCAPS_ENTRY );
+ OstTraceFunctionExit0( CREGISTRATIONPORT_GETCAPS_EXIT );
return KErrNotSupported;
}
@@ -234,8 +243,8 @@
* @return Error
*/
{
- LOG_FUNC
-
+ OstTraceFunctionEntry0( CREGISTRATIONPORT_GETSIGNALS_ENTRY );
+ OstTraceFunctionExit0( CREGISTRATIONPORT_GETSIGNALS_EXIT );
return KErrNotSupported;
}
@@ -251,7 +260,8 @@
* @return Error
*/
{
- LOGTEXT2(_L8(">>CRegistrationPort::SetSignalsToMark aAcmField = 0x%x"), aAcmField);
+ OstTraceFunctionEntry0( CREGISTRATIONPORT_SETSIGNALSTOMARK_ENTRY );
+ OstTrace1( TRACE_NORMAL, CREGISTRATIONPORT_SETSIGNALSTOMARK, "CRegistrationPort::SetSignalsToMark;aAcmField = 0x%x", aAcmField );
// Extract number of interfaces and protocol number
// low 2 bytes represent the number of ACMs
@@ -265,8 +275,8 @@
protocolNumber = protocolNumber ? protocolNumber : KDefaultAcmProtocolNum;
TInt ret = iAcmController.CreateFunctions(interfaces, protocolNumber, KControlIfcName, KDataIfcName);
-
- LOGTEXT2(_L8("<<CRegistrationPort::SetSignalsToMark ret = %d"), ret);
+ OstTrace1( TRACE_NORMAL, CREGISTRATIONPORT_SETSIGNALSTOMARK_DUP1, "CRegistrationPort::SetSignalsToMark;ret=%d", ret );
+ OstTraceFunctionExit0( CREGISTRATIONPORT_SETSIGNALSTOMARK_EXIT );
return ret;
}
@@ -281,11 +291,11 @@
* @return Error
*/
{
- LOGTEXT2(_L8(">>CRegistrationPort::SetSignalsToSpace aNoAcms = %d"), aNoAcms);
-
+ OstTraceFunctionEntry0( CREGISTRATIONPORT_SETSIGNALSTOSPACE_ENTRY );
+ OstTrace1( TRACE_NORMAL, CREGISTRATIONPORT_SETSIGNALSTOSPACE, "CRegistrationPort::SetSignalsToSpace;aNoAcms=%d", (TInt)aNoAcms );
iAcmController.DestroyFunctions(aNoAcms);
-
- LOGTEXT(_L8("<<CRegistrationPort::SetSignalsToSpace ret = KErrNone"));
+ OstTrace0( TRACE_NORMAL, CREGISTRATIONPORT_SETSIGNALSTOSPACE_DUP1, "CRegistrationPort::SetSignalsToSpace;ret = KErrNone" );
+ OstTraceFunctionExit0( CREGISTRATIONPORT_SETSIGNALSTOSPACE_EXIT );
return KErrNone;
}
@@ -297,8 +307,8 @@
* @return Error
*/
{
- LOG_FUNC
-
+ OstTraceFunctionEntry0( CREGISTRATIONPORT_GETRECEIVEBUFFERLENGTH_ENTRY );
+ OstTraceFunctionExit0( CREGISTRATIONPORT_GETRECEIVEBUFFERLENGTH_EXIT );
return KErrNotSupported;
}
@@ -310,8 +320,8 @@
* @return Error
*/
{
- LOG_FUNC
-
+ OstTraceFunctionEntry0( CREGISTRATIONPORT_SETRECEIVEBUFFERLENGTH_ENTRY );
+ OstTraceFunctionExit0( CREGISTRATIONPORT_SETRECEIVEBUFFERLENGTH_EXIT );
return KErrNotSupported;
}
@@ -320,9 +330,9 @@
* Destruct - we must (eventually) call delete this
*/
{
- LOG_FUNC
-
+ OstTraceFunctionEntry0( CREGISTRATIONPORT_DESTRUCT_ENTRY );
delete this;
+ OstTraceFunctionExit0( CREGISTRATIONPORT_DESTRUCT_EXIT );
}
void CRegistrationPort::FreeMemory()
@@ -330,7 +340,8 @@
* Attempt to reduce our memory foot print.
*/
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CREGISTRATIONPORT_FREEMEMORY_ENTRY );
+ OstTraceFunctionExit0( CREGISTRATIONPORT_FREEMEMORY_EXIT );
}
void CRegistrationPort::NotifyDataAvailable()
@@ -338,9 +349,9 @@
* Notify client when data is available
*/
{
- LOG_FUNC
-
+ OstTraceFunctionEntry0( CREGISTRATIONPORT_NOTIFYDATAAVAILABLE_ENTRY );
NotifyDataAvailableCompleted(KErrNotSupported);
+ OstTraceFunctionExit0( CREGISTRATIONPORT_NOTIFYDATAAVAILABLE_EXIT );
}
void CRegistrationPort::NotifyDataAvailableCancel()
@@ -348,9 +359,9 @@
* Cancel an outstanding data availalbe notification
*/
{
- LOG_FUNC
-
+ OstTraceFunctionEntry0( CREGISTRATIONPORT_NOTIFYDATAAVAILABLECANCEL_ENTRY );
NotifyDataAvailableCompleted(KErrNotSupported);
+ OstTraceFunctionExit0( CREGISTRATIONPORT_NOTIFYDATAAVAILABLECANCEL_EXIT );
}
TInt CRegistrationPort::GetFlowControlStatus(TFlowControl& /*aFlowControl*/)
@@ -361,8 +372,8 @@
* @return Error
*/
{
- LOG_FUNC
-
+ OstTraceFunctionEntry0( CREGISTRATIONPORT_GETFLOWCONTROLSTATUS_ENTRY );
+ OstTraceFunctionExit0( CREGISTRATIONPORT_GETFLOWCONTROLSTATUS_EXIT );
return KErrNotSupported;
}
@@ -371,9 +382,9 @@
* Notify the client when the output buffer is empty.
*/
{
- LOG_FUNC
-
+ OstTraceFunctionEntry0( CREGISTRATIONPORT_NOTIFYOUTPUTEMPTY_ENTRY );
NotifyOutputEmptyCompleted(KErrNotSupported);
+ OstTraceFunctionExit0( CREGISTRATIONPORT_NOTIFYOUTPUTEMPTY_EXIT );
}
void CRegistrationPort::NotifyOutputEmptyCancel()
@@ -381,9 +392,9 @@
* Cancel a pending request to be notified when the output buffer is empty.
*/
{
- LOG_FUNC
-
+ OstTraceFunctionEntry0( CREGISTRATIONPORT_NOTIFYOUTPUTEMPTYCANCEL_ENTRY );
NotifyOutputEmptyCompleted(KErrNotSupported);
+ OstTraceFunctionExit0( CREGISTRATIONPORT_NOTIFYOUTPUTEMPTYCANCEL_EXIT );
}
void CRegistrationPort::NotifyBreak()
@@ -391,9 +402,9 @@
* Notify a client of a break on the serial line.
*/
{
- LOG_FUNC
-
+ OstTraceFunctionEntry0( CREGISTRATIONPORT_NOTIFYBREAK_ENTRY );
BreakNotifyCompleted(KErrNotSupported);
+ OstTraceFunctionExit0( CREGISTRATIONPORT_NOTIFYBREAK_EXIT );
}
void CRegistrationPort::NotifyBreakCancel()
@@ -401,9 +412,9 @@
* Cancel a pending notification of a serial line break.
*/
{
- LOG_FUNC
-
+ OstTraceFunctionEntry0( CREGISTRATIONPORT_NOTIFYBREAKCANCEL_ENTRY );
BreakNotifyCompleted(KErrNotSupported);
+ OstTraceFunctionExit0( CREGISTRATIONPORT_NOTIFYBREAKCANCEL_EXIT );
}
void CRegistrationPort::NotifyFlowControlChange()
@@ -411,9 +422,9 @@
* Notify a client of a change in the flow control state.
*/
{
- LOG_FUNC
-
+ OstTraceFunctionEntry0( CREGISTRATIONPORT_NOTIFYFLOWCONTROLCHANGE_ENTRY );
FlowControlChangeCompleted(EFlowControlOn,KErrNotSupported);
+ OstTraceFunctionExit0( CREGISTRATIONPORT_NOTIFYFLOWCONTROLCHANGE_EXIT );
}
void CRegistrationPort::NotifyFlowControlChangeCancel()
@@ -421,9 +432,9 @@
* Cancel a pending request to be notified when the flow control state changes.
*/
{
- LOG_FUNC
-
+ OstTraceFunctionEntry0( CREGISTRATIONPORT_NOTIFYFLOWCONTROLCHANGECANCEL_ENTRY );
FlowControlChangeCompleted(EFlowControlOn,KErrNotSupported);
+ OstTraceFunctionExit0( CREGISTRATIONPORT_NOTIFYFLOWCONTROLCHANGECANCEL_EXIT );
}
void CRegistrationPort::NotifyConfigChange()
@@ -431,9 +442,9 @@
* Notify a client of a change to the serial port configuration.
*/
{
- LOG_FUNC
-
+ OstTraceFunctionEntry0( CREGISTRATIONPORT_NOTIFYCONFIGCHANGE_ENTRY );
ConfigChangeCompleted(KNullDesC8, KErrNotSupported);
+ OstTraceFunctionExit0( CREGISTRATIONPORT_NOTIFYCONFIGCHANGE_EXIT );
}
void CRegistrationPort::NotifyConfigChangeCancel()
@@ -442,9 +453,9 @@
* configuration.
*/
{
- LOG_FUNC
-
+ OstTraceFunctionEntry0( CREGISTRATIONPORT_NOTIFYCONFIGCHANGECANCEL_ENTRY );
ConfigChangeCompleted(KNullDesC8, KErrNotSupported);
+ OstTraceFunctionExit0( CREGISTRATIONPORT_NOTIFYCONFIGCHANGECANCEL_EXIT );
}
void CRegistrationPort::NotifySignalChange(TUint /*aSignalMask*/)
@@ -452,9 +463,9 @@
* Notify a client of a change to the signal lines.
*/
{
- LOG_FUNC
-
+ OstTraceFunctionEntry0( CREGISTRATIONPORT_NOTIFYSIGNALCHANGE_ENTRY );
SignalChangeCompleted(0, KErrNotSupported);
+ OstTraceFunctionExit0( CREGISTRATIONPORT_NOTIFYSIGNALCHANGE_EXIT );
}
void CRegistrationPort::NotifySignalChangeCancel()
@@ -463,9 +474,9 @@
* lines.
*/
{
- LOG_FUNC
-
+ OstTraceFunctionEntry0( CREGISTRATIONPORT_NOTIFYSIGNALCHANGECANCEL_ENTRY );
SignalChangeCompleted(0, KErrNotSupported);
+ OstTraceFunctionExit0( CREGISTRATIONPORT_NOTIFYSIGNALCHANGECANCEL_EXIT );
}
TInt CRegistrationPort::GetRole(TCommRole& aRole)
@@ -476,9 +487,10 @@
* @return Error
*/
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CREGISTRATIONPORT_GETROLE_ENTRY );
aRole = iRole;
- LOGTEXT2(_L8("\trole=%d"), aRole);
+ OstTrace1( TRACE_NORMAL, CREGISTRATIONPORT_GETROLE, "CRegistrationPort::GetRole;aRole=%d", (TInt)aRole );
+ OstTraceFunctionExit0( CREGISTRATIONPORT_GETROLE_EXIT );
return KErrNone;
}
@@ -490,14 +502,14 @@
* @return Error
*/
{
- LOG_FUNC
-
+ OstTraceFunctionEntry0( CREGISTRATIONPORT_SETROLE_ENTRY );
// This is required to keep C32 happy while opening the port.
// All we do is store the role and return it if asked.
// Note that this is needed for multiple ACM ports because C32 doesn't
// check the return value for multiple ports so opening registration port
// more than once will fail.
iRole = aRole;
+ OstTraceFunctionExit0( CREGISTRATIONPORT_SETROLE_EXIT );
return KErrNone;
}
@@ -506,7 +518,8 @@
* Destructor.
*/
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CREGISTRATIONPORT_CREGISTRATIONPORT_DES_ENTRY );
+ OstTraceFunctionExit0( CREGISTRATIONPORT_CREGISTRATIONPORT_DES_EXIT );
}
//
--- a/usbmgmt/usbmgr/device/classdrivers/acm/classimplementation/ecacm/src/RequestHeader.cpp Wed Jul 07 14:16:40 2010 +0800
+++ b/usbmgmt/usbmgr/device/classdrivers/acm/classimplementation/ecacm/src/RequestHeader.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"
@@ -16,6 +16,11 @@
*/
#include "RequestHeader.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "RequestHeaderTraces.h"
+#endif
+
const TDesC8& TUsbRequestHdr::Des()
/**
@@ -26,6 +31,7 @@
* this class and has the same lifetime.
*/
{
+ OstTraceFunctionEntry0( TUSBREQUESTHDR_DES_ENTRY );
iBuffer.SetLength(KUsbRequestHdrSize);
iBuffer[0] = iRequestType;
@@ -37,6 +43,7 @@
iBuffer[6] = static_cast<TUint8>(iLength & 0x00ff);
iBuffer[7] = static_cast<TUint8>((iLength & 0xff00) >> 8);
+ OstTraceFunctionExit0( TUSBREQUESTHDR_DES_EXIT );
return iBuffer;
}
@@ -50,14 +57,20 @@
* @return Error.
*/
{
+ OstTraceFunctionEntry0( TUSBREQUESTHDR_DECODE_ENTRY );
+
if (aBuffer.Length() < static_cast<TInt>(KUsbRequestHdrSize))
+ {
+ OstTraceFunctionExit0( TUSBREQUESTHDR_DECODE_EXIT );
return KErrGeneral;
+ }
aTarget.iRequestType = aBuffer[0];
aTarget.iRequest = aBuffer[1];
aTarget.iValue = static_cast<TUint16>(aBuffer[2] + (aBuffer[3] << 8));
aTarget.iIndex = static_cast<TUint16>(aBuffer[4] + (aBuffer[5] << 8));
aTarget.iLength = static_cast<TUint16>(aBuffer[6] + (aBuffer[7] << 8));
+ OstTraceFunctionExit0( TUSBREQUESTHDR_DECODE_EXIT_DUP1 );
return KErrNone;
}
@@ -68,6 +81,7 @@
* @return TBool Flag indicating whether a data response required.
*/
{
+ OstTraceFunctionEntry0( TUSBREQUESTHDR_ISDATARESPONSEREQUIRED_ENTRY );
return (iRequestType & 0x80) ? ETrue : EFalse;
}
--- a/usbmgmt/usbmgr/device/classdrivers/acm/classimplementation/ecacm/src/acmserver.cpp Wed Jul 07 14:16:40 2010 +0800
+++ b/usbmgmt/usbmgr/device/classdrivers/acm/classimplementation/ecacm/src/acmserver.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"
@@ -21,19 +21,19 @@
@internalComponent
*/
-#include <usb/usblogger.h>
#include "acmserver.h"
#include "acmsession.h"
#include "acmserversecuritypolicy.h"
#include "acmserverconsts.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "acmserverTraces.h"
+#endif
-#ifdef __FLOG_ACTIVE
-_LIT8(KLogComponent, "ECACM");
-#endif
CAcmServer* CAcmServer::NewL(MAcmController& aAcmController)
{
- LOG_STATIC_FUNC_ENTRY
+ OstTraceFunctionEntry0( CACMSERVER_NEWL_ENTRY );
CAcmServer* self = new(ELeave) CAcmServer(aAcmController);
CleanupStack::PushL(self);
@@ -42,33 +42,43 @@
// code).
if ( err != KErrAlreadyExists )
{
- LEAVEIFERRORL(err);
+ if (err < 0)
+ {
+ OstTrace1( TRACE_ERROR, CACMSERVER_NEWL, "CAcmServer::NewL;err=%d", err );
+ User::Leave(err);
+ }
}
CleanupStack::Pop(self);
+ OstTraceFunctionExit0( CACMSERVER_NEWL_EXIT );
return self;
}
CAcmServer::~CAcmServer()
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CACMSERVER_CACMSERVER_DES_ENTRY );
+ OstTraceFunctionExit0( CACMSERVER_CACMSERVER_DES_EXIT );
}
CAcmServer::CAcmServer(MAcmController& aAcmController)
: CPolicyServer(CActive::EPriorityStandard, KAcmServerPolicy),
iAcmController(aAcmController)
{
+ OstTraceFunctionEntry0( CACMSERVER_CACMSERVER_CONS_ENTRY );
+ OstTraceFunctionExit0( CACMSERVER_CACMSERVER_CONS_EXIT );
}
CSession2* CAcmServer::NewSessionL(const TVersion& aVersion, const RMessage2& aMessage) const
{
- LOG_FUNC
-
+ OstTraceFunctionEntry0( CACMSERVER_NEWSESSIONL_ENTRY );
//Validate session as coming from UsbSvr
static _LIT_SECURITY_POLICY_S0(KSidPolicy, 0x101fe1db);
TBool auth = KSidPolicy.CheckPolicy(aMessage);
if(!auth)
{
- LEAVEIFERRORL(KErrPermissionDenied);
+ OstTrace1( TRACE_ERROR, CACMSERVER_NEWSESSIONL_DUP1,
+ "CAcmServer::NewSessionL;KErrPermissionDenied=%d",
+ KErrPermissionDenied );
+ User::Leave(KErrPermissionDenied);
}
// Version number check...
@@ -78,10 +88,14 @@
if ( !User::QueryVersionSupported(v, aVersion) )
{
- LEAVEIFERRORL(KErrNotSupported);
+ OstTrace1( TRACE_ERROR, CACMSERVER_NEWSESSIONL_DUP2,
+ "CAcmServer::NewSessionL;KErrNotSupported=%d",
+ KErrNotSupported );
+ User::Leave(KErrNotSupported);
}
CAcmSession* sess = CAcmSession::NewL(iAcmController);
- LOGTEXT2(_L8("\tsess = 0x%08x"), sess);
+ OstTraceExt1( TRACE_NORMAL, CACMSERVER_NEWSESSIONL, "CAcmServer::NewSessionL;sess=%p", sess );
+ OstTraceFunctionExit0( CACMSERVER_NEWSESSIONL_EXIT );
return sess;
}
--- a/usbmgmt/usbmgr/device/classdrivers/acm/classimplementation/ecacm/src/acmsession.cpp Wed Jul 07 14:16:40 2010 +0800
+++ b/usbmgmt/usbmgr/device/classdrivers/acm/classimplementation/ecacm/src/acmsession.cpp Wed Jul 07 15:08:54 2010 +0800
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2005-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,37 +24,37 @@
#include "acmserverconsts.h"
#include "acmsession.h"
#include "AcmPortFactory.h"
-#include <usb/usblogger.h>
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "acmsessionTraces.h"
+#endif
-#ifdef __FLOG_ACTIVE
-_LIT8(KLogComponent, "ECACM");
-#endif
CAcmSession* CAcmSession::NewL(MAcmController& aAcmController)
{
- LOG_STATIC_FUNC_ENTRY
-
+ OstTraceFunctionEntry0( CACMSESSION_NEWL_ENTRY );
CAcmSession* self = new(ELeave) CAcmSession(aAcmController);
+ OstTraceFunctionExit0( CACMSESSION_NEWL_EXIT );
return self;
}
CAcmSession::CAcmSession(MAcmController& aAcmController)
: iAcmController(aAcmController)
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CACMSESSION_CACMSESSION_CONS_ENTRY );
+ OstTraceFunctionExit0( CACMSESSION_CACMSESSION_CONS_EXIT );
}
CAcmSession::~CAcmSession()
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CACMSESSION_CACMSESSION_DES_ENTRY );
+ OstTraceFunctionExit0( CACMSESSION_CACMSESSION_DES_EXIT );
}
void CAcmSession::CreateFunctionsL(const RMessage2& aMessage)
{
- LOG_FUNC
-
+ OstTraceFunctionEntry0( CACMSESSION_CREATEFUNCTIONSL_ENTRY );
RBuf acmControlIfcName, acmDataIfcName;
-
TInt size = aMessage.GetDesLengthL(2);
acmControlIfcName.CreateL(size);
acmControlIfcName.CleanupClosePushL();
@@ -65,19 +65,27 @@
acmDataIfcName.CleanupClosePushL();
aMessage.ReadL(3, acmDataIfcName);
- LOGTEXT5(_L("\taNoAcms = %d, aProtocolNum = %d, Control Ifc Name = %S, Data Ifc Name = %S"),
- aMessage.Int0(), aMessage.Int1(), &acmControlIfcName, &acmDataIfcName);
+ OstTraceExt4( TRACE_DUMP, CACMSESSION_CREATEFUNCTIONSL,
+ "CAcmSession::CreateFunctionsL;\taNoAcms = %d, aProtocolNum = %d, "
+ "Control Ifc Name = %S, Data Ifc Name = %S",
+ aMessage.Int0(), aMessage.Int1(), acmControlIfcName, acmDataIfcName );
+
- LEAVEIFERRORL(iAcmController.CreateFunctions(aMessage.Int0(), aMessage.Int1(), acmControlIfcName, acmDataIfcName));
+ TInt err = iAcmController.CreateFunctions(aMessage.Int0(), aMessage.Int1(), acmControlIfcName, acmDataIfcName);
+ if (err < 0)
+ {
+ OstTrace1( TRACE_NORMAL, CACMSESSION_CREATEFUNCTIONSL_DUP1, "CAcmSession::CreateFunctionsL;err=%d", err );
+ User::Leave(err);
+ }
CleanupStack::PopAndDestroy(2);
+ OstTraceFunctionExit0( CACMSESSION_CREATEFUNCTIONSL_EXIT );
}
void CAcmSession::ServiceL(const RMessage2& aMessage)
{
- LOG_FUNC
- LOGTEXT2(_L8("\taMessage.Function() = %d"), aMessage.Function());
-
+ OstTraceFunctionEntry0( CACMSESSION_SERVICEL_ENTRY );
+ OstTrace1( TRACE_NORMAL, CACMSESSION_SERVICEL, "CAcmSession::ServiceL;aMessage.Function()=%d", aMessage.Function() );
switch ( aMessage.Function() )
{
case EAcmCreateAcmFunctions:
@@ -99,4 +107,5 @@
aMessage.Panic(KAcmSrvPanic, EAcmBadAcmMessage);
break;
}
+ OstTraceFunctionExit0( CACMSESSION_SERVICEL_EXIT );
}
--- a/usbmgmt/usbmgr/device/classdrivers/acm/classimplementation/ecacm/src/linkstatenotifier.cpp Wed Jul 07 14:16:40 2010 +0800
+++ b/usbmgmt/usbmgr/device/classdrivers/acm/classimplementation/ecacm/src/linkstatenotifier.cpp Wed Jul 07 15:08:54 2010 +0800
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-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"
@@ -17,19 +17,19 @@
#include <e32base.h>
#include <d32usbc.h>
-#include <usb/usblogger.h>
#include "AcmPanic.h"
#include "linkstatenotifier.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "linkstatenotifierTraces.h"
+#endif
-#ifdef __FLOG_ACTIVE
-_LIT8(KLogComponent, "ECACM");
-#endif
CLinkStateNotifier* CLinkStateNotifier::NewL(MLinkStateObserver& aParent, RDevUsbcClient& aUsb)
{
- LOG_STATIC_FUNC_ENTRY
-
+ OstTraceFunctionEntry0( CLINKSTATENOTIFIER_NEWL_ENTRY );
CLinkStateNotifier* self = new (ELeave) CLinkStateNotifier(aParent, aUsb);
+ OstTraceFunctionExit0( CLINKSTATENOTIFIER_NEWL_EXIT );
return self;
}
@@ -38,9 +38,9 @@
: CActive(EPriorityStandard),
iParent(aParent), iUsb(aUsb)
{
- LOG_FUNC
-
+ OstTraceFunctionEntry0( CLINKSTATENOTIFIER_CLINKSTATENOTIFIER_CONS_ENTRY );
CActiveScheduler::Add(this);
+ OstTraceFunctionExit0( CLINKSTATENOTIFIER_CLINKSTATENOTIFIER_CONS_EXIT );
}
@@ -50,8 +50,9 @@
*/
CLinkStateNotifier::~CLinkStateNotifier()
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CLINKSTATENOTIFIER_CLINKSTATENOTIFIER_DES_ENTRY );
Cancel();
+ OstTraceFunctionExit0( CLINKSTATENOTIFIER_CLINKSTATENOTIFIER_DES_EXIT );
}
@@ -62,6 +63,8 @@
*/
TInt CLinkStateNotifier::RunError(TInt /*aError*/)
{
+ OstTraceFunctionEntry0( CLINKSTATENOTIFIER_RUNERROR_ENTRY );
+ OstTraceFunctionExit0( CLINKSTATENOTIFIER_RUNERROR_EXIT );
return KErrNone;
}
@@ -72,14 +75,16 @@
*/
void CLinkStateNotifier::RunL()
{
- LOGTEXT2(_L8("CObexUsbHandler::RunL called state=0x%X"), iUsbState);
+ OstTraceFunctionEntry0( CLINKSTATENOTIFIER_RUNL_ENTRY );
+ OstTrace1( TRACE_NORMAL, CLINKSTATENOTIFIER_RUNL, "CLinkStateNotifier::RunL;called state=0x%X", iUsbState );
if (iStatus != KErrNone)
{
- LOGTEXT2(_L8("CObexUsbHandler::RunL() - Error = %d"),iStatus.Int());
+ OstTrace1( TRACE_NORMAL, CLINKSTATENOTIFIER_RUNL_DUP1, "CLinkStateNotifier::RunL;- Error = %d", iStatus.Int() );
LinkDown();
iParent.MLSOStateChange(KDefaultMaxPacketTypeBulk);
+ OstTraceFunctionExit0( CLINKSTATENOTIFIER_RUNL_EXIT );
return;
}
@@ -105,7 +110,8 @@
break;
default:
- __ASSERT_DEBUG(false, _USB_PANIC(KAcmPanicCat, EPanicUnknownDeviceState));
+ OstTrace0( TRACE_FATAL, CLINKSTATENOTIFIER_RUNL_DUP2, "CLinkStateNotifier::RunL;EPanicUnknownDeviceState" );
+ __ASSERT_DEBUG( EFalse, User::Panic(KAcmPanicCat, EPanicUnknownDeviceState) );
break;
}
}
@@ -115,6 +121,7 @@
// Await further notification of a state change.
iUsb.AlternateDeviceStatusNotify(iStatus, iUsbState);
SetActive();
+ OstTraceFunctionExit0( CLINKSTATENOTIFIER_RUNL_EXIT_DUP1 );
}
@@ -123,9 +130,9 @@
*/
void CLinkStateNotifier::DoCancel()
{
- LOG_FUNC
-
+ OstTraceFunctionEntry0( CLINKSTATENOTIFIER_DOCANCEL_ENTRY );
iUsb.AlternateDeviceStatusNotifyCancel();
+ OstTraceFunctionExit0( CLINKSTATENOTIFIER_DOCANCEL_EXIT );
}
@@ -135,14 +142,16 @@
*/
void CLinkStateNotifier::Start()
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CLINKSTATENOTIFIER_START_ENTRY );
iUsb.AlternateDeviceStatusNotify(iStatus, iUsbState);
SetActive();
+ OstTraceFunctionExit0( CLINKSTATENOTIFIER_START_EXIT );
}
void CLinkStateNotifier::LinkUp()
{
+ OstTraceFunctionEntry0( CLINKSTATENOTIFIER_LINKUP_ENTRY );
if (iUsb.CurrentlyUsingHighSpeed())
{
iPacketSize = KMaxPacketTypeBulkHS;
@@ -151,10 +160,13 @@
{
iPacketSize = KMaxPacketTypeBulkFS;
}
+ OstTraceFunctionExit0( CLINKSTATENOTIFIER_LINKUP_EXIT );
}
void CLinkStateNotifier::LinkDown()
{
+ OstTraceFunctionEntry0( CLINKSTATENOTIFIER_LINKDOWN_ENTRY );
iPacketSize = 0;
+ OstTraceFunctionExit0( CLINKSTATENOTIFIER_LINKDOWN_EXIT );
}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usbmgmt/usbmgr/device/classdrivers/acm/classimplementation/ecacm/traces/OstTraceDefinitions.h Wed Jul 07 15:08:54 2010 +0800
@@ -0,0 +1,7 @@
+#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
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usbmgmt/usbmgr/device/classdrivers/acm/classimplementation/ecacm/traces/fixed_id.definitions Wed Jul 07 15:08:54 2010 +0800
@@ -0,0 +1,1126 @@
+#Fixed group and trace id definitions. If this file is removed, the identifiers are rebuilt.
+[GROUP]TRACE_DUMP=0x89
+[GROUP]TRACE_ERROR=0x82
+[GROUP]TRACE_FATAL=0x81
+[GROUP]TRACE_FLOW=0x8a
+[GROUP]TRACE_NORMAL=0x86
+[TRACE]TRACE_DUMP[0x89]_CACMPORT_HANDLECONFIGNOTIFICATION=0xc
+[TRACE]TRACE_DUMP[0x89]_CACMPORT_HANDLECONFIGNOTIFICATION_DUP1=0xd
+[TRACE]TRACE_DUMP[0x89]_CACMPORT_HANDLECONFIGNOTIFICATION_DUP2=0xe
+[TRACE]TRACE_DUMP[0x89]_CACMPORT_HANDLECONFIGNOTIFICATION_DUP3=0xf
+[TRACE]TRACE_DUMP[0x89]_CACMPORT_HANDLECONFIGNOTIFICATION_DUP4=0x10
+[TRACE]TRACE_DUMP[0x89]_CACMPORT_HANDLECONFIGNOTIFICATION_DUP5=0x11
+[TRACE]TRACE_DUMP[0x89]_CACMPORT_SETCONFIG_DUP10=0x8
+[TRACE]TRACE_DUMP[0x89]_CACMPORT_SETCONFIG_DUP11=0x9
+[TRACE]TRACE_DUMP[0x89]_CACMPORT_SETCONFIG_DUP12=0xa
+[TRACE]TRACE_DUMP[0x89]_CACMPORT_SETCONFIG_DUP13=0xb
+[TRACE]TRACE_DUMP[0x89]_CACMPORT_SETCONFIG_DUP3=0x1
+[TRACE]TRACE_DUMP[0x89]_CACMPORT_SETCONFIG_DUP4=0x2
+[TRACE]TRACE_DUMP[0x89]_CACMPORT_SETCONFIG_DUP5=0x3
+[TRACE]TRACE_DUMP[0x89]_CACMPORT_SETCONFIG_DUP6=0x4
+[TRACE]TRACE_DUMP[0x89]_CACMPORT_SETCONFIG_DUP7=0x5
+[TRACE]TRACE_DUMP[0x89]_CACMPORT_SETCONFIG_DUP8=0x6
+[TRACE]TRACE_DUMP[0x89]_CACMPORT_SETCONFIG_DUP9=0x7
+[TRACE]TRACE_DUMP[0x89]_CACMREADER_ISSUEREAD=0x18
+[TRACE]TRACE_DUMP[0x89]_CACMREADER_ISSUEREADONEORMORE=0x1d
+[TRACE]TRACE_DUMP[0x89]_CACMREADER_ISSUEREADONEORMORE_DUP1=0x1e
+[TRACE]TRACE_DUMP[0x89]_CACMREADER_ISSUEREADONEORMORE_DUP2=0x1f
+[TRACE]TRACE_DUMP[0x89]_CACMREADER_ISSUEREADONEORMORE_DUP3=0x20
+[TRACE]TRACE_DUMP[0x89]_CACMREADER_ISSUEREADONEORMORE_DUP4=0x21
+[TRACE]TRACE_DUMP[0x89]_CACMREADER_ISSUEREAD_DUP1=0x19
+[TRACE]TRACE_DUMP[0x89]_CACMREADER_ISSUEREAD_DUP2=0x1a
+[TRACE]TRACE_DUMP[0x89]_CACMREADER_ISSUEREAD_DUP3=0x1b
+[TRACE]TRACE_DUMP[0x89]_CACMREADER_ISSUEREAD_DUP4=0x1c
+[TRACE]TRACE_DUMP[0x89]_CACMREADER_WRITEBACKDATA=0x12
+[TRACE]TRACE_DUMP[0x89]_CACMREADER_WRITEBACKDATA_DUP1=0x13
+[TRACE]TRACE_DUMP[0x89]_CACMREADER_WRITEBACKDATA_DUP2=0x14
+[TRACE]TRACE_DUMP[0x89]_CACMREADER_WRITEBACKDATA_DUP3=0x15
+[TRACE]TRACE_DUMP[0x89]_CACMREADER_WRITEBACKDATA_DUP4=0x16
+[TRACE]TRACE_DUMP[0x89]_CACMREADER_WRITEBACKDATA_DUP5=0x17
+[TRACE]TRACE_DUMP[0x89]_CACMSESSION_CREATEFUNCTIONSL=0x29
+[TRACE]TRACE_DUMP[0x89]_CCDCCONTROLINTERFACE_SENDSERIALSTATE=0x22
+[TRACE]TRACE_DUMP[0x89]_CCDCCONTROLINTERFACE_SENDSERIALSTATE_DUP1=0x23
+[TRACE]TRACE_DUMP[0x89]_CCDCCONTROLINTERFACE_SENDSERIALSTATE_DUP2=0x24
+[TRACE]TRACE_DUMP[0x89]_CCDCCONTROLINTERFACE_SENDSERIALSTATE_DUP3=0x25
+[TRACE]TRACE_DUMP[0x89]_CCDCCONTROLINTERFACE_SENDSERIALSTATE_DUP4=0x26
+[TRACE]TRACE_DUMP[0x89]_CCDCCONTROLINTERFACE_SENDSERIALSTATE_DUP5=0x27
+[TRACE]TRACE_DUMP[0x89]_CCDCCONTROLINTERFACE_SENDSERIALSTATE_DUP6=0x28
+[TRACE]TRACE_ERROR[0x82]_CACMPORTFACTORY_CREATEFUNCTIONL_DUP4=0x3
+[TRACE]TRACE_ERROR[0x82]_CACMPORTFACTORY_CREATEFUNCTIONL_DUP5=0x4
+[TRACE]TRACE_ERROR[0x82]_CACMPORTFACTORY_NEWPORTL_DUP2=0x1
+[TRACE]TRACE_ERROR[0x82]_CACMPORTFACTORY_NEWPORTL_DUP3=0x2
+[TRACE]TRACE_ERROR[0x82]_CACMREADER_CONSTRUCTL_DUP1=0x5
+[TRACE]TRACE_ERROR[0x82]_CACMSERVER_NEWL=0x7
+[TRACE]TRACE_ERROR[0x82]_CACMSERVER_NEWSESSIONL_DUP1=0x8
+[TRACE]TRACE_ERROR[0x82]_CACMSERVER_NEWSESSIONL_DUP2=0x9
+[TRACE]TRACE_ERROR[0x82]_CACMWRITER_CONSTRUCTL_DUP1=0x6
+[TRACE]TRACE_FATAL[0x81]_CACMPORT_CONSTRUCTL=0x1
+[TRACE]TRACE_FATAL[0x81]_CACMPORT_DOSETBUFFERLENGTHS_DUP5=0xa
+[TRACE]TRACE_FATAL[0x81]_CACMPORT_DOSETBUFFERLENGTHS_DUP6=0xb
+[TRACE]TRACE_FATAL[0x81]_CACMPORT_DOSETBUFFERLENGTHS_DUP7=0xc
+[TRACE]TRACE_FATAL[0x81]_CACMPORT_GETRECEIVEBUFFERLENGTH_DUP2=0x9
+[TRACE]TRACE_FATAL[0x81]_CACMPORT_NOTIFYBREAK_DUP1=0xf
+[TRACE]TRACE_FATAL[0x81]_CACMPORT_NOTIFYDATAAVAILABLECANCEL_DUP1=0xe
+[TRACE]TRACE_FATAL[0x81]_CACMPORT_NOTIFYDATAAVAILABLE_DUP1=0xd
+[TRACE]TRACE_FATAL[0x81]_CACMPORT_QUERYRECEIVEBUFFER_DUP2=0x4
+[TRACE]TRACE_FATAL[0x81]_CACMPORT_READCANCEL_DUP1=0x3
+[TRACE]TRACE_FATAL[0x81]_CACMPORT_RESETBUFFERS_DUP3=0x5
+[TRACE]TRACE_FATAL[0x81]_CACMPORT_RESETBUFFERS_DUP4=0x6
+[TRACE]TRACE_FATAL[0x81]_CACMPORT_SETACM_DUP4=0x10
+[TRACE]TRACE_FATAL[0x81]_CACMPORT_SETACM_DUP5=0x11
+[TRACE]TRACE_FATAL[0x81]_CACMPORT_SETACM_DUP6=0x12
+[TRACE]TRACE_FATAL[0x81]_CACMPORT_STARTREAD_DUP3=0x2
+[TRACE]TRACE_FATAL[0x81]_CACMPORT_STARTWRITE_DUP3=0x7
+[TRACE]TRACE_FATAL[0x81]_CACMPORT_WRITECANCEL_DUP1=0x8
+[TRACE]TRACE_FATAL[0x81]_CACMREADER_CHECKBUFFEREMPTYANDRESETPTRS=0x16
+[TRACE]TRACE_FATAL[0x81]_CACMREADER_CHECKNEWREQUEST=0x17
+[TRACE]TRACE_FATAL[0x81]_CACMREADER_CHECKNEWREQUEST_DUP1=0x18
+[TRACE]TRACE_FATAL[0x81]_CACMREADER_CHECKNEWREQUEST_DUP2=0x1a
+[TRACE]TRACE_FATAL[0x81]_CACMREADER_CHECKNEWREQUEST_DUP3=0x19
+[TRACE]TRACE_FATAL[0x81]_CACMREADER_FINDTERMINATOR_DUP1=0x23
+[TRACE]TRACE_FATAL[0x81]_CACMREADER_ISSUEREADONEORMORE_DUP5=0x22
+[TRACE]TRACE_FATAL[0x81]_CACMREADER_ISSUEREAD_DUP5=0x21
+[TRACE]TRACE_FATAL[0x81]_CACMREADER_PARTIALFINDTERMINATOR_DUP3=0x24
+[TRACE]TRACE_FATAL[0x81]_CACMREADER_READCOMPLETED_DUP3=0x15
+[TRACE]TRACE_FATAL[0x81]_CACMREADER_RESETBUFFER=0x13
+[TRACE]TRACE_FATAL[0x81]_CACMREADER_SETTERMINATORS_DUP2=0x14
+[TRACE]TRACE_FATAL[0x81]_CACMREADER_WRITEBACKDATA_DUP15=0x1b
+[TRACE]TRACE_FATAL[0x81]_CACMREADER_WRITEBACKDATA_DUP16=0x1c
+[TRACE]TRACE_FATAL[0x81]_CACMREADER_WRITEBACKDATA_DUP17=0x1d
+[TRACE]TRACE_FATAL[0x81]_CACMREADER_WRITEBACKDATA_DUP18=0x1e
+[TRACE]TRACE_FATAL[0x81]_CACMREADER_WRITEBACKDATA_DUP19=0x1f
+[TRACE]TRACE_FATAL[0x81]_CACMREADER_WRITEBACKDATA_DUP20=0x20
+[TRACE]TRACE_FATAL[0x81]_CACMWRITER_CHECKNEWREQUEST=0x27
+[TRACE]TRACE_FATAL[0x81]_CACMWRITER_CHECKNEWREQUEST_DUP1=0x28
+[TRACE]TRACE_FATAL[0x81]_CACMWRITER_CHECKNEWREQUEST_DUP2=0x29
+[TRACE]TRACE_FATAL[0x81]_CACMWRITER_ISSUEWRITE_DUP1=0x2a
+[TRACE]TRACE_FATAL[0x81]_CACMWRITER_ISSUEWRITE_DUP2=0x2b
+[TRACE]TRACE_FATAL[0x81]_CACMWRITER_READDATAFROMCLIENT_DUP1=0x26
+[TRACE]TRACE_FATAL[0x81]_CACMWRITER_RESETBUFFER=0x25
+[TRACE]TRACE_FATAL[0x81]_CBREAKCONTROLLER_PUBLISH=0x2e
+[TRACE]TRACE_FATAL[0x81]_CBREAKCONTROLLER_RUNL=0x2c
+[TRACE]TRACE_FATAL[0x81]_CBREAKCONTROLLER_STATEMACHINE=0x2d
+[TRACE]TRACE_FATAL[0x81]_CCDCACMCLASS_BREAKREQUEST=0x34
+[TRACE]TRACE_FATAL[0x81]_CCDCACMCLASS_NOTIFYDATAAVAILABLECANCEL=0x36
+[TRACE]TRACE_FATAL[0x81]_CCDCACMCLASS_NOTIFYDATAAVAILABLE_DUP1=0x35
+[TRACE]TRACE_FATAL[0x81]_CCDCACMCLASS_READCANCEL=0x31
+[TRACE]TRACE_FATAL[0x81]_CCDCACMCLASS_READONEORMORE_MREADONEORMOREOBSERVERREF_TDES8REF_TINT_DUP1=0x2f
+[TRACE]TRACE_FATAL[0x81]_CCDCACMCLASS_READ_DUP2=0x30
+[TRACE]TRACE_FATAL[0x81]_CCDCACMCLASS_WRITECANCEL=0x33
+[TRACE]TRACE_FATAL[0x81]_CCDCACMCLASS_WRITE_DUP2=0x32
+[TRACE]TRACE_FATAL[0x81]_CCDCCONTROLINTERFACEREADER_HANDLEREADCOMPLETION_DUP3=0x38
+[TRACE]TRACE_FATAL[0x81]_CCDCCONTROLINTERFACE_SETUPINTERFACE_DUP6=0x37
+[TRACE]TRACE_FATAL[0x81]_CCDCDATAINTERFACE_CANCELNOTIFYDATAAVAILABLE=0x53
+[TRACE]TRACE_FATAL[0x81]_CCDCDATAINTERFACE_CANCELREAD=0x4f
+[TRACE]TRACE_FATAL[0x81]_CCDCDATAINTERFACE_CANCELREAD_DUP1=0x50
+[TRACE]TRACE_FATAL[0x81]_CCDCDATAINTERFACE_CANCELWRITE=0x41
+[TRACE]TRACE_FATAL[0x81]_CCDCDATAINTERFACE_NOTIFYDATAAVAILABLE=0x51
+[TRACE]TRACE_FATAL[0x81]_CCDCDATAINTERFACE_NOTIFYDATAAVAILABLE_DUP1=0x52
+[TRACE]TRACE_FATAL[0x81]_CCDCDATAINTERFACE_READCOMPLETED_DUP2=0x4d
+[TRACE]TRACE_FATAL[0x81]_CCDCDATAINTERFACE_READCOMPLETED_DUP4=0x4e
+[TRACE]TRACE_FATAL[0x81]_CCDCDATAINTERFACE_READONEORMORECOMPLETED_DUP2=0x4a
+[TRACE]TRACE_FATAL[0x81]_CCDCDATAINTERFACE_READONEORMORECOMPLETED_DUP3=0x4b
+[TRACE]TRACE_FATAL[0x81]_CCDCDATAINTERFACE_READONEORMORECOMPLETED_DUP4=0x4c
+[TRACE]TRACE_FATAL[0x81]_CCDCDATAINTERFACE_READONEORMORE_DUP1=0x46
+[TRACE]TRACE_FATAL[0x81]_CCDCDATAINTERFACE_READONEORMORE_DUP2=0x47
+[TRACE]TRACE_FATAL[0x81]_CCDCDATAINTERFACE_READONEORMORE_DUP3=0x48
+[TRACE]TRACE_FATAL[0x81]_CCDCDATAINTERFACE_READONEORMORE_DUP4=0x49
+[TRACE]TRACE_FATAL[0x81]_CCDCDATAINTERFACE_READ_DUP1=0x42
+[TRACE]TRACE_FATAL[0x81]_CCDCDATAINTERFACE_READ_DUP2=0x43
+[TRACE]TRACE_FATAL[0x81]_CCDCDATAINTERFACE_READ_DUP3=0x44
+[TRACE]TRACE_FATAL[0x81]_CCDCDATAINTERFACE_READ_DUP4=0x45
+[TRACE]TRACE_FATAL[0x81]_CCDCDATAINTERFACE_SETUPINTERFACE_DUP5=0x39
+[TRACE]TRACE_FATAL[0x81]_CCDCDATAINTERFACE_WRITE=0x3a
+[TRACE]TRACE_FATAL[0x81]_CCDCDATAINTERFACE_WRITECOMPLETED_DUP1=0x3c
+[TRACE]TRACE_FATAL[0x81]_CCDCDATAINTERFACE_WRITECOMPLETED_DUP3=0x3d
+[TRACE]TRACE_FATAL[0x81]_CCDCDATAINTERFACE_WRITECOMPLETED_DUP5=0x3e
+[TRACE]TRACE_FATAL[0x81]_CCDCDATAINTERFACE_WRITECOMPLETED_DUP6=0x3f
+[TRACE]TRACE_FATAL[0x81]_CCDCDATAINTERFACE_WRITECOMPLETED_DUP7=0x40
+[TRACE]TRACE_FATAL[0x81]_CCDCDATAINTERFACE_WRITE_DUP1=0x3b
+[TRACE]TRACE_FATAL[0x81]_CLINKSTATENOTIFIER_RUNL_DUP2=0x55
+[TRACE]TRACE_FATAL[0x81]_TUSBCSCLASSDESCRIPTOR_DES=0x54
+[TRACE]TRACE_FLOW[0x8A]_CACMPORTFACTORY_ACMPORTCLOSED_ENTRY=0x97
+[TRACE]TRACE_FLOW[0x8A]_CACMPORTFACTORY_ACMPORTCLOSED_EXIT=0x98
+[TRACE]TRACE_FLOW[0x8A]_CACMPORTFACTORY_CACMPORTFACTORY_ENTRY=0x91
+[TRACE]TRACE_FLOW[0x8A]_CACMPORTFACTORY_CACMPORTFACTORY_EXIT=0x92
+[TRACE]TRACE_FLOW[0x8A]_CACMPORTFACTORY_CHECKACMARRAY_ENTRY=0x9f
+[TRACE]TRACE_FLOW[0x8A]_CACMPORTFACTORY_CHECKACMARRAY_EXIT=0xa0
+[TRACE]TRACE_FLOW[0x8A]_CACMPORTFACTORY_CONSTRUCTL_ENTRY=0x93
+[TRACE]TRACE_FLOW[0x8A]_CACMPORTFACTORY_CONSTRUCTL_EXIT=0x94
+[TRACE]TRACE_FLOW[0x8A]_CACMPORTFACTORY_CREATEFUNCTIONL_ENTRY=0xa3
+[TRACE]TRACE_FLOW[0x8A]_CACMPORTFACTORY_CREATEFUNCTIONL_EXIT=0xa4
+[TRACE]TRACE_FLOW[0x8A]_CACMPORTFACTORY_CREATEFUNCTIONS_ENTRY=0xa1
+[TRACE]TRACE_FLOW[0x8A]_CACMPORTFACTORY_CREATEFUNCTIONS_EXIT=0xa2
+[TRACE]TRACE_FLOW[0x8A]_CACMPORTFACTORY_DESTROYFUNCTIONS_ENTRY=0x9d
+[TRACE]TRACE_FLOW[0x8A]_CACMPORTFACTORY_DESTROYFUNCTIONS_EXIT=0x9e
+[TRACE]TRACE_FLOW[0x8A]_CACMPORTFACTORY_INFO_ENTRY=0xa5
+[TRACE]TRACE_FLOW[0x8A]_CACMPORTFACTORY_INFO_EXIT=0xa6
+[TRACE]TRACE_FLOW[0x8A]_CACMPORTFACTORY_LOGPORTSANDFUNCTIONS_ENTRY=0xa7
+[TRACE]TRACE_FLOW[0x8A]_CACMPORTFACTORY_LOGPORTSANDFUNCTIONS_EXIT=0xa8
+[TRACE]TRACE_FLOW[0x8A]_CACMPORTFACTORY_NEWL_ENTRY=0x8f
+[TRACE]TRACE_FLOW[0x8A]_CACMPORTFACTORY_NEWL_EXIT=0x90
+[TRACE]TRACE_FLOW[0x8A]_CACMPORTFACTORY_NEWPORTL_ENTRY=0x9b
+[TRACE]TRACE_FLOW[0x8A]_CACMPORTFACTORY_NEWPORTL_EXIT=0x9c
+[TRACE]TRACE_FLOW[0x8A]_CACMPORTFACTORY_PORTPLATSECCAPABILITY_ENTRY=0x95
+[TRACE]TRACE_FLOW[0x8A]_CACMPORTFACTORY_PORTPLATSECCAPABILITY_EXIT=0x96
+[TRACE]TRACE_FLOW[0x8A]_CACMPORT_BREAKCANCEL_ENTRY=0x1d
+[TRACE]TRACE_FLOW[0x8A]_CACMPORT_BREAKCANCEL_EXIT=0x1e
+[TRACE]TRACE_FLOW[0x8A]_CACMPORT_BREAKCANCEL_EXIT_DUP1=0x1f
+[TRACE]TRACE_FLOW[0x8A]_CACMPORT_BREAKREQUESTCOMPLETED_ENTRY=0x6e
+[TRACE]TRACE_FLOW[0x8A]_CACMPORT_BREAKREQUESTCOMPLETED_EXIT=0x6f
+[TRACE]TRACE_FLOW[0x8A]_CACMPORT_BREAKSTATECHANGE_ENTRY=0x70
+[TRACE]TRACE_FLOW[0x8A]_CACMPORT_BREAKSTATECHANGE_EXIT=0x71
+[TRACE]TRACE_FLOW[0x8A]_CACMPORT_BREAK_ENTRY=0x1a
+[TRACE]TRACE_FLOW[0x8A]_CACMPORT_BREAK_EXIT=0x1b
+[TRACE]TRACE_FLOW[0x8A]_CACMPORT_BREAK_EXIT_DUP1=0x1c
+[TRACE]TRACE_FLOW[0x8A]_CACMPORT_CACMPORT_CONS_ENTRY=0x5
+[TRACE]TRACE_FLOW[0x8A]_CACMPORT_CACMPORT_DESTRUCTRURE_ENTRY=0x8d
+[TRACE]TRACE_FLOW[0x8A]_CACMPORT_CACMPORT_DESTRUCTRURE_EXIT=0x8e
+[TRACE]TRACE_FLOW[0x8A]_CACMPORT_CACMPORT_DES_EXIT=0x6
+[TRACE]TRACE_FLOW[0x8A]_CACMPORT_CONSTRUCTL_ENTRY=0x3
+[TRACE]TRACE_FLOW[0x8A]_CACMPORT_CONSTRUCTL_EXIT=0x4
+[TRACE]TRACE_FLOW[0x8A]_CACMPORT_CONVERTANDFILTERSIGNALS_ENTRY=0x47
+[TRACE]TRACE_FLOW[0x8A]_CACMPORT_CONVERTANDFILTERSIGNALS_EXIT=0x48
+[TRACE]TRACE_FLOW[0x8A]_CACMPORT_CONVERTSIGNALS_ENTRY=0x49
+[TRACE]TRACE_FLOW[0x8A]_CACMPORT_CONVERTSIGNALS_EXIT=0x4a
+[TRACE]TRACE_FLOW[0x8A]_CACMPORT_DESTRUCT_ENTRY=0x56
+[TRACE]TRACE_FLOW[0x8A]_CACMPORT_DESTRUCT_EXIT=0x57
+[TRACE]TRACE_FLOW[0x8A]_CACMPORT_DOSETBUFFERLENGTHS_ENTRY=0x4e
+[TRACE]TRACE_FLOW[0x8A]_CACMPORT_DOSETBUFFERLENGTHS_EXIT=0x4f
+[TRACE]TRACE_FLOW[0x8A]_CACMPORT_DOSETBUFFERLENGTHS_EXIT_DUP1=0x50
+[TRACE]TRACE_FLOW[0x8A]_CACMPORT_DOSETBUFFERLENGTHS_EXIT_DUP2=0x51
+[TRACE]TRACE_FLOW[0x8A]_CACMPORT_DOSETBUFFERLENGTHS_EXIT_DUP3=0x52
+[TRACE]TRACE_FLOW[0x8A]_CACMPORT_FREEMEMORY_ENTRY=0x58
+[TRACE]TRACE_FLOW[0x8A]_CACMPORT_FREEMEMORY_EXIT=0x59
+[TRACE]TRACE_FLOW[0x8A]_CACMPORT_GETCAPS_ENTRY=0x34
+[TRACE]TRACE_FLOW[0x8A]_CACMPORT_GETCAPS_EXIT=0x35
+[TRACE]TRACE_FLOW[0x8A]_CACMPORT_GETCAPS_EXIT_DUP1=0x36
+[TRACE]TRACE_FLOW[0x8A]_CACMPORT_GETCAPS_EXIT_DUP2=0x37
+[TRACE]TRACE_FLOW[0x8A]_CACMPORT_GETCONFIG_ENTRY=0x20
+[TRACE]TRACE_FLOW[0x8A]_CACMPORT_GETCONFIG_EXIT=0x21
+[TRACE]TRACE_FLOW[0x8A]_CACMPORT_GETCONFIG_EXIT_DUP1=0x22
+[TRACE]TRACE_FLOW[0x8A]_CACMPORT_GETCONFIG_EXIT_DUP2=0x23
+[TRACE]TRACE_FLOW[0x8A]_CACMPORT_GETFLOWCONTROLSTATUS_ENTRY=0x60
+[TRACE]TRACE_FLOW[0x8A]_CACMPORT_GETFLOWCONTROLSTATUS_EXIT=0x61
+[TRACE]TRACE_FLOW[0x8A]_CACMPORT_GETFLOWCONTROLSTATUS_EXIT_DUP1=0x62
+[TRACE]TRACE_FLOW[0x8A]_CACMPORT_GETRECEIVEBUFFERLENGTH_ENTRY=0x4b
+[TRACE]TRACE_FLOW[0x8A]_CACMPORT_GETRECEIVEBUFFERLENGTH_EXIT=0x4c
+[TRACE]TRACE_FLOW[0x8A]_CACMPORT_GETRECEIVEBUFFERLENGTH_EXIT_DUP1=0x4d
+[TRACE]TRACE_FLOW[0x8A]_CACMPORT_GETROLE_ENTRY=0x86
+[TRACE]TRACE_FLOW[0x8A]_CACMPORT_GETROLE_EXIT=0x87
+[TRACE]TRACE_FLOW[0x8A]_CACMPORT_GETSERVERCONFIG_ENTRY=0x30
+[TRACE]TRACE_FLOW[0x8A]_CACMPORT_GETSERVERCONFIG_EXIT=0x31
+[TRACE]TRACE_FLOW[0x8A]_CACMPORT_GETSERVERCONFIG_EXIT_DUP1=0x32
+[TRACE]TRACE_FLOW[0x8A]_CACMPORT_GETSERVERCONFIG_EXIT_DUP2=0x33
+[TRACE]TRACE_FLOW[0x8A]_CACMPORT_GETSIGNALS_ENTRY=0x38
+[TRACE]TRACE_FLOW[0x8A]_CACMPORT_GETSIGNALS_EXIT=0x39
+[TRACE]TRACE_FLOW[0x8A]_CACMPORT_GETSIGNALS_EXIT_DUP1=0x3a
+[TRACE]TRACE_FLOW[0x8A]_CACMPORT_HANDLECONFIGNOTIFICATION_ENTRY=0x28
+[TRACE]TRACE_FLOW[0x8A]_CACMPORT_HANDLECONFIGNOTIFICATION_EXIT=0x29
+[TRACE]TRACE_FLOW[0x8A]_CACMPORT_HOSTCONFIGCHANGE_ENTRY=0x7d
+[TRACE]TRACE_FLOW[0x8A]_CACMPORT_HOSTCONFIGCHANGE_EXIT=0x7e
+[TRACE]TRACE_FLOW[0x8A]_CACMPORT_HOSTSIGNALCHANGE_ENTRY=0x84
+[TRACE]TRACE_FLOW[0x8A]_CACMPORT_HOSTSIGNALCHANGE_EXIT=0x85
+[TRACE]TRACE_FLOW[0x8A]_CACMPORT_NEWL_ENTRY=0x1
+[TRACE]TRACE_FLOW[0x8A]_CACMPORT_NEWL_EXIT=0x2
+[TRACE]TRACE_FLOW[0x8A]_CACMPORT_NOTIFYBREAKCANCEL_ENTRY=0x6b
+[TRACE]TRACE_FLOW[0x8A]_CACMPORT_NOTIFYBREAKCANCEL_EXIT=0x6c
+[TRACE]TRACE_FLOW[0x8A]_CACMPORT_NOTIFYBREAKCANCEL_EXIT_DUP1=0x6d
+[TRACE]TRACE_FLOW[0x8A]_CACMPORT_NOTIFYBREAK_ENTRY=0x68
+[TRACE]TRACE_FLOW[0x8A]_CACMPORT_NOTIFYBREAK_EXIT=0x69
+[TRACE]TRACE_FLOW[0x8A]_CACMPORT_NOTIFYBREAK_EXIT_DUP1=0x6a
+[TRACE]TRACE_FLOW[0x8A]_CACMPORT_NOTIFYCONFIGCHANGECANCEL_ENTRY=0x7a
+[TRACE]TRACE_FLOW[0x8A]_CACMPORT_NOTIFYCONFIGCHANGECANCEL_EXIT=0x7b
+[TRACE]TRACE_FLOW[0x8A]_CACMPORT_NOTIFYCONFIGCHANGECANCEL_EXIT_DUP1=0x7c
+[TRACE]TRACE_FLOW[0x8A]_CACMPORT_NOTIFYCONFIGCHANGE_ENTRY=0x77
+[TRACE]TRACE_FLOW[0x8A]_CACMPORT_NOTIFYCONFIGCHANGE_EXIT=0x78
+[TRACE]TRACE_FLOW[0x8A]_CACMPORT_NOTIFYCONFIGCHANGE_EXIT_DUP1=0x79
+[TRACE]TRACE_FLOW[0x8A]_CACMPORT_NOTIFYDATAAVAILABLECANCEL_ENTRY=0x5d
+[TRACE]TRACE_FLOW[0x8A]_CACMPORT_NOTIFYDATAAVAILABLECANCEL_EXIT=0x5e
+[TRACE]TRACE_FLOW[0x8A]_CACMPORT_NOTIFYDATAAVAILABLECANCEL_EXIT_DUP1=0x5f
+[TRACE]TRACE_FLOW[0x8A]_CACMPORT_NOTIFYDATAAVAILABLE_ENTRY=0x5a
+[TRACE]TRACE_FLOW[0x8A]_CACMPORT_NOTIFYDATAAVAILABLE_EXIT=0x5b
+[TRACE]TRACE_FLOW[0x8A]_CACMPORT_NOTIFYDATAAVAILABLE_EXIT_DUP1=0x5c
+[TRACE]TRACE_FLOW[0x8A]_CACMPORT_NOTIFYFLOWCONTROLCHANGECANCEL_ENTRY=0x75
+[TRACE]TRACE_FLOW[0x8A]_CACMPORT_NOTIFYFLOWCONTROLCHANGECANCEL_EXIT=0x76
+[TRACE]TRACE_FLOW[0x8A]_CACMPORT_NOTIFYFLOWCONTROLCHANGE_ENTRY=0x72
+[TRACE]TRACE_FLOW[0x8A]_CACMPORT_NOTIFYFLOWCONTROLCHANGE_EXIT=0x73
+[TRACE]TRACE_FLOW[0x8A]_CACMPORT_NOTIFYFLOWCONTROLCHANGE_EXIT_DUP1=0x74
+[TRACE]TRACE_FLOW[0x8A]_CACMPORT_NOTIFYOUTPUTEMPTYCANCEL_ENTRY=0x66
+[TRACE]TRACE_FLOW[0x8A]_CACMPORT_NOTIFYOUTPUTEMPTYCANCEL_EXIT=0x67
+[TRACE]TRACE_FLOW[0x8A]_CACMPORT_NOTIFYOUTPUTEMPTY_ENTRY=0x63
+[TRACE]TRACE_FLOW[0x8A]_CACMPORT_NOTIFYOUTPUTEMPTY_EXIT=0x64
+[TRACE]TRACE_FLOW[0x8A]_CACMPORT_NOTIFYOUTPUTEMPTY_EXIT_DUP1=0x65
+[TRACE]TRACE_FLOW[0x8A]_CACMPORT_NOTIFYSIGNALCHANGECANCEL_ENTRY=0x81
+[TRACE]TRACE_FLOW[0x8A]_CACMPORT_NOTIFYSIGNALCHANGECANCEL_EXIT=0x82
+[TRACE]TRACE_FLOW[0x8A]_CACMPORT_NOTIFYSIGNALCHANGECANCEL_EXIT_DUP1=0x83
+[TRACE]TRACE_FLOW[0x8A]_CACMPORT_NOTIFYSIGNALCHANGE_ENTRY=0x7f
+[TRACE]TRACE_FLOW[0x8A]_CACMPORT_NOTIFYSIGNALCHANGE_EXIT=0x80
+[TRACE]TRACE_FLOW[0x8A]_CACMPORT_QUERYRECEIVEBUFFER_ENTRY=0xe
+[TRACE]TRACE_FLOW[0x8A]_CACMPORT_QUERYRECEIVEBUFFER_EXIT=0xf
+[TRACE]TRACE_FLOW[0x8A]_CACMPORT_QUERYRECEIVEBUFFER_EXIT_DUP1=0x10
+[TRACE]TRACE_FLOW[0x8A]_CACMPORT_READCANCEL_ENTRY=0xb
+[TRACE]TRACE_FLOW[0x8A]_CACMPORT_READCANCEL_EXIT=0xc
+[TRACE]TRACE_FLOW[0x8A]_CACMPORT_READCANCEL_EXIT_DUP1=0xd
+[TRACE]TRACE_FLOW[0x8A]_CACMPORT_RESETBUFFERS_ENTRY=0x11
+[TRACE]TRACE_FLOW[0x8A]_CACMPORT_RESETBUFFERS_EXIT=0x12
+[TRACE]TRACE_FLOW[0x8A]_CACMPORT_SETACM_ENTRY=0x8b
+[TRACE]TRACE_FLOW[0x8A]_CACMPORT_SETACM_EXIT=0x8c
+[TRACE]TRACE_FLOW[0x8A]_CACMPORT_SETCONFIG_ENTRY=0x24
+[TRACE]TRACE_FLOW[0x8A]_CACMPORT_SETCONFIG_EXIT=0x25
+[TRACE]TRACE_FLOW[0x8A]_CACMPORT_SETCONFIG_EXIT_DUP1=0x26
+[TRACE]TRACE_FLOW[0x8A]_CACMPORT_SETCONFIG_EXIT_DUP2=0x27
+[TRACE]TRACE_FLOW[0x8A]_CACMPORT_SETRECEIVEBUFFERLENGTH_ENTRY=0x53
+[TRACE]TRACE_FLOW[0x8A]_CACMPORT_SETRECEIVEBUFFERLENGTH_EXIT=0x54
+[TRACE]TRACE_FLOW[0x8A]_CACMPORT_SETRECEIVEBUFFERLENGTH_EXIT_DUP1=0x55
+[TRACE]TRACE_FLOW[0x8A]_CACMPORT_SETROLE_ENTRY=0x89
+[TRACE]TRACE_FLOW[0x8A]_CACMPORT_SETROLE_EXIT=0x8a
+[TRACE]TRACE_FLOW[0x8A]_CACMPORT_SETSERVERCONFIG_ENTRY=0x2a
+[TRACE]TRACE_FLOW[0x8A]_CACMPORT_SETSERVERCONFIG_EXIT=0x2b
+[TRACE]TRACE_FLOW[0x8A]_CACMPORT_SETSERVERCONFIG_EXIT_DUP1=0x2c
+[TRACE]TRACE_FLOW[0x8A]_CACMPORT_SETSERVERCONFIG_EXIT_DUP2=0x2d
+[TRACE]TRACE_FLOW[0x8A]_CACMPORT_SETSERVERCONFIG_EXIT_DUP3=0x2e
+[TRACE]TRACE_FLOW[0x8A]_CACMPORT_SETSERVERCONFIG_EXIT_DUP4=0x2f
+[TRACE]TRACE_FLOW[0x8A]_CACMPORT_SETSIGNALSTOMARK_ENTRY=0x3b
+[TRACE]TRACE_FLOW[0x8A]_CACMPORT_SETSIGNALSTOMARK_EXIT=0x3c
+[TRACE]TRACE_FLOW[0x8A]_CACMPORT_SETSIGNALSTOMARK_EXIT_DUP1=0x3d
+[TRACE]TRACE_FLOW[0x8A]_CACMPORT_SETSIGNALSTOMARK_EXIT_DUP2=0x3e
+[TRACE]TRACE_FLOW[0x8A]_CACMPORT_SETSIGNALSTOSPACE_ENTRY=0x3f
+[TRACE]TRACE_FLOW[0x8A]_CACMPORT_SETSIGNALSTOSPACE_EXIT=0x40
+[TRACE]TRACE_FLOW[0x8A]_CACMPORT_SETSIGNALSTOSPACE_EXIT_DUP1=0x41
+[TRACE]TRACE_FLOW[0x8A]_CACMPORT_SETSIGNALSTOSPACE_EXIT_DUP2=0x42
+[TRACE]TRACE_FLOW[0x8A]_CACMPORT_SETSIGNALS_ENTRY=0x43
+[TRACE]TRACE_FLOW[0x8A]_CACMPORT_SETSIGNALS_EXIT=0x44
+[TRACE]TRACE_FLOW[0x8A]_CACMPORT_SETSIGNALS_EXIT_DUP1=0x45
+[TRACE]TRACE_FLOW[0x8A]_CACMPORT_SETSIGNALS_EXIT_DUP2=0x46
+[TRACE]TRACE_FLOW[0x8A]_CACMPORT_STARTREAD_ENTRY=0x7
+[TRACE]TRACE_FLOW[0x8A]_CACMPORT_STARTREAD_EXIT=0x8
+[TRACE]TRACE_FLOW[0x8A]_CACMPORT_STARTREAD_EXIT_DUP1=0x9
+[TRACE]TRACE_FLOW[0x8A]_CACMPORT_STARTREAD_EXIT_DUP2=0xa
+[TRACE]TRACE_FLOW[0x8A]_CACMPORT_STARTWRITE_ENTRY=0x13
+[TRACE]TRACE_FLOW[0x8A]_CACMPORT_STARTWRITE_EXIT=0x14
+[TRACE]TRACE_FLOW[0x8A]_CACMPORT_STARTWRITE_EXIT_DUP1=0x15
+[TRACE]TRACE_FLOW[0x8A]_CACMPORT_STARTWRITE_EXIT_DUP2=0x16
+[TRACE]TRACE_FLOW[0x8A]_CACMPORT_WRITECANCEL_ENTRY=0x17
+[TRACE]TRACE_FLOW[0x8A]_CACMPORT_WRITECANCEL_EXIT=0x18
+[TRACE]TRACE_FLOW[0x8A]_CACMPORT_WRITECANCEL_EXIT_DUP1=0x19
+[TRACE]TRACE_FLOW[0x8A]_CACMREADER_BUFLEN_ENTRY=0xc4
+[TRACE]TRACE_FLOW[0x8A]_CACMREADER_BUFLEN_EXIT=0xc5
+[TRACE]TRACE_FLOW[0x8A]_CACMREADER_CACMREADER_CONS_ENTRY=0xad
+[TRACE]TRACE_FLOW[0x8A]_CACMREADER_CACMREADER_CONS_EXIT=0xae
+[TRACE]TRACE_FLOW[0x8A]_CACMREADER_CACMREADER_DES_ENTRY=0xab
+[TRACE]TRACE_FLOW[0x8A]_CACMREADER_CACMREADER_DES_EXIT=0xac
+[TRACE]TRACE_FLOW[0x8A]_CACMREADER_CHECKBUFFEREMPTYANDRESETPTRS_ENTRY=0xd7
+[TRACE]TRACE_FLOW[0x8A]_CACMREADER_CHECKBUFFEREMPTYANDRESETPTRS_EXIT=0xd8
+[TRACE]TRACE_FLOW[0x8A]_CACMREADER_CHECKFORBUFFEREDTERMINATORSANDPROCEED_ENTRY=0xdb
+[TRACE]TRACE_FLOW[0x8A]_CACMREADER_CHECKFORBUFFEREDTERMINATORSANDPROCEED_EXIT=0xdc
+[TRACE]TRACE_FLOW[0x8A]_CACMREADER_CHECKNEWREQUEST_ENTRY=0xd9
+[TRACE]TRACE_FLOW[0x8A]_CACMREADER_CHECKNEWREQUEST_EXIT=0xda
+[TRACE]TRACE_FLOW[0x8A]_CACMREADER_COMPLETEREQUEST_ENTRY=0xdf
+[TRACE]TRACE_FLOW[0x8A]_CACMREADER_COMPLETEREQUEST_EXIT=0xe0
+[TRACE]TRACE_FLOW[0x8A]_CACMREADER_CONSTRUCTL_ENTRY=0xaf
+[TRACE]TRACE_FLOW[0x8A]_CACMREADER_CONSTRUCTL_EXIT=0xb0
+[TRACE]TRACE_FLOW[0x8A]_CACMREADER_FINDTERMINATOR_ENTRY=0xe5
+[TRACE]TRACE_FLOW[0x8A]_CACMREADER_FINDTERMINATOR_EXIT=0xe6
+[TRACE]TRACE_FLOW[0x8A]_CACMREADER_ISSUEREADONEORMORE_ENTRY=0xe3
+[TRACE]TRACE_FLOW[0x8A]_CACMREADER_ISSUEREADONEORMORE_EXIT=0xe4
+[TRACE]TRACE_FLOW[0x8A]_CACMREADER_ISSUEREAD_ENTRY=0xe1
+[TRACE]TRACE_FLOW[0x8A]_CACMREADER_ISSUEREAD_EXIT=0xe2
+[TRACE]TRACE_FLOW[0x8A]_CACMREADER_NEWL_ENTRY=0xa9
+[TRACE]TRACE_FLOW[0x8A]_CACMREADER_NEWL_EXIT=0xaa
+[TRACE]TRACE_FLOW[0x8A]_CACMREADER_NOTIFYDATAAVAILABLECANCEL_ENTRY=0xc0
+[TRACE]TRACE_FLOW[0x8A]_CACMREADER_NOTIFYDATAAVAILABLECANCEL_EXIT=0xc1
+[TRACE]TRACE_FLOW[0x8A]_CACMREADER_NOTIFYDATAAVAILABLECOMPLETED_ENTRY=0xd5
+[TRACE]TRACE_FLOW[0x8A]_CACMREADER_NOTIFYDATAAVAILABLECOMPLETED_EXIT=0xd6
+[TRACE]TRACE_FLOW[0x8A]_CACMREADER_NOTIFYDATAAVAILABLE_ENTRY=0xbd
+[TRACE]TRACE_FLOW[0x8A]_CACMREADER_NOTIFYDATAAVAILABLE_EXIT=0xbe
+[TRACE]TRACE_FLOW[0x8A]_CACMREADER_NOTIFYDATAAVAILABLE_EXIT_DUP1=0xbf
+[TRACE]TRACE_FLOW[0x8A]_CACMREADER_PARTIALFINDTERMINATOR_DUP1=0xe8
+[TRACE]TRACE_FLOW[0x8A]_CACMREADER_PARTIALFINDTERMINATOR_ENTRY=0xe7
+[TRACE]TRACE_FLOW[0x8A]_CACMREADER_PARTIALFINDTERMINATOR_EXIT=0xe9
+[TRACE]TRACE_FLOW[0x8A]_CACMREADER_PARTIALFINDTERMINATOR_EXIT_DUP2=0xea
+[TRACE]TRACE_FLOW[0x8A]_CACMREADER_READCANCEL_ENTRY=0xc2
+[TRACE]TRACE_FLOW[0x8A]_CACMREADER_READCANCEL_EXIT=0xc3
+[TRACE]TRACE_FLOW[0x8A]_CACMREADER_READCOMPLETED_ENTRY=0xce
+[TRACE]TRACE_FLOW[0x8A]_CACMREADER_READCOMPLETED_EXIT=0xcf
+[TRACE]TRACE_FLOW[0x8A]_CACMREADER_READCOMPLETED_EXIT_DUP1=0xd0
+[TRACE]TRACE_FLOW[0x8A]_CACMREADER_READONEORMORECOMPLETED_ENTRY=0xd1
+[TRACE]TRACE_FLOW[0x8A]_CACMREADER_READONEORMORECOMPLETED_EXIT=0xd2
+[TRACE]TRACE_FLOW[0x8A]_CACMREADER_READONEORMORECOMPLETED_EXIT_DUP1=0xd3
+[TRACE]TRACE_FLOW[0x8A]_CACMREADER_READONEORMORECOMPLETED_EXIT_DUP2=0xd4
+[TRACE]TRACE_FLOW[0x8A]_CACMREADER_READONEORMORE_DUP2=0xba
+[TRACE]TRACE_FLOW[0x8A]_CACMREADER_READONEORMORE_ENTRY=0xb9
+[TRACE]TRACE_FLOW[0x8A]_CACMREADER_READONEORMORE_EXIT=0xbb
+[TRACE]TRACE_FLOW[0x8A]_CACMREADER_READONEORMORE_EXIT_DUP1=0xbc
+[TRACE]TRACE_FLOW[0x8A]_CACMREADER_READWITHOUTTERMINATORS_ENTRY=0xb3
+[TRACE]TRACE_FLOW[0x8A]_CACMREADER_READWITHOUTTERMINATORS_EXIT=0xb4
+[TRACE]TRACE_FLOW[0x8A]_CACMREADER_READWITHOUTTERMINATORS_EXIT_DUP1=0xb5
+[TRACE]TRACE_FLOW[0x8A]_CACMREADER_READWITHTERMINATORS_ENTRY=0xb6
+[TRACE]TRACE_FLOW[0x8A]_CACMREADER_READWITHTERMINATORS_EXIT=0xb7
+[TRACE]TRACE_FLOW[0x8A]_CACMREADER_READWITHTERMINATORS_EXIT_DUP1=0xb8
+[TRACE]TRACE_FLOW[0x8A]_CACMREADER_READ_ENTRY=0xb1
+[TRACE]TRACE_FLOW[0x8A]_CACMREADER_READ_EXIT=0xb2
+[TRACE]TRACE_FLOW[0x8A]_CACMREADER_RESETBUFFER_ENTRY=0xc6
+[TRACE]TRACE_FLOW[0x8A]_CACMREADER_RESETBUFFER_EXIT=0xc7
+[TRACE]TRACE_FLOW[0x8A]_CACMREADER_SETBUFSIZE_ENTRY=0xc8
+[TRACE]TRACE_FLOW[0x8A]_CACMREADER_SETBUFSIZE_EXIT=0xc9
+[TRACE]TRACE_FLOW[0x8A]_CACMREADER_SETBUFSIZE_EXIT_DUP1=0xca
+[TRACE]TRACE_FLOW[0x8A]_CACMREADER_SETBUFSIZE_EXIT_DUP2=0xcb
+[TRACE]TRACE_FLOW[0x8A]_CACMREADER_SETTERMINATORS_ENTRY=0xcc
+[TRACE]TRACE_FLOW[0x8A]_CACMREADER_SETTERMINATORS_EXIT=0xcd
+[TRACE]TRACE_FLOW[0x8A]_CACMREADER_WRITEBACKDATA_ENTRY=0xdd
+[TRACE]TRACE_FLOW[0x8A]_CACMREADER_WRITEBACKDATA_EXIT=0xde
+[TRACE]TRACE_FLOW[0x8A]_CACMSERVER_CACMSERVER_CONS_ENTRY=0x263
+[TRACE]TRACE_FLOW[0x8A]_CACMSERVER_CACMSERVER_CONS_EXIT=0x264
+[TRACE]TRACE_FLOW[0x8A]_CACMSERVER_CACMSERVER_DES_ENTRY=0x261
+[TRACE]TRACE_FLOW[0x8A]_CACMSERVER_CACMSERVER_DES_EXIT=0x262
+[TRACE]TRACE_FLOW[0x8A]_CACMSERVER_NEWL_ENTRY=0x25f
+[TRACE]TRACE_FLOW[0x8A]_CACMSERVER_NEWL_EXIT=0x260
+[TRACE]TRACE_FLOW[0x8A]_CACMSERVER_NEWSESSIONL_ENTRY=0x265
+[TRACE]TRACE_FLOW[0x8A]_CACMSERVER_NEWSESSIONL_EXIT=0x266
+[TRACE]TRACE_FLOW[0x8A]_CACMSESSION_CACMSESSION_CONS_ENTRY=0x269
+[TRACE]TRACE_FLOW[0x8A]_CACMSESSION_CACMSESSION_CONS_EXIT=0x26a
+[TRACE]TRACE_FLOW[0x8A]_CACMSESSION_CACMSESSION_DES_ENTRY=0x26b
+[TRACE]TRACE_FLOW[0x8A]_CACMSESSION_CACMSESSION_DES_EXIT=0x26c
+[TRACE]TRACE_FLOW[0x8A]_CACMSESSION_CREATEFUNCTIONSL_ENTRY=0x26d
+[TRACE]TRACE_FLOW[0x8A]_CACMSESSION_CREATEFUNCTIONSL_EXIT=0x26e
+[TRACE]TRACE_FLOW[0x8A]_CACMSESSION_NEWL_ENTRY=0x267
+[TRACE]TRACE_FLOW[0x8A]_CACMSESSION_NEWL_EXIT=0x268
+[TRACE]TRACE_FLOW[0x8A]_CACMSESSION_SERVICEL_ENTRY=0x26f
+[TRACE]TRACE_FLOW[0x8A]_CACMSESSION_SERVICEL_EXIT=0x270
+[TRACE]TRACE_FLOW[0x8A]_CACMWRITER_CACMWRITER_CONS_ENTRY=0xf9
+[TRACE]TRACE_FLOW[0x8A]_CACMWRITER_CACMWRITER_CONS_EXIT=0xfa
+[TRACE]TRACE_FLOW[0x8A]_CACMWRITER_CACMWRITER_DES_ENTRY=0xed
+[TRACE]TRACE_FLOW[0x8A]_CACMWRITER_CACMWRITER_DES_EXIT=0xee
+[TRACE]TRACE_FLOW[0x8A]_CACMWRITER_CHECKNEWREQUEST_ENTRY=0x101
+[TRACE]TRACE_FLOW[0x8A]_CACMWRITER_CHECKNEWREQUEST_EXIT=0x102
+[TRACE]TRACE_FLOW[0x8A]_CACMWRITER_COMPLETEREQUEST_ENTRY=0x103
+[TRACE]TRACE_FLOW[0x8A]_CACMWRITER_COMPLETEREQUEST_EXIT=0x104
+[TRACE]TRACE_FLOW[0x8A]_CACMWRITER_CONSTRUCTL_ENTRY=0xfb
+[TRACE]TRACE_FLOW[0x8A]_CACMWRITER_CONSTRUCTL_EXIT=0xfc
+[TRACE]TRACE_FLOW[0x8A]_CACMWRITER_ISSUEWRITE_ENTRY=0x105
+[TRACE]TRACE_FLOW[0x8A]_CACMWRITER_ISSUEWRITE_EXIT=0x106
+[TRACE]TRACE_FLOW[0x8A]_CACMWRITER_NEWL_ENTRY=0xeb
+[TRACE]TRACE_FLOW[0x8A]_CACMWRITER_NEWL_EXIT=0xec
+[TRACE]TRACE_FLOW[0x8A]_CACMWRITER_READDATAFROMCLIENT_ENTRY=0xff
+[TRACE]TRACE_FLOW[0x8A]_CACMWRITER_READDATAFROMCLIENT_EXIT=0x100
+[TRACE]TRACE_FLOW[0x8A]_CACMWRITER_RESETBUFFER_ENTRY=0xf3
+[TRACE]TRACE_FLOW[0x8A]_CACMWRITER_RESETBUFFER_EXIT=0xf4
+[TRACE]TRACE_FLOW[0x8A]_CACMWRITER_SETBUFSIZE_ENTRY=0xf5
+[TRACE]TRACE_FLOW[0x8A]_CACMWRITER_SETBUFSIZE_EXIT=0xf6
+[TRACE]TRACE_FLOW[0x8A]_CACMWRITER_SETBUFSIZE_EXIT_DUP1=0xf7
+[TRACE]TRACE_FLOW[0x8A]_CACMWRITER_SETBUFSIZE_EXIT_DUP2=0xf8
+[TRACE]TRACE_FLOW[0x8A]_CACMWRITER_WRITECANCEL_ENTRY=0xf1
+[TRACE]TRACE_FLOW[0x8A]_CACMWRITER_WRITECANCEL_EXIT=0xf2
+[TRACE]TRACE_FLOW[0x8A]_CACMWRITER_WRITECOMPLETED_ENTRY=0xfd
+[TRACE]TRACE_FLOW[0x8A]_CACMWRITER_WRITECOMPLETED_EXIT=0xfe
+[TRACE]TRACE_FLOW[0x8A]_CACMWRITER_WRITE_ENTRY=0xef
+[TRACE]TRACE_FLOW[0x8A]_CACMWRITER_WRITE_EXIT=0xf0
+[TRACE]TRACE_FLOW[0x8A]_CACTIVEDATAAVAILABLENOTIFIER_CACTIVEDATAAVAILABLENOTIFIER_CONS_ENTRY=0x107
+[TRACE]TRACE_FLOW[0x8A]_CACTIVEDATAAVAILABLENOTIFIER_CACTIVEDATAAVAILABLENOTIFIER_CONS_EXIT=0x108
+[TRACE]TRACE_FLOW[0x8A]_CACTIVEDATAAVAILABLENOTIFIER_CACTIVEDATAAVAILABLENOTIFIER_DES_ENTRY=0x109
+[TRACE]TRACE_FLOW[0x8A]_CACTIVEDATAAVAILABLENOTIFIER_CACTIVEDATAAVAILABLENOTIFIER_DES_EXIT=0x10a
+[TRACE]TRACE_FLOW[0x8A]_CACTIVEDATAAVAILABLENOTIFIER_DOCANCEL_ENTRY=0x10f
+[TRACE]TRACE_FLOW[0x8A]_CACTIVEDATAAVAILABLENOTIFIER_DOCANCEL_EXIT=0x110
+[TRACE]TRACE_FLOW[0x8A]_CACTIVEDATAAVAILABLENOTIFIER_NEWL_ENTRY=0x10b
+[TRACE]TRACE_FLOW[0x8A]_CACTIVEDATAAVAILABLENOTIFIER_NEWL_EXIT=0x10c
+[TRACE]TRACE_FLOW[0x8A]_CACTIVEDATAAVAILABLENOTIFIER_NOTIFYDATAAVAILABLE_ENTRY=0x10d
+[TRACE]TRACE_FLOW[0x8A]_CACTIVEDATAAVAILABLENOTIFIER_NOTIFYDATAAVAILABLE_EXIT=0x10e
+[TRACE]TRACE_FLOW[0x8A]_CACTIVEDATAAVAILABLENOTIFIER_RUNL_ENTRY=0x111
+[TRACE]TRACE_FLOW[0x8A]_CACTIVEDATAAVAILABLENOTIFIER_RUNL_EXIT=0x112
+[TRACE]TRACE_FLOW[0x8A]_CACTIVEREADER_CACTIVEREADER_CONS_ENTRY=0x11f
+[TRACE]TRACE_FLOW[0x8A]_CACTIVEREADER_CACTIVEREADER_CONS_EXIT=0x120
+[TRACE]TRACE_FLOW[0x8A]_CACTIVEREADER_CACTIVEREADER_DES_ENTRY=0x121
+[TRACE]TRACE_FLOW[0x8A]_CACTIVEREADER_CACTIVEREADER_DES_EXIT=0x122
+[TRACE]TRACE_FLOW[0x8A]_CACTIVEREADER_DOCANCEL_ENTRY=0x127
+[TRACE]TRACE_FLOW[0x8A]_CACTIVEREADER_DOCANCEL_EXIT=0x128
+[TRACE]TRACE_FLOW[0x8A]_CACTIVEREADER_NEWL_ENTRY=0x123
+[TRACE]TRACE_FLOW[0x8A]_CACTIVEREADER_NEWL_EXIT=0x124
+[TRACE]TRACE_FLOW[0x8A]_CACTIVEREADER_READ_ENTRY=0x125
+[TRACE]TRACE_FLOW[0x8A]_CACTIVEREADER_READ_EXIT=0x126
+[TRACE]TRACE_FLOW[0x8A]_CACTIVEREADER_RUNL_ENTRY=0x129
+[TRACE]TRACE_FLOW[0x8A]_CACTIVEREADER_RUNL_EXIT=0x12a
+[TRACE]TRACE_FLOW[0x8A]_CACTIVEREADONEORMOREREADER_CACTIVEREADONEORMOREREADER_CONS_ENTRY=0x113
+[TRACE]TRACE_FLOW[0x8A]_CACTIVEREADONEORMOREREADER_CACTIVEREADONEORMOREREADER_CONS_EXIT=0x114
+[TRACE]TRACE_FLOW[0x8A]_CACTIVEREADONEORMOREREADER_CACTIVEREADONEORMOREREADER_DES_ENTRY=0x115
+[TRACE]TRACE_FLOW[0x8A]_CACTIVEREADONEORMOREREADER_CACTIVEREADONEORMOREREADER_DES_EXIT=0x116
+[TRACE]TRACE_FLOW[0x8A]_CACTIVEREADONEORMOREREADER_DOCANCEL_ENTRY=0x11b
+[TRACE]TRACE_FLOW[0x8A]_CACTIVEREADONEORMOREREADER_DOCANCEL_EXIT=0x11c
+[TRACE]TRACE_FLOW[0x8A]_CACTIVEREADONEORMOREREADER_NEWL_ENTRY=0x117
+[TRACE]TRACE_FLOW[0x8A]_CACTIVEREADONEORMOREREADER_NEWL_EXIT=0x118
+[TRACE]TRACE_FLOW[0x8A]_CACTIVEREADONEORMOREREADER_READONEORMORE_ENTRY=0x119
+[TRACE]TRACE_FLOW[0x8A]_CACTIVEREADONEORMOREREADER_READONEORMORE_EXIT=0x11a
+[TRACE]TRACE_FLOW[0x8A]_CACTIVEREADONEORMOREREADER_RUNL_ENTRY=0x11d
+[TRACE]TRACE_FLOW[0x8A]_CACTIVEREADONEORMOREREADER_RUNL_EXIT=0x11e
+[TRACE]TRACE_FLOW[0x8A]_CACTIVEWRITER_CACTIVEWRITER_CONS_ENTRY=0x12b
+[TRACE]TRACE_FLOW[0x8A]_CACTIVEWRITER_CACTIVEWRITER_CONS_EXIT=0x12c
+[TRACE]TRACE_FLOW[0x8A]_CACTIVEWRITER_CACTIVEWRITER_DES_ENTRY=0x12d
+[TRACE]TRACE_FLOW[0x8A]_CACTIVEWRITER_CACTIVEWRITER_DES_EXIT=0x12e
+[TRACE]TRACE_FLOW[0x8A]_CACTIVEWRITER_DOCANCEL_ENTRY=0x133
+[TRACE]TRACE_FLOW[0x8A]_CACTIVEWRITER_DOCANCEL_EXIT=0x134
+[TRACE]TRACE_FLOW[0x8A]_CACTIVEWRITER_NEWL_ENTRY=0x12f
+[TRACE]TRACE_FLOW[0x8A]_CACTIVEWRITER_NEWL_EXIT=0x130
+[TRACE]TRACE_FLOW[0x8A]_CACTIVEWRITER_RUNL_ENTRY=0x135
+[TRACE]TRACE_FLOW[0x8A]_CACTIVEWRITER_RUNL_EXIT=0x136
+[TRACE]TRACE_FLOW[0x8A]_CACTIVEWRITER_WRITE_ENTRY=0x131
+[TRACE]TRACE_FLOW[0x8A]_CACTIVEWRITER_WRITE_EXIT=0x132
+[TRACE]TRACE_FLOW[0x8A]_CBREAKCONTROLLER_BREAKREQUEST_DUP1=0x142
+[TRACE]TRACE_FLOW[0x8A]_CBREAKCONTROLLER_BREAKREQUEST_ENTRY=0x141
+[TRACE]TRACE_FLOW[0x8A]_CBREAKCONTROLLER_BREAKREQUEST_EXIT=0x143
+[TRACE]TRACE_FLOW[0x8A]_CBREAKCONTROLLER_BREAKREQUEST_EXIT_DUP1=0x144
+[TRACE]TRACE_FLOW[0x8A]_CBREAKCONTROLLER_CBREAKCONTROLLER_CONS_ENTRY=0x137
+[TRACE]TRACE_FLOW[0x8A]_CBREAKCONTROLLER_CBREAKCONTROLLER_CONS_EXIT=0x138
+[TRACE]TRACE_FLOW[0x8A]_CBREAKCONTROLLER_CBREAKCONTROLLER_DES_ENTRY=0x13b
+[TRACE]TRACE_FLOW[0x8A]_CBREAKCONTROLLER_CBREAKCONTROLLER_DES_EXIT=0x13c
+[TRACE]TRACE_FLOW[0x8A]_CBREAKCONTROLLER_DOCANCEL_ENTRY=0x13f
+[TRACE]TRACE_FLOW[0x8A]_CBREAKCONTROLLER_DOCANCEL_EXIT=0x140
+[TRACE]TRACE_FLOW[0x8A]_CBREAKCONTROLLER_NEWL_ENTRY=0x139
+[TRACE]TRACE_FLOW[0x8A]_CBREAKCONTROLLER_NEWL_EXIT=0x13a
+[TRACE]TRACE_FLOW[0x8A]_CBREAKCONTROLLER_PUBLISH_ENTRY=0x147
+[TRACE]TRACE_FLOW[0x8A]_CBREAKCONTROLLER_PUBLISH_EXIT=0x148
+[TRACE]TRACE_FLOW[0x8A]_CBREAKCONTROLLER_RUNL_ENTRY=0x13d
+[TRACE]TRACE_FLOW[0x8A]_CBREAKCONTROLLER_RUNL_EXIT=0x13e
+[TRACE]TRACE_FLOW[0x8A]_CBREAKCONTROLLER_SCINACTIVE_ENTRY=0x14b
+[TRACE]TRACE_FLOW[0x8A]_CBREAKCONTROLLER_SCINACTIVE_EXIT=0x14c
+[TRACE]TRACE_FLOW[0x8A]_CBREAKCONTROLLER_SCINVALID_ENTRY=0x149
+[TRACE]TRACE_FLOW[0x8A]_CBREAKCONTROLLER_SCINVALID_EXIT=0x14a
+[TRACE]TRACE_FLOW[0x8A]_CBREAKCONTROLLER_SCLOCKED_ENTRY=0x150
+[TRACE]TRACE_FLOW[0x8A]_CBREAKCONTROLLER_SCLOCKED_EXIT=0x151
+[TRACE]TRACE_FLOW[0x8A]_CBREAKCONTROLLER_SCSETTIMER_ENTRY=0x14d
+[TRACE]TRACE_FLOW[0x8A]_CBREAKCONTROLLER_SCSETTIMER_EXIT=0x14e
+[TRACE]TRACE_FLOW[0x8A]_CBREAKCONTROLLER_SCSETTIMER_EXIT_DUP1=0x14f
+[TRACE]TRACE_FLOW[0x8A]_CBREAKCONTROLLER_STATEMACHINE_ENTRY=0x145
+[TRACE]TRACE_FLOW[0x8A]_CBREAKCONTROLLER_STATEMACHINE_EXIT=0x146
+[TRACE]TRACE_FLOW[0x8A]_CCDCACMCLASS_BREAKACTIVE_ENTRY=0x18c
+[TRACE]TRACE_FLOW[0x8A]_CCDCACMCLASS_BREAKACTIVE_EXIT=0x18d
+[TRACE]TRACE_FLOW[0x8A]_CCDCACMCLASS_BREAKCALLBACK_ENTRY=0x198
+[TRACE]TRACE_FLOW[0x8A]_CCDCACMCLASS_BREAKCALLBACK_EXIT=0x199
+[TRACE]TRACE_FLOW[0x8A]_CCDCACMCLASS_BREAKREQUEST_ENTRY=0x19a
+[TRACE]TRACE_FLOW[0x8A]_CCDCACMCLASS_BREAKREQUEST_EXIT=0x19b
+[TRACE]TRACE_FLOW[0x8A]_CCDCACMCLASS_CALLBACK_ENTRY=0x196
+[TRACE]TRACE_FLOW[0x8A]_CCDCACMCLASS_CALLBACK_EXIT=0x197
+[TRACE]TRACE_FLOW[0x8A]_CCDCACMCLASS_CCDCACMCLASS_CONS_ENTRY=0x152
+[TRACE]TRACE_FLOW[0x8A]_CCDCACMCLASS_CCDCACMCLASS_CONS_EXIT=0x153
+[TRACE]TRACE_FLOW[0x8A]_CCDCACMCLASS_CCDCACMCLASS_DES_ENTRY=0x158
+[TRACE]TRACE_FLOW[0x8A]_CCDCACMCLASS_CCDCACMCLASS_DES_EXIT=0x159
+[TRACE]TRACE_FLOW[0x8A]_CCDCACMCLASS_CONSTRUCTL_ENTRY=0x156
+[TRACE]TRACE_FLOW[0x8A]_CCDCACMCLASS_CONSTRUCTL_EXIT=0x157
+[TRACE]TRACE_FLOW[0x8A]_CCDCACMCLASS_CONVERTUSBCONFIGCODINGTOEPOC_ENTRY=0x177
+[TRACE]TRACE_FLOW[0x8A]_CCDCACMCLASS_CONVERTUSBCONFIGCODINGTOEPOC_EXIT=0x178
+[TRACE]TRACE_FLOW[0x8A]_CCDCACMCLASS_DCDSTATE_ENTRY=0x192
+[TRACE]TRACE_FLOW[0x8A]_CCDCACMCLASS_DCDSTATE_EXIT=0x193
+[TRACE]TRACE_FLOW[0x8A]_CCDCACMCLASS_DSRSTATE_ENTRY=0x190
+[TRACE]TRACE_FLOW[0x8A]_CCDCACMCLASS_DSRSTATE_EXIT=0x191
+[TRACE]TRACE_FLOW[0x8A]_CCDCACMCLASS_HANDLECLEARCOMMFEATURE_ENTRY=0x170
+[TRACE]TRACE_FLOW[0x8A]_CCDCACMCLASS_HANDLECLEARCOMMFEATURE_EXIT=0x171
+[TRACE]TRACE_FLOW[0x8A]_CCDCACMCLASS_HANDLEGETCOMMFEATURE_ENTRY=0x16e
+[TRACE]TRACE_FLOW[0x8A]_CCDCACMCLASS_HANDLEGETCOMMFEATURE_EXIT=0x16f
+[TRACE]TRACE_FLOW[0x8A]_CCDCACMCLASS_HANDLEGETENCAPRESPONSE_ENTRY=0x17f
+[TRACE]TRACE_FLOW[0x8A]_CCDCACMCLASS_HANDLEGETENCAPRESPONSE_EXIT=0x180
+[TRACE]TRACE_FLOW[0x8A]_CCDCACMCLASS_HANDLEGETLINECODING_ENTRY=0x184
+[TRACE]TRACE_FLOW[0x8A]_CCDCACMCLASS_HANDLEGETLINECODING_EXIT=0x185
+[TRACE]TRACE_FLOW[0x8A]_CCDCACMCLASS_HANDLENEWABSTRACTSTATE_ENTRY=0x179
+[TRACE]TRACE_FLOW[0x8A]_CCDCACMCLASS_HANDLENEWABSTRACTSTATE_EXIT=0x17a
+[TRACE]TRACE_FLOW[0x8A]_CCDCACMCLASS_HANDLENEWCOUNTRYCODE_ENTRY=0x17b
+[TRACE]TRACE_FLOW[0x8A]_CCDCACMCLASS_HANDLENEWCOUNTRYCODE_EXIT=0x17c
+[TRACE]TRACE_FLOW[0x8A]_CCDCACMCLASS_HANDLESENDBREAK_ENTRY=0x188
+[TRACE]TRACE_FLOW[0x8A]_CCDCACMCLASS_HANDLESENDBREAK_EXIT=0x189
+[TRACE]TRACE_FLOW[0x8A]_CCDCACMCLASS_HANDLESENDENCAPCOMMAND_ENTRY=0x17d
+[TRACE]TRACE_FLOW[0x8A]_CCDCACMCLASS_HANDLESENDENCAPCOMMAND_EXIT=0x17e
+[TRACE]TRACE_FLOW[0x8A]_CCDCACMCLASS_HANDLESETCOMMFEATURE_ENTRY=0x181
+[TRACE]TRACE_FLOW[0x8A]_CCDCACMCLASS_HANDLESETCOMMFEATURE_EXIT=0x182
+[TRACE]TRACE_FLOW[0x8A]_CCDCACMCLASS_HANDLESETCOMMFEATURE_EXIT_DUP1=0x183
+[TRACE]TRACE_FLOW[0x8A]_CCDCACMCLASS_HANDLESETCONTROLLINESTATE_ENTRY=0x186
+[TRACE]TRACE_FLOW[0x8A]_CCDCACMCLASS_HANDLESETCONTROLLINESTATE_EXIT=0x187
+[TRACE]TRACE_FLOW[0x8A]_CCDCACMCLASS_HANDLESETLINECODING_ENTRY=0x172
+[TRACE]TRACE_FLOW[0x8A]_CCDCACMCLASS_HANDLESETLINECODING_EXIT=0x173
+[TRACE]TRACE_FLOW[0x8A]_CCDCACMCLASS_HANDLESETLINECODING_EXIT_DUP1=0x174
+[TRACE]TRACE_FLOW[0x8A]_CCDCACMCLASS_NEWL_ENTRY=0x154
+[TRACE]TRACE_FLOW[0x8A]_CCDCACMCLASS_NEWL_EXIT=0x155
+[TRACE]TRACE_FLOW[0x8A]_CCDCACMCLASS_NOTIFYDATAAVAILABLECANCEL_ENTRY=0x19e
+[TRACE]TRACE_FLOW[0x8A]_CCDCACMCLASS_NOTIFYDATAAVAILABLECANCEL_EXIT=0x19f
+[TRACE]TRACE_FLOW[0x8A]_CCDCACMCLASS_NOTIFYDATAAVAILABLE_ENTRY=0x19c
+[TRACE]TRACE_FLOW[0x8A]_CCDCACMCLASS_NOTIFYDATAAVAILABLE_EXIT=0x19d
+[TRACE]TRACE_FLOW[0x8A]_CCDCACMCLASS_READCANCEL_ENTRY=0x166
+[TRACE]TRACE_FLOW[0x8A]_CCDCACMCLASS_READCANCEL_EXIT=0x167
+[TRACE]TRACE_FLOW[0x8A]_CCDCACMCLASS_READONEORMORE_ENTRY=0x15e
+[TRACE]TRACE_FLOW[0x8A]_CCDCACMCLASS_READONEORMORE_EXIT=0x15f
+[TRACE]TRACE_FLOW[0x8A]_CCDCACMCLASS_READONEORMORE_MREADONEORMOREOBSERVERREF_TDES8REF_TINT_ENTRY=0x160
+[TRACE]TRACE_FLOW[0x8A]_CCDCACMCLASS_READONEORMORE_MREADONEORMOREOBSERVERREF_TDES8REF_TINT_EXIT=0x161
+[TRACE]TRACE_FLOW[0x8A]_CCDCACMCLASS_READ_ENTRY=0x162
+[TRACE]TRACE_FLOW[0x8A]_CCDCACMCLASS_READ_ENTRY_DUP1=0x164
+[TRACE]TRACE_FLOW[0x8A]_CCDCACMCLASS_READ_ENTRY_DUP1_EXIT=0x165
+[TRACE]TRACE_FLOW[0x8A]_CCDCACMCLASS_READ_EXIT=0x163
+[TRACE]TRACE_FLOW[0x8A]_CCDCACMCLASS_RINGSTATE_ENTRY=0x18e
+[TRACE]TRACE_FLOW[0x8A]_CCDCACMCLASS_RINGSTATE_EXIT=0x18f
+[TRACE]TRACE_FLOW[0x8A]_CCDCACMCLASS_SENDSERIALSTATE_ENTRY=0x18a
+[TRACE]TRACE_FLOW[0x8A]_CCDCACMCLASS_SENDSERIALSTATE_EXIT=0x18b
+[TRACE]TRACE_FLOW[0x8A]_CCDCACMCLASS_SETBREAKACTIVE_ENTRY=0x194
+[TRACE]TRACE_FLOW[0x8A]_CCDCACMCLASS_SETBREAKACTIVE_EXIT=0x195
+[TRACE]TRACE_FLOW[0x8A]_CCDCACMCLASS_SETBREAKCALLBACK_ENTRY=0x15c
+[TRACE]TRACE_FLOW[0x8A]_CCDCACMCLASS_SETBREAKCALLBACK_EXIT=0x15d
+[TRACE]TRACE_FLOW[0x8A]_CCDCACMCLASS_SETCALLBACK_ENTRY=0x15a
+[TRACE]TRACE_FLOW[0x8A]_CCDCACMCLASS_SETCALLBACK_EXIT=0x15b
+[TRACE]TRACE_FLOW[0x8A]_CCDCACMCLASS_SETDEFAULTACM_ENTRY=0x175
+[TRACE]TRACE_FLOW[0x8A]_CCDCACMCLASS_SETDEFAULTACM_EXIT=0x176
+[TRACE]TRACE_FLOW[0x8A]_CCDCACMCLASS_WRITECANCEL_ENTRY=0x16c
+[TRACE]TRACE_FLOW[0x8A]_CCDCACMCLASS_WRITECANCEL_EXIT=0x16d
+[TRACE]TRACE_FLOW[0x8A]_CCDCACMCLASS_WRITE_ENTRY=0x168
+[TRACE]TRACE_FLOW[0x8A]_CCDCACMCLASS_WRITE_ENTRY_DUP1=0x16a
+[TRACE]TRACE_FLOW[0x8A]_CCDCACMCLASS_WRITE_ENTRY_DUP1_EXIT=0x16b
+[TRACE]TRACE_FLOW[0x8A]_CCDCACMCLASS_WRITE_EXIT=0x169
+[TRACE]TRACE_FLOW[0x8A]_CCDCCONTROLINTERFACEREADER_CCDCCONTROLINTERFACEREADER_CONS_ENTRY=0x1be
+[TRACE]TRACE_FLOW[0x8A]_CCDCCONTROLINTERFACEREADER_CCDCCONTROLINTERFACEREADER_CONS_EXIT=0x1bf
+[TRACE]TRACE_FLOW[0x8A]_CCDCCONTROLINTERFACEREADER_CCDCCONTROLINTERFACEREADER_DES_ENTRY=0x1c0
+[TRACE]TRACE_FLOW[0x8A]_CCDCCONTROLINTERFACEREADER_CCDCCONTROLINTERFACEREADER_DES_EXIT=0x1c1
+[TRACE]TRACE_FLOW[0x8A]_CCDCCONTROLINTERFACEREADER_DECODEMESSAGEDATAWITHRESPONSEREQUIRED_ENTRY=0x1ce
+[TRACE]TRACE_FLOW[0x8A]_CCDCCONTROLINTERFACEREADER_DECODEMESSAGEDATAWITHRESPONSEREQUIRED_EXIT=0x1cf
+[TRACE]TRACE_FLOW[0x8A]_CCDCCONTROLINTERFACEREADER_DECODEMESSAGEDATA_ENTRY=0x1d0
+[TRACE]TRACE_FLOW[0x8A]_CCDCCONTROLINTERFACEREADER_DECODEMESSAGEDATA_EXIT=0x1d1
+[TRACE]TRACE_FLOW[0x8A]_CCDCCONTROLINTERFACEREADER_DECODEMESSAGEDATA_EXIT_DUP1=0x1d2
+[TRACE]TRACE_FLOW[0x8A]_CCDCCONTROLINTERFACEREADER_DECODEMESSAGEHEADER_ENTRY=0x1cb
+[TRACE]TRACE_FLOW[0x8A]_CCDCCONTROLINTERFACEREADER_DECODEMESSAGEHEADER_EXIT=0x1cc
+[TRACE]TRACE_FLOW[0x8A]_CCDCCONTROLINTERFACEREADER_DOCANCEL_ENTRY=0x1c6
+[TRACE]TRACE_FLOW[0x8A]_CCDCCONTROLINTERFACEREADER_DOCANCEL_EXIT=0x1c7
+[TRACE]TRACE_FLOW[0x8A]_CCDCCONTROLINTERFACEREADER_HANDLEREADCOMPLETION_ENTRY=0x1c8
+[TRACE]TRACE_FLOW[0x8A]_CCDCCONTROLINTERFACEREADER_HANDLEREADCOMPLETION_EXIT=0x1c9
+[TRACE]TRACE_FLOW[0x8A]_CCDCCONTROLINTERFACEREADER_HANDLEREADCOMPLETION_EXIT_DUP1=0x1ca
+[TRACE]TRACE_FLOW[0x8A]_CCDCCONTROLINTERFACEREADER_NEWL_ENTRY=0x1c2
+[TRACE]TRACE_FLOW[0x8A]_CCDCCONTROLINTERFACEREADER_NEWL_EXIT=0x1c3
+[TRACE]TRACE_FLOW[0x8A]_CCDCCONTROLINTERFACEREADER_READMESSAGEDATA_ENTRY=0x1d5
+[TRACE]TRACE_FLOW[0x8A]_CCDCCONTROLINTERFACEREADER_READMESSAGEDATA_EXIT=0x1d6
+[TRACE]TRACE_FLOW[0x8A]_CCDCCONTROLINTERFACEREADER_READMESSAGEHEADER_ENTRY=0x1d3
+[TRACE]TRACE_FLOW[0x8A]_CCDCCONTROLINTERFACEREADER_READMESSAGEHEADER_EXIT=0x1d4
+[TRACE]TRACE_FLOW[0x8A]_CCDCCONTROLINTERFACEREADER_RUNL_ENTRY=0x1c4
+[TRACE]TRACE_FLOW[0x8A]_CCDCCONTROLINTERFACEREADER_RUNL_EXIT=0x1c5
+[TRACE]TRACE_FLOW[0x8A]_CCDCCONTROLINTERFACE_CCDCCONTROLINTERFACE_CONS_ENTRY=0x1a0
+[TRACE]TRACE_FLOW[0x8A]_CCDCCONTROLINTERFACE_CCDCCONTROLINTERFACE_CONS_EXIT=0x1a1
+[TRACE]TRACE_FLOW[0x8A]_CCDCCONTROLINTERFACE_CONSTRUCTL_ENTRY=0x1a4
+[TRACE]TRACE_FLOW[0x8A]_CCDCCONTROLINTERFACE_CONSTRUCTL_EXIT=0x1a5
+[TRACE]TRACE_FLOW[0x8A]_CCDCCONTROLINTERFACE_NEWL_ENTRY=0x1a2
+[TRACE]TRACE_FLOW[0x8A]_CCDCCONTROLINTERFACE_NEWL_EXIT=0x1a3
+[TRACE]TRACE_FLOW[0x8A]_CCDCCONTROLINTERFACE_SENDNETWORKCONNECTION_ENTRY=0x1b4
+[TRACE]TRACE_FLOW[0x8A]_CCDCCONTROLINTERFACE_SENDNETWORKCONNECTION_EXIT=0x1b5
+[TRACE]TRACE_FLOW[0x8A]_CCDCCONTROLINTERFACE_SENDSERIALSTATE_ENTRY=0x1b8
+[TRACE]TRACE_FLOW[0x8A]_CCDCCONTROLINTERFACE_SENDSERIALSTATE_EXIT=0x1b9
+[TRACE]TRACE_FLOW[0x8A]_CCDCCONTROLINTERFACE_SETUPCLASSSPECIFICDESCRIPTOR_ENTRY=0x1ac
+[TRACE]TRACE_FLOW[0x8A]_CCDCCONTROLINTERFACE_SETUPCLASSSPECIFICDESCRIPTOR_EXIT=0x1ad
+[TRACE]TRACE_FLOW[0x8A]_CCDCCONTROLINTERFACE_SETUPCLASSSPECIFICDESCRIPTOR_EXIT_DUP1=0x1ae
+[TRACE]TRACE_FLOW[0x8A]_CCDCCONTROLINTERFACE_SETUPCLASSSPECIFICDESCRIPTOR_EXIT_DUP2=0x1af
+[TRACE]TRACE_FLOW[0x8A]_CCDCCONTROLINTERFACE_SETUPINTERFACE_ENTRY=0x1a6
+[TRACE]TRACE_FLOW[0x8A]_CCDCCONTROLINTERFACE_SETUPINTERFACE_EXIT=0x1a7
+[TRACE]TRACE_FLOW[0x8A]_CCDCCONTROLINTERFACE_SETUPINTERFACE_EXIT_DUP1=0x1a8
+[TRACE]TRACE_FLOW[0x8A]_CCDCCONTROLINTERFACE_SETUPINTERFACE_EXIT_DUP2=0x1a9
+[TRACE]TRACE_FLOW[0x8A]_CCDCCONTROLINTERFACE_SETUPINTERFACE_EXIT_DUP3=0x1aa
+[TRACE]TRACE_FLOW[0x8A]_CCDCCONTROLINTERFACE_SETUPINTERFACE_EXIT_DUP4=0x1ab
+[TRACE]TRACE_FLOW[0x8A]_CCDCCONTROLINTERFACE_WRITEDATA_ENTRY=0x1bb
+[TRACE]TRACE_FLOW[0x8A]_CCDCCONTROLINTERFACE_WRITEDATA_EXIT=0x1bc
+[TRACE]TRACE_FLOW[0x8A]_CCDCCONTROLINTERFACE_WRITEDATA_EXIT_DUP1=0x1bd
+[TRACE]TRACE_FLOW[0x8A]_CCDCDATAINTERFACE_CANCELNOTIFYDATAAVAILABLE_ENTRY=0x1fb
+[TRACE]TRACE_FLOW[0x8A]_CCDCDATAINTERFACE_CANCELNOTIFYDATAAVAILABLE_EXIT=0x1fc
+[TRACE]TRACE_FLOW[0x8A]_CCDCDATAINTERFACE_CANCELREAD_ENTRY=0x1f5
+[TRACE]TRACE_FLOW[0x8A]_CCDCDATAINTERFACE_CANCELREAD_EXIT=0x1f6
+[TRACE]TRACE_FLOW[0x8A]_CCDCDATAINTERFACE_CANCELWRITE_ENTRY=0x1eb
+[TRACE]TRACE_FLOW[0x8A]_CCDCDATAINTERFACE_CANCELWRITE_EXIT=0x1ec
+[TRACE]TRACE_FLOW[0x8A]_CCDCDATAINTERFACE_CCDCDATAINTERFACE_CONS_ENTRY=0x1d7
+[TRACE]TRACE_FLOW[0x8A]_CCDCDATAINTERFACE_CCDCDATAINTERFACE_CONS_EXIT=0x1d8
+[TRACE]TRACE_FLOW[0x8A]_CCDCDATAINTERFACE_CCDCDATAINTERFACE_DES_ENTRY=0x1e5
+[TRACE]TRACE_FLOW[0x8A]_CCDCDATAINTERFACE_CCDCDATAINTERFACE_DES_EXIT=0x1e6
+[TRACE]TRACE_FLOW[0x8A]_CCDCDATAINTERFACE_CONSTRUCTL_ENTRY=0x1db
+[TRACE]TRACE_FLOW[0x8A]_CCDCDATAINTERFACE_CONSTRUCTL_EXIT=0x1dc
+[TRACE]TRACE_FLOW[0x8A]_CCDCDATAINTERFACE_MLSOSTATECHANGE_ENTRY=0x1e3
+[TRACE]TRACE_FLOW[0x8A]_CCDCDATAINTERFACE_MLSOSTATECHANGE_EXIT=0x1e4
+[TRACE]TRACE_FLOW[0x8A]_CCDCDATAINTERFACE_NEWL_ENTRY=0x1d9
+[TRACE]TRACE_FLOW[0x8A]_CCDCDATAINTERFACE_NEWL_EXIT=0x1da
+[TRACE]TRACE_FLOW[0x8A]_CCDCDATAINTERFACE_NOTIFYDATAAVAILABLECOMPLETED_ENTRY=0x1f7
+[TRACE]TRACE_FLOW[0x8A]_CCDCDATAINTERFACE_NOTIFYDATAAVAILABLECOMPLETED_EXIT=0x1f8
+[TRACE]TRACE_FLOW[0x8A]_CCDCDATAINTERFACE_NOTIFYDATAAVAILABLE_ENTRY=0x1f9
+[TRACE]TRACE_FLOW[0x8A]_CCDCDATAINTERFACE_NOTIFYDATAAVAILABLE_EXIT=0x1fa
+[TRACE]TRACE_FLOW[0x8A]_CCDCDATAINTERFACE_READCOMPLETED_ENTRY=0x1f3
+[TRACE]TRACE_FLOW[0x8A]_CCDCDATAINTERFACE_READCOMPLETED_EXIT=0x1f4
+[TRACE]TRACE_FLOW[0x8A]_CCDCDATAINTERFACE_READONEORMORECOMPLETED_ENTRY=0x1f1
+[TRACE]TRACE_FLOW[0x8A]_CCDCDATAINTERFACE_READONEORMORECOMPLETED_EXIT=0x1f2
+[TRACE]TRACE_FLOW[0x8A]_CCDCDATAINTERFACE_READONEORMORE_ENTRY=0x1ef
+[TRACE]TRACE_FLOW[0x8A]_CCDCDATAINTERFACE_READONEORMORE_EXIT=0x1f0
+[TRACE]TRACE_FLOW[0x8A]_CCDCDATAINTERFACE_READ_ENTRY=0x1ed
+[TRACE]TRACE_FLOW[0x8A]_CCDCDATAINTERFACE_READ_EXIT=0x1ee
+[TRACE]TRACE_FLOW[0x8A]_CCDCDATAINTERFACE_SETUPINTERFACE_ENTRY=0x1dd
+[TRACE]TRACE_FLOW[0x8A]_CCDCDATAINTERFACE_SETUPINTERFACE_EXIT=0x1de
+[TRACE]TRACE_FLOW[0x8A]_CCDCDATAINTERFACE_SETUPINTERFACE_EXIT_DUP1=0x1df
+[TRACE]TRACE_FLOW[0x8A]_CCDCDATAINTERFACE_SETUPINTERFACE_EXIT_DUP2=0x1e0
+[TRACE]TRACE_FLOW[0x8A]_CCDCDATAINTERFACE_SETUPINTERFACE_EXIT_DUP3=0x1e1
+[TRACE]TRACE_FLOW[0x8A]_CCDCDATAINTERFACE_SETUPINTERFACE_EXIT_DUP4=0x1e2
+[TRACE]TRACE_FLOW[0x8A]_CCDCDATAINTERFACE_WRITECOMPLETED_ENTRY=0x1e9
+[TRACE]TRACE_FLOW[0x8A]_CCDCDATAINTERFACE_WRITECOMPLETED_EXIT=0x1ea
+[TRACE]TRACE_FLOW[0x8A]_CCDCDATAINTERFACE_WRITE_ENTRY=0x1e7
+[TRACE]TRACE_FLOW[0x8A]_CCDCDATAINTERFACE_WRITE_EXIT=0x1e8
+[TRACE]TRACE_FLOW[0x8A]_CCDCINTERFACEBASE_BASECONSTRUCTL_ENTRY=0x1ff
+[TRACE]TRACE_FLOW[0x8A]_CCDCINTERFACEBASE_BASECONSTRUCTL_EXIT=0x200
+[TRACE]TRACE_FLOW[0x8A]_CCDCINTERFACEBASE_CCDCINTERFACEBASE_CONS_ENTRY=0x1fd
+[TRACE]TRACE_FLOW[0x8A]_CCDCINTERFACEBASE_CCDCINTERFACEBASE_CONS_EXIT=0x1fe
+[TRACE]TRACE_FLOW[0x8A]_CCDCINTERFACEBASE_CCDCINTERFACEBASE_DES_ENTRY=0x201
+[TRACE]TRACE_FLOW[0x8A]_CCDCINTERFACEBASE_CCDCINTERFACEBASE_DES_EXIT=0x202
+[TRACE]TRACE_FLOW[0x8A]_CCDCINTERFACEBASE_GETINTERFACENUMBER_ENTRY=0x203
+[TRACE]TRACE_FLOW[0x8A]_CCDCINTERFACEBASE_GETINTERFACENUMBER_EXIT=0x204
+[TRACE]TRACE_FLOW[0x8A]_CCDCINTERFACEBASE_GETINTERFACENUMBER_EXIT_DUP1=0x205
+[TRACE]TRACE_FLOW[0x8A]_CCDCINTERFACEBASE_GETINTERFACENUMBER_EXIT_DUP2=0x206
+[TRACE]TRACE_FLOW[0x8A]_CCDCINTERFACEBASE_GETINTERFACENUMBER_EXIT_DUP3=0x207
+[TRACE]TRACE_FLOW[0x8A]_CLINKSTATENOTIFIER_CLINKSTATENOTIFIER_CONS_ENTRY=0x273
+[TRACE]TRACE_FLOW[0x8A]_CLINKSTATENOTIFIER_CLINKSTATENOTIFIER_CONS_EXIT=0x274
+[TRACE]TRACE_FLOW[0x8A]_CLINKSTATENOTIFIER_CLINKSTATENOTIFIER_DES_ENTRY=0x275
+[TRACE]TRACE_FLOW[0x8A]_CLINKSTATENOTIFIER_CLINKSTATENOTIFIER_DES_EXIT=0x276
+[TRACE]TRACE_FLOW[0x8A]_CLINKSTATENOTIFIER_DOCANCEL_ENTRY=0x27c
+[TRACE]TRACE_FLOW[0x8A]_CLINKSTATENOTIFIER_DOCANCEL_EXIT=0x27d
+[TRACE]TRACE_FLOW[0x8A]_CLINKSTATENOTIFIER_LINKDOWN_ENTRY=0x282
+[TRACE]TRACE_FLOW[0x8A]_CLINKSTATENOTIFIER_LINKDOWN_EXIT=0x283
+[TRACE]TRACE_FLOW[0x8A]_CLINKSTATENOTIFIER_LINKUP_ENTRY=0x280
+[TRACE]TRACE_FLOW[0x8A]_CLINKSTATENOTIFIER_LINKUP_EXIT=0x281
+[TRACE]TRACE_FLOW[0x8A]_CLINKSTATENOTIFIER_NEWL_ENTRY=0x271
+[TRACE]TRACE_FLOW[0x8A]_CLINKSTATENOTIFIER_NEWL_EXIT=0x272
+[TRACE]TRACE_FLOW[0x8A]_CLINKSTATENOTIFIER_RUNERROR_ENTRY=0x277
+[TRACE]TRACE_FLOW[0x8A]_CLINKSTATENOTIFIER_RUNERROR_EXIT=0x278
+[TRACE]TRACE_FLOW[0x8A]_CLINKSTATENOTIFIER_RUNL_ENTRY=0x279
+[TRACE]TRACE_FLOW[0x8A]_CLINKSTATENOTIFIER_RUNL_EXIT=0x27a
+[TRACE]TRACE_FLOW[0x8A]_CLINKSTATENOTIFIER_RUNL_EXIT_DUP1=0x27b
+[TRACE]TRACE_FLOW[0x8A]_CLINKSTATENOTIFIER_START_ENTRY=0x27e
+[TRACE]TRACE_FLOW[0x8A]_CLINKSTATENOTIFIER_START_EXIT=0x27f
+[TRACE]TRACE_FLOW[0x8A]_CREGISTRATIONPORT_BREAKCANCEL_ENTRY=0x21f
+[TRACE]TRACE_FLOW[0x8A]_CREGISTRATIONPORT_BREAKCANCEL_EXIT=0x220
+[TRACE]TRACE_FLOW[0x8A]_CREGISTRATIONPORT_BREAK_ENTRY=0x21d
+[TRACE]TRACE_FLOW[0x8A]_CREGISTRATIONPORT_BREAK_EXIT=0x21e
+[TRACE]TRACE_FLOW[0x8A]_CREGISTRATIONPORT_CONSTRUCTL_ENTRY=0x20d
+[TRACE]TRACE_FLOW[0x8A]_CREGISTRATIONPORT_CONSTRUCTL_EXIT=0x20e
+[TRACE]TRACE_FLOW[0x8A]_CREGISTRATIONPORT_CREGISTRATIONPORT_CONS_ENTRY=0x20f
+[TRACE]TRACE_FLOW[0x8A]_CREGISTRATIONPORT_CREGISTRATIONPORT_CONS_EXIT=0x210
+[TRACE]TRACE_FLOW[0x8A]_CREGISTRATIONPORT_CREGISTRATIONPORT_DES_ENTRY=0x257
+[TRACE]TRACE_FLOW[0x8A]_CREGISTRATIONPORT_CREGISTRATIONPORT_DES_EXIT=0x258
+[TRACE]TRACE_FLOW[0x8A]_CREGISTRATIONPORT_DESTRUCT_ENTRY=0x235
+[TRACE]TRACE_FLOW[0x8A]_CREGISTRATIONPORT_DESTRUCT_EXIT=0x236
+[TRACE]TRACE_FLOW[0x8A]_CREGISTRATIONPORT_FREEMEMORY_ENTRY=0x237
+[TRACE]TRACE_FLOW[0x8A]_CREGISTRATIONPORT_FREEMEMORY_EXIT=0x238
+[TRACE]TRACE_FLOW[0x8A]_CREGISTRATIONPORT_GETCAPS_ENTRY=0x229
+[TRACE]TRACE_FLOW[0x8A]_CREGISTRATIONPORT_GETCAPS_EXIT=0x22a
+[TRACE]TRACE_FLOW[0x8A]_CREGISTRATIONPORT_GETCONFIG_ENTRY=0x221
+[TRACE]TRACE_FLOW[0x8A]_CREGISTRATIONPORT_GETCONFIG_EXIT=0x222
+[TRACE]TRACE_FLOW[0x8A]_CREGISTRATIONPORT_GETFLOWCONTROLSTATUS_ENTRY=0x23d
+[TRACE]TRACE_FLOW[0x8A]_CREGISTRATIONPORT_GETFLOWCONTROLSTATUS_EXIT=0x23e
+[TRACE]TRACE_FLOW[0x8A]_CREGISTRATIONPORT_GETRECEIVEBUFFERLENGTH_ENTRY=0x231
+[TRACE]TRACE_FLOW[0x8A]_CREGISTRATIONPORT_GETRECEIVEBUFFERLENGTH_EXIT=0x232
+[TRACE]TRACE_FLOW[0x8A]_CREGISTRATIONPORT_GETROLE_ENTRY=0x253
+[TRACE]TRACE_FLOW[0x8A]_CREGISTRATIONPORT_GETROLE_EXIT=0x254
+[TRACE]TRACE_FLOW[0x8A]_CREGISTRATIONPORT_GETSERVERCONFIG_ENTRY=0x227
+[TRACE]TRACE_FLOW[0x8A]_CREGISTRATIONPORT_GETSERVERCONFIG_EXIT=0x228
+[TRACE]TRACE_FLOW[0x8A]_CREGISTRATIONPORT_GETSIGNALS_ENTRY=0x22b
+[TRACE]TRACE_FLOW[0x8A]_CREGISTRATIONPORT_GETSIGNALS_EXIT=0x22c
+[TRACE]TRACE_FLOW[0x8A]_CREGISTRATIONPORT_NEWL_ENTRY=0x20b
+[TRACE]TRACE_FLOW[0x8A]_CREGISTRATIONPORT_NEWL_EXIT=0x20c
+[TRACE]TRACE_FLOW[0x8A]_CREGISTRATIONPORT_NOTIFYBREAKCANCEL_ENTRY=0x245
+[TRACE]TRACE_FLOW[0x8A]_CREGISTRATIONPORT_NOTIFYBREAKCANCEL_EXIT=0x246
+[TRACE]TRACE_FLOW[0x8A]_CREGISTRATIONPORT_NOTIFYBREAK_ENTRY=0x243
+[TRACE]TRACE_FLOW[0x8A]_CREGISTRATIONPORT_NOTIFYBREAK_EXIT=0x244
+[TRACE]TRACE_FLOW[0x8A]_CREGISTRATIONPORT_NOTIFYCONFIGCHANGECANCEL_ENTRY=0x24d
+[TRACE]TRACE_FLOW[0x8A]_CREGISTRATIONPORT_NOTIFYCONFIGCHANGECANCEL_EXIT=0x24e
+[TRACE]TRACE_FLOW[0x8A]_CREGISTRATIONPORT_NOTIFYCONFIGCHANGE_ENTRY=0x24b
+[TRACE]TRACE_FLOW[0x8A]_CREGISTRATIONPORT_NOTIFYCONFIGCHANGE_EXIT=0x24c
+[TRACE]TRACE_FLOW[0x8A]_CREGISTRATIONPORT_NOTIFYDATAAVAILABLECANCEL_ENTRY=0x23b
+[TRACE]TRACE_FLOW[0x8A]_CREGISTRATIONPORT_NOTIFYDATAAVAILABLECANCEL_EXIT=0x23c
+[TRACE]TRACE_FLOW[0x8A]_CREGISTRATIONPORT_NOTIFYDATAAVAILABLE_ENTRY=0x239
+[TRACE]TRACE_FLOW[0x8A]_CREGISTRATIONPORT_NOTIFYDATAAVAILABLE_EXIT=0x23a
+[TRACE]TRACE_FLOW[0x8A]_CREGISTRATIONPORT_NOTIFYFLOWCONTROLCHANGECANCEL_ENTRY=0x249
+[TRACE]TRACE_FLOW[0x8A]_CREGISTRATIONPORT_NOTIFYFLOWCONTROLCHANGECANCEL_EXIT=0x24a
+[TRACE]TRACE_FLOW[0x8A]_CREGISTRATIONPORT_NOTIFYFLOWCONTROLCHANGE_ENTRY=0x247
+[TRACE]TRACE_FLOW[0x8A]_CREGISTRATIONPORT_NOTIFYFLOWCONTROLCHANGE_EXIT=0x248
+[TRACE]TRACE_FLOW[0x8A]_CREGISTRATIONPORT_NOTIFYOUTPUTEMPTYCANCEL_ENTRY=0x241
+[TRACE]TRACE_FLOW[0x8A]_CREGISTRATIONPORT_NOTIFYOUTPUTEMPTYCANCEL_EXIT=0x242
+[TRACE]TRACE_FLOW[0x8A]_CREGISTRATIONPORT_NOTIFYOUTPUTEMPTY_ENTRY=0x23f
+[TRACE]TRACE_FLOW[0x8A]_CREGISTRATIONPORT_NOTIFYOUTPUTEMPTY_EXIT=0x240
+[TRACE]TRACE_FLOW[0x8A]_CREGISTRATIONPORT_NOTIFYSIGNALCHANGECANCEL_ENTRY=0x251
+[TRACE]TRACE_FLOW[0x8A]_CREGISTRATIONPORT_NOTIFYSIGNALCHANGECANCEL_EXIT=0x252
+[TRACE]TRACE_FLOW[0x8A]_CREGISTRATIONPORT_NOTIFYSIGNALCHANGE_ENTRY=0x24f
+[TRACE]TRACE_FLOW[0x8A]_CREGISTRATIONPORT_NOTIFYSIGNALCHANGE_EXIT=0x250
+[TRACE]TRACE_FLOW[0x8A]_CREGISTRATIONPORT_QUERYRECEIVEBUFFER_ENTRY=0x215
+[TRACE]TRACE_FLOW[0x8A]_CREGISTRATIONPORT_QUERYRECEIVEBUFFER_EXIT=0x216
+[TRACE]TRACE_FLOW[0x8A]_CREGISTRATIONPORT_READCANCEL_ENTRY=0x213
+[TRACE]TRACE_FLOW[0x8A]_CREGISTRATIONPORT_READCANCEL_EXIT=0x214
+[TRACE]TRACE_FLOW[0x8A]_CREGISTRATIONPORT_RESETBUFFERS_ENTRY=0x217
+[TRACE]TRACE_FLOW[0x8A]_CREGISTRATIONPORT_RESETBUFFERS_EXIT=0x218
+[TRACE]TRACE_FLOW[0x8A]_CREGISTRATIONPORT_SETCONFIG_ENTRY=0x223
+[TRACE]TRACE_FLOW[0x8A]_CREGISTRATIONPORT_SETCONFIG_EXIT=0x224
+[TRACE]TRACE_FLOW[0x8A]_CREGISTRATIONPORT_SETRECEIVEBUFFERLENGTH_ENTRY=0x233
+[TRACE]TRACE_FLOW[0x8A]_CREGISTRATIONPORT_SETRECEIVEBUFFERLENGTH_EXIT=0x234
+[TRACE]TRACE_FLOW[0x8A]_CREGISTRATIONPORT_SETROLE_ENTRY=0x255
+[TRACE]TRACE_FLOW[0x8A]_CREGISTRATIONPORT_SETROLE_EXIT=0x256
+[TRACE]TRACE_FLOW[0x8A]_CREGISTRATIONPORT_SETSERVERCONFIG_ENTRY=0x225
+[TRACE]TRACE_FLOW[0x8A]_CREGISTRATIONPORT_SETSERVERCONFIG_EXIT=0x226
+[TRACE]TRACE_FLOW[0x8A]_CREGISTRATIONPORT_SETSIGNALSTOMARK_ENTRY=0x22d
+[TRACE]TRACE_FLOW[0x8A]_CREGISTRATIONPORT_SETSIGNALSTOMARK_EXIT=0x22e
+[TRACE]TRACE_FLOW[0x8A]_CREGISTRATIONPORT_SETSIGNALSTOSPACE_ENTRY=0x22f
+[TRACE]TRACE_FLOW[0x8A]_CREGISTRATIONPORT_SETSIGNALSTOSPACE_EXIT=0x230
+[TRACE]TRACE_FLOW[0x8A]_CREGISTRATIONPORT_STARTREAD_ENTRY=0x211
+[TRACE]TRACE_FLOW[0x8A]_CREGISTRATIONPORT_STARTREAD_EXIT=0x212
+[TRACE]TRACE_FLOW[0x8A]_CREGISTRATIONPORT_STARTWRITE_ENTRY=0x219
+[TRACE]TRACE_FLOW[0x8A]_CREGISTRATIONPORT_STARTWRITE_EXIT=0x21a
+[TRACE]TRACE_FLOW[0x8A]_CREGISTRATIONPORT_WRITECANCEL_ENTRY=0x21b
+[TRACE]TRACE_FLOW[0x8A]_CREGISTRATIONPORT_WRITECANCEL_EXIT=0x21c
+[TRACE]TRACE_FLOW[0x8A]_DLLMAIN_LIBENTRYL_ECACM_ENTRY=0x20a
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CACMPORTFACTORY_CACMPORTFACTORY_ENTRY=0x99
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CACMPORTFACTORY_CACMPORTFACTORY_EXIT=0x9a
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CACMPORT_GETROLE_EXIT=0x88
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CCDCCONTROLINTERFACEREADER_DECODEMESSAGEHEADER_EXIT=0x1cd
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CCDCCONTROLINTERFACE_CCDCCONTROLINTERFACE_ENTRY=0x1b0
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CCDCCONTROLINTERFACE_CCDCCONTROLINTERFACE_EXIT=0x1b1
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CCDCCONTROLINTERFACE_SENDSERIALSTATE_EXIT=0x1ba
+[TRACE]TRACE_FLOW[0x8A]_TUSBCSCLASSDESCRIPTOR_DES_ENTRY=0x208
+[TRACE]TRACE_FLOW[0x8A]_TUSBCSCLASSDESCRIPTOR_DES_EXIT=0x209
+[TRACE]TRACE_FLOW[0x8A]_TUSBNOTIFICATIONNETWORKCONNECTION_PACKBUFFER_ENTRY=0x1b2
+[TRACE]TRACE_FLOW[0x8A]_TUSBNOTIFICATIONNETWORKCONNECTION_PACKBUFFER_EXIT=0x1b3
+[TRACE]TRACE_FLOW[0x8A]_TUSBNOTIFICATIONSERIALSTATE_PACKBUFFER_ENTRY=0x1b6
+[TRACE]TRACE_FLOW[0x8A]_TUSBNOTIFICATIONSERIALSTATE_PACKBUFFER_EXIT=0x1b7
+[TRACE]TRACE_FLOW[0x8A]_TUSBREQUESTHDR_DECODE_ENTRY=0x25b
+[TRACE]TRACE_FLOW[0x8A]_TUSBREQUESTHDR_DECODE_EXIT=0x25c
+[TRACE]TRACE_FLOW[0x8A]_TUSBREQUESTHDR_DECODE_EXIT_DUP1=0x25d
+[TRACE]TRACE_FLOW[0x8A]_TUSBREQUESTHDR_DES_ENTRY=0x259
+[TRACE]TRACE_FLOW[0x8A]_TUSBREQUESTHDR_DES_EXIT=0x25a
+[TRACE]TRACE_FLOW[0x8A]_TUSBREQUESTHDR_ISDATARESPONSEREQUIRED_ENTRY=0x25e
+[TRACE]TRACE_NORMAL[0x86]_CACMPORTFACTORY_ACMPORTCLOSED=0x6f
+[TRACE]TRACE_NORMAL[0x86]_CACMPORTFACTORY_CHECKACMARRAY=0x74
+[TRACE]TRACE_NORMAL[0x86]_CACMPORTFACTORY_CONSTRUCTL=0x69
+[TRACE]TRACE_NORMAL[0x86]_CACMPORTFACTORY_CONSTRUCTL_DUP1=0x6a
+[TRACE]TRACE_NORMAL[0x86]_CACMPORTFACTORY_CONSTRUCTL_DUP2=0x6b
+[TRACE]TRACE_NORMAL[0x86]_CACMPORTFACTORY_CONSTRUCTL_DUP3=0x6c
+[TRACE]TRACE_NORMAL[0x86]_CACMPORTFACTORY_CONSTRUCTL_DUP4=0x6d
+[TRACE]TRACE_NORMAL[0x86]_CACMPORTFACTORY_CREATEFUNCTIONL=0x78
+[TRACE]TRACE_NORMAL[0x86]_CACMPORTFACTORY_CREATEFUNCTIONL_DUP1=0x79
+[TRACE]TRACE_NORMAL[0x86]_CACMPORTFACTORY_CREATEFUNCTIONL_DUP2=0x7a
+[TRACE]TRACE_NORMAL[0x86]_CACMPORTFACTORY_CREATEFUNCTIONL_DUP3=0x7b
+[TRACE]TRACE_NORMAL[0x86]_CACMPORTFACTORY_CREATEFUNCTIONS=0x75
+[TRACE]TRACE_NORMAL[0x86]_CACMPORTFACTORY_CREATEFUNCTIONS_DUP1=0x76
+[TRACE]TRACE_NORMAL[0x86]_CACMPORTFACTORY_CREATEFUNCTIONS_DUP2=0x77
+[TRACE]TRACE_NORMAL[0x86]_CACMPORTFACTORY_DESTROYFUNCTIONS=0x72
+[TRACE]TRACE_NORMAL[0x86]_CACMPORTFACTORY_DESTROYFUNCTIONS_DUP1=0x73
+[TRACE]TRACE_NORMAL[0x86]_CACMPORTFACTORY_LOGPORTSANDFUNCTIONS=0x7c
+[TRACE]TRACE_NORMAL[0x86]_CACMPORTFACTORY_LOGPORTSANDFUNCTIONS_DUP1=0x7d
+[TRACE]TRACE_NORMAL[0x86]_CACMPORTFACTORY_NEWPORTL=0x70
+[TRACE]TRACE_NORMAL[0x86]_CACMPORTFACTORY_NEWPORTL_DUP1=0x71
+[TRACE]TRACE_NORMAL[0x86]_CACMPORTFACTORY_PUBLISHACMCONFIG=0x6e
+[TRACE]TRACE_NORMAL[0x86]_CACMPORT_BREAK=0xe
+[TRACE]TRACE_NORMAL[0x86]_CACMPORT_BREAKCANCEL=0x12
+[TRACE]TRACE_NORMAL[0x86]_CACMPORT_BREAKCANCEL_DUP1=0x13
+[TRACE]TRACE_NORMAL[0x86]_CACMPORT_BREAKREQUESTCOMPLETED=0x4a
+[TRACE]TRACE_NORMAL[0x86]_CACMPORT_BREAKREQUESTCOMPLETED_DUP1=0x4b
+[TRACE]TRACE_NORMAL[0x86]_CACMPORT_BREAKSTATECHANGE=0x4c
+[TRACE]TRACE_NORMAL[0x86]_CACMPORT_BREAKSTATECHANGE_DUP1=0x4d
+[TRACE]TRACE_NORMAL[0x86]_CACMPORT_BREAKSTATECHANGE_DUP2=0x4e
+[TRACE]TRACE_NORMAL[0x86]_CACMPORT_BREAKSTATECHANGE_DUP3=0x4f
+[TRACE]TRACE_NORMAL[0x86]_CACMPORT_BREAK_DUP1=0xf
+[TRACE]TRACE_NORMAL[0x86]_CACMPORT_BREAK_DUP2=0x10
+[TRACE]TRACE_NORMAL[0x86]_CACMPORT_BREAK_DUP3=0x11
+[TRACE]TRACE_NORMAL[0x86]_CACMPORT_CACMPORT_DESTRUCTRURE=0x67
+[TRACE]TRACE_NORMAL[0x86]_CACMPORT_CACMPORT_DESTRUCTRURE_DUP1=0x68
+[TRACE]TRACE_NORMAL[0x86]_CACMPORT_DOSETBUFFERLENGTHS=0x3a
+[TRACE]TRACE_NORMAL[0x86]_CACMPORT_DOSETBUFFERLENGTHS_DUP1=0x3b
+[TRACE]TRACE_NORMAL[0x86]_CACMPORT_DOSETBUFFERLENGTHS_DUP2=0x3c
+[TRACE]TRACE_NORMAL[0x86]_CACMPORT_DOSETBUFFERLENGTHS_DUP3=0x3d
+[TRACE]TRACE_NORMAL[0x86]_CACMPORT_DOSETBUFFERLENGTHS_DUP4=0x3e
+[TRACE]TRACE_NORMAL[0x86]_CACMPORT_GETCAPS=0x2b
+[TRACE]TRACE_NORMAL[0x86]_CACMPORT_GETCAPS_DUP1=0x2c
+[TRACE]TRACE_NORMAL[0x86]_CACMPORT_GETCONFIG=0x14
+[TRACE]TRACE_NORMAL[0x86]_CACMPORT_GETCONFIG_DUP1=0x16
+[TRACE]TRACE_NORMAL[0x86]_CACMPORT_GETCONFIG_DUP10=0x1f
+[TRACE]TRACE_NORMAL[0x86]_CACMPORT_GETCONFIG_DUP11=0x20
+[TRACE]TRACE_NORMAL[0x86]_CACMPORT_GETCONFIG_DUP12=0x15
+[TRACE]TRACE_NORMAL[0x86]_CACMPORT_GETCONFIG_DUP2=0x17
+[TRACE]TRACE_NORMAL[0x86]_CACMPORT_GETCONFIG_DUP3=0x18
+[TRACE]TRACE_NORMAL[0x86]_CACMPORT_GETCONFIG_DUP4=0x19
+[TRACE]TRACE_NORMAL[0x86]_CACMPORT_GETCONFIG_DUP5=0x1a
+[TRACE]TRACE_NORMAL[0x86]_CACMPORT_GETCONFIG_DUP6=0x1b
+[TRACE]TRACE_NORMAL[0x86]_CACMPORT_GETCONFIG_DUP7=0x1c
+[TRACE]TRACE_NORMAL[0x86]_CACMPORT_GETCONFIG_DUP8=0x1d
+[TRACE]TRACE_NORMAL[0x86]_CACMPORT_GETCONFIG_DUP9=0x1e
+[TRACE]TRACE_NORMAL[0x86]_CACMPORT_GETFLOWCONTROLSTATUS=0x44
+[TRACE]TRACE_NORMAL[0x86]_CACMPORT_GETFLOWCONTROLSTATUS_DUP1=0x45
+[TRACE]TRACE_NORMAL[0x86]_CACMPORT_GETRECEIVEBUFFERLENGTH=0x38
+[TRACE]TRACE_NORMAL[0x86]_CACMPORT_GETRECEIVEBUFFERLENGTH_DUP1=0x39
+[TRACE]TRACE_NORMAL[0x86]_CACMPORT_GETROLE=0x5f
+[TRACE]TRACE_NORMAL[0x86]_CACMPORT_GETROLE_DUP1=0x60
+[TRACE]TRACE_NORMAL[0x86]_CACMPORT_GETSERVERCONFIG=0x29
+[TRACE]TRACE_NORMAL[0x86]_CACMPORT_GETSERVERCONFIG_DUP1=0x2a
+[TRACE]TRACE_NORMAL[0x86]_CACMPORT_GETSIGNALS=0x2d
+[TRACE]TRACE_NORMAL[0x86]_CACMPORT_GETSIGNALS_DUP1=0x2e
+[TRACE]TRACE_NORMAL[0x86]_CACMPORT_HANDLECONFIGNOTIFICATION_DUP6=0x24
+[TRACE]TRACE_NORMAL[0x86]_CACMPORT_HOSTSIGNALCHANGE=0x5a
+[TRACE]TRACE_NORMAL[0x86]_CACMPORT_HOSTSIGNALCHANGE_DUP1=0x5b
+[TRACE]TRACE_NORMAL[0x86]_CACMPORT_HOSTSIGNALCHANGE_DUP2=0x5c
+[TRACE]TRACE_NORMAL[0x86]_CACMPORT_HOSTSIGNALCHANGE_DUP3=0x5d
+[TRACE]TRACE_NORMAL[0x86]_CACMPORT_HOSTSIGNALCHANGE_DUP4=0x5e
+[TRACE]TRACE_NORMAL[0x86]_CACMPORT_NOTIFYBREAK=0x48
+[TRACE]TRACE_NORMAL[0x86]_CACMPORT_NOTIFYBREAKCANCEL=0x49
+[TRACE]TRACE_NORMAL[0x86]_CACMPORT_NOTIFYCONFIGCHANGE=0x52
+[TRACE]TRACE_NORMAL[0x86]_CACMPORT_NOTIFYCONFIGCHANGECANCEL=0x54
+[TRACE]TRACE_NORMAL[0x86]_CACMPORT_NOTIFYCONFIGCHANGE_DUP1=0x53
+[TRACE]TRACE_NORMAL[0x86]_CACMPORT_NOTIFYDATAAVAILABLE=0x42
+[TRACE]TRACE_NORMAL[0x86]_CACMPORT_NOTIFYDATAAVAILABLECANCEL=0x43
+[TRACE]TRACE_NORMAL[0x86]_CACMPORT_NOTIFYFLOWCONTROLCHANGE=0x50
+[TRACE]TRACE_NORMAL[0x86]_CACMPORT_NOTIFYFLOWCONTROLCHANGE_DUP1=0x51
+[TRACE]TRACE_NORMAL[0x86]_CACMPORT_NOTIFYOUTPUTEMPTY=0x46
+[TRACE]TRACE_NORMAL[0x86]_CACMPORT_NOTIFYOUTPUTEMPTY_DUP1=0x47
+[TRACE]TRACE_NORMAL[0x86]_CACMPORT_NOTIFYSIGNALCHANGE=0x55
+[TRACE]TRACE_NORMAL[0x86]_CACMPORT_NOTIFYSIGNALCHANGECANCEL=0x59
+[TRACE]TRACE_NORMAL[0x86]_CACMPORT_NOTIFYSIGNALCHANGE_DUP1=0x56
+[TRACE]TRACE_NORMAL[0x86]_CACMPORT_NOTIFYSIGNALCHANGE_DUP2=0x57
+[TRACE]TRACE_NORMAL[0x86]_CACMPORT_NOTIFYSIGNALCHANGE_DUP3=0x58
+[TRACE]TRACE_NORMAL[0x86]_CACMPORT_QUERYRECEIVEBUFFER=0x5
+[TRACE]TRACE_NORMAL[0x86]_CACMPORT_QUERYRECEIVEBUFFER_DUP1=0x6
+[TRACE]TRACE_NORMAL[0x86]_CACMPORT_READCANCEL=0x4
+[TRACE]TRACE_NORMAL[0x86]_CACMPORT_RESETBUFFERS=0x7
+[TRACE]TRACE_NORMAL[0x86]_CACMPORT_RESETBUFFERS_DUP1=0x8
+[TRACE]TRACE_NORMAL[0x86]_CACMPORT_RESETBUFFERS_DUP2=0x9
+[TRACE]TRACE_NORMAL[0x86]_CACMPORT_SETACM=0x63
+[TRACE]TRACE_NORMAL[0x86]_CACMPORT_SETACM_DUP1=0x65
+[TRACE]TRACE_NORMAL[0x86]_CACMPORT_SETACM_DUP2=0x66
+[TRACE]TRACE_NORMAL[0x86]_CACMPORT_SETACM_DUP3=0x64
+[TRACE]TRACE_NORMAL[0x86]_CACMPORT_SETCONFIG=0x21
+[TRACE]TRACE_NORMAL[0x86]_CACMPORT_SETCONFIG_DUP1=0x22
+[TRACE]TRACE_NORMAL[0x86]_CACMPORT_SETCONFIG_DUP2=0x23
+[TRACE]TRACE_NORMAL[0x86]_CACMPORT_SETRECEIVEBUFFERLENGTH=0x3f
+[TRACE]TRACE_NORMAL[0x86]_CACMPORT_SETRECEIVEBUFFERLENGTH_DUP1=0x40
+[TRACE]TRACE_NORMAL[0x86]_CACMPORT_SETRECEIVEBUFFERLENGTH_DUP2=0x41
+[TRACE]TRACE_NORMAL[0x86]_CACMPORT_SETROLE=0x61
+[TRACE]TRACE_NORMAL[0x86]_CACMPORT_SETROLE_DUP1=0x62
+[TRACE]TRACE_NORMAL[0x86]_CACMPORT_SETSERVERCONFIG=0x25
+[TRACE]TRACE_NORMAL[0x86]_CACMPORT_SETSERVERCONFIG_DUP1=0x26
+[TRACE]TRACE_NORMAL[0x86]_CACMPORT_SETSERVERCONFIG_DUP2=0x27
+[TRACE]TRACE_NORMAL[0x86]_CACMPORT_SETSERVERCONFIG_DUP3=0x28
+[TRACE]TRACE_NORMAL[0x86]_CACMPORT_SETSIGNALS=0x35
+[TRACE]TRACE_NORMAL[0x86]_CACMPORT_SETSIGNALSTOMARK=0x2f
+[TRACE]TRACE_NORMAL[0x86]_CACMPORT_SETSIGNALSTOMARK_DUP1=0x30
+[TRACE]TRACE_NORMAL[0x86]_CACMPORT_SETSIGNALSTOMARK_DUP2=0x31
+[TRACE]TRACE_NORMAL[0x86]_CACMPORT_SETSIGNALSTOSPACE=0x32
+[TRACE]TRACE_NORMAL[0x86]_CACMPORT_SETSIGNALSTOSPACE_DUP1=0x33
+[TRACE]TRACE_NORMAL[0x86]_CACMPORT_SETSIGNALSTOSPACE_DUP2=0x34
+[TRACE]TRACE_NORMAL[0x86]_CACMPORT_SETSIGNALS_DUP1=0x36
+[TRACE]TRACE_NORMAL[0x86]_CACMPORT_SETSIGNALS_DUP2=0x37
+[TRACE]TRACE_NORMAL[0x86]_CACMPORT_STARTREAD=0x1
+[TRACE]TRACE_NORMAL[0x86]_CACMPORT_STARTREAD_DUP1=0x2
+[TRACE]TRACE_NORMAL[0x86]_CACMPORT_STARTREAD_DUP2=0x3
+[TRACE]TRACE_NORMAL[0x86]_CACMPORT_STARTWRITE=0xa
+[TRACE]TRACE_NORMAL[0x86]_CACMPORT_STARTWRITE_DUP1=0xb
+[TRACE]TRACE_NORMAL[0x86]_CACMPORT_STARTWRITE_DUP2=0xc
+[TRACE]TRACE_NORMAL[0x86]_CACMPORT_WRITECANCEL=0xd
+[TRACE]TRACE_NORMAL[0x86]_CACMREADER_BUFLEN=0x89
+[TRACE]TRACE_NORMAL[0x86]_CACMREADER_BUFLEN_DUP1=0x8a
+[TRACE]TRACE_NORMAL[0x86]_CACMREADER_BUFLEN_DUP2=0x8b
+[TRACE]TRACE_NORMAL[0x86]_CACMREADER_BUFLEN_DUP3=0x8c
+[TRACE]TRACE_NORMAL[0x86]_CACMREADER_CHECKFORBUFFEREDTERMINATORSANDPROCEED=0x9e
+[TRACE]TRACE_NORMAL[0x86]_CACMREADER_CHECKFORBUFFEREDTERMINATORSANDPROCEED_DUP1=0x9f
+[TRACE]TRACE_NORMAL[0x86]_CACMREADER_CHECKFORBUFFEREDTERMINATORSANDPROCEED_DUP2=0xa0
+[TRACE]TRACE_NORMAL[0x86]_CACMREADER_CHECKFORBUFFEREDTERMINATORSANDPROCEED_DUP3=0xa1
+[TRACE]TRACE_NORMAL[0x86]_CACMREADER_CHECKFORBUFFEREDTERMINATORSANDPROCEED_DUP4=0xa2
+[TRACE]TRACE_NORMAL[0x86]_CACMREADER_CHECKFORBUFFEREDTERMINATORSANDPROCEED_DUP5=0xa3
+[TRACE]TRACE_NORMAL[0x86]_CACMREADER_CHECKFORBUFFEREDTERMINATORSANDPROCEED_DUP6=0x9d
+[TRACE]TRACE_NORMAL[0x86]_CACMREADER_COMPLETEREQUEST=0xad
+[TRACE]TRACE_NORMAL[0x86]_CACMREADER_COMPLETEREQUEST_DUP1=0xae
+[TRACE]TRACE_NORMAL[0x86]_CACMREADER_COMPLETEREQUEST_DUP2=0xaf
+[TRACE]TRACE_NORMAL[0x86]_CACMREADER_CONSTRUCTL=0x7e
+[TRACE]TRACE_NORMAL[0x86]_CACMREADER_FINDTERMINATOR=0xb0
+[TRACE]TRACE_NORMAL[0x86]_CACMREADER_NOTIFYDATAAVAILABLECANCEL=0x87
+[TRACE]TRACE_NORMAL[0x86]_CACMREADER_NOTIFYDATAAVAILABLECOMPLETED=0x9b
+[TRACE]TRACE_NORMAL[0x86]_CACMREADER_NOTIFYDATAAVAILABLECOMPLETED_DUP2=0x9c
+[TRACE]TRACE_NORMAL[0x86]_CACMREADER_PARTIALFINDTERMINATOR=0xb1
+[TRACE]TRACE_NORMAL[0x86]_CACMREADER_PARTIALFINDTERMINATOR_DUP2=0xb2
+[TRACE]TRACE_NORMAL[0x86]_CACMREADER_READ=0x7f
+[TRACE]TRACE_NORMAL[0x86]_CACMREADER_READCANCEL=0x88
+[TRACE]TRACE_NORMAL[0x86]_CACMREADER_READCOMPLETED=0x92
+[TRACE]TRACE_NORMAL[0x86]_CACMREADER_READCOMPLETED_DUP1=0x93
+[TRACE]TRACE_NORMAL[0x86]_CACMREADER_READCOMPLETED_DUP2=0x94
+[TRACE]TRACE_NORMAL[0x86]_CACMREADER_READONEORMORE=0x85
+[TRACE]TRACE_NORMAL[0x86]_CACMREADER_READONEORMORECOMPLETED=0x95
+[TRACE]TRACE_NORMAL[0x86]_CACMREADER_READONEORMORECOMPLETED_DUP1=0x96
+[TRACE]TRACE_NORMAL[0x86]_CACMREADER_READONEORMORECOMPLETED_DUP2=0x97
+[TRACE]TRACE_NORMAL[0x86]_CACMREADER_READONEORMORECOMPLETED_DUP3=0x98
+[TRACE]TRACE_NORMAL[0x86]_CACMREADER_READONEORMORECOMPLETED_DUP4=0x99
+[TRACE]TRACE_NORMAL[0x86]_CACMREADER_READONEORMORECOMPLETED_DUP5=0x9a
+[TRACE]TRACE_NORMAL[0x86]_CACMREADER_READONEORMORE_DUP1=0x86
+[TRACE]TRACE_NORMAL[0x86]_CACMREADER_READWITHOUTTERMINATORS=0x80
+[TRACE]TRACE_NORMAL[0x86]_CACMREADER_READWITHOUTTERMINATORS_DUP1=0x81
+[TRACE]TRACE_NORMAL[0x86]_CACMREADER_READWITHOUTTERMINATORS_DUP2=0x82
+[TRACE]TRACE_NORMAL[0x86]_CACMREADER_READWITHOUTTERMINATORS_DUP3=0x83
+[TRACE]TRACE_NORMAL[0x86]_CACMREADER_READWITHTERMINATORS=0x84
+[TRACE]TRACE_NORMAL[0x86]_CACMREADER_SETBUFSIZE=0x8d
+[TRACE]TRACE_NORMAL[0x86]_CACMREADER_SETBUFSIZE_DUP1=0x8e
+[TRACE]TRACE_NORMAL[0x86]_CACMREADER_SETBUFSIZE_DUP2=0x8f
+[TRACE]TRACE_NORMAL[0x86]_CACMREADER_SETTERMINATORS=0x90
+[TRACE]TRACE_NORMAL[0x86]_CACMREADER_SETTERMINATORS_DUP1=0x91
+[TRACE]TRACE_NORMAL[0x86]_CACMREADER_WRITEBACKDATA_DUP10=0xa8
+[TRACE]TRACE_NORMAL[0x86]_CACMREADER_WRITEBACKDATA_DUP11=0xa9
+[TRACE]TRACE_NORMAL[0x86]_CACMREADER_WRITEBACKDATA_DUP12=0xaa
+[TRACE]TRACE_NORMAL[0x86]_CACMREADER_WRITEBACKDATA_DUP13=0xab
+[TRACE]TRACE_NORMAL[0x86]_CACMREADER_WRITEBACKDATA_DUP14=0xac
+[TRACE]TRACE_NORMAL[0x86]_CACMREADER_WRITEBACKDATA_DUP6=0xa4
+[TRACE]TRACE_NORMAL[0x86]_CACMREADER_WRITEBACKDATA_DUP7=0xa5
+[TRACE]TRACE_NORMAL[0x86]_CACMREADER_WRITEBACKDATA_DUP8=0xa6
+[TRACE]TRACE_NORMAL[0x86]_CACMREADER_WRITEBACKDATA_DUP9=0xa7
+[TRACE]TRACE_NORMAL[0x86]_CACMSERVER_NEWSESSIONL=0x152
+[TRACE]TRACE_NORMAL[0x86]_CACMSESSION_CREATEFUNCTIONSL_DUP1=0x153
+[TRACE]TRACE_NORMAL[0x86]_CACMSESSION_SERVICEL=0x154
+[TRACE]TRACE_NORMAL[0x86]_CACMWRITER_COMPLETEREQUEST=0xbc
+[TRACE]TRACE_NORMAL[0x86]_CACMWRITER_COMPLETEREQUEST_DUP1=0xbd
+[TRACE]TRACE_NORMAL[0x86]_CACMWRITER_CONSTRUCTL=0xb8
+[TRACE]TRACE_NORMAL[0x86]_CACMWRITER_ISSUEWRITE=0xbe
+[TRACE]TRACE_NORMAL[0x86]_CACMWRITER_READDATAFROMCLIENT=0xbb
+[TRACE]TRACE_NORMAL[0x86]_CACMWRITER_SETBUFSIZE=0xb5
+[TRACE]TRACE_NORMAL[0x86]_CACMWRITER_SETBUFSIZE_DUP1=0xb6
+[TRACE]TRACE_NORMAL[0x86]_CACMWRITER_SETBUFSIZE_DUP2=0xb7
+[TRACE]TRACE_NORMAL[0x86]_CACMWRITER_WRITE=0xb3
+[TRACE]TRACE_NORMAL[0x86]_CACMWRITER_WRITECANCEL=0xb4
+[TRACE]TRACE_NORMAL[0x86]_CACMWRITER_WRITECOMPLETED=0xb9
+[TRACE]TRACE_NORMAL[0x86]_CACMWRITER_WRITECOMPLETED_DUP1=0xba
+[TRACE]TRACE_NORMAL[0x86]_CACTIVEDATAAVAILABLENOTIFIER_RUNL=0xbf
+[TRACE]TRACE_NORMAL[0x86]_CACTIVEREADER_RUNL=0xc2
+[TRACE]TRACE_NORMAL[0x86]_CACTIVEREADONEORMOREREADER_READONEORMORE=0xc0
+[TRACE]TRACE_NORMAL[0x86]_CACTIVEREADONEORMOREREADER_RUNL=0xc1
+[TRACE]TRACE_NORMAL[0x86]_CACTIVEWRITER_RUNL=0xc5
+[TRACE]TRACE_NORMAL[0x86]_CACTIVEWRITER_RUNL_DUP1=0xc6
+[TRACE]TRACE_NORMAL[0x86]_CACTIVEWRITER_WRITE=0xc3
+[TRACE]TRACE_NORMAL[0x86]_CACTIVEWRITER_WRITE_DUP1=0xc4
+[TRACE]TRACE_NORMAL[0x86]_CBREAKCONTROLLER_BREAKREQUEST=0xc8
+[TRACE]TRACE_NORMAL[0x86]_CBREAKCONTROLLER_CONSTRUCTL=0xc7
+[TRACE]TRACE_NORMAL[0x86]_CBREAKCONTROLLER_PUBLISH_DUP1=0xcb
+[TRACE]TRACE_NORMAL[0x86]_CBREAKCONTROLLER_PUBLISH_DUP2=0xcc
+[TRACE]TRACE_NORMAL[0x86]_CBREAKCONTROLLER_PUBLISH_DUP3=0xcd
+[TRACE]TRACE_NORMAL[0x86]_CBREAKCONTROLLER_PUBLISH_DUP4=0xce
+[TRACE]TRACE_NORMAL[0x86]_CBREAKCONTROLLER_STATEMACHINE_DUP1=0xc9
+[TRACE]TRACE_NORMAL[0x86]_CBREAKCONTROLLER_STATEMACHINE_DUP2=0xca
+[TRACE]TRACE_NORMAL[0x86]_CCDCACMCLASS_BREAKREQUEST_DUP1=0x100
+[TRACE]TRACE_NORMAL[0x86]_CCDCACMCLASS_CONSTRUCTL=0xcf
+[TRACE]TRACE_NORMAL[0x86]_CCDCACMCLASS_CONSTRUCTL_DUP1=0xd0
+[TRACE]TRACE_NORMAL[0x86]_CCDCACMCLASS_CONSTRUCTL_DUP2=0xd1
+[TRACE]TRACE_NORMAL[0x86]_CCDCACMCLASS_CONSTRUCTL_DUP3=0xd2
+[TRACE]TRACE_NORMAL[0x86]_CCDCACMCLASS_CONSTRUCTL_DUP4=0xd3
+[TRACE]TRACE_NORMAL[0x86]_CCDCACMCLASS_CONSTRUCTL_DUP5=0xd4
+[TRACE]TRACE_NORMAL[0x86]_CCDCACMCLASS_HANDLECLEARCOMMFEATURE=0xe3
+[TRACE]TRACE_NORMAL[0x86]_CCDCACMCLASS_HANDLECLEARCOMMFEATURE_DUP1=0xe4
+[TRACE]TRACE_NORMAL[0x86]_CCDCACMCLASS_HANDLECLEARCOMMFEATURE_DUP2=0xe5
+[TRACE]TRACE_NORMAL[0x86]_CCDCACMCLASS_HANDLECLEARCOMMFEATURE_DUP3=0xe6
+[TRACE]TRACE_NORMAL[0x86]_CCDCACMCLASS_HANDLECLEARCOMMFEATURE_DUP4=0xe7
+[TRACE]TRACE_NORMAL[0x86]_CCDCACMCLASS_HANDLECLEARCOMMFEATURE_DUP5=0xe8
+[TRACE]TRACE_NORMAL[0x86]_CCDCACMCLASS_HANDLEGETCOMMFEATURE=0xdd
+[TRACE]TRACE_NORMAL[0x86]_CCDCACMCLASS_HANDLEGETCOMMFEATURE_DUP1=0xde
+[TRACE]TRACE_NORMAL[0x86]_CCDCACMCLASS_HANDLEGETCOMMFEATURE_DUP2=0xdf
+[TRACE]TRACE_NORMAL[0x86]_CCDCACMCLASS_HANDLEGETCOMMFEATURE_DUP3=0xe0
+[TRACE]TRACE_NORMAL[0x86]_CCDCACMCLASS_HANDLEGETCOMMFEATURE_DUP4=0xe1
+[TRACE]TRACE_NORMAL[0x86]_CCDCACMCLASS_HANDLEGETCOMMFEATURE_DUP5=0xe2
+[TRACE]TRACE_NORMAL[0x86]_CCDCACMCLASS_HANDLEGETENCAPRESPONSE=0xf1
+[TRACE]TRACE_NORMAL[0x86]_CCDCACMCLASS_HANDLENEWABSTRACTSTATE=0xea
+[TRACE]TRACE_NORMAL[0x86]_CCDCACMCLASS_HANDLENEWABSTRACTSTATE_DUP1=0xeb
+[TRACE]TRACE_NORMAL[0x86]_CCDCACMCLASS_HANDLENEWABSTRACTSTATE_DUP2=0xec
+[TRACE]TRACE_NORMAL[0x86]_CCDCACMCLASS_HANDLENEWABSTRACTSTATE_DUP3=0xed
+[TRACE]TRACE_NORMAL[0x86]_CCDCACMCLASS_HANDLENEWCOUNTRYCODE=0xee
+[TRACE]TRACE_NORMAL[0x86]_CCDCACMCLASS_HANDLENEWCOUNTRYCODE_DUP1=0xef
+[TRACE]TRACE_NORMAL[0x86]_CCDCACMCLASS_HANDLESENDBREAK=0xfc
+[TRACE]TRACE_NORMAL[0x86]_CCDCACMCLASS_HANDLESENDBREAK_DUP1=0xfd
+[TRACE]TRACE_NORMAL[0x86]_CCDCACMCLASS_HANDLESENDENCAPCOMMAND=0xf0
+[TRACE]TRACE_NORMAL[0x86]_CCDCACMCLASS_HANDLESETCOMMFEATURE=0xf2
+[TRACE]TRACE_NORMAL[0x86]_CCDCACMCLASS_HANDLESETCOMMFEATURE_DUP1=0xf3
+[TRACE]TRACE_NORMAL[0x86]_CCDCACMCLASS_HANDLESETCOMMFEATURE_DUP2=0xf4
+[TRACE]TRACE_NORMAL[0x86]_CCDCACMCLASS_HANDLESETCOMMFEATURE_DUP3=0xf5
+[TRACE]TRACE_NORMAL[0x86]_CCDCACMCLASS_HANDLESETCOMMFEATURE_DUP4=0xf6
+[TRACE]TRACE_NORMAL[0x86]_CCDCACMCLASS_HANDLESETCOMMFEATURE_DUP5=0xf7
+[TRACE]TRACE_NORMAL[0x86]_CCDCACMCLASS_HANDLESETCOMMFEATURE_DUP6=0xf8
+[TRACE]TRACE_NORMAL[0x86]_CCDCACMCLASS_HANDLESETCOMMFEATURE_DUP7=0xf9
+[TRACE]TRACE_NORMAL[0x86]_CCDCACMCLASS_HANDLESETCONTROLLINESTATE=0xfa
+[TRACE]TRACE_NORMAL[0x86]_CCDCACMCLASS_HANDLESETCONTROLLINESTATE_DUP1=0xfb
+[TRACE]TRACE_NORMAL[0x86]_CCDCACMCLASS_HANDLESETLINECODING=0xe9
+[TRACE]TRACE_NORMAL[0x86]_CCDCACMCLASS_NOTIFYDATAAVAILABLE=0x101
+[TRACE]TRACE_NORMAL[0x86]_CCDCACMCLASS_READ=0xd9
+[TRACE]TRACE_NORMAL[0x86]_CCDCACMCLASS_READONEORMORE=0xd7
+[TRACE]TRACE_NORMAL[0x86]_CCDCACMCLASS_READONEORMORE_MREADONEORMOREOBSERVERREF_TDES8REF_TINT=0xd8
+[TRACE]TRACE_NORMAL[0x86]_CCDCACMCLASS_READ_DUP1=0xda
+[TRACE]TRACE_NORMAL[0x86]_CCDCACMCLASS_SENDSERIALSTATE=0xfe
+[TRACE]TRACE_NORMAL[0x86]_CCDCACMCLASS_SENDSERIALSTATE_DUP1=0xff
+[TRACE]TRACE_NORMAL[0x86]_CCDCACMCLASS_SETBREAKCALLBACK=0xd6
+[TRACE]TRACE_NORMAL[0x86]_CCDCACMCLASS_SETCALLBACK=0xd5
+[TRACE]TRACE_NORMAL[0x86]_CCDCACMCLASS_WRITE=0xdb
+[TRACE]TRACE_NORMAL[0x86]_CCDCACMCLASS_WRITE_DUP1=0xdc
+[TRACE]TRACE_NORMAL[0x86]_CCDCCONTROLINTERFACEREADER_DECODEMESSAGEDATA=0x124
+[TRACE]TRACE_NORMAL[0x86]_CCDCCONTROLINTERFACEREADER_DECODEMESSAGEDATAWITHRESPONSEREQUIRED=0x122
+[TRACE]TRACE_NORMAL[0x86]_CCDCCONTROLINTERFACEREADER_DECODEMESSAGEDATAWITHRESPONSEREQUIRED_DUP1=0x123
+[TRACE]TRACE_NORMAL[0x86]_CCDCCONTROLINTERFACEREADER_DECODEMESSAGEDATA_DUP1=0x125
+[TRACE]TRACE_NORMAL[0x86]_CCDCCONTROLINTERFACEREADER_DECODEMESSAGEDATA_DUP2=0x126
+[TRACE]TRACE_NORMAL[0x86]_CCDCCONTROLINTERFACEREADER_DECODEMESSAGEHEADER=0x120
+[TRACE]TRACE_NORMAL[0x86]_CCDCCONTROLINTERFACEREADER_DECODEMESSAGEHEADER_DUP1=0x121
+[TRACE]TRACE_NORMAL[0x86]_CCDCCONTROLINTERFACEREADER_HANDLEREADCOMPLETION=0x11d
+[TRACE]TRACE_NORMAL[0x86]_CCDCCONTROLINTERFACEREADER_HANDLEREADCOMPLETION_DUP1=0x11e
+[TRACE]TRACE_NORMAL[0x86]_CCDCCONTROLINTERFACEREADER_HANDLEREADCOMPLETION_DUP2=0x11f
+[TRACE]TRACE_NORMAL[0x86]_CCDCCONTROLINTERFACEREADER_READMESSAGEDATA=0x127
+[TRACE]TRACE_NORMAL[0x86]_CCDCCONTROLINTERFACEREADER_RUNL=0x11c
+[TRACE]TRACE_NORMAL[0x86]_CCDCCONTROLINTERFACE_CONSTRUCTL=0x103
+[TRACE]TRACE_NORMAL[0x86]_CCDCCONTROLINTERFACE_NEWL=0x102
+[TRACE]TRACE_NORMAL[0x86]_CCDCCONTROLINTERFACE_SENDNETWORKCONNECTION=0x112
+[TRACE]TRACE_NORMAL[0x86]_CCDCCONTROLINTERFACE_SENDNETWORKCONNECTION_DUP1=0x113
+[TRACE]TRACE_NORMAL[0x86]_CCDCCONTROLINTERFACE_SENDSERIALSTATE_DUP7=0x114
+[TRACE]TRACE_NORMAL[0x86]_CCDCCONTROLINTERFACE_SENDSERIALSTATE_DUP8=0x115
+[TRACE]TRACE_NORMAL[0x86]_CCDCCONTROLINTERFACE_SETUPCLASSSPECIFICDESCRIPTOR=0x10e
+[TRACE]TRACE_NORMAL[0x86]_CCDCCONTROLINTERFACE_SETUPCLASSSPECIFICDESCRIPTOR_DUP1=0x10f
+[TRACE]TRACE_NORMAL[0x86]_CCDCCONTROLINTERFACE_SETUPCLASSSPECIFICDESCRIPTOR_DUP2=0x110
+[TRACE]TRACE_NORMAL[0x86]_CCDCCONTROLINTERFACE_SETUPCLASSSPECIFICDESCRIPTOR_DUP3=0x111
+[TRACE]TRACE_NORMAL[0x86]_CCDCCONTROLINTERFACE_SETUPINTERFACE=0x104
+[TRACE]TRACE_NORMAL[0x86]_CCDCCONTROLINTERFACE_SETUPINTERFACE_DUP1=0x105
+[TRACE]TRACE_NORMAL[0x86]_CCDCCONTROLINTERFACE_SETUPINTERFACE_DUP10=0x10c
+[TRACE]TRACE_NORMAL[0x86]_CCDCCONTROLINTERFACE_SETUPINTERFACE_DUP11=0x10d
+[TRACE]TRACE_NORMAL[0x86]_CCDCCONTROLINTERFACE_SETUPINTERFACE_DUP2=0x106
+[TRACE]TRACE_NORMAL[0x86]_CCDCCONTROLINTERFACE_SETUPINTERFACE_DUP3=0x107
+[TRACE]TRACE_NORMAL[0x86]_CCDCCONTROLINTERFACE_SETUPINTERFACE_DUP4=0x108
+[TRACE]TRACE_NORMAL[0x86]_CCDCCONTROLINTERFACE_SETUPINTERFACE_DUP5=0x109
+[TRACE]TRACE_NORMAL[0x86]_CCDCCONTROLINTERFACE_SETUPINTERFACE_DUP8=0x10a
+[TRACE]TRACE_NORMAL[0x86]_CCDCCONTROLINTERFACE_SETUPINTERFACE_DUP9=0x10b
+[TRACE]TRACE_NORMAL[0x86]_CCDCCONTROLINTERFACE_WRITEDATA=0x116
+[TRACE]TRACE_NORMAL[0x86]_CCDCCONTROLINTERFACE_WRITEDATA_DUP1=0x117
+[TRACE]TRACE_NORMAL[0x86]_CCDCCONTROLINTERFACE_WRITEDATA_DUP2=0x118
+[TRACE]TRACE_NORMAL[0x86]_CCDCCONTROLINTERFACE_WRITEDATA_DUP3=0x119
+[TRACE]TRACE_NORMAL[0x86]_CCDCCONTROLINTERFACE_WRITEDATA_DUP4=0x11a
+[TRACE]TRACE_NORMAL[0x86]_CCDCCONTROLINTERFACE_WRITEDATA_DUP5=0x11b
+[TRACE]TRACE_NORMAL[0x86]_CCDCDATAINTERFACE_NEWL=0x128
+[TRACE]TRACE_NORMAL[0x86]_CCDCDATAINTERFACE_NOTIFYDATAAVAILABLECOMPLETED=0x13f
+[TRACE]TRACE_NORMAL[0x86]_CCDCDATAINTERFACE_NOTIFYDATAAVAILABLECOMPLETED_DUP1=0x140
+[TRACE]TRACE_NORMAL[0x86]_CCDCDATAINTERFACE_READ=0x136
+[TRACE]TRACE_NORMAL[0x86]_CCDCDATAINTERFACE_READCOMPLETED=0x13b
+[TRACE]TRACE_NORMAL[0x86]_CCDCDATAINTERFACE_READCOMPLETED_DUP1=0x13c
+[TRACE]TRACE_NORMAL[0x86]_CCDCDATAINTERFACE_READCOMPLETED_DUP3=0x13d
+[TRACE]TRACE_NORMAL[0x86]_CCDCDATAINTERFACE_READCOMPLETED_DUP5=0x13e
+[TRACE]TRACE_NORMAL[0x86]_CCDCDATAINTERFACE_READONEORMORE=0x137
+[TRACE]TRACE_NORMAL[0x86]_CCDCDATAINTERFACE_READONEORMORECOMPLETED=0x138
+[TRACE]TRACE_NORMAL[0x86]_CCDCDATAINTERFACE_READONEORMORECOMPLETED_DUP1=0x139
+[TRACE]TRACE_NORMAL[0x86]_CCDCDATAINTERFACE_READONEORMORECOMPLETED_DUP5=0x13a
+[TRACE]TRACE_NORMAL[0x86]_CCDCDATAINTERFACE_SETUPINTERFACE=0x129
+[TRACE]TRACE_NORMAL[0x86]_CCDCDATAINTERFACE_SETUPINTERFACE_DUP1=0x12a
+[TRACE]TRACE_NORMAL[0x86]_CCDCDATAINTERFACE_SETUPINTERFACE_DUP2=0x12b
+[TRACE]TRACE_NORMAL[0x86]_CCDCDATAINTERFACE_SETUPINTERFACE_DUP3=0x12c
+[TRACE]TRACE_NORMAL[0x86]_CCDCDATAINTERFACE_SETUPINTERFACE_DUP4=0x12e
+[TRACE]TRACE_NORMAL[0x86]_CCDCDATAINTERFACE_SETUPINTERFACE_DUP6=0x12f
+[TRACE]TRACE_NORMAL[0x86]_CCDCDATAINTERFACE_SETUPINTERFACE_DUP7=0x130
+[TRACE]TRACE_NORMAL[0x86]_CCDCDATAINTERFACE_SETUPINTERFACE_DUP8=0x131
+[TRACE]TRACE_NORMAL[0x86]_CCDCDATAINTERFACE_SETUPINTERFACE_DUP9=0x12d
+[TRACE]TRACE_NORMAL[0x86]_CCDCDATAINTERFACE_WRITECOMPLETED=0x132
+[TRACE]TRACE_NORMAL[0x86]_CCDCDATAINTERFACE_WRITECOMPLETED_DUP2=0x133
+[TRACE]TRACE_NORMAL[0x86]_CCDCDATAINTERFACE_WRITECOMPLETED_DUP4=0x134
+[TRACE]TRACE_NORMAL[0x86]_CCDCDATAINTERFACE_WRITECOMPLETED_DUP8=0x135
+[TRACE]TRACE_NORMAL[0x86]_CCDCINTERFACEBASE_BASECONSTRUCTL=0x141
+[TRACE]TRACE_NORMAL[0x86]_CCDCINTERFACEBASE_BASECONSTRUCTL_DUP1=0x142
+[TRACE]TRACE_NORMAL[0x86]_CCDCINTERFACEBASE_BASECONSTRUCTL_DUP2=0x143
+[TRACE]TRACE_NORMAL[0x86]_CCDCINTERFACEBASE_CCDCINTERFACEBASE_DES=0x144
+[TRACE]TRACE_NORMAL[0x86]_CCDCINTERFACEBASE_CCDCINTERFACEBASE_DES_DUP1=0x145
+[TRACE]TRACE_NORMAL[0x86]_CCDCINTERFACEBASE_GETINTERFACENUMBER=0x146
+[TRACE]TRACE_NORMAL[0x86]_CCDCINTERFACEBASE_GETINTERFACENUMBER_DUP1=0x147
+[TRACE]TRACE_NORMAL[0x86]_CCDCINTERFACEBASE_GETINTERFACENUMBER_DUP2=0x148
+[TRACE]TRACE_NORMAL[0x86]_CCDCINTERFACEBASE_GETINTERFACENUMBER_DUP3=0x149
+[TRACE]TRACE_NORMAL[0x86]_CCDCINTERFACEBASE_GETINTERFACENUMBER_DUP4=0x14a
+[TRACE]TRACE_NORMAL[0x86]_CCDCINTERFACEBASE_GETINTERFACENUMBER_DUP5=0x14b
+[TRACE]TRACE_NORMAL[0x86]_CLINKSTATENOTIFIER_RUNL=0x155
+[TRACE]TRACE_NORMAL[0x86]_CLINKSTATENOTIFIER_RUNL_DUP1=0x156
+[TRACE]TRACE_NORMAL[0x86]_CREGISTRATIONPORT_CONSTRUCTL=0x14c
+[TRACE]TRACE_NORMAL[0x86]_CREGISTRATIONPORT_GETROLE=0x151
+[TRACE]TRACE_NORMAL[0x86]_CREGISTRATIONPORT_SETSIGNALSTOMARK=0x14d
+[TRACE]TRACE_NORMAL[0x86]_CREGISTRATIONPORT_SETSIGNALSTOMARK_DUP1=0x14e
+[TRACE]TRACE_NORMAL[0x86]_CREGISTRATIONPORT_SETSIGNALSTOSPACE=0x14f
+[TRACE]TRACE_NORMAL[0x86]_CREGISTRATIONPORT_SETSIGNALSTOSPACE_DUP1=0x150
--- a/usbmgmt/usbmgr/device/classdrivers/ms/classcontroller/group/msclasscontroller.mmp Wed Jul 07 14:16:40 2010 +0800
+++ b/usbmgmt/usbmgr/device/classdrivers/ms/classcontroller/group/msclasscontroller.mmp Wed Jul 07 15:08:54 2010 +0800
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2004-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"
@@ -28,13 +28,15 @@
uid 0x10009d8d 0x10204bbb
-userinclude ../inc
+sourcepath ../src
+source CUsbMsClassController.cpp
+source CUsbMsClassImpCollection.cpp
+
+USERINCLUDE ../inc
+USERINCLUDE ../traces
OS_LAYER_SYSTEMINCLUDE_SYMBIAN
-sourcepath ../src
-source CUsbMsClassController.cpp
-source CUsbMsClassImpCollection.cpp
start resource usbms.rss
targetpath /private/10204bbb
@@ -50,6 +52,4 @@
LIBRARY efsrv.lib
LIBRARY bafl.lib
-#include <usb/usblogger.mmh>
-
VENDORID 0x70000001
--- a/usbmgmt/usbmgr/device/classdrivers/ms/classcontroller/src/CUsbMsClassController.cpp Wed Jul 07 14:16:40 2010 +0800
+++ b/usbmgmt/usbmgr/device/classdrivers/ms/classcontroller/src/CUsbMsClassController.cpp Wed Jul 07 15:08:54 2010 +0800
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2004-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"
@@ -28,14 +28,13 @@
#include <cusbclasscontrollerplugin.h>
#include <usbms.rsg>
#include "CUsbMsClassController.h"
-#include <usb/usblogger.h>
-
-#ifdef __FLOG_ACTIVE
-_LIT8(KLogComponent, "MSCC");
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "CUsbMsClassControllerTraces.h"
#endif
+#ifdef _DEBUG
// Panic category
-#ifdef _DEBUG
_LIT( KMsCcPanicCategory, "UsbMsCc" );
#endif
@@ -58,12 +57,12 @@
CUsbMsClassController* CUsbMsClassController::NewL(
MUsbClassControllerNotify& aOwner)
{
- LOG_STATIC_FUNC_ENTRY
-
+ OstTraceFunctionEntry0( CUSBMSCLASSCONTROLLER_NEWL_ENTRY );
CUsbMsClassController* r = new (ELeave) CUsbMsClassController(aOwner);
CleanupStack::PushL(r);
r->ConstructL();
CleanupStack::Pop();
+ OstTraceFunctionExit0( CUSBMSCLASSCONTROLLER_NEWL_EXIT );
return r;
}
@@ -72,7 +71,9 @@
*/
CUsbMsClassController::~CUsbMsClassController()
{
+ OstTraceFunctionEntry0( CUSBMSCLASSCONTROLLER_CUSBMSCLASSCONTROLLER_DES_ENTRY );
Cancel();
+ OstTraceFunctionExit0( CUSBMSCLASSCONTROLLER_CUSBMSCLASSCONTROLLER_DES_EXIT );
}
/**
@@ -84,7 +85,9 @@
MUsbClassControllerNotify& aOwner)
: CUsbClassControllerPlugIn(aOwner, KMsStartupPriority)
{
+ OstTraceFunctionEntry0( CUSBMSCLASSCONTROLLER_CUSBMSCLASSCONTROLLER_CONS_ENTRY );
// Intentionally left blank
+ OstTraceFunctionExit0( CUSBMSCLASSCONTROLLER_CUSBMSCLASSCONTROLLER_CONS_EXIT );
}
/**
@@ -92,9 +95,9 @@
*/
void CUsbMsClassController::ConstructL()
{
- LOG_FUNC
-
+ OstTraceFunctionEntry0( CUSBMSCLASSCONTROLLER_CONSTRUCT_ENTRY );
ReadMassStorageConfigL();
+ OstTraceFunctionExit0( CUSBMSCLASSCONTROLLER_CONSTRUCT_EXIT );
}
/**
@@ -104,11 +107,16 @@
*/
void CUsbMsClassController::Start(TRequestStatus& aStatus)
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CUSBMSCLASSCONTROLLER_START_ENTRY );
// The service state should always be idle when this function is called
// (guaranteed by CUsbSession).
- __ASSERT_DEBUG( iState == EUsbServiceIdle, _USB_PANIC(KMsCcPanicCategory, EBadApiCall) );
+
+ if (iState != EUsbServiceIdle)
+ {
+ OstTrace1( TRACE_FATAL, CUSBMSCLASSCONTROLLER_START, "CUsbMsClassController::Star;iState=%d", (TInt)iState );
+ __ASSERT_DEBUG( EFalse, User::Panic(KMsCcPanicCategory, EBadApiCall) );
+ }
TRequestStatus* reportStatus = &aStatus;
@@ -121,7 +129,9 @@
{
iState = EUsbServiceIdle;
User::RequestComplete(reportStatus, err);
- LOGTEXT(_L8("Failed to connect to mass storage file server"));
+ OstTrace0( TRACE_NORMAL, CUSBMSCLASSCONTROLLER_START_DUP1,
+ "CUsbMsClassController::Start;Failed to connect to mass storage file server" );
+ OstTraceFunctionExit0( CUSBMSCLASSCONTROLLER_START_EXIT );
return;
}
@@ -131,19 +141,19 @@
if (err != KErrNone)
{
iState = EUsbServiceIdle;
-
// Connection was created successfully in last step
// Get it closed since failed to start device.
iUsbMs.Close();
-
User::RequestComplete(reportStatus, err);
- LOGTEXT(_L8("Failed to start mass storage device"));
+ OstTrace0( TRACE_NORMAL, CUSBMSCLASSCONTROLLER_START_DUP2,
+ "CUsbMsClassController::Start;Failed to start mass storage device" );
+ OstTraceFunctionExit0( CUSBMSCLASSCONTROLLER_START_EXIT_DUP1 );
return;
}
iState = EUsbServiceStarted;
-
User::RequestComplete(reportStatus, KErrNone);
+ OstTraceFunctionExit0( CUSBMSCLASSCONTROLLER_START_EXIT_DUP2 );
}
/**
@@ -153,27 +163,32 @@
*/
void CUsbMsClassController::Stop(TRequestStatus& aStatus)
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CUSBMSCLASSCONTROLLER_STOP_ENTRY );
// The service state should always be started when this function is called
// (guaranteed by CUsbSession)
- __ASSERT_DEBUG( iState == EUsbServiceStarted, _USB_PANIC(KMsCcPanicCategory, EBadApiCall) );
+ if (iState != EUsbServiceStarted)
+ {
+ OstTrace1( TRACE_FATAL, CUSBMSCLASSCONTROLLER_STOP, "CUsbMsClassController::Stop;iState=%d", (TInt)iState );
+ __ASSERT_DEBUG( EFalse, User::Panic(KMsCcPanicCategory, EBadApiCall) );
+ }
TRequestStatus* reportStatus = &aStatus;
-
TInt err = iUsbMs.Stop();
if (err != KErrNone)
{
iState = EUsbServiceStarted;
User::RequestComplete(reportStatus, err);
- LOGTEXT(_L8("Failed to stop mass storage device"));
+ OstTrace0( TRACE_NORMAL, CUSBMSCLASSCONTROLLER_STOP_DUP1,
+ "CUsbMsClassController::Start;Failed to stop mass storage device" );
+ OstTraceFunctionExit0( CUSBMSCLASSCONTROLLER_STOP_EXIT );
return;
}
iUsbMs.Close();
-
User::RequestComplete(reportStatus, KErrNone);
+ OstTraceFunctionExit0( CUSBMSCLASSCONTROLLER_START_STOP_DUP1 );
}
/**
@@ -184,7 +199,11 @@
*/
void CUsbMsClassController::GetDescriptorInfo(TUsbDescriptor& /*aDescriptorInfo*/) const
{
- __ASSERT_DEBUG( EFalse, _USB_PANIC(KMsCcPanicCategory, EUnusedFunction));
+ OstTraceFunctionEntry0( CUSBMSCLASSCONTROLLER_GETDESCRIPTORINFO_ENTRY );
+ OstTrace1( TRACE_FATAL, CUSBMSCLASSCONTROLLER_GETDESCRIPTORINFO,
+ "CUsbMsClassController::GetDescriptorInfo;panic line=%d", (TInt)__LINE__ );
+ __ASSERT_DEBUG( EFalse, User::Panic(KMsCcPanicCategory, EUnusedFunction) );
+ OstTraceFunctionExit0( CUSBMSCLASSCONTROLLER_GETDESCRIPTORINFO_EXIT );
}
/**
@@ -193,7 +212,11 @@
*/
void CUsbMsClassController::RunL()
{
- __ASSERT_DEBUG( EFalse, _USB_PANIC(KMsCcPanicCategory, EUnusedFunction) );
+ OstTraceFunctionEntry0( CUSBMSCLASSCONTROLLER_RUNL_ENTRY );
+ OstTrace1( TRACE_FATAL, CUSBMSCLASSCONTROLLER_RUNL,
+ "CUsbMsClassController::RunL;panic line=%d", (TInt)__LINE__ );
+ __ASSERT_DEBUG( EFalse, User::Panic(KMsCcPanicCategory, EUnusedFunction) );
+ OstTraceFunctionExit0( CUSBMSCLASSCONTROLLER_RUNL_EXIT );
}
/**
@@ -202,7 +225,11 @@
*/
void CUsbMsClassController::DoCancel()
{
- __ASSERT_DEBUG( EFalse, _USB_PANIC(KMsCcPanicCategory, EUnusedFunction) );
+ OstTraceFunctionEntry0( CUSBMSCLASSCONTROLLER_DOCANCEL_ENTRY );
+ OstTrace1( TRACE_FATAL, CUSBMSCLASSCONTROLLER_DOCANCEL,
+ "CUsbMsClassController::DoCancel;panic line=%d", (TInt)__LINE__ );
+ __ASSERT_DEBUG( EFalse, User::Panic(KMsCcPanicCategory, EUnusedFunction) );
+ OstTraceFunctionExit0( CUSBMSCLASSCONTROLLER_DOCANCEL_EXIT );
}
/**
@@ -214,7 +241,11 @@
*/
TInt CUsbMsClassController::RunError(TInt /*aError*/)
{
- __ASSERT_DEBUG( EFalse, _USB_PANIC(KMsCcPanicCategory, EUnusedFunction) );
+ OstTraceFunctionEntry0( CUSBMSCLASSCONTROLLER_RUNERROR_ENTRY );
+ OstTrace1( TRACE_FATAL, CUSBMSCLASSCONTROLLER_RUNERROR,
+ "CUsbMsClassController::RunError;panic line=%d", (TInt)__LINE__ );
+ __ASSERT_DEBUG( EFalse, User::Panic(KMsCcPanicCategory, EUnusedFunction) );
+ OstTraceFunctionExit0( CUSBMSCLASSCONTROLLER_RUNERROR_EXIT );
return KErrNone;
}
@@ -223,21 +254,31 @@
*/
void CUsbMsClassController::ReadMassStorageConfigL()
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CUSBMSCLASSCONTROLLER_READMASSSTORAGECONFIGL_ENTRY );
// Try to connect to file server
- RFs fs;
- LEAVEIFERRORL(fs.Connect());
+ RFs fs;
+ TInt fserr = fs.Connect();
+
+ if (fserr < 0)
+ {
+ OstTrace1( TRACE_FATAL, CUSBMSCLASSCONTROLLER_READMASSSTORAGECONFIGL,
+ "CUsbMsClassController::ReadMassStorageConfigL;leave err = %d", fserr );
+ User::Leave(fserr);
+ }
CleanupClosePushL(fs);
RResourceFile resource;
TRAPD(err, resource.OpenL(fs, KUsbMsResource));
- LOGTEXT2(_L8("Opened resource file with error %d"), err);
+ OstTrace1( TRACE_NORMAL, CUSBMSCLASSCONTROLLER_READMASSSTORAGECONFIGL_DUP1,
+ "CUsbMsClassController::ReadMassStorageConfigL;Opened resource file with error %d", err );
if (err != KErrNone)
{
- LOGTEXT(_L8("Unable to open resource file"));
+ OstTrace0( TRACE_NORMAL, CUSBMSCLASSCONTROLLER_READMASSSTORAGECONFIGL_DUP2,
+ "CUsbMsClassController::ReadMassStorageConfigL;Unable to open resource file" );
CleanupStack::PopAndDestroy(&fs);
+ OstTraceFunctionExit0( CUSBMSCLASSCONTROLLER_READMASSSTORAGECONFIGL_EXIT );
return;
}
@@ -249,8 +290,10 @@
TRAPD(ret, msConfigBuf = resource.AllocReadL(USBMS_CONFIG));
if (ret != KErrNone)
{
- LOGTEXT(_L8("Failed to open mass storage configuration file"));
+ OstTrace0( TRACE_NORMAL, CUSBMSCLASSCONTROLLER_READMASSSTORAGECONFIGL_DUP3,
+ "CUsbMsClassController::ReadMassStorageConfigL;Failed to open mass storage configuration file" );
CleanupStack::PopAndDestroy(2, &fs);
+ OstTraceFunctionExit0( CUSBMSCLASSCONTROLLER_READMASSSTORAGECONFIGL_EXIT_DUP1 );
return;
}
CleanupStack::PushL(msConfigBuf);
@@ -282,11 +325,17 @@
ConfigItem(productRev, iMsConfig.iProductRev, 4);
// Debugging
- LOGTEXT2(_L8("vendorId = %S\n"), &vendorId);
- LOGTEXT2(_L8("productId = %S\n"), &productId);
- LOGTEXT2(_L8("productRev = %S\n"), &productRev);
+ OstTraceExt1( TRACE_NORMAL, CUSBMSCLASSCONTROLLER_READMASSSTORAGECONFIGL_DUP4,
+ "CUsbMsClassController::ReadMassStorageConfigL;vendorId = %S\n", vendorId );
+
+ OstTraceExt1( TRACE_NORMAL, CUSBMSCLASSCONTROLLER_READMASSSTORAGECONFIGL_DUP5,
+ "CUsbMsClassController::ReadMassStorageConfigL;productId = %S\n", productId );
+
+ OstTraceExt1( TRACE_NORMAL, CUSBMSCLASSCONTROLLER_READMASSSTORAGECONFIGL_DUP6,
+ "CUsbMsClassController::ReadMassStorageConfigL;productRev = %S\n", productRev );
CleanupStack::PopAndDestroy(3, &fs); // msConfigBuf, resource, fs
+ OstTraceFunctionExit0( CUSBMSCLASSCONTROLLER_READMASSSTORAGECONFIGL_EXIT_DUP2 );
}
/**
@@ -295,11 +344,13 @@
*/
void CUsbMsClassController::ConfigItem(const TPtrC& source, TDes& target, TInt maxLength)
{
+ OstTraceFunctionEntry0( CUSBMSCLASSCONTROLLER_CONFIGITEM_ENTRY );
if (source.Length() < maxLength)
{
maxLength = source.Length();
}
- target.Copy(source.Ptr(), maxLength);
+ target.Copy(source.Ptr(), maxLength);
+ OstTraceFunctionExit0( CUSBMSCLASSCONTROLLER_CONFIGITEM_EXIT );
}
--- a/usbmgmt/usbmgr/device/classdrivers/ms/classcontroller/src/CUsbMsClassImpCollection.cpp Wed Jul 07 14:16:40 2010 +0800
+++ b/usbmgmt/usbmgr/device/classdrivers/ms/classcontroller/src/CUsbMsClassImpCollection.cpp Wed Jul 07 15:08:54 2010 +0800
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2004-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"
@@ -26,6 +26,12 @@
#include <ecom/implementationproxy.h>
#include "CUsbMsClassController.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "CUsbMsClassImpCollectionTraces.h"
+#endif
+
+
// Define the private interface UIDs
const TImplementationProxy UsbCCImplementationTable[] =
{
@@ -34,7 +40,8 @@
EXPORT_C const TImplementationProxy* ImplementationGroupProxy(TInt& aTableCount)
{
+ OstTraceFunctionEntry0( CUSBMSCLASSIMPCOLLECTION_IMPLEMENTATIONGROUPPROXY_ENTRY );
aTableCount = sizeof(UsbCCImplementationTable) / sizeof(TImplementationProxy);
-
+ OstTraceFunctionExit0( CUSBMSCLASSIMPCOLLECTION_IMPLEMENTATIONGROUPPROXY_EXIT );
return UsbCCImplementationTable;
}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usbmgmt/usbmgr/device/classdrivers/ms/classcontroller/traces/OstTraceDefinitions.h Wed Jul 07 15:08:54 2010 +0800
@@ -0,0 +1,7 @@
+#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
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usbmgmt/usbmgr/device/classdrivers/ms/classcontroller/traces/fixed_id.definitions Wed Jul 07 15:08:54 2010 +0800
@@ -0,0 +1,51 @@
+#Fixed group and trace id definitions. If this file is removed, the identifiers are rebuilt.
+[GROUP]TRACE_FATAL=0x81
+[GROUP]TRACE_FLOW=0x8a
+[GROUP]TRACE_NORMAL=0x86
+[TRACE]TRACE_FATAL[0x81]_CUSBMSCLASSCONTROLLER_DOCANCEL=0x5
+[TRACE]TRACE_FATAL[0x81]_CUSBMSCLASSCONTROLLER_GETDESCRIPTORINFO=0x3
+[TRACE]TRACE_FATAL[0x81]_CUSBMSCLASSCONTROLLER_READMASSSTORAGECONFIGL=0x7
+[TRACE]TRACE_FATAL[0x81]_CUSBMSCLASSCONTROLLER_RUNERROR=0x6
+[TRACE]TRACE_FATAL[0x81]_CUSBMSCLASSCONTROLLER_RUNL=0x4
+[TRACE]TRACE_FATAL[0x81]_CUSBMSCLASSCONTROLLER_START=0x1
+[TRACE]TRACE_FATAL[0x81]_CUSBMSCLASSCONTROLLER_STOP=0x2
+[TRACE]TRACE_FLOW[0x8A]_CUSBMSCLASSCONTROLLER_CONFIGITEM_ENTRY=0x1c
+[TRACE]TRACE_FLOW[0x8A]_CUSBMSCLASSCONTROLLER_CONFIGITEM_EXIT=0x1d
+[TRACE]TRACE_FLOW[0x8A]_CUSBMSCLASSCONTROLLER_CONSTRUCT_ENTRY=0x7
+[TRACE]TRACE_FLOW[0x8A]_CUSBMSCLASSCONTROLLER_CONSTRUCT_EXIT=0x8
+[TRACE]TRACE_FLOW[0x8A]_CUSBMSCLASSCONTROLLER_CUSBMSCLASSCONTROLLER_CONS_ENTRY=0x5
+[TRACE]TRACE_FLOW[0x8A]_CUSBMSCLASSCONTROLLER_CUSBMSCLASSCONTROLLER_CONS_EXIT=0x6
+[TRACE]TRACE_FLOW[0x8A]_CUSBMSCLASSCONTROLLER_CUSBMSCLASSCONTROLLER_DES_ENTRY=0x3
+[TRACE]TRACE_FLOW[0x8A]_CUSBMSCLASSCONTROLLER_CUSBMSCLASSCONTROLLER_DES_EXIT=0x4
+[TRACE]TRACE_FLOW[0x8A]_CUSBMSCLASSCONTROLLER_DOCANCEL_ENTRY=0x14
+[TRACE]TRACE_FLOW[0x8A]_CUSBMSCLASSCONTROLLER_DOCANCEL_EXIT=0x15
+[TRACE]TRACE_FLOW[0x8A]_CUSBMSCLASSCONTROLLER_GETDESCRIPTORINFO_ENTRY=0x10
+[TRACE]TRACE_FLOW[0x8A]_CUSBMSCLASSCONTROLLER_GETDESCRIPTORINFO_EXIT=0x11
+[TRACE]TRACE_FLOW[0x8A]_CUSBMSCLASSCONTROLLER_NEWL_ENTRY=0x1
+[TRACE]TRACE_FLOW[0x8A]_CUSBMSCLASSCONTROLLER_NEWL_EXIT=0x2
+[TRACE]TRACE_FLOW[0x8A]_CUSBMSCLASSCONTROLLER_READMASSSTORAGECONFIGL_ENTRY=0x18
+[TRACE]TRACE_FLOW[0x8A]_CUSBMSCLASSCONTROLLER_READMASSSTORAGECONFIGL_EXIT=0x19
+[TRACE]TRACE_FLOW[0x8A]_CUSBMSCLASSCONTROLLER_READMASSSTORAGECONFIGL_EXIT_DUP1=0x1a
+[TRACE]TRACE_FLOW[0x8A]_CUSBMSCLASSCONTROLLER_READMASSSTORAGECONFIGL_EXIT_DUP2=0x1b
+[TRACE]TRACE_FLOW[0x8A]_CUSBMSCLASSCONTROLLER_RUNERROR_ENTRY=0x16
+[TRACE]TRACE_FLOW[0x8A]_CUSBMSCLASSCONTROLLER_RUNERROR_EXIT=0x17
+[TRACE]TRACE_FLOW[0x8A]_CUSBMSCLASSCONTROLLER_RUNL_ENTRY=0x12
+[TRACE]TRACE_FLOW[0x8A]_CUSBMSCLASSCONTROLLER_RUNL_EXIT=0x13
+[TRACE]TRACE_FLOW[0x8A]_CUSBMSCLASSCONTROLLER_START_ENTRY=0x9
+[TRACE]TRACE_FLOW[0x8A]_CUSBMSCLASSCONTROLLER_START_EXIT=0xa
+[TRACE]TRACE_FLOW[0x8A]_CUSBMSCLASSCONTROLLER_START_EXIT_DUP1=0xb
+[TRACE]TRACE_FLOW[0x8A]_CUSBMSCLASSCONTROLLER_START_EXIT_DUP2=0xc
+[TRACE]TRACE_FLOW[0x8A]_CUSBMSCLASSCONTROLLER_START_STOP_DUP1=0xf
+[TRACE]TRACE_FLOW[0x8A]_CUSBMSCLASSCONTROLLER_STOP_ENTRY=0xd
+[TRACE]TRACE_FLOW[0x8A]_CUSBMSCLASSCONTROLLER_STOP_EXIT=0xe
+[TRACE]TRACE_FLOW[0x8A]_CUSBMSCLASSIMPCOLLECTION_IMPLEMENTATIONGROUPPROXY_ENTRY=0x1e
+[TRACE]TRACE_FLOW[0x8A]_CUSBMSCLASSIMPCOLLECTION_IMPLEMENTATIONGROUPPROXY_EXIT=0x1f
+[TRACE]TRACE_NORMAL[0x86]_CUSBMSCLASSCONTROLLER_READMASSSTORAGECONFIGL_DUP1=0x4
+[TRACE]TRACE_NORMAL[0x86]_CUSBMSCLASSCONTROLLER_READMASSSTORAGECONFIGL_DUP2=0x5
+[TRACE]TRACE_NORMAL[0x86]_CUSBMSCLASSCONTROLLER_READMASSSTORAGECONFIGL_DUP3=0x6
+[TRACE]TRACE_NORMAL[0x86]_CUSBMSCLASSCONTROLLER_READMASSSTORAGECONFIGL_DUP4=0x7
+[TRACE]TRACE_NORMAL[0x86]_CUSBMSCLASSCONTROLLER_READMASSSTORAGECONFIGL_DUP5=0x8
+[TRACE]TRACE_NORMAL[0x86]_CUSBMSCLASSCONTROLLER_READMASSSTORAGECONFIGL_DUP6=0x9
+[TRACE]TRACE_NORMAL[0x86]_CUSBMSCLASSCONTROLLER_START_DUP1=0x1
+[TRACE]TRACE_NORMAL[0x86]_CUSBMSCLASSCONTROLLER_START_DUP2=0x2
+[TRACE]TRACE_NORMAL[0x86]_CUSBMSCLASSCONTROLLER_STOP_DUP1=0x3
--- a/usbmgmt/usbmgr/device/classdrivers/ncm/classcontroller/group/ncmclasscontroller.mmp Wed Jul 07 14:16:40 2010 +0800
+++ b/usbmgmt/usbmgr/device/classdrivers/ncm/classcontroller/group/ncmclasscontroller.mmp Wed Jul 07 15:08:54 2010 +0800
@@ -36,3 +36,4 @@
LIBRARY usbcsc_bil.lib
LIBRARY insock.lib
LIBRARY nifman.lib
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usbmgmt/usbmgr/device/classdrivers/ncm/classcontroller/traces/OstTraceDefinitions.h Wed Jul 07 15:08:54 2010 +0800
@@ -0,0 +1,7 @@
+#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
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usbmgmt/usbmgr/device/classdrivers/ncm/classcontroller/traces/fixed_id.definitions Wed Jul 07 15:08:54 2010 +0800
@@ -0,0 +1,480 @@
+#Fixed group and trace id definitions. If this file is removed, the identifiers are rebuilt.
+[GROUP]TRACE_ERROR=0x82
+[GROUP]TRACE_FATAL=0x81
+[GROUP]TRACE_FLOW=0x8a
+[GROUP]TRACE_NORMAL=0x86
+[TRACE]TRACE_ERROR[0x82]_CNCMCLASSCONTROLLER_RUNL_DEFAULT=0x11
+[TRACE]TRACE_ERROR[0x82]_CNCMCLIENTMANAGER_CNCMCLIENTMANAGER_CLOSE_COMM_CHUNK_FAIL=0x12
+[TRACE]TRACE_ERROR[0x82]_CNCMCLIENTMANAGER_CNCMCLIENTMANAGER_CLOSE_DATA_CHUNK_FAIL=0x13
+[TRACE]TRACE_ERROR[0x82]_CNCMCLIENTMANAGER_SETCOMMUNICATIONINTERFACEL=0x14
+[TRACE]TRACE_ERROR[0x82]_CNCMCLIENTMANAGER_SETCOMMUNICATIONINTERFACEL_FAIL_TO_INIT=0x15
+[TRACE]TRACE_ERROR[0x82]_CNCMCLIENTMANAGER_SETDATAINTERFACEL_SET_INTERFACE_FAIL=0x16
+[TRACE]TRACE_ERROR[0x82]_CNCMCONNECTIONMANAGER_CONSTRUCTL=0x17
+[TRACE]TRACE_ERROR[0x82]_CNCMCONNECTIONMANAGER_MICOHANDLEIAPREADINGCOMPLETE_IAP_RESULT=0x1a
+[TRACE]TRACE_ERROR[0x82]_CNCMCONNECTIONMANAGER_MICOHANDLEIAPREADINGCOMPLETE_SET_SHARED_STATE=0x1b
+[TRACE]TRACE_ERROR[0x82]_CNCMCONNECTIONMANAGER_MIPSOHANDLECLASSFATALERROR=0x19
+[TRACE]TRACE_ERROR[0x82]_CNCMCONNECTIONMANAGER_SETCUSTOMMTUL_SEARCH_FAIL=0x18
+[TRACE]TRACE_ERROR[0x82]_CNCMIAPREADER_GETNCMIAPIDL=0x1c
+[TRACE]TRACE_ERROR[0x82]_CNCMIAPREADER_GETNCMIAPIDL_NOT_FOUND=0x1d
+[TRACE]TRACE_FATAL[0x81]_CNCMCLASSCONTROLLER_DOCANCEL_DEFAULT=0x5
+[TRACE]TRACE_FATAL[0x81]_CNCMDHCPNOTIFWATCHER_STARTL=0x6
+[TRACE]TRACE_FLOW[0x8A]_CNCMCLASSCONTROLLER_CNCMCLASSCONTROLLER_ENTRY=0xde
+[TRACE]TRACE_FLOW[0x8A]_CNCMCLASSCONTROLLER_CNCMCLASSCONTROLLER_ENTRY_DESTROY=0xe4
+[TRACE]TRACE_FLOW[0x8A]_CNCMCLASSCONTROLLER_CNCMCLASSCONTROLLER_EXIT=0xdf
+[TRACE]TRACE_FLOW[0x8A]_CNCMCLASSCONTROLLER_CNCMCLASSCONTROLLER_EXIT_DESTROY=0xe5
+[TRACE]TRACE_FLOW[0x8A]_CNCMCLASSCONTROLLER_CONSTRUCTL_ENTRY=0xe0
+[TRACE]TRACE_FLOW[0x8A]_CNCMCLASSCONTROLLER_CONSTRUCTL_EXIT=0xe1
+[TRACE]TRACE_FLOW[0x8A]_CNCMCLASSCONTROLLER_DOCANCEL_ENTRY=0xf1
+[TRACE]TRACE_FLOW[0x8A]_CNCMCLASSCONTROLLER_DOCANCEL_EXIT=0xf2
+[TRACE]TRACE_FLOW[0x8A]_CNCMCLASSCONTROLLER_DOCANCEL_EXIT_DUP1=0xf3
+[TRACE]TRACE_FLOW[0x8A]_CNCMCLASSCONTROLLER_GETDESCRIPTORINFO_ENTRY=0xea
+[TRACE]TRACE_FLOW[0x8A]_CNCMCLASSCONTROLLER_GETDESCRIPTORINFO_EXIT=0xeb
+[TRACE]TRACE_FLOW[0x8A]_CNCMCLASSCONTROLLER_MCMOERRORINDICATION_ENTRY=0xec
+[TRACE]TRACE_FLOW[0x8A]_CNCMCLASSCONTROLLER_MCMOERRORINDICATION_EXIT=0xed
+[TRACE]TRACE_FLOW[0x8A]_CNCMCLASSCONTROLLER_NEWL_ENTRY=0xdc
+[TRACE]TRACE_FLOW[0x8A]_CNCMCLASSCONTROLLER_NEWL_EXIT=0xdd
+[TRACE]TRACE_FLOW[0x8A]_CNCMCLASSCONTROLLER_RANDOMMACADDRESSL_ENTRY=0xe2
+[TRACE]TRACE_FLOW[0x8A]_CNCMCLASSCONTROLLER_RANDOMMACADDRESSL_EXIT=0xe3
+[TRACE]TRACE_FLOW[0x8A]_CNCMCLASSCONTROLLER_RUNERROR_ENTRY=0xf4
+[TRACE]TRACE_FLOW[0x8A]_CNCMCLASSCONTROLLER_RUNERROR_EXIT=0xf5
+[TRACE]TRACE_FLOW[0x8A]_CNCMCLASSCONTROLLER_RUNL_ENTRY=0xee
+[TRACE]TRACE_FLOW[0x8A]_CNCMCLASSCONTROLLER_RUNL_EXIT=0xf0
+[TRACE]TRACE_FLOW[0x8A]_CNCMCLASSCONTROLLER_RUNL_TRANSFER_HANDLES=0xef
+[TRACE]TRACE_FLOW[0x8A]_CNCMCLASSCONTROLLER_START_ENTRY=0xe6
+[TRACE]TRACE_FLOW[0x8A]_CNCMCLASSCONTROLLER_START_EXIT=0xe7
+[TRACE]TRACE_FLOW[0x8A]_CNCMCLASSCONTROLLER_STOP_ENTRY=0xe8
+[TRACE]TRACE_FLOW[0x8A]_CNCMCLASSCONTROLLER_STOP_EXIT=0xe9
+[TRACE]TRACE_FLOW[0x8A]_CNCMCLIENTMANAGER_CNCMCLIENTMANAGER_ENTRY=0x102
+[TRACE]TRACE_FLOW[0x8A]_CNCMCLIENTMANAGER_CNCMCLIENTMANAGER_ENTRY_DESTRUCTOR=0xfc
+[TRACE]TRACE_FLOW[0x8A]_CNCMCLIENTMANAGER_CNCMCLIENTMANAGER_ENTRY_DESTRUCTOR_EXIT=0xfd
+[TRACE]TRACE_FLOW[0x8A]_CNCMCLIENTMANAGER_CNCMCLIENTMANAGER_EXIT=0x103
+[TRACE]TRACE_FLOW[0x8A]_CNCMCLIENTMANAGER_CONSTRUCTL_ENTRY=0x104
+[TRACE]TRACE_FLOW[0x8A]_CNCMCLIENTMANAGER_CONSTRUCTL_EXIT=0x105
+[TRACE]TRACE_FLOW[0x8A]_CNCMCLIENTMANAGER_DATAINTERFACENUMBER_ENTRY=0x110
+[TRACE]TRACE_FLOW[0x8A]_CNCMCLIENTMANAGER_DATAINTERFACENUMBER_EXIT=0x111
+[TRACE]TRACE_FLOW[0x8A]_CNCMCLIENTMANAGER_DATAINTERFACENUMBER_EXIT_DUP1=0x112
+[TRACE]TRACE_FLOW[0x8A]_CNCMCLIENTMANAGER_DATAINTERFACENUMBER_EXIT_DUP2=0x113
+[TRACE]TRACE_FLOW[0x8A]_CNCMCLIENTMANAGER_DATAINTERFACENUMBER_EXIT_DUP3=0x114
+[TRACE]TRACE_FLOW[0x8A]_CNCMCLIENTMANAGER_NEWLC_ENTRY=0xf8
+[TRACE]TRACE_FLOW[0x8A]_CNCMCLIENTMANAGER_NEWLC_EXIT=0xf9
+[TRACE]TRACE_FLOW[0x8A]_CNCMCLIENTMANAGER_NEWL_ENTRY=0xfa
+[TRACE]TRACE_FLOW[0x8A]_CNCMCLIENTMANAGER_NEWL_EXIT=0xfb
+[TRACE]TRACE_FLOW[0x8A]_CNCMCLIENTMANAGER_SETCOMMUNICATIONINTERFACEL_ENTRY=0x106
+[TRACE]TRACE_FLOW[0x8A]_CNCMCLIENTMANAGER_SETCOMMUNICATIONINTERFACEL_EXIT=0x107
+[TRACE]TRACE_FLOW[0x8A]_CNCMCLIENTMANAGER_SETDATAINTERFACEL_ENTRY=0x108
+[TRACE]TRACE_FLOW[0x8A]_CNCMCLIENTMANAGER_SETDATAINTERFACEL_EXIT=0x109
+[TRACE]TRACE_FLOW[0x8A]_CNCMCLIENTMANAGER_SETMACADDRESSSTRING_ENTRY=0x10e
+[TRACE]TRACE_FLOW[0x8A]_CNCMCLIENTMANAGER_SETMACADDRESSSTRING_EXIT=0x10f
+[TRACE]TRACE_FLOW[0x8A]_CNCMCLIENTMANAGER_SETNCMINTERFACESL_ENTRY=0xfe
+[TRACE]TRACE_FLOW[0x8A]_CNCMCLIENTMANAGER_SETNCMINTERFACESL_EXIT=0xff
+[TRACE]TRACE_FLOW[0x8A]_CNCMCLIENTMANAGER_SETUPCLASSSPECIFICDESCRIPTOR_ENTRY=0x10a
+[TRACE]TRACE_FLOW[0x8A]_CNCMCLIENTMANAGER_SETUPCLASSSPECIFICDESCRIPTOR_EXIT=0x10b
+[TRACE]TRACE_FLOW[0x8A]_CNCMCLIENTMANAGER_SETUPCLASSSPECIFICDESCRIPTOR_EXIT_DUP1=0x10c
+[TRACE]TRACE_FLOW[0x8A]_CNCMCLIENTMANAGER_SETUPCLASSSPECIFICDESCRIPTOR_EXIT_DUP2=0x10d
+[TRACE]TRACE_FLOW[0x8A]_CNCMCLIENTMANAGER_TRANSFERINTERFACESL_ENTRY=0x100
+[TRACE]TRACE_FLOW[0x8A]_CNCMCLIENTMANAGER_TRANSFERINTERFACESL_EXIT=0x101
+[TRACE]TRACE_FLOW[0x8A]_CNCMCONNECTIONMANAGER_CNCMCONNECTIONMANAGER_DESTRUCTOR_ENTRY=0x11b
+[TRACE]TRACE_FLOW[0x8A]_CNCMCONNECTIONMANAGER_CNCMCONNECTIONMANAGER_DESTRUCTOR_EXIT=0x11c
+[TRACE]TRACE_FLOW[0x8A]_CNCMCONNECTIONMANAGER_CONSTRUCTL_ENTRY=0x117
+[TRACE]TRACE_FLOW[0x8A]_CNCMCONNECTIONMANAGER_CONSTRUCTL_EXIT=0x118
+[TRACE]TRACE_FLOW[0x8A]_CNCMCONNECTIONMANAGER_HANDLECONNECTIONCOMPLETEL_ENTRY=0x119
+[TRACE]TRACE_FLOW[0x8A]_CNCMCONNECTIONMANAGER_HANDLECONNECTIONCOMPLETEL_EXIT=0x11a
+[TRACE]TRACE_FLOW[0x8A]_CNCMCONNECTIONMANAGER_MDNOHANDLEDHCPNOTIFICATION_ENTRY=0x12b
+[TRACE]TRACE_FLOW[0x8A]_CNCMCONNECTIONMANAGER_MDNOHANDLEDHCPNOTIFICATION_EXIT=0x12c
+[TRACE]TRACE_FLOW[0x8A]_CNCMCONNECTIONMANAGER_MDNOHANDLEDHCPNOTIFICATION_EXIT_DUP1=0x12d
+[TRACE]TRACE_FLOW[0x8A]_CNCMCONNECTIONMANAGER_MICOHANDLECONNECTIONCOMPLETE_ENTRY=0x129
+[TRACE]TRACE_FLOW[0x8A]_CNCMCONNECTIONMANAGER_MICOHANDLECONNECTIONCOMPLETE_EXIT=0x12a
+[TRACE]TRACE_FLOW[0x8A]_CNCMCONNECTIONMANAGER_MICOHANDLEIAPREADINGCOMPLETE_ENTRY=0x12e
+[TRACE]TRACE_FLOW[0x8A]_CNCMCONNECTIONMANAGER_MICOHANDLEIAPREADINGCOMPLETE_EXIT=0x12f
+[TRACE]TRACE_FLOW[0x8A]_CNCMCONNECTIONMANAGER_MICOHANDLEIAPREADINGCOMPLETE_EXIT_DUP1=0x130
+[TRACE]TRACE_FLOW[0x8A]_CNCMCONNECTIONMANAGER_MICOHANDLEIAPREADINGCOMPLETE_EXIT_DUP2=0x131
+[TRACE]TRACE_FLOW[0x8A]_CNCMCONNECTIONMANAGER_MIPSOHANDLECLASSFATALERROR_ENTRY=0x127
+[TRACE]TRACE_FLOW[0x8A]_CNCMCONNECTIONMANAGER_MIPSOHANDLECLASSFATALERROR_EXIT=0x128
+[TRACE]TRACE_FLOW[0x8A]_CNCMCONNECTIONMANAGER_NEWL_ENTRY=0x115
+[TRACE]TRACE_FLOW[0x8A]_CNCMCONNECTIONMANAGER_NEWL_EXIT=0x116
+[TRACE]TRACE_FLOW[0x8A]_CNCMCONNECTIONMANAGER_RESET_ENTRY=0x123
+[TRACE]TRACE_FLOW[0x8A]_CNCMCONNECTIONMANAGER_RESET_EXIT=0x124
+[TRACE]TRACE_FLOW[0x8A]_CNCMCONNECTIONMANAGER_SETCUSTOMMTUL_ENTRY=0x125
+[TRACE]TRACE_FLOW[0x8A]_CNCMCONNECTIONMANAGER_SETCUSTOMMTUL_EXIT=0x126
+[TRACE]TRACE_FLOW[0x8A]_CNCMCONNECTIONMANAGER_STARTCANCEL_ENTRY=0x11f
+[TRACE]TRACE_FLOW[0x8A]_CNCMCONNECTIONMANAGER_STARTCANCEL_EXIT=0x120
+[TRACE]TRACE_FLOW[0x8A]_CNCMCONNECTIONMANAGER_START_ENTRY=0x11d
+[TRACE]TRACE_FLOW[0x8A]_CNCMCONNECTIONMANAGER_START_EXIT=0x11e
+[TRACE]TRACE_FLOW[0x8A]_CNCMCONNECTIONMANAGER_STOP_ENTRY=0x121
+[TRACE]TRACE_FLOW[0x8A]_CNCMCONNECTIONMANAGER_STOP_EXIT=0x122
+[TRACE]TRACE_FLOW[0x8A]_CNCMCONNECTIONMANHELPER_CNCMCONNECTIONMANHELPER_ENTRY=0x134
+[TRACE]TRACE_FLOW[0x8A]_CNCMCONNECTIONMANHELPER_CNCMCONNECTIONMANHELPER_ENTRY_DESTRUCTOR=0x136
+[TRACE]TRACE_FLOW[0x8A]_CNCMCONNECTIONMANHELPER_CNCMCONNECTIONMANHELPER_ENTRY_DESTRUCTOR_EXIT=0x137
+[TRACE]TRACE_FLOW[0x8A]_CNCMCONNECTIONMANHELPER_CNCMCONNECTIONMANHELPER_EXIT=0x135
+[TRACE]TRACE_FLOW[0x8A]_CNCMCONNECTIONMANHELPER_CONSTRUCTL_ENTRY=0x138
+[TRACE]TRACE_FLOW[0x8A]_CNCMCONNECTIONMANHELPER_CONSTRUCTL_EXIT=0x139
+[TRACE]TRACE_FLOW[0x8A]_CNCMCONNECTIONMANHELPER_DOCANCEL_ENTRY=0x13e
+[TRACE]TRACE_FLOW[0x8A]_CNCMCONNECTIONMANHELPER_DOCANCEL_EXIT=0x13f
+[TRACE]TRACE_FLOW[0x8A]_CNCMCONNECTIONMANHELPER_NEWL_ENTRY=0x132
+[TRACE]TRACE_FLOW[0x8A]_CNCMCONNECTIONMANHELPER_NEWL_EXIT=0x133
+[TRACE]TRACE_FLOW[0x8A]_CNCMCONNECTIONMANHELPER_RUNL_ENTRY=0x140
+[TRACE]TRACE_FLOW[0x8A]_CNCMCONNECTIONMANHELPER_RUNL_EXIT=0x141
+[TRACE]TRACE_FLOW[0x8A]_CNCMCONNECTIONMANHELPER_START_ENTRY=0x13a
+[TRACE]TRACE_FLOW[0x8A]_CNCMCONNECTIONMANHELPER_START_EXIT=0x13b
+[TRACE]TRACE_FLOW[0x8A]_CNCMCONNECTIONMANHELPER_STOP_ENTRY=0x13c
+[TRACE]TRACE_FLOW[0x8A]_CNCMCONNECTIONMANHELPER_STOP_EXIT=0x13d
+[TRACE]TRACE_FLOW[0x8A]_CNCMDHCPNOTIFWATCHER_CNCMDHCPNOTIFWATCHER_ENTRY=0x142
+[TRACE]TRACE_FLOW[0x8A]_CNCMDHCPNOTIFWATCHER_CNCMDHCPNOTIFWATCHER_ENTRY_DESTROY=0x144
+[TRACE]TRACE_FLOW[0x8A]_CNCMDHCPNOTIFWATCHER_CNCMDHCPNOTIFWATCHER_EXIT=0x143
+[TRACE]TRACE_FLOW[0x8A]_CNCMDHCPNOTIFWATCHER_CNCMDHCPNOTIFWATCHER_EXIT_DESTROY=0x145
+[TRACE]TRACE_FLOW[0x8A]_CNCMDHCPNOTIFWATCHER_DOCANCEL_ENTRY=0x148
+[TRACE]TRACE_FLOW[0x8A]_CNCMDHCPNOTIFWATCHER_DOCANCEL_EXIT=0x149
+[TRACE]TRACE_FLOW[0x8A]_CNCMDHCPNOTIFWATCHER_RUNL_ENTRY=0x14a
+[TRACE]TRACE_FLOW[0x8A]_CNCMDHCPNOTIFWATCHER_RUNL_EXIT=0x14b
+[TRACE]TRACE_FLOW[0x8A]_CNCMDHCPNOTIFWATCHER_START_ENTRY=0x146
+[TRACE]TRACE_FLOW[0x8A]_CNCMDHCPNOTIFWATCHER_START_EXIT=0x147
+[TRACE]TRACE_FLOW[0x8A]_CNCMIAPPROGRESSWATCHER_CNCMIAPPROGRESSWATCHER_ENTRY=0x14e
+[TRACE]TRACE_FLOW[0x8A]_CNCMIAPPROGRESSWATCHER_CNCMIAPPROGRESSWATCHER_ENTRY_DESTRUCTOR=0x150
+[TRACE]TRACE_FLOW[0x8A]_CNCMIAPPROGRESSWATCHER_CNCMIAPPROGRESSWATCHER_ENTRY_DESTRUCTOR_EXIT=0x151
+[TRACE]TRACE_FLOW[0x8A]_CNCMIAPPROGRESSWATCHER_CNCMIAPPROGRESSWATCHER_EXIT=0x14f
+[TRACE]TRACE_FLOW[0x8A]_CNCMIAPPROGRESSWATCHER_CONSTRUCTL_ENTRY=0x152
+[TRACE]TRACE_FLOW[0x8A]_CNCMIAPPROGRESSWATCHER_CONSTRUCTL_EXIT=0x153
+[TRACE]TRACE_FLOW[0x8A]_CNCMIAPPROGRESSWATCHER_DOCANCEL_ENTRY=0x156
+[TRACE]TRACE_FLOW[0x8A]_CNCMIAPPROGRESSWATCHER_DOCANCEL_EXIT=0x157
+[TRACE]TRACE_FLOW[0x8A]_CNCMIAPPROGRESSWATCHER_NEWL_ENTRY=0x14c
+[TRACE]TRACE_FLOW[0x8A]_CNCMIAPPROGRESSWATCHER_NEWL_EXIT=0x14d
+[TRACE]TRACE_FLOW[0x8A]_CNCMIAPPROGRESSWATCHER_RUNL_ENTRY=0x158
+[TRACE]TRACE_FLOW[0x8A]_CNCMIAPPROGRESSWATCHER_RUNL_EXIT=0x159
+[TRACE]TRACE_FLOW[0x8A]_CNCMIAPPROGRESSWATCHER_START_ENTRY=0x154
+[TRACE]TRACE_FLOW[0x8A]_CNCMIAPPROGRESSWATCHER_START_EXIT=0x155
+[TRACE]TRACE_FLOW[0x8A]_CNCMIAPREADER_CNCMIAPREADER_ENTRY=0x15a
+[TRACE]TRACE_FLOW[0x8A]_CNCMIAPREADER_CNCMIAPREADER_ENTRY_DESTRUCTOR=0x15c
+[TRACE]TRACE_FLOW[0x8A]_CNCMIAPREADER_CNCMIAPREADER_ENTRY_DESTRUCTOR_EXIT=0x15d
+[TRACE]TRACE_FLOW[0x8A]_CNCMIAPREADER_CNCMIAPREADER_EXIT=0x15b
+[TRACE]TRACE_FLOW[0x8A]_CNCMIAPREADER_DOCANCEL_ENTRY=0x160
+[TRACE]TRACE_FLOW[0x8A]_CNCMIAPREADER_DOCANCEL_EXIT=0x161
+[TRACE]TRACE_FLOW[0x8A]_CNCMIAPREADER_GETNCMIAPIDL_ENTRY=0x164
+[TRACE]TRACE_FLOW[0x8A]_CNCMIAPREADER_GETNCMIAPIDL_EXIT=0x165
+[TRACE]TRACE_FLOW[0x8A]_CNCMIAPREADER_RUNL_ENTRY=0x162
+[TRACE]TRACE_FLOW[0x8A]_CNCMIAPREADER_RUNL_EXIT=0x163
+[TRACE]TRACE_FLOW[0x8A]_CNCMIAPREADER_START_ENTRY=0x15e
+[TRACE]TRACE_FLOW[0x8A]_CNCMIAPREADER_START_EXIT=0x15f
+[TRACE]TRACE_FLOW[0x8A]_TNCMCLASSDESCRIPTOR_DES_ENTRY=0xf6
+[TRACE]TRACE_FLOW[0x8A]_TNCMCLASSDESCRIPTOR_DES_EXIT=0xf7
+[TRACE]TRACE_NORMAL[0x86]_CNCMCLASSCONTROLLER_CNCMCLASSCONTROLLER_PRE_UNLOAD_CSC_LDD=0x53
+[TRACE]TRACE_NORMAL[0x86]_CNCMCLASSCONTROLLER_CNCMCLASSCONTROLLER_UNLOAD_LDD_RESULT=0x54
+[TRACE]TRACE_NORMAL[0x86]_CNCMCLASSCONTROLLER_CONSTRUCTL=0x50
+[TRACE]TRACE_NORMAL[0x86]_CNCMCLASSCONTROLLER_CONSTRUCTL_CSC_LDD_LOADED=0x52
+[TRACE]TRACE_NORMAL[0x86]_CNCMCLASSCONTROLLER_CONSTRUCTL_LOAD_CSC_LDD=0x51
+[TRACE]TRACE_NORMAL[0x86]_CNCMCLASSCONTROLLER_DOCANCEL_IDLE=0x5b
+[TRACE]TRACE_NORMAL[0x86]_CNCMCLASSCONTROLLER_DOCANCEL_INFO_PRINT=0x5a
+[TRACE]TRACE_NORMAL[0x86]_CNCMCLASSCONTROLLER_RUNL_BUILT_NCM_CONNECTION=0x59
+[TRACE]TRACE_NORMAL[0x86]_CNCMCLASSCONTROLLER_RUNL_PRINT_INFO=0x57
+[TRACE]TRACE_NORMAL[0x86]_CNCMCLASSCONTROLLER_RUNL_STARTED=0x58
+[TRACE]TRACE_NORMAL[0x86]_CNCMCLASSCONTROLLER_START_PRINT_STATE=0x55
+[TRACE]TRACE_NORMAL[0x86]_CNCMCLASSCONTROLLER_STOP_PRINT_STATE=0x56
+[TRACE]TRACE_NORMAL[0x86]_CNCMCLIENTMANAGER_CNCMCLIENTMANAGER_CLOSE_COMM_CHUNK=0x5d
+[TRACE]TRACE_NORMAL[0x86]_CNCMCLIENTMANAGER_CNCMCLIENTMANAGER_CLOSE_COMM_INTERFACE=0x5e
+[TRACE]TRACE_NORMAL[0x86]_CNCMCLIENTMANAGER_CNCMCLIENTMANAGER_CLOSE_DATA_CHUNK=0x60
+[TRACE]TRACE_NORMAL[0x86]_CNCMCLIENTMANAGER_CNCMCLIENTMANAGER_CLOSE_DATA_INTERFACE=0x61
+[TRACE]TRACE_NORMAL[0x86]_CNCMCLIENTMANAGER_CNCMCLIENTMANAGER_PRE_CLOSE_COMM_INTERFACE=0x5c
+[TRACE]TRACE_NORMAL[0x86]_CNCMCLIENTMANAGER_CNCMCLIENTMANAGER_PRE_CLOSE_DATA_INTERFACE=0x5f
+[TRACE]TRACE_NORMAL[0x86]_CNCMCLIENTMANAGER_DATAINTERFACENUMBER=0x69
+[TRACE]TRACE_NORMAL[0x86]_CNCMCLIENTMANAGER_DATAINTERFACENUMBER_INTERFACE_INFO=0x67
+[TRACE]TRACE_NORMAL[0x86]_CNCMCLIENTMANAGER_DATAINTERFACENUMBER_INTERFACE_INFO2=0x68
+[TRACE]TRACE_NORMAL[0x86]_CNCMCLIENTMANAGER_SETDATAINTERFACEL_TRY_NEW_BUF_SIZE=0x64
+[TRACE]TRACE_NORMAL[0x86]_CNCMCLIENTMANAGER_SETMACADDRESSSTRING=0x66
+[TRACE]TRACE_NORMAL[0x86]_CNCMCLIENTMANAGER_SETUPCLASSSPECIFICDESCRIPTOR_PRE_SET_BLOCK=0x65
+[TRACE]TRACE_NORMAL[0x86]_CNCMCLIENTMANAGER_TRANSFERINTERFACESL_INTERFACES_TRANSFERED=0x63
+[TRACE]TRACE_NORMAL[0x86]_CNCMCLIENTMANAGER_TRANSFERINTERFACESL_PRE_TRANSFER_INTERFACES=0x62
+[TRACE]TRACE_NORMAL[0x86]_CNCMCONNECTIONMANAGER_HANDLECONNECTIONCOMPLETEL_CHANGE_MTU=0x6a
+[TRACE]TRACE_NORMAL[0x86]_CNCMCONNECTIONMANAGER_HANDLECONNECTIONCOMPLETEL_CONN_NCM_INTERNAL_SVR=0x6b
+[TRACE]TRACE_NORMAL[0x86]_CNCMCONNECTIONMANAGER_MDNOHANDLEDHCPNOTIFICATION_CALL_IOCTL=0x73
+[TRACE]TRACE_NORMAL[0x86]_CNCMCONNECTIONMANAGER_MDNOHANDLEDHCPNOTIFICATION_RETURN_IOCTL=0x74
+[TRACE]TRACE_NORMAL[0x86]_CNCMCONNECTIONMANAGER_SETCUSTOMMTUL=0x6c
+[TRACE]TRACE_NORMAL[0x86]_CNCMCONNECTIONMANAGER_SETCUSTOMMTUL_INTER_INFO=0x6d
+[TRACE]TRACE_NORMAL[0x86]_CNCMCONNECTIONMANAGER_SETCUSTOMMTUL_INTER_MTU=0x71
+[TRACE]TRACE_NORMAL[0x86]_CNCMCONNECTIONMANAGER_SETCUSTOMMTUL_INTER_NAME=0x70
+[TRACE]TRACE_NORMAL[0x86]_CNCMCONNECTIONMANAGER_SETCUSTOMMTUL_NEW_MTU_SIZE=0x6e
+[TRACE]TRACE_NORMAL[0x86]_CNCMCONNECTIONMANAGER_SETCUSTOMMTUL_PRE_SETMTU=0x72
+[TRACE]TRACE_NORMAL[0x86]_CNCMCONNECTIONMANAGER_SETCUSTOMMTUL_START_INTER_ENUM=0x6f
+[TRACE]TRACE_NORMAL[0x86]_CNCMCONNECTIONMANHELPER_DOCNCEL=0x76
+[TRACE]TRACE_NORMAL[0x86]_CNCMCONNECTIONMANHELPER_STOP_RETURN_CODE=0x75
+[TRACE]TRACE_NORMAL[0x86]_CNCMIAPPROGRESSWATCHER_RUNL_COMPLETION_CODE=0x77
+[TRACE]TRACE_NORMAL[0x86]_CNCMIAPPROGRESSWATCHER_RUNL_INFO=0x78
+[TRACE]TRACE_NORMAL[0x86]_CNCMIAPPROGRESSWATCHER_RUNL_RESTART_WATCHER=0x79
+[TRACE]TRACE_NORMAL[0x86]_CNCMIAPREADER_GETNCMIAPIDL_CHOSEN_IAP_ID=0x7f
+[TRACE]TRACE_NORMAL[0x86]_CNCMIAPREADER_GETNCMIAPIDL_CHOSEN_LAN_BEARER=0x7c
+[TRACE]TRACE_NORMAL[0x86]_CNCMIAPREADER_GETNCMIAPIDL_COUNT_LAN_BEARER=0x7b
+[TRACE]TRACE_NORMAL[0x86]_CNCMIAPREADER_GETNCMIAPIDL_RECORD_BEARER_ID=0x7e
+[TRACE]TRACE_NORMAL[0x86]_CNCMIAPREADER_GETNCMIAPIDL_RECORD_ID=0x7d
+[TRACE]TRACE_NORMAL[0x86]_CNCMIAPREADER_RUNL_GETIAP=0x7a
+[TRACE]TRACE_NORMAL[0x86]_CNCMIAPREADER_SEARCHNCMIAPL_ONLY_ONE_NCM_IAP=0x4f
+[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_CCONNECTIONMANAGER_CONSTRUCTL=0xc
+[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_CCONNECTIONMANAGER_MICOHANDLEIAPREADINGCOMPLETE_IAP_RESULT=0x1
+[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_CCONNECTIONMANAGER_MICOHANDLEIAPREADINGCOMPLETE_SET_SHARED_STATE=0x2
+[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_CCONNECTIONMANAGER_MIPSOHANDLECLASSFATALERROR=0xb
+[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_CCONNECTIONMANAGER_SETCUSTOMMTUL_SEARCH_FAIL=0x8
+[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_CIAPREADER_GETNCMIAPIDL=0xd
+[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_CIAPREADER_GETNCMIAPIDL_NOT_FOUND=0x3
+[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_CNCMCLASSCONTROLLER_RUNL_DEFAULT=0xf
+[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_CUSBCLIENTMANAGER_CUSBCLIENTMANAGER_CLOSE_COMM_CHUNK_FAIL=0x4
+[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_CUSBCLIENTMANAGER_CUSBCLIENTMANAGER_CLOSE_DATA_CHUNK_FAIL=0x5
+[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_CUSBCLIENTMANAGER_SETCOMMUNICATIONINTERFACEL=0xe
+[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_CUSBCLIENTMANAGER_SETCOMMUNICATIONINTERFACEL_FAIL_TO_INIT=0x6
+[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_CUSBCLIENTMANAGER_SETDATAINTERFACEL_SET_INTERFACE_FAIL=0x7
+[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_CUSBNCMCLASSCONTROLLER_DOCANCEL_DEFAULT=0xa
+[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_CUSBNCMCLASSCONTROLLER_RUNL_DEFAULT=0x10
+[[OBSOLETE]][TRACE]TRACE_FATAL[0x81]_CDHCPNOTIFWATCHER_STARTL=0x2
+[[OBSOLETE]][TRACE]TRACE_FATAL[0x81]_CNCMCLASSCONTROLLER_DOCANCEL_DEFAULT=0x3
+[[OBSOLETE]][TRACE]TRACE_FATAL[0x81]_CUSBNCMCLASSCONTROLLER_DOCANCEL_DEFAULT=0x4
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CCONNECTIONMANAGER_CCONNECTIONMANAGER_DESTRUCTOR_ENTRY=0x6
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CCONNECTIONMANAGER_CCONNECTIONMANAGER_DESTRUCTOR_EXIT=0x7
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CCONNECTIONMANAGER_CCONNECTIONMANAGER_ENTRY=0x8
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CCONNECTIONMANAGER_CCONNECTIONMANAGER_EXIT=0x9
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CCONNECTIONMANAGER_CONSTRUCTL=0x1
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CCONNECTIONMANAGER_CONSTRUCTL_ENTRY=0x2
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CCONNECTIONMANAGER_CONSTRUCTL_EXIT=0x3
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CCONNECTIONMANAGER_HANDLECONNECTIONCOMPLETEL_ENTRY=0x4
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CCONNECTIONMANAGER_HANDLECONNECTIONCOMPLETEL_EXIT=0x5
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CCONNECTIONMANAGER_MDNOHANDLEDHCPNOTIFICATION_ENTRY=0x1c
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CCONNECTIONMANAGER_MDNOHANDLEDHCPNOTIFICATION_EXIT=0x9a
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CCONNECTIONMANAGER_MDNOHANDLEDHCPNOTIFICATION_EXIT_DUP1=0x9b
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CCONNECTIONMANAGER_MICOHANDLECONNECTIONCOMPLETE_ENTRY=0x1a
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CCONNECTIONMANAGER_MICOHANDLECONNECTIONCOMPLETE_EXIT=0x1b
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CCONNECTIONMANAGER_MICOHANDLEIAPREADINGCOMPLETE_ENTRY=0x1e
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CCONNECTIONMANAGER_MICOHANDLEIAPREADINGCOMPLETE_EXIT=0x1f
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CCONNECTIONMANAGER_MICOHANDLEIAPREADINGCOMPLETE_EXIT_DUP1=0x9c
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CCONNECTIONMANAGER_MICOHANDLEIAPREADINGCOMPLETE_EXIT_DUP2=0x9d
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CCONNECTIONMANAGER_MIPSOHANDLECLASSFATALERROR_ENTRY=0x18
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CCONNECTIONMANAGER_MIPSOHANDLECLASSFATALERROR_EXIT=0x19
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CCONNECTIONMANAGER_MIPSOHANDLEIAPTEARDOWN_ENTRY=0x16
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CCONNECTIONMANAGER_MIPSOHANDLEIAPTEARDOWN_EXIT=0x17
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CCONNECTIONMANAGER_NEWL_ENTRY=0x14
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CCONNECTIONMANAGER_NEWL_EXIT=0x15
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CCONNECTIONMANAGER_RESET_ENTRY=0x10
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CCONNECTIONMANAGER_RESET_EXIT=0x11
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CCONNECTIONMANAGER_SETCUSTOMMTUL_ENTRY=0x12
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CCONNECTIONMANAGER_SETCUSTOMMTUL_EXIT=0x13
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CCONNECTIONMANAGER_STARTCANCEL_ENTRY=0xc
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CCONNECTIONMANAGER_STARTCANCEL_EXIT=0xd
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CCONNECTIONMANAGER_START_ENTRY=0xa
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CCONNECTIONMANAGER_START_EXIT=0xb
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CCONNECTIONMANAGER_STOP_ENTRY=0xe
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CCONNECTIONMANAGER_STOP_EXIT=0xf
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CCONNECTIONMANHELPER_CCONNECTIONMANHELPER_ENTRY=0x22
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CCONNECTIONMANHELPER_CCONNECTIONMANHELPER_ENTRY_DESTRUCTOR=0x24
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CCONNECTIONMANHELPER_CCONNECTIONMANHELPER_ENTRY_DESTRUCTOR_EXIT=0x25
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CCONNECTIONMANHELPER_CCONNECTIONMANHELPER_EXIT=0x23
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CCONNECTIONMANHELPER_CONSTRUCTL_ENTRY=0x26
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CCONNECTIONMANHELPER_CONSTRUCTL_EXIT=0x27
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CCONNECTIONMANHELPER_DOCANCEL_ENTRY=0x2e
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CCONNECTIONMANHELPER_DOCANCEL_EXIT=0x2f
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CCONNECTIONMANHELPER_NEWL_ENTRY=0x20
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CCONNECTIONMANHELPER_NEWL_EXIT=0x21
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CCONNECTIONMANHELPER_RUNL_ENTRY=0x30
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CCONNECTIONMANHELPER_RUNL_EXIT=0x31
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CCONNECTIONMANHELPER_SILENTSTOP_ENTRY=0x2c
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CCONNECTIONMANHELPER_SILENTSTOP_EXIT=0x2d
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CCONNECTIONMANHELPER_START_ENTRY=0x28
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CCONNECTIONMANHELPER_START_EXIT=0x29
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CCONNECTIONMANHELPER_STOP_ENTRY=0x2a
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CCONNECTIONMANHELPER_STOP_EXIT=0x2b
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDHCPNOTIFWATCHER_CDHCPNOTIFWATCHER_ENTRY=0x34
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDHCPNOTIFWATCHER_CDHCPNOTIFWATCHER_ENTRY_DESTROY=0x9e
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDHCPNOTIFWATCHER_CDHCPNOTIFWATCHER_EXIT=0x35
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDHCPNOTIFWATCHER_CDHCPNOTIFWATCHER_EXIT_DESTROY=0x9f
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDHCPNOTIFWATCHER_CONSTRUCTL_ENTRY=0x38
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDHCPNOTIFWATCHER_CONSTRUCTL_EXIT=0x39
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDHCPNOTIFWATCHER_DOCANCEL_ENTRY=0x3c
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDHCPNOTIFWATCHER_DOCANCEL_EXIT=0x3d
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDHCPNOTIFWATCHER_NEWL_ENTRY=0x32
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDHCPNOTIFWATCHER_NEWL_EXIT=0x33
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDHCPNOTIFWATCHER_RUNL_ENTRY=0x3e
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDHCPNOTIFWATCHER_RUNL_EXIT=0x3f
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDHCPNOTIFWATCHER_START_ENTRY=0x3a
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDHCPNOTIFWATCHER_START_EXIT=0x3b
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CIAPPROGRESSWATCHER_CIAPPROGRESSWATCHER_ENTRY=0x42
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CIAPPROGRESSWATCHER_CIAPPROGRESSWATCHER_ENTRY_DESTRUCTOR=0x44
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CIAPPROGRESSWATCHER_CIAPPROGRESSWATCHER_ENTRY_DESTRUCTOR_EXIT=0x45
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CIAPPROGRESSWATCHER_CIAPPROGRESSWATCHER_EXIT=0x43
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CIAPPROGRESSWATCHER_CONSTRUCTL_ENTRY=0x46
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CIAPPROGRESSWATCHER_CONSTRUCTL_EXIT=0x47
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CIAPPROGRESSWATCHER_DOCANCEL_ENTRY=0x4a
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CIAPPROGRESSWATCHER_DOCANCEL_EXIT=0x4b
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CIAPPROGRESSWATCHER_NEWL_ENTRY=0x40
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CIAPPROGRESSWATCHER_NEWL_EXIT=0x41
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CIAPPROGRESSWATCHER_RUNL_ENTRY=0x4c
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CIAPPROGRESSWATCHER_RUNL_EXIT=0x4d
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CIAPPROGRESSWATCHER_START_ENTRY=0x48
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CIAPPROGRESSWATCHER_START_EXIT=0x49
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CIAPREADER_CIAPREADER_ENTRY=0x50
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CIAPREADER_CIAPREADER_ENTRY_DESTRUCTOR=0x52
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CIAPREADER_CIAPREADER_ENTRY_DESTRUCTOR_EXIT=0x53
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CIAPREADER_CIAPREADER_EXIT=0x51
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CIAPREADER_CONSTRUCTL_ENTRY=0x54
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CIAPREADER_CONSTRUCTL_EXIT=0x55
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CIAPREADER_DOCANCEL_ENTRY=0x58
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CIAPREADER_DOCANCEL_EXIT=0x59
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CIAPREADER_GETNCMIAPIDL_ENTRY=0x5c
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CIAPREADER_GETNCMIAPIDL_EXIT=0x5d
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CIAPREADER_NEWL_ENTRY=0x4e
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CIAPREADER_NEWL_EXIT=0x4f
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CIAPREADER_RUNL_ENTRY=0x5a
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CIAPREADER_RUNL_EXIT=0x5b
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CIAPREADER_START_ENTRY=0x56
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CIAPREADER_START_EXIT=0x57
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CNCMCLASSCONTROLLER_CNCMCLASSCONTROLLER_ENTRY=0xaa
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CNCMCLASSCONTROLLER_CNCMCLASSCONTROLLER_ENTRY_DESTROY=0xb0
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CNCMCLASSCONTROLLER_CNCMCLASSCONTROLLER_EXIT=0xab
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CNCMCLASSCONTROLLER_CNCMCLASSCONTROLLER_EXIT_DESTROY=0xb1
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CNCMCLASSCONTROLLER_CONSTRUCTL_ENTRY=0xac
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CNCMCLASSCONTROLLER_CONSTRUCTL_EXIT=0xad
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CNCMCLASSCONTROLLER_DOCANCEL_ENTRY=0xbd
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CNCMCLASSCONTROLLER_DOCANCEL_EXIT=0xbe
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CNCMCLASSCONTROLLER_DOCANCEL_EXIT_DUP1=0xbf
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CNCMCLASSCONTROLLER_GETDESCRIPTORINFO_ENTRY=0xb6
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CNCMCLASSCONTROLLER_GETDESCRIPTORINFO_EXIT=0xb7
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CNCMCLASSCONTROLLER_MCMOERRORINDICATION_ENTRY=0xb8
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CNCMCLASSCONTROLLER_MCMOERRORINDICATION_EXIT=0xb9
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CNCMCLASSCONTROLLER_NEWL_ENTRY=0xa8
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CNCMCLASSCONTROLLER_NEWL_EXIT=0xa9
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CNCMCLASSCONTROLLER_RANDOMMACADDRESSL_ENTRY=0xae
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CNCMCLASSCONTROLLER_RANDOMMACADDRESSL_EXIT=0xaf
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CNCMCLASSCONTROLLER_RUNERROR_ENTRY=0xc0
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CNCMCLASSCONTROLLER_RUNERROR_EXIT=0xc1
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CNCMCLASSCONTROLLER_RUNL_ENTRY=0xba
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CNCMCLASSCONTROLLER_RUNL_EXIT=0xbc
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CNCMCLASSCONTROLLER_RUNL_TRANSFER_HANDLES=0xbb
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CNCMCLASSCONTROLLER_START_ENTRY=0xb2
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CNCMCLASSCONTROLLER_START_EXIT=0xb3
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CNCMCLASSCONTROLLER_STOP_ENTRY=0xb4
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CNCMCLASSCONTROLLER_STOP_EXIT=0xb5
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBCLIENTMANAGER_CONSTRUCTL_ENTRY=0x6c
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBCLIENTMANAGER_CONSTRUCTL_EXIT=0x6d
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBCLIENTMANAGER_CUSBCLIENTMANAGER_ENTRY=0x6a
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBCLIENTMANAGER_CUSBCLIENTMANAGER_ENTRY_DESTRUCTOR=0x64
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBCLIENTMANAGER_CUSBCLIENTMANAGER_ENTRY_DESTRUCTOR_EXIT=0x65
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBCLIENTMANAGER_CUSBCLIENTMANAGER_EXIT=0x6b
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBCLIENTMANAGER_DATAINTERFACENUMBER_ENTRY=0x78
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBCLIENTMANAGER_DATAINTERFACENUMBER_EXIT=0x79
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBCLIENTMANAGER_DATAINTERFACENUMBER_EXIT_DUP1=0xa2
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBCLIENTMANAGER_DATAINTERFACENUMBER_EXIT_DUP2=0xa3
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBCLIENTMANAGER_DATAINTERFACENUMBER_EXIT_DUP3=0xa4
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBCLIENTMANAGER_NEWLC_ENTRY=0x60
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBCLIENTMANAGER_NEWLC_EXIT=0x61
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBCLIENTMANAGER_NEWL_ENTRY=0x62
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBCLIENTMANAGER_NEWL_EXIT=0x63
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBCLIENTMANAGER_SETCOMMUNICATIONINTERFACEL_ENTRY=0x6e
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBCLIENTMANAGER_SETCOMMUNICATIONINTERFACEL_EXIT=0x6f
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBCLIENTMANAGER_SETDATAINTERFACEL_ENTRY=0x70
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBCLIENTMANAGER_SETDATAINTERFACEL_EXIT=0x71
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBCLIENTMANAGER_SETMACADDRESSSTRING_ENTRY=0x76
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBCLIENTMANAGER_SETMACADDRESSSTRING_EXIT=0x77
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBCLIENTMANAGER_SETNCMINTERFACESL_ENTRY=0x66
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBCLIENTMANAGER_SETNCMINTERFACESL_EXIT=0x67
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBCLIENTMANAGER_SETUPCLASSSPECIFICDESCRIPTOR_ENTRY=0x72
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBCLIENTMANAGER_SETUPCLASSSPECIFICDESCRIPTOR_EXIT=0x73
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBCLIENTMANAGER_SETUPCLASSSPECIFICDESCRIPTOR_EXIT_DUP1=0xa0
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBCLIENTMANAGER_SETUPCLASSSPECIFICDESCRIPTOR_EXIT_DUP2=0xa1
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBCLIENTMANAGER_TRANSFERINTERFACESL_ENTRY=0x68
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBCLIENTMANAGER_TRANSFERINTERFACESL_EXIT=0x69
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBNCMCLASSCONTROLLER_CONSTRUCTL_ENTRY=0xc6
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBNCMCLASSCONTROLLER_CONSTRUCTL_EXIT=0xc7
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBNCMCLASSCONTROLLER_CUSBNCMCLASSCONTROLLER_ENTRY=0xc4
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBNCMCLASSCONTROLLER_CUSBNCMCLASSCONTROLLER_ENTRY_DESTROY=0xca
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBNCMCLASSCONTROLLER_CUSBNCMCLASSCONTROLLER_EXIT=0xc5
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBNCMCLASSCONTROLLER_CUSBNCMCLASSCONTROLLER_EXIT_DESTROY=0xcb
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBNCMCLASSCONTROLLER_DOCANCEL_ENTRY=0xd7
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBNCMCLASSCONTROLLER_DOCANCEL_EXIT=0xd8
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBNCMCLASSCONTROLLER_DOCANCEL_EXIT_DUP1=0xd9
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBNCMCLASSCONTROLLER_GETDESCRIPTORINFO_ENTRY=0xd0
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBNCMCLASSCONTROLLER_GETDESCRIPTORINFO_EXIT=0xd1
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBNCMCLASSCONTROLLER_MCMOERRORINDICATION_ENTRY=0xd2
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBNCMCLASSCONTROLLER_MCMOERRORINDICATION_EXIT=0xd3
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBNCMCLASSCONTROLLER_NEWL_ENTRY=0xc2
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBNCMCLASSCONTROLLER_NEWL_EXIT=0xc3
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBNCMCLASSCONTROLLER_RANDOMMACADDRESSL_ENTRY=0xc8
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBNCMCLASSCONTROLLER_RANDOMMACADDRESSL_EXIT=0xc9
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBNCMCLASSCONTROLLER_RUNERROR_ENTRY=0xda
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBNCMCLASSCONTROLLER_RUNERROR_EXIT=0xdb
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBNCMCLASSCONTROLLER_RUNL_ENTRY=0xd4
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBNCMCLASSCONTROLLER_RUNL_EXIT=0xd6
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBNCMCLASSCONTROLLER_RUNL_TRANSFER_HANDLES=0xd5
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBNCMCLASSCONTROLLER_START_ENTRY=0xcc
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBNCMCLASSCONTROLLER_START_EXIT=0xcd
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBNCMCLASSCONTROLLER_STOP_ENTRY=0xce
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBNCMCLASSCONTROLLER_STOP_EXIT=0xcf
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_CCONNECTIONMANAGER_MDNOHANDLEDHCPNOTIFICATION_EXIT=0x7d
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_CCONNECTIONMANAGER_MICOHANDLEIAPREADINGCOMPLETE_EXIT=0x7e
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_CDHCPNOTIFWATCHER_CDHCPNOTIFWATCHER_ENTRY=0x36
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_CDHCPNOTIFWATCHER_CDHCPNOTIFWATCHER_EXIT=0x37
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_CUSBCLIENTMANAGER_DATAINTERFACENUMBER_EXIT=0x7a
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_CUSBCLIENTMANAGER_SETUPCLASSSPECIFICDESCRIPTOR_EXIT=0x74
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_CUSBNCMCLASSCONTROLLER_CUSBNCMCLASSCONTROLLER_ENTRY=0x88
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_CUSBNCMCLASSCONTROLLER_CUSBNCMCLASSCONTROLLER_EXIT=0x89
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_CUSBNCMCLASSCONTROLLER_DOCANCEL_EXIT=0x97
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP2_CCONNECTIONMANAGER_MICOHANDLEIAPREADINGCOMPLETE_EXIT=0x7f
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP2_CUSBCLIENTMANAGER_DATAINTERFACENUMBER_EXIT=0x7b
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP2_CUSBCLIENTMANAGER_SETUPCLASSSPECIFICDESCRIPTOR_EXIT=0x75
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP3_CUSBCLIENTMANAGER_DATAINTERFACENUMBER_EXIT=0x7c
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_TUSBNCMCLASSDESCRIPTOR_DES_ENTRY=0x5e
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_TUSBNCMCLASSDESCRIPTOR_DES_EXIT=0x5f
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CCONNECTIONMANAGER_HANDLECONNECTIONCOMPLETEL_CHANGE_MTU=0x1
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CCONNECTIONMANAGER_HANDLECONNECTIONCOMPLETEL_CONN_NCM_INTERNAL_SVR=0x2
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CCONNECTIONMANAGER_MDNOHANDLEDHCPNOTIFICATION_CALL_IOCTL=0x33
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CCONNECTIONMANAGER_MDNOHANDLEDHCPNOTIFICATION_RETURN_IOCTL=0x34
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CCONNECTIONMANAGER_SETCUSTOMMTUL=0x3
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CCONNECTIONMANAGER_SETCUSTOMMTUL_INTER_INFO=0x4
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CCONNECTIONMANAGER_SETCUSTOMMTUL_INTER_MTU=0x8
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CCONNECTIONMANAGER_SETCUSTOMMTUL_INTER_NAME=0x7
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CCONNECTIONMANAGER_SETCUSTOMMTUL_NEW_MTU_SIZE=0x5
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CCONNECTIONMANAGER_SETCUSTOMMTUL_PRE_SETMTU=0x25
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CCONNECTIONMANAGER_SETCUSTOMMTUL_START_INTER_ENUM=0x6
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CCONNECTIONMANHELPER_DOCNCEL=0xd
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CCONNECTIONMANHELPER_SILENTSTOP=0xc
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CCONNECTIONMANHELPER_STOP_RETURN_CODE=0xb
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CIAPPROGRESSWATCHER_RUNL_COMPLETION_CODE=0xe
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CIAPPROGRESSWATCHER_RUNL_INFO=0xf
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CIAPPROGRESSWATCHER_RUNL_RESTART_WATCHER=0x35
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CIAPREADER_GETNCMIAPIDL=0x13
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CIAPREADER_GETNCMIAPIDL_CHOSEN_IAP_ID=0x17
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CIAPREADER_GETNCMIAPIDL_CHOSEN_LAN_BEARER=0x14
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CIAPREADER_GETNCMIAPIDL_COUNT_LAN_BEARER=0x12
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CIAPREADER_GETNCMIAPIDL_RECORD_BEARER_ID=0x16
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CIAPREADER_GETNCMIAPIDL_RECORD_ID=0x15
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CIAPREADER_RUNL_GETIAP=0x10
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CNCMCLASSCONTROLLER_CNCMCLASSCONTROLLER_PRE_UNLOAD_CSC_LDD=0x3a
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CNCMCLASSCONTROLLER_CNCMCLASSCONTROLLER_UNLOAD_LDD_RESULT=0x3b
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CNCMCLASSCONTROLLER_CONSTRUCTL=0x37
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CNCMCLASSCONTROLLER_CONSTRUCTL_CSC_LDD_LOADED=0x39
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CNCMCLASSCONTROLLER_CONSTRUCTL_LOAD_CSC_LDD=0x38
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CNCMCLASSCONTROLLER_DOCANCEL_IDLE=0x42
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CNCMCLASSCONTROLLER_DOCANCEL_INFO_PRINT=0x41
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CNCMCLASSCONTROLLER_RUNL_BUILT_NCM_CONNECTION=0x40
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CNCMCLASSCONTROLLER_RUNL_PRINT_INFO=0x3e
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CNCMCLASSCONTROLLER_RUNL_STARTED=0x3f
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CNCMCLASSCONTROLLER_START_PRINT_STATE=0x3c
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CNCMCLASSCONTROLLER_STOP_PRINT_STATE=0x3d
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CNCMIAPREADER_SEARCHNCMIAPL_ENSURE_ONLY_ONE_NCM_IAP=0x36
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBCLIENTMANAGER_CUSBCLIENTMANAGER_CLOSE_COMM_CHUNK=0x19
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBCLIENTMANAGER_CUSBCLIENTMANAGER_CLOSE_COMM_INTERFACE=0x1a
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBCLIENTMANAGER_CUSBCLIENTMANAGER_CLOSE_DATA_CHUNK=0x1c
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBCLIENTMANAGER_CUSBCLIENTMANAGER_CLOSE_DATA_INTERFACE=0x1d
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBCLIENTMANAGER_CUSBCLIENTMANAGER_PRE_CLOSE_COMM_INTERFACE=0x18
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBCLIENTMANAGER_CUSBCLIENTMANAGER_PRE_CLOSE_DATA_INTERFACE=0x1b
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBCLIENTMANAGER_DATAINTERFACENUMBER=0x24
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBCLIENTMANAGER_DATAINTERFACENUMBER_INTERFACE_INFO=0x22
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBCLIENTMANAGER_DATAINTERFACENUMBER_INTERFACE_INFO2=0x23
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBCLIENTMANAGER_SETDATAINTERFACEL_TRY_NEW_BUF_SIZE=0x20
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBCLIENTMANAGER_SETMACADDRESSSTRING=0x21
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBCLIENTMANAGER_SETUPCLASSSPECIFICDESCRIPTOR_PRE_SET_BLOCK=0x26
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBCLIENTMANAGER_TRANSFERINTERFACESL_INTERFACES_TRANSFERED=0x1f
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBCLIENTMANAGER_TRANSFERINTERFACESL_PRE_TRANSFER_INTERFACES=0x1e
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBNCMCLASSCONTROLLER_CONSTRUCTL=0x43
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBNCMCLASSCONTROLLER_CONSTRUCTL_CSC_LDD_LOADED=0x45
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBNCMCLASSCONTROLLER_CONSTRUCTL_LOAD_CSC_LDD=0x44
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBNCMCLASSCONTROLLER_CUSBNCMCLASSCONTROLLER_PRE_UNLOAD_CSC_LDD=0x46
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBNCMCLASSCONTROLLER_CUSBNCMCLASSCONTROLLER_UNLOAD_LDD_RESULT=0x47
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBNCMCLASSCONTROLLER_DOCANCEL_IDLE=0x4e
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBNCMCLASSCONTROLLER_DOCANCEL_INFO_PRINT=0x4d
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBNCMCLASSCONTROLLER_RUNL_BUILT_NCM_CONNECTION=0x4c
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBNCMCLASSCONTROLLER_RUNL_PRINT_INFO=0x4a
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBNCMCLASSCONTROLLER_RUNL_STARTED=0x4b
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBNCMCLASSCONTROLLER_START_PRINT_STATE=0x48
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBNCMCLASSCONTROLLER_STOP_PRINT_STATE=0x49
--- a/usbmgmt/usbmgr/device/classdrivers/ncm/classimplementation/ncmpktdrv/client/group/ncminternalsrv.mmp Wed Jul 07 14:16:40 2010 +0800
+++ b/usbmgmt/usbmgr/device/classdrivers/ncm/classimplementation/ncmpktdrv/client/group/ncminternalsrv.mmp Wed Jul 07 15:08:54 2010 +0800
@@ -37,3 +37,4 @@
SOURCE ncminternalsrv.cpp
LIBRARY euser.lib
+
--- a/usbmgmt/usbmgr/device/classdrivers/ncm/classimplementation/ncmpktdrv/pktdrv/group/pktdrv.mmp Wed Jul 07 14:16:40 2010 +0800
+++ b/usbmgmt/usbmgr/device/classdrivers/ncm/classimplementation/ncmpktdrv/pktdrv/group/pktdrv.mmp Wed Jul 07 15:08:54 2010 +0800
@@ -60,3 +60,4 @@
LIBRARY efsrv.lib random.lib
LIBRARY nodemessages.lib
LIBRARY netmeta.lib
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usbmgmt/usbmgr/device/classdrivers/ncm/classimplementation/ncmpktdrv/pktdrv/traces/OstTraceDefinitions.h Wed Jul 07 15:08:54 2010 +0800
@@ -0,0 +1,7 @@
+#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
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usbmgmt/usbmgr/device/classdrivers/ncm/classimplementation/ncmpktdrv/pktdrv/traces/fixed_id.definitions Wed Jul 07 15:08:54 2010 +0800
@@ -0,0 +1,307 @@
+#Fixed group and trace id definitions. If this file is removed, the identifiers are rebuilt.
+[GROUP]TRACE_ERROR=0x40
+[GROUP]TRACE_FATAL=0x1
+[GROUP]TRACE_FLOW=0x7
+[GROUP]TRACE_NORMAL=0x3
+[GROUP]TRACE_WARNING=0x41
+[TRACE]TRACE_ERROR[0x40]_CNCMCOEXISTBEARERWATCHER_CONSTRUCTL_DUP02=0x1
+[TRACE]TRACE_ERROR[0x40]_CNCMCOEXISTBEARERWATCHER_DOACTIVE=0x2
+[TRACE]TRACE_ERROR[0x40]_CNCMCOEXISTBEARERWATCHER_DOACTIVE_DUP01=0x3
+[TRACE]TRACE_ERROR[0x40]_CNCMCOEXISTBEARERWATCHER_DOACTIVE_DUP02=0x4
+[TRACE]TRACE_ERROR[0x40]_CNCMCOEXISTBEARERWATCHER_DOACTIVE_DUP03=0x5
+[TRACE]TRACE_ERROR[0x40]_CNCMCOMMUNICATIONINTERFACE_DECODESETUP=0x6
+[TRACE]TRACE_ERROR[0x40]_CNCMCOMMUNICATIONINTERFACE_WRITEINTERRUPTDATA1=0x7
+[TRACE]TRACE_ERROR[0x40]_CNCMCOMMUNICATIONINTERFACE_WRITEINTERRUPTDATA2=0x8
+[TRACE]TRACE_ERROR[0x40]_CNCMDATARECEIVER_READDATA_DUP03=0xa
+[TRACE]TRACE_ERROR[0x40]_CNCMDATARECEIVER_RUNL=0xb
+[TRACE]TRACE_ERROR[0x40]_CNCMDATARECEIVER_START_DUP01=0x9
+[TRACE]TRACE_ERROR[0x40]_CNCMDATASENDER_START=0xc
+[TRACE]TRACE_ERROR[0x40]_CNCMENGINE_DATAERROR=0xe
+[TRACE]TRACE_ERROR[0x40]_CNCMENGINE_START_DUP01=0xd
+[TRACE]TRACE_ERROR[0x40]_CNCMNTB16PARSER_PARSENCMNTB16HEADER=0xf
+[TRACE]TRACE_ERROR[0x40]_CNCMNTB16PARSER_QUEUEBUF=0x10
+[TRACE]TRACE_ERROR[0x40]_CNCMSHAREDSTATEMANAGER_SETSTATEVALUE_DUP02=0x11
+[TRACE]TRACE_FATAL[0x1]_CNCMBUFFERMANAGER_SETBUFFERCELLSIZE1=0x1
+[TRACE]TRACE_FATAL[0x1]_CNCMCOMMINTERFACESENDERANDRECEIVER_READ_DUP1=0x3
+[TRACE]TRACE_FATAL[0x1]_CNCMCOMMINTERFACESENDERANDRECEIVER_START1=0x2
+[TRACE]TRACE_FATAL[0x1]_CNCMCOMMINTERFACESENDERANDRECEIVER_WRITE1=0x4
+[TRACE]TRACE_FATAL[0x1]_CNCMCOMMINTERFACESENDERANDRECEIVER_WRITE2=0x5
+[TRACE]TRACE_FATAL[0x1]_CNCMCOMMINTERFACESENDERANDRECEIVER_WRITE3=0x6
+[TRACE]TRACE_FATAL[0x1]_CNCMCOMMINTERFACESENDERANDRECEIVER_WRITE4=0x7
+[TRACE]TRACE_FATAL[0x1]_CNCMCOMMUNICATIONINTERFACE_READSETUP=0x9
+[TRACE]TRACE_FATAL[0x1]_CNCMCOMMUNICATIONINTERFACE_START1=0x8
+[TRACE]TRACE_FATAL[0x1]_CNCMCOMMUNICATIONINTERFACE_WRITEINTERRUPTDATA=0xa
+[TRACE]TRACE_FATAL[0x1]_CNCMDATASENDER_SENDNTBPAYLOAD4=0x10
+[TRACE]TRACE_FATAL[0x1]_CNCMDATASENDER_SETNTBINMAXSIZE1=0x11
+[TRACE]TRACE_FATAL[0x1]_CNCMDATASENDER_START1=0xb
+[TRACE]TRACE_FATAL[0x1]_CNCMDATASENDER_START2=0xc
+[TRACE]TRACE_FATAL[0x1]_CNCMDATASENDER_START3=0xd
+[TRACE]TRACE_FATAL[0x1]_CNCMDATASENDER_START5=0xe
+[TRACE]TRACE_FATAL[0x1]_CNCMDATASENDER_STARTNEWNTB=0xf
+[TRACE]TRACE_FLOW[0x7]_CNCMBUFFERMANAGER_CNCMBUFFERMANAGER_ENTRY=0x3
+[TRACE]TRACE_FLOW[0x7]_CNCMBUFFERMANAGER_CNCMBUFFERMANAGER_EXIT=0x4
+[TRACE]TRACE_FLOW[0x7]_CNCMBUFFERMANAGER_FREEBUFFER_ENTRY=0x8
+[TRACE]TRACE_FLOW[0x7]_CNCMBUFFERMANAGER_FREEBUFFER_EXIT=0x9
+[TRACE]TRACE_FLOW[0x7]_CNCMBUFFERMANAGER_GETBUFFER_ENTRY=0x5
+[TRACE]TRACE_FLOW[0x7]_CNCMBUFFERMANAGER_GETBUFFER_EXIT=0x6
+[TRACE]TRACE_FLOW[0x7]_CNCMBUFFERMANAGER_GETBUFFER_EXIT_DUP1=0x7
+[TRACE]TRACE_FLOW[0x7]_CNCMBUFFERMANAGER_NEWL_ENTRY=0x1
+[TRACE]TRACE_FLOW[0x7]_CNCMBUFFERMANAGER_NEWL_EXIT=0x2
+[TRACE]TRACE_FLOW[0x7]_CNCMBUFFERMANAGER_SETBUFFERCELLSIZE_ENTRY=0xa
+[TRACE]TRACE_FLOW[0x7]_CNCMBUFFERMANAGER_SETBUFFERCELLSIZE_EXIT=0xb
+[TRACE]TRACE_FLOW[0x7]_CNCMBUFFERMANAGER_SETBUFFERCELLSIZE_EXIT_DUP1=0xc
+[TRACE]TRACE_FLOW[0x7]_CNCMCOEXISTBEARERWATCHER_CONSTRUCTL=0xd
+[TRACE]TRACE_FLOW[0x7]_CNCMCOEXISTBEARERWATCHER_CONSTRUCTL_DUP01=0xe
+[TRACE]TRACE_FLOW[0x7]_CNCMCOEXISTBEARERWATCHER_DOCANCEL=0x12
+[TRACE]TRACE_FLOW[0x7]_CNCMCOEXISTBEARERWATCHER_SETIPOVERUSBACTIVE=0xf
+[TRACE]TRACE_FLOW[0x7]_CNCMCOEXISTBEARERWATCHER_SETIPOVERUSBACTIVE_DUP02=0x10
+[TRACE]TRACE_FLOW[0x7]_CNCMCOEXISTBEARERWATCHER_SETIPOVERUSBACTIVE_DUP03=0x11
+[TRACE]TRACE_FLOW[0x7]_CNCMCOMMINTERFACESENDERANDRECEIVER_DOCANCEL_ENTRY=0x28
+[TRACE]TRACE_FLOW[0x7]_CNCMCOMMINTERFACESENDERANDRECEIVER_DOCANCEL_EXIT=0x29
+[TRACE]TRACE_FLOW[0x7]_CNCMCOMMINTERFACESENDERANDRECEIVER_READDATA_ENTRY=0x21
+[TRACE]TRACE_FLOW[0x7]_CNCMCOMMINTERFACESENDERANDRECEIVER_READDATA_EXIT=0x22
+[TRACE]TRACE_FLOW[0x7]_CNCMCOMMINTERFACESENDERANDRECEIVER_READDATA_EXIT_DUP1=0x23
+[TRACE]TRACE_FLOW[0x7]_CNCMCOMMINTERFACESENDERANDRECEIVER_READDATA_EXIT_DUP2=0x24
+[TRACE]TRACE_FLOW[0x7]_CNCMCOMMINTERFACESENDERANDRECEIVER_READDATA_EXIT_DUP3=0x25
+[TRACE]TRACE_FLOW[0x7]_CNCMCOMMINTERFACESENDERANDRECEIVER_READ_ENTRY=0x18
+[TRACE]TRACE_FLOW[0x7]_CNCMCOMMINTERFACESENDERANDRECEIVER_READ_EXIT=0x19
+[TRACE]TRACE_FLOW[0x7]_CNCMCOMMINTERFACESENDERANDRECEIVER_READ_EXIT_DUP1=0x1a
+[TRACE]TRACE_FLOW[0x7]_CNCMCOMMINTERFACESENDERANDRECEIVER_RUNL_ENTRY=0x26
+[TRACE]TRACE_FLOW[0x7]_CNCMCOMMINTERFACESENDERANDRECEIVER_RUNL_EXIT=0x27
+[TRACE]TRACE_FLOW[0x7]_CNCMCOMMINTERFACESENDERANDRECEIVER_START_ENTRY=0x13
+[TRACE]TRACE_FLOW[0x7]_CNCMCOMMINTERFACESENDERANDRECEIVER_START_EXIT=0x14
+[TRACE]TRACE_FLOW[0x7]_CNCMCOMMINTERFACESENDERANDRECEIVER_START_EXIT_DUP1=0x15
+[TRACE]TRACE_FLOW[0x7]_CNCMCOMMINTERFACESENDERANDRECEIVER_STOP_ENTRY=0x16
+[TRACE]TRACE_FLOW[0x7]_CNCMCOMMINTERFACESENDERANDRECEIVER_STOP_EXIT=0x17
+[TRACE]TRACE_FLOW[0x7]_CNCMCOMMINTERFACESENDERANDRECEIVER_WRITE_ENTRY=0x1b
+[TRACE]TRACE_FLOW[0x7]_CNCMCOMMINTERFACESENDERANDRECEIVER_WRITE_EXIT=0x1c
+[TRACE]TRACE_FLOW[0x7]_CNCMCOMMINTERFACESENDERANDRECEIVER_WRITE_EXIT_DUP1=0x1d
+[TRACE]TRACE_FLOW[0x7]_CNCMCOMMINTERFACESENDERANDRECEIVER_WRITE_EXIT_DUP2=0x1e
+[TRACE]TRACE_FLOW[0x7]_CNCMCOMMINTERFACESENDERANDRECEIVER_WRITE_EXIT_DUP3=0x1f
+[TRACE]TRACE_FLOW[0x7]_CNCMCOMMINTERFACESENDERANDRECEIVER_WRITE_EXIT_DUP4=0x20
+[TRACE]TRACE_FLOW[0x7]_CNCMCOMMUNICATIONINTERFACE_CNCMCOMMUNICATIONINTERFACE_ENTRY=0x2c
+[TRACE]TRACE_FLOW[0x7]_CNCMCOMMUNICATIONINTERFACE_CNCMCOMMUNICATIONINTERFACE_EXIT=0x2d
+[TRACE]TRACE_FLOW[0x7]_CNCMCOMMUNICATIONINTERFACE_CONTROLMSGERROR_ENTRY=0x46
+[TRACE]TRACE_FLOW[0x7]_CNCMCOMMUNICATIONINTERFACE_CONTROLMSGERROR_EXIT=0x47
+[TRACE]TRACE_FLOW[0x7]_CNCMCOMMUNICATIONINTERFACE_DECODESETUP_ENTRY=0x35
+[TRACE]TRACE_FLOW[0x7]_CNCMCOMMUNICATIONINTERFACE_DECODESETUP_EXIT=0x36
+[TRACE]TRACE_FLOW[0x7]_CNCMCOMMUNICATIONINTERFACE_DOCANCEL_ENTRY=0x3f
+[TRACE]TRACE_FLOW[0x7]_CNCMCOMMUNICATIONINTERFACE_DOCANCEL_EXIT=0x40
+[TRACE]TRACE_FLOW[0x7]_CNCMCOMMUNICATIONINTERFACE_GETINTERFACENUMBER_ENTRY=0x4f
+[TRACE]TRACE_FLOW[0x7]_CNCMCOMMUNICATIONINTERFACE_GETINTERFACENUMBER_EXIT=0x50
+[TRACE]TRACE_FLOW[0x7]_CNCMCOMMUNICATIONINTERFACE_GETINTERFACENUMBER_EXIT_DUP1=0x51
+[TRACE]TRACE_FLOW[0x7]_CNCMCOMMUNICATIONINTERFACE_GETINTERFACENUMBER_EXIT_DUP2=0x52
+[TRACE]TRACE_FLOW[0x7]_CNCMCOMMUNICATIONINTERFACE_GETINTERFACENUMBER_EXIT_DUP3=0x53
+[TRACE]TRACE_FLOW[0x7]_CNCMCOMMUNICATIONINTERFACE_NEWL_ENTRY=0x2a
+[TRACE]TRACE_FLOW[0x7]_CNCMCOMMUNICATIONINTERFACE_NEWL_EXIT=0x2b
+[TRACE]TRACE_FLOW[0x7]_CNCMCOMMUNICATIONINTERFACE_PARSEDATAOUT_ENTRY=0x39
+[TRACE]TRACE_FLOW[0x7]_CNCMCOMMUNICATIONINTERFACE_PARSEDATAOUT_EXIT=0x3a
+[TRACE]TRACE_FLOW[0x7]_CNCMCOMMUNICATIONINTERFACE_READDATAOUT_ENTRY=0x37
+[TRACE]TRACE_FLOW[0x7]_CNCMCOMMUNICATIONINTERFACE_READDATAOUT_EXIT=0x38
+[TRACE]TRACE_FLOW[0x7]_CNCMCOMMUNICATIONINTERFACE_READSETUP_ENTRY=0x32
+[TRACE]TRACE_FLOW[0x7]_CNCMCOMMUNICATIONINTERFACE_READSETUP_EXIT=0x33
+[TRACE]TRACE_FLOW[0x7]_CNCMCOMMUNICATIONINTERFACE_READSETUP_EXIT_DUP1=0x34
+[TRACE]TRACE_FLOW[0x7]_CNCMCOMMUNICATIONINTERFACE_RUNL_ENTRY=0x43
+[TRACE]TRACE_FLOW[0x7]_CNCMCOMMUNICATIONINTERFACE_RUNL_EXIT=0x44
+[TRACE]TRACE_FLOW[0x7]_CNCMCOMMUNICATIONINTERFACE_RUNL_EXIT_DUP1=0x45
+[TRACE]TRACE_FLOW[0x7]_CNCMCOMMUNICATIONINTERFACE_SENDCONNECTIONNOTIFICATION_ENTRY=0x3b
+[TRACE]TRACE_FLOW[0x7]_CNCMCOMMUNICATIONINTERFACE_SENDSPEEDNOTIFICATION_ENTRY=0x3c
+[TRACE]TRACE_FLOW[0x7]_CNCMCOMMUNICATIONINTERFACE_START_ENTRY=0x2e
+[TRACE]TRACE_FLOW[0x7]_CNCMCOMMUNICATIONINTERFACE_START_EXIT=0x2f
+[TRACE]TRACE_FLOW[0x7]_CNCMCOMMUNICATIONINTERFACE_START_EXIT_DUP1=0x30
+[TRACE]TRACE_FLOW[0x7]_CNCMCOMMUNICATIONINTERFACE_START_EXIT_DUP2=0x31
+[TRACE]TRACE_FLOW[0x7]_CNCMCOMMUNICATIONINTERFACE_STOP_ENTRY=0x41
+[TRACE]TRACE_FLOW[0x7]_CNCMCOMMUNICATIONINTERFACE_STOP_EXIT=0x42
+[TRACE]TRACE_FLOW[0x7]_CNCMCOMMUNICATIONINTERFACE_WRITEDATAIN_ENTRY=0x3d
+[TRACE]TRACE_FLOW[0x7]_CNCMCOMMUNICATIONINTERFACE_WRITEDATAIN_EXIT=0x3e
+[TRACE]TRACE_FLOW[0x7]_CNCMCOMMUNICATIONINTERFACE_WRITEINTERRUPTDATA_ENTRY=0x48
+[TRACE]TRACE_FLOW[0x7]_CNCMCOMMUNICATIONINTERFACE_WRITEINTERRUPTDATA_EXIT=0x49
+[TRACE]TRACE_FLOW[0x7]_CNCMCOMMUNICATIONINTERFACE_WRITEINTERRUPTDATA_EXIT_DUP1=0x4a
+[TRACE]TRACE_FLOW[0x7]_CNCMCOMMUNICATIONINTERFACE_WRITEINTERRUPTDATA_EXIT_DUP2=0x4b
+[TRACE]TRACE_FLOW[0x7]_CNCMCOMMUNICATIONINTERFACE_WRITEINTERRUPTDATA_EXIT_DUP3=0x4c
+[TRACE]TRACE_FLOW[0x7]_CNCMCOMMUNICATIONINTERFACE_WRITEINTERRUPTDATA_EXIT_DUP4=0x4d
+[TRACE]TRACE_FLOW[0x7]_CNCMCOMMUNICATIONINTERFACE_WRITEINTERRUPTDATA_EXIT_DUP5=0x4e
+[TRACE]TRACE_FLOW[0x7]_CNCMDATAINTERFACE_CNCMDATAINTERFACE_DUP01=0x56
+[TRACE]TRACE_FLOW[0x7]_CNCMDATAINTERFACE_CNCMDATAINTERFACE_DUP02=0x57
+[TRACE]TRACE_FLOW[0x7]_CNCMDATAINTERFACE_CONSTRUCTL=0x54
+[TRACE]TRACE_FLOW[0x7]_CNCMDATAINTERFACE_CONSTRUCTL_DUP01=0x55
+[TRACE]TRACE_FLOW[0x7]_CNCMDATAINTERFACE_START=0x58
+[TRACE]TRACE_FLOW[0x7]_CNCMDATAINTERFACE_START_DUP01=0x59
+[TRACE]TRACE_FLOW[0x7]_CNCMDATAINTERFACE_STOP=0x5a
+[TRACE]TRACE_FLOW[0x7]_CNCMDATAINTERFACE_STOP_DUP01=0x5b
+[TRACE]TRACE_FLOW[0x7]_CNCMDATARECEIVER_CNCMDATARECEIVER_DUP01=0x5e
+[TRACE]TRACE_FLOW[0x7]_CNCMDATARECEIVER_DOCANCEL=0x64
+[TRACE]TRACE_FLOW[0x7]_CNCMDATARECEIVER_NEWL=0x5c
+[TRACE]TRACE_FLOW[0x7]_CNCMDATARECEIVER_NEWL_DUP01=0x5d
+[TRACE]TRACE_FLOW[0x7]_CNCMDATARECEIVER_READDATA=0x62
+[TRACE]TRACE_FLOW[0x7]_CNCMDATARECEIVER_READDATA_DUP01=0x63
+[TRACE]TRACE_FLOW[0x7]_CNCMDATARECEIVER_START=0x5f
+[TRACE]TRACE_FLOW[0x7]_CNCMDATARECEIVER_START_DUP02=0x60
+[TRACE]TRACE_FLOW[0x7]_CNCMDATARECEIVER_START_DUP03=0x61
+[TRACE]TRACE_FLOW[0x7]_CNCMDATARECEIVER_STOP=0x65
+[TRACE]TRACE_FLOW[0x7]_CNCMDATARECEIVER_STOP_DUP01=0x66
+[TRACE]TRACE_FLOW[0x7]_CNCMDATASENDER_DOCANCEL_ENTRY=0x7a
+[TRACE]TRACE_FLOW[0x7]_CNCMDATASENDER_DOCANCEL_EXIT=0x7b
+[TRACE]TRACE_FLOW[0x7]_CNCMDATASENDER_NEWL_ENTRY=0x67
+[TRACE]TRACE_FLOW[0x7]_CNCMDATASENDER_NEWL_EXIT=0x68
+[TRACE]TRACE_FLOW[0x7]_CNCMDATASENDER_RUNL_ENTRY=0x70
+[TRACE]TRACE_FLOW[0x7]_CNCMDATASENDER_RUNL_EXIT=0x71
+[TRACE]TRACE_FLOW[0x7]_CNCMDATASENDER_RUNL_EXIT_DUP1=0x72
+[TRACE]TRACE_FLOW[0x7]_CNCMDATASENDER_SENDNTBCOMPLETE_ENTRY=0x7f
+[TRACE]TRACE_FLOW[0x7]_CNCMDATASENDER_SENDNTBCOMPLETE_EXIT=0x80
+[TRACE]TRACE_FLOW[0x7]_CNCMDATASENDER_SENDNTBPAYLOAD_ENTRY=0x7c
+[TRACE]TRACE_FLOW[0x7]_CNCMDATASENDER_SENDNTBPAYLOAD_EXIT=0x7d
+[TRACE]TRACE_FLOW[0x7]_CNCMDATASENDER_SENDNTBPAYLOAD_EXIT_DUP1=0x7e
+[TRACE]TRACE_FLOW[0x7]_CNCMDATASENDER_SEND_ENTRY=0x75
+[TRACE]TRACE_FLOW[0x7]_CNCMDATASENDER_SEND_EXIT=0x76
+[TRACE]TRACE_FLOW[0x7]_CNCMDATASENDER_SEND_EXIT_DUP1=0x77
+[TRACE]TRACE_FLOW[0x7]_CNCMDATASENDER_SEND_EXIT_DUP2=0x78
+[TRACE]TRACE_FLOW[0x7]_CNCMDATASENDER_SEND_EXIT_DUP3=0x79
+[TRACE]TRACE_FLOW[0x7]_CNCMDATASENDER_SETINEPBUFFERSIZE_ENTRY=0x88
+[TRACE]TRACE_FLOW[0x7]_CNCMDATASENDER_SETINEPBUFFERSIZE_EXIT=0x89
+[TRACE]TRACE_FLOW[0x7]_CNCMDATASENDER_SETNTBINMAXSIZE_ENTRY=0x81
+[TRACE]TRACE_FLOW[0x7]_CNCMDATASENDER_SETNTBINMAXSIZE_EXIT=0x82
+[TRACE]TRACE_FLOW[0x7]_CNCMDATASENDER_SETNTBINMAXSIZE_EXIT_DUP1=0x83
+[TRACE]TRACE_FLOW[0x7]_CNCMDATASENDER_SETNTBINMAXSIZE_EXIT_DUP2=0x84
+[TRACE]TRACE_FLOW[0x7]_CNCMDATASENDER_SETNTBINMAXSIZE_EXIT_DUP4=0x85
+[TRACE]TRACE_FLOW[0x7]_CNCMDATASENDER_STARTNEWNTB_ENTRY=0x73
+[TRACE]TRACE_FLOW[0x7]_CNCMDATASENDER_STARTNEWNTB_EXIT=0x74
+[TRACE]TRACE_FLOW[0x7]_CNCMDATASENDER_START_ENTRY=0x69
+[TRACE]TRACE_FLOW[0x7]_CNCMDATASENDER_START_EXIT=0x6a
+[TRACE]TRACE_FLOW[0x7]_CNCMDATASENDER_START_EXIT_DUP1=0x6b
+[TRACE]TRACE_FLOW[0x7]_CNCMDATASENDER_START_EXIT_DUP2=0x6c
+[TRACE]TRACE_FLOW[0x7]_CNCMDATASENDER_START_EXIT_DUP3=0x6d
+[TRACE]TRACE_FLOW[0x7]_CNCMDATASENDER_START_EXIT_DUP4=0x6e
+[TRACE]TRACE_FLOW[0x7]_CNCMDATASENDER_START_EXIT_DUP5=0x6f
+[TRACE]TRACE_FLOW[0x7]_CNCMDATASENDER_STOP_ENTRY=0x86
+[TRACE]TRACE_FLOW[0x7]_CNCMDATASENDER_STOP_EXIT=0x87
+[TRACE]TRACE_FLOW[0x7]_CNCMENGINE_CNCMENGINE_DUP10=0x8e
+[TRACE]TRACE_FLOW[0x7]_CNCMENGINE_CNCMENGINE_DUP11=0x8f
+[TRACE]TRACE_FLOW[0x7]_CNCMENGINE_CONSTRUCTL=0x8c
+[TRACE]TRACE_FLOW[0x7]_CNCMENGINE_CONSTRUCTL_DUP01=0x8d
+[TRACE]TRACE_FLOW[0x7]_CNCMENGINE_DOCANCEL=0x96
+[TRACE]TRACE_FLOW[0x7]_CNCMENGINE_DONCMSTARTED=0x97
+[TRACE]TRACE_FLOW[0x7]_CNCMENGINE_HANDLEGETNTBINPUTSIZE=0x9d
+[TRACE]TRACE_FLOW[0x7]_CNCMENGINE_HANDLEGETNTBPARAM=0x9c
+[TRACE]TRACE_FLOW[0x7]_CNCMENGINE_HANDLESETNTBINPUTSIZE=0x9b
+[TRACE]TRACE_FLOW[0x7]_CNCMENGINE_INITLDDL=0x90
+[TRACE]TRACE_FLOW[0x7]_CNCMENGINE_INITLDDL_DUP01=0x91
+[TRACE]TRACE_FLOW[0x7]_CNCMENGINE_NEWL=0x8a
+[TRACE]TRACE_FLOW[0x7]_CNCMENGINE_NEWL_DUP01=0x8b
+[TRACE]TRACE_FLOW[0x7]_CNCMENGINE_NOTIFYDHCPSTARTED=0x9e
+[TRACE]TRACE_FLOW[0x7]_CNCMENGINE_RESUMESENDING=0x9f
+[TRACE]TRACE_FLOW[0x7]_CNCMENGINE_START=0x92
+[TRACE]TRACE_FLOW[0x7]_CNCMENGINE_STARTDATALAYER=0x98
+[TRACE]TRACE_FLOW[0x7]_CNCMENGINE_START_DUP10=0x93
+[TRACE]TRACE_FLOW[0x7]_CNCMENGINE_START_DUP11=0x94
+[TRACE]TRACE_FLOW[0x7]_CNCMENGINE_START_DUP12=0x95
+[TRACE]TRACE_FLOW[0x7]_CNCMENGINE_STOP=0x9a
+[TRACE]TRACE_FLOW[0x7]_CNCMENGINE_STOPDATALAYER=0x99
+[TRACE]TRACE_FLOW[0x7]_CNCMNTB16BUILDER_APPENDPACKET_ENTRY=0xa9
+[TRACE]TRACE_FLOW[0x7]_CNCMNTB16BUILDER_APPENDPACKET_EXIT=0xaa
+[TRACE]TRACE_FLOW[0x7]_CNCMNTB16BUILDER_BUILDNDP_ENTRY=0xa7
+[TRACE]TRACE_FLOW[0x7]_CNCMNTB16BUILDER_BUILDNDP_EXIT=0xa8
+[TRACE]TRACE_FLOW[0x7]_CNCMNTB16BUILDER_BUILDNTBHEADER_ENTRY=0xa5
+[TRACE]TRACE_FLOW[0x7]_CNCMNTB16BUILDER_BUILDNTBHEADER_EXIT=0xa6
+[TRACE]TRACE_FLOW[0x7]_CNCMNTB16BUILDER_COMPLETENTBBUILD_ENTRY=0xac
+[TRACE]TRACE_FLOW[0x7]_CNCMNTB16BUILDER_COMPLETENTBBUILD_EXIT=0xad
+[TRACE]TRACE_FLOW[0x7]_CNCMNTB16BUILDER_NEWL_ENTRY=0xa0
+[TRACE]TRACE_FLOW[0x7]_CNCMNTB16BUILDER_NEWL_EXIT=0xa1
+[TRACE]TRACE_FLOW[0x7]_CNCMNTB16BUILDER_RESET_ENTRY=0xb0
+[TRACE]TRACE_FLOW[0x7]_CNCMNTB16BUILDER_RESET_EXIT=0xb1
+[TRACE]TRACE_FLOW[0x7]_CNCMNTB16BUILDER_SETNTBINMAXSIZE_ENTRY=0xa2
+[TRACE]TRACE_FLOW[0x7]_CNCMNTB16BUILDER_SETNTBINMAXSIZE_EXIT=0xa3
+[TRACE]TRACE_FLOW[0x7]_CNCMNTB16BUILDER_STARTNEWNTB_ENTRY=0xae
+[TRACE]TRACE_FLOW[0x7]_CNCMNTB16BUILDER_STARTNEWNTB_EXIT=0xaf
+[TRACE]TRACE_FLOW[0x7]_CNCMNTBBUILDSIMPLEPOLICY_CNCMNTBBUILDSIMPLEPOLICY_ENTRY=0xb4
+[TRACE]TRACE_FLOW[0x7]_CNCMNTBBUILDSIMPLEPOLICY_CNCMNTBBUILDSIMPLEPOLICY_EXIT=0xb5
+[TRACE]TRACE_FLOW[0x7]_CNCMNTBBUILDSIMPLEPOLICY_COMPLETENTBBUILD_ENTRY=0xbb
+[TRACE]TRACE_FLOW[0x7]_CNCMNTBBUILDSIMPLEPOLICY_COMPLETENTBBUILD_EXIT=0xbc
+[TRACE]TRACE_FLOW[0x7]_CNCMNTBBUILDSIMPLEPOLICY_DOCANCEL_ENTRY=0xb6
+[TRACE]TRACE_FLOW[0x7]_CNCMNTBBUILDSIMPLEPOLICY_DOCANCEL_EXIT=0xb7
+[TRACE]TRACE_FLOW[0x7]_CNCMNTBBUILDSIMPLEPOLICY_NEWL_ENTRY=0xb2
+[TRACE]TRACE_FLOW[0x7]_CNCMNTBBUILDSIMPLEPOLICY_NEWL_EXIT=0xb3
+[TRACE]TRACE_FLOW[0x7]_CNCMNTBBUILDSIMPLEPOLICY_RUNL_ENTRY=0xb8
+[TRACE]TRACE_FLOW[0x7]_CNCMNTBBUILDSIMPLEPOLICY_RUNL_EXIT=0xb9
+[TRACE]TRACE_FLOW[0x7]_CNCMNTBBUILDSIMPLEPOLICY_RUNL_EXIT_DUP1=0xba
+[TRACE]TRACE_FLOW[0x7]_CNCMNTBBUILDSIMPLEPOLICY_STARTNEWNTB_ENTRY=0xbd
+[TRACE]TRACE_FLOW[0x7]_CNCMNTBBUILDSIMPLEPOLICY_STARTNEWNTB_EXIT=0xbe
+[TRACE]TRACE_FLOW[0x7]_CNCMNTBBUILDSIMPLEPOLICY_UPDATENTB_ENTRY=0xbf
+[TRACE]TRACE_FLOW[0x7]_CNCMNTBBUILDSIMPLEPOLICY_UPDATENTB_EXIT=0xc0
+[TRACE]TRACE_FLOW[0x7]_CNCMNTB_DUP116BUILDER_APPENDPACKET_EXIT=0xab
+[TRACE]TRACE_FLOW[0x7]_CNCMNTB_DUP116BUILDER_SETNTBINMAXSIZE_EXIT=0xa4
+[TRACE]TRACE_FLOW[0x7]_CNCMPKTDRV_CONSTRUCTL=0xc1
+[TRACE]TRACE_FLOW[0x7]_CNCMPKTDRV_STARTINTERFACE=0xc2
+[TRACE]TRACE_FLOW[0x7]_CNCMPKTDRV_STARTINTERFACE_DUP01=0xc3
+[TRACE]TRACE_FLOW[0x7]_CNCMPKTDRV_STOPINTERFACE=0xc4
+[TRACE]TRACE_FLOW[0x7]_CNCMSESSION_SERVICEL=0xcb
+[TRACE]TRACE_FLOW[0x7]_CNCMSHAREDSTATEMANAGER_CNCMSHAREDSTATEMANAGER=0xc5
+[TRACE]TRACE_FLOW[0x7]_CNCMSHAREDSTATEMANAGER_CNCMSHAREDSTATEMANAGER_DUP01=0xc6
+[TRACE]TRACE_FLOW[0x7]_CNCMSHAREDSTATEMANAGER_CONSTRUCTL=0xc7
+[TRACE]TRACE_FLOW[0x7]_CNCMSHAREDSTATEMANAGER_CONSTRUCTL_DUP01=0xc8
+[TRACE]TRACE_FLOW[0x7]_CNCMSHAREDSTATEMANAGER_NOTIFYDHCPPROVISIONREQUESTED=0xc9
+[TRACE]TRACE_FLOW[0x7]_CNCMSHAREDSTATEMANAGER_NOTIFYDHCPPROVISIONREQUESTED_DUP01=0xca
+[TRACE]TRACE_NORMAL[0x3]_CNCMBUFFERMANAGER_INITBUFFERAREA=0x1
+[TRACE]TRACE_NORMAL[0x3]_CNCMBUFFERMANAGER_ISCONGESTION=0x3
+[TRACE]TRACE_NORMAL[0x3]_CNCMBUFFERMANAGER_SETBUFFERCELLSIZE=0x2
+[TRACE]TRACE_NORMAL[0x3]_CNCMCOEXISTBEARERWATCHER_RUNL=0x6
+[TRACE]TRACE_NORMAL[0x3]_CNCMCOEXISTBEARERWATCHER_RUNL_DUP01=0x7
+[TRACE]TRACE_NORMAL[0x3]_CNCMCOEXISTBEARERWATCHER_SETIPOVERUSBACTIVE_DUP01=0x4
+[TRACE]TRACE_NORMAL[0x3]_CNCMCOEXISTBEARERWATCHER_SETIPOVERUSBDEACTIVE=0x5
+[TRACE]TRACE_NORMAL[0x3]_CNCMCOMMINTERFACESENDERANDRECEIVER_READ=0x8
+[TRACE]TRACE_NORMAL[0x3]_CNCMCOMMINTERFACESENDERANDRECEIVER_READDATA=0xa
+[TRACE]TRACE_NORMAL[0x3]_CNCMCOMMINTERFACESENDERANDRECEIVER_READDATA1=0xb
+[TRACE]TRACE_NORMAL[0x3]_CNCMCOMMINTERFACESENDERANDRECEIVER_READDATA2=0xc
+[TRACE]TRACE_NORMAL[0x3]_CNCMCOMMINTERFACESENDERANDRECEIVER_READDATA3=0xd
+[TRACE]TRACE_NORMAL[0x3]_CNCMCOMMINTERFACESENDERANDRECEIVER_READDATA4=0xe
+[TRACE]TRACE_NORMAL[0x3]_CNCMCOMMINTERFACESENDERANDRECEIVER_RUNL=0xf
+[TRACE]TRACE_NORMAL[0x3]_CNCMCOMMINTERFACESENDERANDRECEIVER_RUNL1=0x10
+[TRACE]TRACE_NORMAL[0x3]_CNCMCOMMINTERFACESENDERANDRECEIVER_RUNL2=0x11
+[TRACE]TRACE_NORMAL[0x3]_CNCMCOMMINTERFACESENDERANDRECEIVER_WRITE=0x9
+[TRACE]TRACE_NORMAL[0x3]_CNCMCOMMUNICATIONINTERFACE_CONTROLMSGERROR=0x12
+[TRACE]TRACE_NORMAL[0x3]_CNCMDATAINTERFACE_ACTIVATELDD=0x13
+[TRACE]TRACE_NORMAL[0x3]_CNCMDATAINTERFACE_RUNL=0x14
+[TRACE]TRACE_NORMAL[0x3]_CNCMDATARECEIVER_READDATA_DUP02=0x15
+[TRACE]TRACE_NORMAL[0x3]_CNCMDATASENDER_RUNL=0x17
+[TRACE]TRACE_NORMAL[0x3]_CNCMDATASENDER_SEND2=0x18
+[TRACE]TRACE_NORMAL[0x3]_CNCMDATASENDER_SENDNTBCOMPLETE3=0x1d
+[TRACE]TRACE_NORMAL[0x3]_CNCMDATASENDER_SENDNTBPAYLOAD=0x19
+[TRACE]TRACE_NORMAL[0x3]_CNCMDATASENDER_SENDNTBPAYLOAD1=0x1a
+[TRACE]TRACE_NORMAL[0x3]_CNCMDATASENDER_SENDNTBPAYLOAD2=0x1b
+[TRACE]TRACE_NORMAL[0x3]_CNCMDATASENDER_SENDNTBPAYLOAD3=0x1c
+[TRACE]TRACE_NORMAL[0x3]_CNCMDATASENDER_SETINEPBUFFERSIZE=0x1f
+[TRACE]TRACE_NORMAL[0x3]_CNCMDATASENDER_SETNTBINMAXSIZE=0x1e
+[TRACE]TRACE_NORMAL[0x3]_CNCMDATASENDER_START4=0x16
+[TRACE]TRACE_NORMAL[0x3]_CNCMENGINE_CONTROLERROR=0x22
+[TRACE]TRACE_NORMAL[0x3]_CNCMENGINE_HANDLEALTSETTING=0x28
+[TRACE]TRACE_NORMAL[0x3]_CNCMENGINE_INTERFACEADDRESS=0x25
+[TRACE]TRACE_NORMAL[0x3]_CNCMENGINE_PROCESSRECEIVEDDATAGRAM=0x27
+[TRACE]TRACE_NORMAL[0x3]_CNCMENGINE_RANDOMMACADDRESSL=0x26
+[TRACE]TRACE_NORMAL[0x3]_CNCMENGINE_RUNL=0x21
+[TRACE]TRACE_NORMAL[0x3]_CNCMENGINE_SEND=0x24
+[TRACE]TRACE_NORMAL[0x3]_CNCMENGINE_SETINEPBUFFERSIZE=0x29
+[TRACE]TRACE_NORMAL[0x3]_CNCMENGINE_STARTDATALAYER_DUP02=0x23
+[TRACE]TRACE_NORMAL[0x3]_CNCMENGINE_START_DUP02=0x20
+[TRACE]TRACE_NORMAL[0x3]_CNCMNTB16BUILDER_BUILDNTBHEADER=0x2a
+[TRACE]TRACE_NORMAL[0x3]_CNCMNTB16PARSER_DATAPACKET=0x34
+[TRACE]TRACE_NORMAL[0x3]_CNCMNTB16PARSER_PARSE=0x2d
+[TRACE]TRACE_NORMAL[0x3]_CNCMNTB16PARSER_PARSENCMNTB16HEADER_DUP01=0x31
+[TRACE]TRACE_NORMAL[0x3]_CNCMNTB16PARSER_PARSENCMNTB16NDPDATAGRAM=0x32
+[TRACE]TRACE_NORMAL[0x3]_CNCMNTB16PARSER_PARSENCMNTB16NDPDATAGRAM_DUP01=0x33
+[TRACE]TRACE_NORMAL[0x3]_CNCMNTB16PARSER_PARSE_DUP01=0x2e
+[TRACE]TRACE_NORMAL[0x3]_CNCMNTB16PARSER_PARSE_DUP02=0x2f
+[TRACE]TRACE_NORMAL[0x3]_CNCMNTB16PARSER_SEARCHNCMHEAD=0x30
+[TRACE]TRACE_NORMAL[0x3]_CNCMNTBBUILDSIMPLEPOLICY_RUNL=0x2b
+[TRACE]TRACE_NORMAL[0x3]_CNCMNTBBUILDSIMPLEPOLICY_UPDATENTB=0x2c
+[TRACE]TRACE_NORMAL[0x3]_CNCMPKTDRV_STARTINTERFACE_DUP02=0x35
+[TRACE]TRACE_NORMAL[0x3]_CNCMSESSION_SERVICEL_DUP01=0x38
+[TRACE]TRACE_NORMAL[0x3]_CNCMSHAREDSTATEMANAGER_RUNL=0x36
+[TRACE]TRACE_NORMAL[0x3]_CNCMSHAREDSTATEMANAGER_SETSTATEVALUE=0x37
+[TRACE]TRACE_WARNING[0x41]_CNCMCOEXISTBEARERWATCHER_DOACTIVE_DUP04=0x1
+[TRACE]TRACE_WARNING[0x41]_CNCMCOMMUNICATIONINTERFACE_PARSEDATAOUT=0x3
+[TRACE]TRACE_WARNING[0x41]_CNCMCOMMUNICATIONINTERFACE_START=0x2
+[TRACE]TRACE_WARNING[0x41]_CNCMDATASENDER_SEND1=0x4
+[TRACE]TRACE_WARNING[0x41]_CNCMENGINE_NOTIFYDHCPSTARTED_DUP01=0x7
+[TRACE]TRACE_WARNING[0x41]_CNCMENGINE_STARTDATALAYER_DUP01=0x5
+[TRACE]TRACE_WARNING[0x41]_CNCMENGINE_STARTDATALAYER_DUP03=0x6
+[TRACE]TRACE_WARNING[0x41]_CNCMSHAREDSTATEMANAGER_SETSTATEVALUE_DUP01=0x8
--- a/usbmgmt/usbmgr/device/classdrivers/obex/classcontroller/group/ObexClassController.mmp Wed Jul 07 14:16:40 2010 +0800
+++ b/usbmgmt/usbmgr/device/classdrivers/obex/classcontroller/group/ObexClassController.mmp 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"
@@ -34,6 +34,7 @@
SOURCE CUsbObexClassController.cpp
USERINCLUDE ../inc
+USERINCLUDE ../traces
OS_LAYER_SYSTEMINCLUDE_SYMBIAN
@@ -44,5 +45,3 @@
LIBRARY euser.lib
LIBRARY usbclasscontroller.lib
-
-#include <usb/usblogger.mmh>
--- a/usbmgmt/usbmgr/device/classdrivers/obex/classcontroller/src/CUsbObexClassController.cpp Wed Jul 07 14:16:40 2010 +0800
+++ b/usbmgmt/usbmgr/device/classdrivers/obex/classcontroller/src/CUsbObexClassController.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"
@@ -23,18 +23,17 @@
#include "CUsbObexClassController.h"
#include <usb_std.h>
#include <d32usbc.h>
-#include <usb/usblogger.h>
-
-#ifdef __FLOG_ACTIVE
-_LIT8(KLogComponent, "OBEXCC");
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "CUsbObexClassControllerTraces.h"
#endif
-
+#ifdef _DEBUG
// Panic category only used in debug builds
-#ifdef _DEBUG
_LIT( KObexCcPanicCategory, "UsbObexCc" );
#endif
+
/**
* Panic codes for the USB OBEX Class Controller.
*/
@@ -59,10 +58,10 @@
CUsbObexClassController* CUsbObexClassController::NewL(
MUsbClassControllerNotify& aOwner)
{
- LOG_STATIC_FUNC_ENTRY
-
+ OstTraceFunctionEntry0( REF_CUSBOBEXCLASSCONTROLLER_NEWL_ENTRY );
CUsbObexClassController* self =
new (ELeave) CUsbObexClassController(aOwner);
+ OstTraceFunctionExit0( REF_CUSBOBEXCLASSCONTROLLER_NEWL_EXIT );
return self;
}
@@ -75,7 +74,9 @@
MUsbClassControllerNotify& aOwner)
: CUsbClassControllerPlugIn(aOwner, KObexClassPriority)
{
+ OstTraceFunctionEntry0( REF_CUSBOBEXCLASSCONTROLLER_CUSBOBEXCLASSCONTROLLER_CONS_ENTRY );
iState = EUsbServiceIdle;
+ OstTraceFunctionExit0( REF_CUSBOBEXCLASSCONTROLLER_CUSBOBEXCLASSCONTROLLER_CONS_EXIT );
}
/**
@@ -83,6 +84,8 @@
*/
CUsbObexClassController::~CUsbObexClassController()
{
+ OstTraceFunctionEntry0( REF_CUSBOBEXCLASSCONTROLLER_CUSBOBEXCLASSCONTROLLER_DES_ENTRY );
+
Cancel();
if (iState == EUsbServiceStarted)
{
@@ -92,6 +95,7 @@
iLdd2.ReleaseInterface(0);
iLdd2.Close();
}
+ OstTraceFunctionExit0( REF_CUSBOBEXCLASSCONTROLLER_CUSBOBEXCLASSCONTROLLER_DES_EXIT );
}
/**
@@ -104,12 +108,16 @@
TInt CUsbObexClassController::SetUpClassAndInterface()
{
+ OstTraceFunctionEntry0( REF_CUSBOBEXCLASSCONTROLLER_SETUPCLASSANDINTERFACE_ENTRY );
+
TUsbcInterfaceInfoBuf ifc;
HBufC16* string = KUsbObexIfc().Alloc();
if (!string)
+ {
+ OstTraceFunctionExit0( REF_CUSBOBEXCLASSCONTROLLER_SETUPCLASSANDINTERFACE_EXIT );
return KErrNoMemory;
-
+ }
ifc().iString = string;
ifc().iClass.iClassNum = KObexClassNumber;
ifc().iClass.iSubClassNum = KObexSubClassNumber;
@@ -131,6 +139,7 @@
if (err != KErrNone)
{
+ OstTraceFunctionExit0( REF_CUSBOBEXCLASSCONTROLLER_SETUPCLASSANDINTERFACE_EXIT_DUP1 );
return err;
}
@@ -164,12 +173,14 @@
err= iLdd.SetCSInterfaceDescriptorBlock(0, desc);
if (err!= KErrNone)
{
+ OstTraceFunctionExit0( REF_CUSBOBEXCLASSCONTROLLER_SETUPCLASSANDINTERFACE_EXIT_DUP2 );
return err;
}
err = iLdd2.Open(0);
if (err != KErrNone)
{
+ OstTraceFunctionExit0( REF_CUSBOBEXCLASSCONTROLLER_SETUPCLASSANDINTERFACE_EXIT_DUP3 );
return err;
}
@@ -190,26 +201,33 @@
if (err != KErrNone)
{
iLdd2.Close();
+ OstTraceFunctionExit0( REF_CUSBOBEXCLASSCONTROLLER_SETUPCLASSANDINTERFACE_EXIT_DUP4 );
return err;
}
TUsbDeviceCaps dCaps;
TInt ret = iLdd.DeviceCaps(dCaps);
- if (ret != KErrNone)
+ if (ret != KErrNone)
+ {
+ OstTraceFunctionExit0( REF_CUSBOBEXCLASSCONTROLLER_SETUPCLASSANDINTERFACE_EXIT_DUP5 );
return ret;
-
+ }
TInt n = dCaps().iTotalEndpoints;
- if (n < KObexMinNumEndpoints)
+ if (n < KObexMinNumEndpoints)
+ {
+ OstTraceFunctionExit0( REF_CUSBOBEXCLASSCONTROLLER_SETUPCLASSANDINTERFACE_EXIT_DUP6 );
return KErrGeneral;
-
+ }
// Endpoints
TUsbcEndpointData data[KUsbcMaxEndpoints];
TPtr8 dataptr(REINTERPRET_CAST(TUint8*, data), sizeof(data), sizeof(data));
ret = iLdd.EndpointCaps(dataptr);
- if (ret!= KErrNone)
+ if (ret!= KErrNone)
+ {
+ OstTraceFunctionExit0( REF_CUSBOBEXCLASSCONTROLLER_SETUPCLASSANDINTERFACE_EXIT_DUP7 );
return ret;
-
+ }
// Set the active interface
TUsbcInterfaceInfoBuf dataifc2;
@@ -248,7 +266,10 @@
}
if (!(foundIn && foundOut))
+ {
+ OstTraceFunctionExit0( REF_CUSBOBEXCLASSCONTROLLER_SETUPCLASSANDINTERFACE_EXIT_DUP8 );
return KErrGeneral;
+ }
dataifc2().iString = NULL;
dataifc2().iClass.iClassNum = KObexDataClass;
@@ -265,9 +286,12 @@
{
iLdd2.ReleaseInterface(0);
iLdd2.Close();
+ OstTraceFunctionExit0( REF_CUSBOBEXCLASSCONTROLLER_SETUPCLASSANDINTERFACE_EXIT_DUP9 );
return err;
}
+
+ OstTraceFunctionExit0( REF_CUSBOBEXCLASSCONTROLLER_SETUPCLASSANDINTERFACE_EXIT_DUP10 );
return KErrNone;
}
@@ -278,10 +302,14 @@
*/
void CUsbObexClassController::Start(TRequestStatus& aStatus)
{
- LOG_FUNC
-
+ OstTraceFunctionEntry0( REF_CUSBOBEXCLASSCONTROLLER_START_ENTRY );
+
//Start() should never be called if started, starting or stopping (or in state EUsbServiceFatalError)
- __ASSERT_DEBUG( iState == EUsbServiceIdle, _USB_PANIC(KObexCcPanicCategory, EBadApiCallStart) );
+ if (iState != EUsbServiceIdle)
+ {
+ OstTrace1( TRACE_FATAL, CUSBOBEXCLASSCONTROLLER_START, "CUsbObexClassController::Start;iState=%d", (TInt)iState );
+ __ASSERT_DEBUG( EFalse, User::Panic(KObexCcPanicCategory, EBadApiCallStart) );
+ }
TRequestStatus* reportStatus = &aStatus;
@@ -292,6 +320,7 @@
{
User::RequestComplete(reportStatus, err);
iState = EUsbServiceIdle;
+ OstTraceFunctionExit0( REF_CUSBOBEXCLASSCONTROLLER_START_EXIT );
return;
}
@@ -301,6 +330,7 @@
iState = EUsbServiceIdle;
User::RequestComplete(reportStatus, err);
+ OstTraceFunctionExit0( REF_CUSBOBEXCLASSCONTROLLER_START_EXIT_DUP1 );
return;
}
@@ -311,11 +341,13 @@
iState = EUsbServiceIdle;
User::RequestComplete(reportStatus, err);
+ OstTraceFunctionExit0( REF_CUSBOBEXCLASSCONTROLLER_START_EXIT_DUP2 );
return;
}
iState = EUsbServiceStarted;
User::RequestComplete(reportStatus, KErrNone);
+ OstTraceFunctionExit0( REF_CUSBOBEXCLASSCONTROLLER_START_EXIT_DUP3 );
}
@@ -326,10 +358,13 @@
*/
void CUsbObexClassController::Stop(TRequestStatus& aStatus)
{
- LOG_FUNC
-
+ OstTraceFunctionEntry0( REF_CUSBOBEXCLASSCONTROLLER_STOP_ENTRY );
//Stop() should never be called if stopping, idle or starting (or in state EUsbServiceFatalError)
- __ASSERT_DEBUG( iState == EUsbServiceStarted, _USB_PANIC(KObexCcPanicCategory, EBadApiCallStop) );
+ if (iState != EUsbServiceStarted)
+ {
+ OstTrace1( TRACE_FATAL, REF_CUSBOBEXCLASSCONTROLLER_STOP, "CUsbObexClassController::Stop;iState=%d", (TInt)iState );
+ __ASSERT_DEBUG( EFalse, User::Panic(KObexCcPanicCategory, EBadApiCallStop) );
+ }
TRequestStatus* ReportStatus = &aStatus;
@@ -346,6 +381,7 @@
iState = EUsbServiceIdle;
User::RequestComplete(ReportStatus, KErrNone);
+ OstTraceFunctionExit0( REF_CUSBOBEXCLASSCONTROLLER_STOP_EXIT );
}
@@ -356,8 +392,10 @@
*/
void CUsbObexClassController::GetDescriptorInfo(TUsbDescriptor& aDescriptorInfo) const
{
+ OstTraceFunctionEntry0( REF_CUSBOBEXCLASSCONTROLLER_GETDESCRIPTORINFO_ENTRY );
aDescriptorInfo.iNumInterfaces = KObexNumInterfaces;
aDescriptorInfo.iLength = KObexDescriptorLength;
+ OstTraceFunctionExit0( REF_CUSBOBEXCLASSCONTROLLER_GETDESCRIPTORINFO_EXIT );
}
/**
@@ -367,7 +405,10 @@
*/
void CUsbObexClassController::RunL()
{
- __ASSERT_DEBUG(EFalse, _USB_PANIC(KObexCcPanicCategory, EUnusedFunction));
+ OstTraceFunctionEntry0( REF_CUSBOBEXCLASSCONTROLLER_RUNL_ENTRY );
+ OstTrace0( TRACE_FATAL, REF_CUSBOBEXCLASSCONTROLLER_RUNL, "CUsbObexClassController::RunL;EUnusedFunction" );
+ __ASSERT_DEBUG( EFalse, User::Panic(KObexCcPanicCategory, EUnusedFunction) );
+ OstTraceFunctionExit0( REF_CUSBOBEXCLASSCONTROLLER_RUNL_EXIT );
}
/**
@@ -377,7 +418,10 @@
*/
void CUsbObexClassController::DoCancel()
{
- __ASSERT_DEBUG(EFalse, _USB_PANIC(KObexCcPanicCategory, EUnusedFunction));
+ OstTraceFunctionEntry0( REF_CUSBOBEXCLASSCONTROLLER_DOCANCEL_ENTRY );
+ OstTrace0( TRACE_FATAL, REF_CUSBOBEXCLASSCONTROLLER_DOCANCEL, "CUsbObexClassController::DoCancel;EUnusedFunction" );
+ __ASSERT_DEBUG( EFalse, User::Panic(KObexCcPanicCategory, EUnusedFunction) );
+ OstTraceFunctionExit0( REF_CUSBOBEXCLASSCONTROLLER_DOCANCEL_EXIT );
}
/**
@@ -389,6 +433,9 @@
TInt CUsbObexClassController::RunError(TInt /*aError*/)
{
- __ASSERT_DEBUG(EFalse, _USB_PANIC(KObexCcPanicCategory, EUnusedFunction));
+ OstTraceFunctionEntry0( REF_CUSBOBEXCLASSCONTROLLER_RUNERROR_ENTRY );
+ OstTrace0( TRACE_FATAL, REF_CUSBOBEXCLASSCONTROLLER_RUNERROR, "CUsbObexClassController::RunError;EUnusedFunction" );
+ __ASSERT_DEBUG( EFalse, User::Panic(KObexCcPanicCategory, EUnusedFunction) );
+ OstTraceFunctionExit0( REF_CUSBOBEXCLASSCONTROLLER_RUNERROR_EXIT );
return KErrNone;
}
--- a/usbmgmt/usbmgr/device/classdrivers/obex/classcontroller/src/CUsbObexClassImpCollection.cpp Wed Jul 07 14:16:40 2010 +0800
+++ b/usbmgmt/usbmgr/device/classdrivers/obex/classcontroller/src/CUsbObexClassImpCollection.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"
@@ -25,6 +25,11 @@
#include <ecom/ecom.h>
#include <ecom/implementationproxy.h>
#include "CUsbObexClassController.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "CUsbObexClassImpCollectionTraces.h"
+#endif
+
// Define the private interface UIDs
const TImplementationProxy UsbCCImplementationTable[] =
@@ -34,8 +39,9 @@
EXPORT_C const TImplementationProxy* ImplementationGroupProxy(TInt& aTableCount)
{
+ OstTraceFunctionEntry0( CUSBOBEXCLASSIMPCOLLECTION_IMPLEMENTATIONGROUPPROXY_ENTRY );
aTableCount = sizeof(UsbCCImplementationTable) / sizeof(TImplementationProxy);
-
+ OstTraceFunctionExit0( CUSBOBEXCLASSIMPCOLLECTION__IMPLEMENTATIONGROUPPROXY_EXIT );
return UsbCCImplementationTable;
}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usbmgmt/usbmgr/device/classdrivers/obex/classcontroller/traces/OstTraceDefinitions.h Wed Jul 07 15:08:54 2010 +0800
@@ -0,0 +1,7 @@
+#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
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usbmgmt/usbmgr/device/classdrivers/obex/classcontroller/traces/fixed_id.definitions Wed Jul 07 15:08:54 2010 +0800
@@ -0,0 +1,43 @@
+#Fixed group and trace id definitions. If this file is removed, the identifiers are rebuilt.
+[GROUP]TRACE_FATAL=0x81
+[GROUP]TRACE_FLOW=0x8a
+[TRACE]TRACE_FATAL[0x81]_CUSBOBEXCLASSCONTROLLER_START=0x1
+[TRACE]TRACE_FATAL[0x81]_REF_CUSBOBEXCLASSCONTROLLER_DOCANCEL=0x4
+[TRACE]TRACE_FATAL[0x81]_REF_CUSBOBEXCLASSCONTROLLER_RUNERROR=0x5
+[TRACE]TRACE_FATAL[0x81]_REF_CUSBOBEXCLASSCONTROLLER_RUNL=0x3
+[TRACE]TRACE_FATAL[0x81]_REF_CUSBOBEXCLASSCONTROLLER_STOP=0x2
+[TRACE]TRACE_FLOW[0x8A]_CUSBOBEXCLASSIMPCOLLECTION_IMPLEMENTATIONGROUPPROXY_ENTRY=0x22
+[TRACE]TRACE_FLOW[0x8A]_CUSBOBEXCLASSIMPCOLLECTION__IMPLEMENTATIONGROUPPROXY_EXIT=0x23
+[TRACE]TRACE_FLOW[0x8A]_REF_CUSBOBEXCLASSCONTROLLER_CUSBOBEXCLASSCONTROLLER_CONS_ENTRY=0x3
+[TRACE]TRACE_FLOW[0x8A]_REF_CUSBOBEXCLASSCONTROLLER_CUSBOBEXCLASSCONTROLLER_CONS_EXIT=0x4
+[TRACE]TRACE_FLOW[0x8A]_REF_CUSBOBEXCLASSCONTROLLER_CUSBOBEXCLASSCONTROLLER_DES_ENTRY=0x5
+[TRACE]TRACE_FLOW[0x8A]_REF_CUSBOBEXCLASSCONTROLLER_CUSBOBEXCLASSCONTROLLER_DES_EXIT=0x6
+[TRACE]TRACE_FLOW[0x8A]_REF_CUSBOBEXCLASSCONTROLLER_DOCANCEL_ENTRY=0x1e
+[TRACE]TRACE_FLOW[0x8A]_REF_CUSBOBEXCLASSCONTROLLER_DOCANCEL_EXIT=0x1f
+[TRACE]TRACE_FLOW[0x8A]_REF_CUSBOBEXCLASSCONTROLLER_GETDESCRIPTORINFO_ENTRY=0x1a
+[TRACE]TRACE_FLOW[0x8A]_REF_CUSBOBEXCLASSCONTROLLER_GETDESCRIPTORINFO_EXIT=0x1b
+[TRACE]TRACE_FLOW[0x8A]_REF_CUSBOBEXCLASSCONTROLLER_NEWL_ENTRY=0x1
+[TRACE]TRACE_FLOW[0x8A]_REF_CUSBOBEXCLASSCONTROLLER_NEWL_EXIT=0x2
+[TRACE]TRACE_FLOW[0x8A]_REF_CUSBOBEXCLASSCONTROLLER_RUNERROR_ENTRY=0x20
+[TRACE]TRACE_FLOW[0x8A]_REF_CUSBOBEXCLASSCONTROLLER_RUNERROR_EXIT=0x21
+[TRACE]TRACE_FLOW[0x8A]_REF_CUSBOBEXCLASSCONTROLLER_RUNL_ENTRY=0x1c
+[TRACE]TRACE_FLOW[0x8A]_REF_CUSBOBEXCLASSCONTROLLER_RUNL_EXIT=0x1d
+[TRACE]TRACE_FLOW[0x8A]_REF_CUSBOBEXCLASSCONTROLLER_SETUPCLASSANDINTERFACE_ENTRY=0x7
+[TRACE]TRACE_FLOW[0x8A]_REF_CUSBOBEXCLASSCONTROLLER_SETUPCLASSANDINTERFACE_EXIT=0x8
+[TRACE]TRACE_FLOW[0x8A]_REF_CUSBOBEXCLASSCONTROLLER_SETUPCLASSANDINTERFACE_EXIT_DUP1=0x9
+[TRACE]TRACE_FLOW[0x8A]_REF_CUSBOBEXCLASSCONTROLLER_SETUPCLASSANDINTERFACE_EXIT_DUP10=0x12
+[TRACE]TRACE_FLOW[0x8A]_REF_CUSBOBEXCLASSCONTROLLER_SETUPCLASSANDINTERFACE_EXIT_DUP2=0xa
+[TRACE]TRACE_FLOW[0x8A]_REF_CUSBOBEXCLASSCONTROLLER_SETUPCLASSANDINTERFACE_EXIT_DUP3=0xb
+[TRACE]TRACE_FLOW[0x8A]_REF_CUSBOBEXCLASSCONTROLLER_SETUPCLASSANDINTERFACE_EXIT_DUP4=0xc
+[TRACE]TRACE_FLOW[0x8A]_REF_CUSBOBEXCLASSCONTROLLER_SETUPCLASSANDINTERFACE_EXIT_DUP5=0xd
+[TRACE]TRACE_FLOW[0x8A]_REF_CUSBOBEXCLASSCONTROLLER_SETUPCLASSANDINTERFACE_EXIT_DUP6=0xe
+[TRACE]TRACE_FLOW[0x8A]_REF_CUSBOBEXCLASSCONTROLLER_SETUPCLASSANDINTERFACE_EXIT_DUP7=0xf
+[TRACE]TRACE_FLOW[0x8A]_REF_CUSBOBEXCLASSCONTROLLER_SETUPCLASSANDINTERFACE_EXIT_DUP8=0x10
+[TRACE]TRACE_FLOW[0x8A]_REF_CUSBOBEXCLASSCONTROLLER_SETUPCLASSANDINTERFACE_EXIT_DUP9=0x11
+[TRACE]TRACE_FLOW[0x8A]_REF_CUSBOBEXCLASSCONTROLLER_START_ENTRY=0x13
+[TRACE]TRACE_FLOW[0x8A]_REF_CUSBOBEXCLASSCONTROLLER_START_EXIT=0x14
+[TRACE]TRACE_FLOW[0x8A]_REF_CUSBOBEXCLASSCONTROLLER_START_EXIT_DUP1=0x15
+[TRACE]TRACE_FLOW[0x8A]_REF_CUSBOBEXCLASSCONTROLLER_START_EXIT_DUP2=0x16
+[TRACE]TRACE_FLOW[0x8A]_REF_CUSBOBEXCLASSCONTROLLER_START_EXIT_DUP3=0x17
+[TRACE]TRACE_FLOW[0x8A]_REF_CUSBOBEXCLASSCONTROLLER_STOP_ENTRY=0x18
+[TRACE]TRACE_FLOW[0x8A]_REF_CUSBOBEXCLASSCONTROLLER_STOP_EXIT=0x19
--- a/usbmgmt/usbmgr/device/classdrivers/whcm/classcontroller/SRC/CUsbWHCMClassController.cpp Wed Jul 07 14:16:40 2010 +0800
+++ b/usbmgmt/usbmgr/device/classdrivers/whcm/classcontroller/SRC/CUsbWHCMClassController.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"
@@ -20,18 +20,16 @@
@file
*/
-#include "CUsbWHCMClassController.h"
#include <usb_std.h>
#include <cusbclasscontrolleriterator.h>
#include <musbclasscontrollernotify.h>
-#include <usb/usblogger.h>
-
-#ifdef __FLOG_ACTIVE
-_LIT8(KLogComponent, "WHCMCC");
+#include "CUsbWHCMClassController.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "CUsbWHCMClassControllerTraces.h"
#endif
_LIT(KUsbLDDName, "eusbc");
-
_LIT( KWhcmCcPanicCategory, "UsbWhcmCc" );
/**
@@ -56,7 +54,7 @@
CUsbWHCMClassController* CUsbWHCMClassController::NewL(
MUsbClassControllerNotify& aOwner)
{
- LOG_STATIC_FUNC_ENTRY
+ OstTraceFunctionEntry0( CUSBWHCMCLASSCONTROLLER_NEWL_ENTRY );
CUsbWHCMClassController* self =
new (ELeave) CUsbWHCMClassController(aOwner);
@@ -64,6 +62,7 @@
CleanupStack::PushL(self);
self->ConstructL();
CleanupStack::Pop();
+ OstTraceFunctionExit0( CUSBWHCMCLASSCONTROLLER_NEWL_EXIT );
return self;
}
@@ -76,7 +75,9 @@
MUsbClassControllerNotify& aOwner)
: CUsbClassControllerPlugIn(aOwner, KWHCMPriority)
{
+ OstTraceFunctionEntry0( CUSBWHCMCLASSCONTROLLER_CUSBWHCMCLASSCONTROLLER_CONS_ENTRY );
iState = EUsbServiceIdle;
+ OstTraceFunctionExit0( CUSBWHCMCLASSCONTROLLER_CUSBWHCMCLASSCONTROLLER_CONS_EXIT );
}
/**
@@ -84,14 +85,25 @@
*/
void CUsbWHCMClassController::ConstructL()
{
+ OstTraceFunctionEntry0( CUSBWHCMCLASSCONTROLLER_CONSTRUCTL_ENTRY );
// Load the device driver
TInt err = User::LoadLogicalDevice(KUsbLDDName);
if (err != KErrNone && err != KErrAlreadyExists)
{
- LEAVEL(err);
+ OstTrace1( TRACE_NORMAL, CUSBWHCMCLASSCONTROLLER_CONSTRUCTL,
+ "CUsbWHCMClassController::ConstructL;err=%d", err );
+ User::Leave(err);
}
- LEAVEIFERRORL(iLdd.Open(0));
+
+ err = iLdd.Open(0);
+ if (err < 0)
+ {
+ OstTrace1( TRACE_NORMAL, CUSBWHCMCLASSCONTROLLER_CONSTRUCTL_DUP1,
+ "CUsbWHCMClassController::ConstructL;err=%d", err );
+ User::Leave(err);
+ }
+ OstTraceFunctionExit0( CUSBWHCMCLASSCONTROLLER_CONSTRUCTL_EXIT );
}
/**
@@ -99,14 +111,15 @@
*/
CUsbWHCMClassController::~CUsbWHCMClassController()
{
+ OstTraceFunctionEntry0( CUSBWHCMCLASSCONTROLLER_CUSBWHCMCLASSCONTROLLER_DES_ENTRY );
Cancel();
-
if (iState == EUsbServiceStarted)
{
// Must release all interfaces before closing the LDD to avoid a crash.
iLdd.ReleaseInterface(0);
}
iLdd.Close();
+ OstTraceFunctionExit0( CUSBWHCMCLASSCONTROLLER_CUSBWHCMCLASSCONTROLLER_DES_EXIT );
}
/**
@@ -116,25 +129,29 @@
*/
void CUsbWHCMClassController::Start(TRequestStatus& aStatus)
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CUSBWHCMCLASSCONTROLLER_START_ENTRY );
//Start() should never be called if started, starting or stopping (or in state EUsbServiceFatalError)
- __ASSERT_DEBUG( iState == EUsbServiceIdle, _USB_PANIC(KWhcmCcPanicCategory, EBadApiCallStart) );
+ if (iState != EUsbServiceIdle)
+ {
+ OstTrace1( TRACE_FATAL, CUSBWHCMCLASSCONTROLLER_START, "CUsbWHCMClassController::Start;iState=%d", (TInt)iState );
+ __ASSERT_DEBUG( EFalse, User::Panic(KWhcmCcPanicCategory, EBadApiCallStart) );
+ }
TRequestStatus* reportStatus = &aStatus;
iState = EUsbServiceStarting;
-
TRAPD(err, SetUpWHCMDescriptorL());
-
if (err != KErrNone)
{
iState = EUsbServiceIdle;
User::RequestComplete(reportStatus, err);
+ OstTraceFunctionExit0( CUSBWHCMCLASSCONTROLLER_START_EXIT );
return;
}
iState = EUsbServiceStarted;
User::RequestComplete(reportStatus, KErrNone);
+ OstTraceFunctionExit0( CUSBWHCMCLASSCONTROLLER_START_EXIT_DUP1 );
}
/**
@@ -144,10 +161,14 @@
*/
void CUsbWHCMClassController::Stop(TRequestStatus& aStatus)
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CUSBWHCMCLASSCONTROLLER_STOP_ENTRY );
//Stop() should never be called if stopping, idle or starting (or in state EUsbServiceFatalError)
- __ASSERT_DEBUG( iState == EUsbServiceStarted, _USB_PANIC(KWhcmCcPanicCategory, EBadApiCallStop) );
+ if (iState != EUsbServiceStarted)
+ {
+ OstTrace1( TRACE_FATAL, CUSBWHCMCLASSCONTROLLER_STOP, "CUsbWHCMClassController::Stop;iState=%d", (TInt)iState );
+ __ASSERT_DEBUG( EFalse, User::Panic(KWhcmCcPanicCategory, EBadApiCallStart) );
+ }
TRequestStatus* reportStatus = &aStatus;
@@ -159,6 +180,7 @@
aStatus = KRequestPending;
User::RequestComplete(reportStatus, KErrNone);
+ OstTraceFunctionExit0( CUSBWHCMCLASSCONTROLLER_STOP_EXIT );
}
/**
@@ -169,6 +191,8 @@
void CUsbWHCMClassController::GetDescriptorInfo(
TUsbDescriptor& /*aDescriptorInfo*/) const
{
+ OstTraceFunctionEntry0( CUSBWHCMCLASSCONTROLLER_GETDESCRIPTORINFO_ENTRY );
+ OstTraceFunctionExit0( CUSBWHCMCLASSCONTROLLER_GETDESCRIPTORINFO_EXIT );
}
/**
@@ -177,7 +201,8 @@
void CUsbWHCMClassController::RunL()
{
// This function should never be called.
- _USB_PANIC(KWhcmCcPanicCategory, EUnusedFunction);
+ OstTrace0( TRACE_FATAL, CUSBWHCMCLASSCONTROLLER_RUNL, "CUsbWHCMClassController::RunL;EUnusedFunction");
+ User::Panic(KWhcmCcPanicCategory, EUnusedFunction);
}
/**
@@ -187,7 +212,8 @@
void CUsbWHCMClassController::DoCancel()
{
// This function should never be called.
- _USB_PANIC(KWhcmCcPanicCategory, EUnusedFunction);
+ OstTrace0( TRACE_FATAL, CUSBWHCMCLASSCONTROLLER_DOCANCEL, "CUsbWHCMClassController::DoCancel;EUnusedFunction");
+ User::Panic(KWhcmCcPanicCategory, EUnusedFunction);
}
/**
@@ -197,8 +223,8 @@
TInt CUsbWHCMClassController::RunError(TInt /*aError*/)
{
// This function should never be called.
- _USB_PANIC(KWhcmCcPanicCategory, EUnusedFunction);
-
+ OstTrace0( TRACE_FATAL, CUSBWHCMCLASSCONTROLLER_RUNERROR, "CUsbWHCMClassController::RunError;EUnusedFunction");
+ User::Panic(KWhcmCcPanicCategory, EUnusedFunction);
return KErrNone;
}
@@ -208,6 +234,8 @@
* Setup the WHCM Class Descriptors.
*/
{
+ OstTraceFunctionEntry0( CUSBWHCMCLASSCONTROLLER_SETUPWHCMDESCROPTORL_ENTRY );
+
// Set up and register the WHCM interface descriptor
TUsbcInterfaceInfoBuf ifc;
@@ -221,11 +249,23 @@
// from EP0.
ifc().iFeatureWord |= KUsbcInterfaceInfo_NoEp0RequestsPlease;
- LEAVEIFERRORL(iLdd.SetInterface(0, ifc));
+ TInt err = iLdd.SetInterface(0, ifc);
+ if (err < 0)
+ {
+ OstTrace1( TRACE_NORMAL, CUSBWHCMCLASSCONTROLLER_SETUPWHCMDESCROPTORL,
+ "CUsbWHCMClassController::SetUpWHCMDescriptorL;err=%d", (TInt)err );
+ User::Leave(err);
+ }
// Get the interface number from the LDD for later reference
TBuf8<100> interface_descriptor;
- LEAVEIFERRORL(iLdd.GetInterfaceDescriptor(0, interface_descriptor));
+ err = iLdd.GetInterfaceDescriptor(0, interface_descriptor);
+ if (err < 0)
+ {
+ OstTrace1( TRACE_NORMAL, CUSBWHCMCLASSCONTROLLER_SETUPWHCMDESCROPTORL_DUP1,
+ "CUsbWHCMClassController::SetUpWHCMDescriptorL;err=%d", (TInt)err );
+ User::Leave(err);
+ }
TUint8 WHCM_int_no = interface_descriptor[2];
@@ -279,5 +319,12 @@
desc[10] = union_len;
// Register the whole class-specific interface block
- LEAVEIFERRORL(iLdd.SetCSInterfaceDescriptorBlock(0, desc));
+ err = iLdd.SetCSInterfaceDescriptorBlock(0, desc);
+ if (err < 0)
+ {
+ OstTrace1( TRACE_NORMAL, CUSBWHCMCLASSCONTROLLER_SETUPWHCMDESCROPTORL_DUP2,
+ "CUsbWHCMClassController::SetUpWHCMDescriptorL;err=%d", (TInt)err );
+ User::Leave(err);
+ }
+ OstTraceFunctionExit0( CUSBWHCMCLASSCONTROLLER_SETUPWHCMDESCROPTORL_EXIT );
}
--- a/usbmgmt/usbmgr/device/classdrivers/whcm/classcontroller/SRC/CUsbWHCMClassImpCollection.cpp Wed Jul 07 14:16:40 2010 +0800
+++ b/usbmgmt/usbmgr/device/classdrivers/whcm/classcontroller/SRC/CUsbWHCMClassImpCollection.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"
@@ -25,6 +25,10 @@
#include <ecom/ecom.h>
#include <ecom/implementationproxy.h>
#include "CUsbWHCMClassController.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "CUsbWHCMClassImpCollectionTraces.h"
+#endif
// Define the private interface UIDs
const TImplementationProxy UsbCCImplementationTable[] =
@@ -34,8 +38,9 @@
EXPORT_C const TImplementationProxy* ImplementationGroupProxy(TInt& aTableCount)
{
+ OstTraceFunctionEntry0( CBUSWHCMCLASSIMPCOLLECTION_IMPLEMENTATUIONGROUPPROXY_ENTRY );
aTableCount = sizeof(UsbCCImplementationTable) / sizeof(TImplementationProxy);
-
+ OstTraceFunctionEntry0( CBUSWHCMCLASSIMPCOLLECTION_IMPLEMENTATUIONGROUPPROXY_EXIT );
return UsbCCImplementationTable;
}
--- a/usbmgmt/usbmgr/device/classdrivers/whcm/classcontroller/group/WHCMClassController.mmp Wed Jul 07 14:16:40 2010 +0800
+++ b/usbmgmt/usbmgr/device/classdrivers/whcm/classcontroller/group/WHCMClassController.mmp 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"
@@ -33,7 +33,8 @@
SOURCE CUsbWHCMClassImpCollection.cpp
SOURCE CUsbWHCMClassController.cpp
-USERINCLUDE ../INC
+USERINCLUDE ../INC
+USERINCLUDE ../traces
OS_LAYER_SYSTEMINCLUDE_SYMBIAN
@@ -44,5 +45,3 @@
LIBRARY euser.lib
LIBRARY usbclasscontroller.lib
-
-#include <usb/usblogger.mmh>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usbmgmt/usbmgr/device/classdrivers/whcm/classcontroller/traces/OstTraceDefinitions.h Wed Jul 07 15:08:54 2010 +0800
@@ -0,0 +1,7 @@
+#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
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usbmgmt/usbmgr/device/classdrivers/whcm/classcontroller/traces/fixed_id.definitions Wed Jul 07 15:08:54 2010 +0800
@@ -0,0 +1,33 @@
+#Fixed group and trace id definitions. If this file is removed, the identifiers are rebuilt.
+[GROUP]TRACE_FATAL=0x81
+[GROUP]TRACE_FLOW=0x8a
+[GROUP]TRACE_NORMAL=0x86
+[TRACE]TRACE_FATAL[0x81]_CUSBWHCMCLASSCONTROLLER_DOCANCEL=0x4
+[TRACE]TRACE_FATAL[0x81]_CUSBWHCMCLASSCONTROLLER_RUNERROR=0x5
+[TRACE]TRACE_FATAL[0x81]_CUSBWHCMCLASSCONTROLLER_RUNL=0x3
+[TRACE]TRACE_FATAL[0x81]_CUSBWHCMCLASSCONTROLLER_START=0x1
+[TRACE]TRACE_FATAL[0x81]_CUSBWHCMCLASSCONTROLLER_STOP=0x2
+[TRACE]TRACE_FLOW[0x8A]_CBUSWHCMCLASSIMPCOLLECTION_IMPLEMENTATUIONGROUPPROXY_ENTRY=0x12
+[TRACE]TRACE_FLOW[0x8A]_CBUSWHCMCLASSIMPCOLLECTION_IMPLEMENTATUIONGROUPPROXY_EXIT=0x13
+[TRACE]TRACE_FLOW[0x8A]_CUSBWHCMCLASSCONTROLLER_CONSTRUCTL_ENTRY=0x5
+[TRACE]TRACE_FLOW[0x8A]_CUSBWHCMCLASSCONTROLLER_CONSTRUCTL_EXIT=0x6
+[TRACE]TRACE_FLOW[0x8A]_CUSBWHCMCLASSCONTROLLER_CUSBWHCMCLASSCONTROLLER_CONS_ENTRY=0x3
+[TRACE]TRACE_FLOW[0x8A]_CUSBWHCMCLASSCONTROLLER_CUSBWHCMCLASSCONTROLLER_CONS_EXIT=0x4
+[TRACE]TRACE_FLOW[0x8A]_CUSBWHCMCLASSCONTROLLER_CUSBWHCMCLASSCONTROLLER_DES_ENTRY=0x7
+[TRACE]TRACE_FLOW[0x8A]_CUSBWHCMCLASSCONTROLLER_CUSBWHCMCLASSCONTROLLER_DES_EXIT=0x8
+[TRACE]TRACE_FLOW[0x8A]_CUSBWHCMCLASSCONTROLLER_GETDESCRIPTORINFO_ENTRY=0xe
+[TRACE]TRACE_FLOW[0x8A]_CUSBWHCMCLASSCONTROLLER_GETDESCRIPTORINFO_EXIT=0xf
+[TRACE]TRACE_FLOW[0x8A]_CUSBWHCMCLASSCONTROLLER_NEWL_ENTRY=0x1
+[TRACE]TRACE_FLOW[0x8A]_CUSBWHCMCLASSCONTROLLER_NEWL_EXIT=0x2
+[TRACE]TRACE_FLOW[0x8A]_CUSBWHCMCLASSCONTROLLER_SETUPWHCMDESCROPTORL_ENTRY=0x10
+[TRACE]TRACE_FLOW[0x8A]_CUSBWHCMCLASSCONTROLLER_SETUPWHCMDESCROPTORL_EXIT=0x11
+[TRACE]TRACE_FLOW[0x8A]_CUSBWHCMCLASSCONTROLLER_START_ENTRY=0x9
+[TRACE]TRACE_FLOW[0x8A]_CUSBWHCMCLASSCONTROLLER_START_EXIT=0xa
+[TRACE]TRACE_FLOW[0x8A]_CUSBWHCMCLASSCONTROLLER_START_EXIT_DUP1=0xb
+[TRACE]TRACE_FLOW[0x8A]_CUSBWHCMCLASSCONTROLLER_STOP_ENTRY=0xc
+[TRACE]TRACE_FLOW[0x8A]_CUSBWHCMCLASSCONTROLLER_STOP_EXIT=0xd
+[TRACE]TRACE_NORMAL[0x86]_CUSBWHCMCLASSCONTROLLER_CONSTRUCTL=0x1
+[TRACE]TRACE_NORMAL[0x86]_CUSBWHCMCLASSCONTROLLER_CONSTRUCTL_DUP1=0x2
+[TRACE]TRACE_NORMAL[0x86]_CUSBWHCMCLASSCONTROLLER_SETUPWHCMDESCROPTORL=0x3
+[TRACE]TRACE_NORMAL[0x86]_CUSBWHCMCLASSCONTROLLER_SETUPWHCMDESCROPTORL_DUP1=0x4
+[TRACE]TRACE_NORMAL[0x86]_CUSBWHCMCLASSCONTROLLER_SETUPWHCMDESCROPTORL_DUP2=0x5
--- a/usbmgmt/usbmgr/group/Usbman.iby Wed Jul 07 14:16:40 2010 +0800
+++ b/usbmgmt/usbmgr/group/Usbman.iby Wed Jul 07 15:08:54 2010 +0800
@@ -49,11 +49,6 @@
// The main backup registration file. Plug-ins should use its own backup registration file in order to back its perfered data.
data=ZPRIVATE\101fe1db\backup_registration.xml private\101fe1db\backup_registration.xml
-// *** USB logger. This is not dependent on EUSBC as it is used by
-// *** usbman.dll. It compiles down to next to nothing when __FLOG_ACTIVE is
-// *** undefined, and we cannot remove it altogether because things link
-// *** against it.
-file=ABI_DIR\USB_DIR\usblogger.dll usblogger.dll
#if defined(_DEBUG) || defined (__USB_DEBUG__)
#include "commsdebugutility.iby"
--- a/usbmgmt/usbmgr/host/fdf/production/client/group/usbhoststack.mmp Wed Jul 07 14:16:40 2010 +0800
+++ b/usbmgmt/usbmgr/host/fdf/production/client/group/usbhoststack.mmp 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"
--- a/usbmgmt/usbmgr/host/fdf/production/client/group/usbhoststack_base.mmp Wed Jul 07 14:16:40 2010 +0800
+++ b/usbmgmt/usbmgr/host/fdf/production/client/group/usbhoststack_base.mmp 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"
@@ -29,11 +29,10 @@
USERINCLUDE ../../server/public
USERINCLUDE ../public
+USERINCLUDE ../traces
OS_LAYER_SYSTEMINCLUDE_SYMBIAN
DEFFILE usbhoststack.def
LIBRARY euser.lib
-
-#include <usb/usblogger.mmh>
--- a/usbmgmt/usbmgr/host/fdf/production/client/group/usbhoststack_over_dummyusbdi.mmp Wed Jul 07 14:16:40 2010 +0800
+++ b/usbmgmt/usbmgr/host/fdf/production/client/group/usbhoststack_over_dummyusbdi.mmp 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"
--- a/usbmgmt/usbmgr/host/fdf/production/client/public/usbhosterrors.h Wed Jul 07 14:16:40 2010 +0800
+++ b/usbmgmt/usbmgr/host/fdf/production/client/public/usbhosterrors.h 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"
--- a/usbmgmt/usbmgr/host/fdf/production/client/public/usbhoststack.h Wed Jul 07 14:16:40 2010 +0800
+++ b/usbmgmt/usbmgr/host/fdf/production/client/public/usbhoststack.h 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"
--- a/usbmgmt/usbmgr/host/fdf/production/client/src/session.cpp Wed Jul 07 14:16:40 2010 +0800
+++ b/usbmgmt/usbmgr/host/fdf/production/client/src/session.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"
@@ -21,21 +21,22 @@
*/
#include <e32base.h>
-#include <usb/usblogger.h>
#include "usbhoststack.h"
#include "fdfapi.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "sessionTraces.h"
+#endif
-#ifdef __FLOG_ACTIVE
-_LIT8(KLogComponent, "usbhstcli");
-#endif
+
/**
Starts the server process.
*/
static TInt StartServer()
{
- LOG_STATIC_FUNC_ENTRY
-
+ OstTraceFunctionEntry0( _FDF_STARTSERVER_ENTRY );
+
const TUidType serverUid(KNullUid, KNullUid, KUsbFdfUid);
//
@@ -45,10 +46,12 @@
//
RProcess server;
TInt err = server.Create(KUsbFdfImg, KNullDesC, serverUid);
- LOGTEXT2(_L8("\terr = %d"), err);
+
+ OstTrace1( TRACE_NORMAL, _FDF_STARTSERVER, "\terr = %d", err );
if ( err != KErrNone )
{
+ OstTraceFunctionExit0( _FDF_STARTSERVER_EXIT );
return err;
}
@@ -57,12 +60,14 @@
if ( stat != KRequestPending )
{
- LOGTEXT(_L8("\taborting startup"));
+ OstTrace0( TRACE_NORMAL, _FDF_STARTSERVER_DUP1, "\taborting startup" );
+
server.Kill(0); // abort startup
}
else
{
- LOGTEXT(_L8("\tresuming"));
+ OstTrace0( TRACE_NORMAL, _FDF_STARTSERVER_DUP2, "\tresuming" );
+
server.Resume(); // logon OK - start the server
}
@@ -71,12 +76,15 @@
// we can't use the 'exit reason' if the server panicked as this
// is the panic 'reason' and may be '0' which cannot be distinguished
// from KErrNone
- LOGTEXT2(_L8("\tstat.Int = %d"), stat.Int());
+ OstTrace1( TRACE_NORMAL, _FDF_STARTSERVER_DUP3, "\tstat.Int = %d", stat.Int());
+
err = (server.ExitType() == EExitPanic) ? KErrServerTerminated : stat.Int();
server.Close();
- LOGTEXT2(_L8("\terr = %d"), err);
+ OstTrace1( TRACE_NORMAL, _FDF_STARTSERVER_DUP4, "\terr = %d", err );
+
+ OstTraceFunctionExit0( _FDF_STARTSERVER_EXIT_DUP1 );
return err;
}
@@ -85,17 +93,16 @@
: iDeviceEventPckg(TDeviceEventInformation()),
iDevmonEventPckg(0)
{
- LOGTEXT(_L8("*** Search on '***USB HOST STACK' to find device events."));
-
- LOG_LINE
- LOG_FUNC
+ OstTraceFunctionEntry0( RUSBHOSTSTACK_RUSBHOSTSTACK_ENTRY );
+
+ OstTrace0( TRACE_NORMAL, RUSBHOSTSTACK_RUSBHOSTSTACK, "*** Search on '***USB HOST STACK' to find device events." );
+
}
EXPORT_C TVersion RUsbHostStack::Version() const
{
- LOG_LINE
- LOG_FUNC
-
+ OstTraceFunctionEntry0( RUSBHOSTSTACK_VERSION_ENTRY );
+
return(TVersion( KUsbFdfSrvMajorVersionNumber,
KUsbFdfSrvMinorVersionNumber,
KUsbFdfSrvBuildNumber
@@ -105,12 +112,12 @@
EXPORT_C TInt RUsbHostStack::Connect()
{
- LOG_LINE
- LOG_FUNC;
-
+ OstTraceFunctionEntry0( RUSBHOSTSTACK_CONNECT_ENTRY );
+
TInt err = DoConnect();
- LOGTEXT2(_L8("\terr = %d"), err);
+ OstTrace1( TRACE_NORMAL, RUSBHOSTSTACK_CONNECT, "\terr = %d", err);
+
return err;
}
@@ -120,7 +127,8 @@
*/
TInt RUsbHostStack::DoConnect()
{
- LOG_FUNC
+ OstTraceFunctionEntry0( RUSBHOSTSTACK_DOCONNECT_ENTRY);
+
TInt retry = 2;
@@ -128,26 +136,32 @@
{
// Use message slots from the global pool.
TInt err = CreateSession(KUsbFdfServerName, Version(), -1);
- LOGTEXT2(_L8("\terr = %d"), err);
-
+ OstTrace1( TRACE_NORMAL, RUSBHOSTSTACK_DOCONNECT, "\terr = %d", err );
+
if ((err != KErrNotFound) && (err != KErrServerTerminated))
{
- LOGTEXT(_L8("\treturning after CreateSession"));
+ OstTrace0( TRACE_NORMAL, RUSBHOSTSTACK_DOCONNECT_DUP1, "\treturning after CreateSession" );
+
+ OstTraceFunctionExit0( RUSBHOSTSTACK_DOCONNECT_EXIT);
return err;
}
if (--retry == 0)
{
- LOGTEXT(_L8("\treturning after running out of retries"));
+ OstTrace0( TRACE_NORMAL, RUSBHOSTSTACK_DOCONNECT_DUP2, "\treturning after running out of retries" );
+
+ OstTraceFunctionExit0( RUSBHOSTSTACK_DOCONNECT_EXIT_DUP1 );
return err;
}
err = StartServer();
- LOGTEXT2(_L8("\terr = %d"), err);
-
+ OstTrace1( TRACE_NORMAL, RUSBHOSTSTACK_DOCONNECT_DUT3, "\terr = %d", err );
+
if ((err != KErrNone) && (err != KErrAlreadyExists))
{
- LOGTEXT(_L8("\treturning after StartServer"));
+ OstTrace0( TRACE_NORMAL, RUSBHOSTSTACK_DOCONNECT_DUP4, "\treturning after StartServer" );
+
+ OstTraceFunctionExit0( RUSBHOSTSTACK_DOCONNECT_EXIT_DUP2 );
return err;
}
}
@@ -155,83 +169,85 @@
EXPORT_C TInt RUsbHostStack::EnableDriverLoading()
{
- LOG_LINE
- LOG_FUNC
+ OstTraceFunctionEntry0( RUSBHOSTSTACK_ENABLEDRIVERLOADING_ENTRY );
+
+ TInt ret = SendReceive(EUsbFdfSrvEnableDriverLoading);
+ OstTrace1( TRACE_NORMAL, RUSBHOSTSTACK_ENABLEDRIVERLOADING, "\tret = %d", ret );
- TInt ret = SendReceive(EUsbFdfSrvEnableDriverLoading);
- LOGTEXT2(_L8("\tret = %d"), ret);
+ OstTraceFunctionExit0( RUSBHOSTSTACK_ENABLEDRIVERLOADING_EXIT );
return ret;
}
EXPORT_C void RUsbHostStack::DisableDriverLoading()
{
- LOG_LINE
- LOG_FUNC
+ OstTraceFunctionEntry0( RUSBHOSTSTACK_DISABLEDRIVERLOADING_ENTRY );
TInt ret = SendReceive(EUsbFdfSrvDisableDriverLoading);
- LOGTEXT2(_L8("\tret = %d"), ret);
+ OstTrace1( TRACE_NORMAL, RUSBHOSTSTACK_DISABLEDRIVERLOADING, "\tret = %d", ret );
(void)ret;
+ OstTraceFunctionExit0( RUSBHOSTSTACK_DISABLEDRIVERLOADING_EXIT );
}
EXPORT_C void RUsbHostStack::NotifyDeviceEvent(TRequestStatus& aStat, TDeviceEventInformation& aDeviceEventInformation)
{
- LOG_LINE
- LOG_FUNC
-
+ OstTraceFunctionEntry0( RUSBHOSTSTACK_NOTIFYDEVICEEVENT_ENTRY );
+
TIpcArgs args;
iDeviceEventPckg.Set((TUint8*)&aDeviceEventInformation, sizeof(TDeviceEventInformation), sizeof(TDeviceEventInformation));
args.Set(0, &iDeviceEventPckg);
SendReceive(EUsbFdfSrvNotifyDeviceEvent, args, aStat);
+ OstTraceFunctionExit0( RUSBHOSTSTACK_NOTIFYDEVICEEVENT_EXIT );
}
EXPORT_C void RUsbHostStack::NotifyDeviceEventCancel()
{
- LOG_LINE
- LOG_FUNC
-
+ OstTraceFunctionEntry0( RUSBHOSTSTACK_NOTIFYDEVICEEVENTCANCEL_ENTRY );
+
TInt ret = SendReceive(EUsbFdfSrvNotifyDeviceEventCancel);
- LOGTEXT2(_L8("\tret = %d"), ret);
+ OstTrace1( TRACE_NORMAL, RUSBHOSTSTACK_NOTIFYDEVICEEVENTCANCEL, "\tret = %d", ret);
(void)ret;
+ OstTraceFunctionExit0( RUSBHOSTSTACK_NOTIFYDEVICEEVENTCANCEL_EXIT );
}
EXPORT_C void RUsbHostStack::NotifyDevmonEvent(TRequestStatus& aStat, TInt& aEvent)
{
- LOG_LINE
- LOG_FUNC
-
+ OstTraceFunctionEntry0( RUSBHOSTSTACK_NOTIFYDEVMONEVENT_ENTRY );
+
TIpcArgs args;
iDevmonEventPckg.Set((TUint8*)&aEvent, sizeof(TInt), sizeof(TInt));
args.Set(0, &iDevmonEventPckg);
SendReceive(EUsbFdfSrvNotifyDevmonEvent, args, aStat);
+ OstTraceFunctionExit0( RUSBHOSTSTACK_NOTIFYDEVMONEVENT_EXIT );
}
EXPORT_C void RUsbHostStack::NotifyDevmonEventCancel()
{
- LOG_LINE
- LOG_FUNC
-
+ OstTraceFunctionEntry0( RUSBHOSTSTACK_NOTIFYDEVMONEVENTCANCEL_ENTRY );
+
TInt ret = SendReceive(EUsbFdfSrvNotifyDevmonEventCancel);
- LOGTEXT2(_L8("\tret = %d"), ret);
+ OstTrace1( TRACE_NORMAL, RUSBHOSTSTACK_NOTIFYDEVMONEVENTCANCEL, "\tret = %d", ret);
(void)ret;
+ OstTraceFunctionExit0( RUSBHOSTSTACK_NOTIFYDEVMONEVENTCANCEL_EXIT );
}
EXPORT_C TInt RUsbHostStack::GetSupportedLanguages(TUint aDeviceId, RArray<TUint>& aLangIds)
{
- LOG_LINE
- LOG_FUNC
-
+ OstTraceFunctionEntry0( RUSBHOSTSTACK_GETSUPPORTEDLANGUAGES_ENTRY );
+
aLangIds.Reset();
TUint singleLangIdOrNumLangs = 0;
TPckg<TUint> singleLangIdOrNumLangsBuf(singleLangIdOrNumLangs);
TInt ret = SendReceive(EUsbFdfSrvGetSingleSupportedLanguageOrNumberOfSupportedLanguages, TIpcArgs(aDeviceId, &singleLangIdOrNumLangsBuf));
- LOGTEXT2(_L8("\tsingleLangIdOrNumLangs = %d"), singleLangIdOrNumLangs);
+ OstTrace1( TRACE_NORMAL, RUSBHOSTSTACK_GETSUPPORTEDLANGUAGES, "\tsingleLangIdOrNumLangs = %d", singleLangIdOrNumLangs);
+
switch ( ret )
{
case KErrNotFound:
- LOGTEXT2(_L8("\tThere is no language available or the wrong device id %d was supplied"),aDeviceId);
+ OstTrace1( TRACE_NORMAL, RUSBHOSTSTACK_GETSUPPORTEDLANGUAGES_DUP1, "\tThere is no language available or the wrong device id %d was supplied",aDeviceId);
+
ret = KErrNotFound;
break;
@@ -263,18 +279,21 @@
break;
}
- LOGTEXT2(_L8("\tret = %d"), ret);
+ OstTrace1( TRACE_NORMAL, RUSBHOSTSTACK_GETSUPPORTEDLANGUAGES_DUP2, "\tret = %d", ret);
+
+ OstTraceFunctionExit0( RUSBHOSTSTACK_GETSUPPORTEDLANGUAGES_EXIT );
return ret;
}
TInt RUsbHostStack::CopyLangIdsToArray(RArray<TUint>& aLangIds, const TDesC8& aBuffer)
{
- LOG_FUNC
-
+ OstTraceFunctionEntry0( RUSBHOSTSTACK_COPYLANGIDSTOARRAY_ENTRY );
+
ASSERT(!(aBuffer.Size() % 4));
const TUint numLangs = aBuffer.Size() / 4;
- LOGTEXT2(_L8("\tnumLangs = %d"), numLangs);
-
+
+ OstTrace1( TRACE_NORMAL, RUSBHOSTSTACK_COPYLANGIDSTOARRAY, "\tnumLangs = %d", numLangs );
+
TInt ret = KErrNone;
const TUint* ptr = reinterpret_cast<const TUint*>(aBuffer.Ptr());
for ( TUint ii = 0 ; ii < numLangs ; ++ii )
@@ -287,46 +306,51 @@
}
}
- LOGTEXT2(_L8("\tret = %d"), ret);
+ OstTrace1( TRACE_NORMAL, RUSBHOSTSTACK_COPYLANGIDSTOARRAY_DUP1, "\tret = %d", ret );
+
+ OstTraceFunctionExit0( RUSBHOSTSTACK_COPYLANGIDSTOARRAY_EXIT );
return ret;
}
EXPORT_C TInt RUsbHostStack::GetManufacturerStringDescriptor(TUint aDeviceId, TUint aLangId, TName& aString)
{
- LOG_LINE
- LOG_FUNC
-
+ OstTraceFunctionEntry0( RUSBHOSTSTACK_GETMANUFACTURERSTRINGDESCRIPTOR_ENTRY );
+
TInt ret = SendReceive(EUsbFdfSrvGetManufacturerStringDescriptor, TIpcArgs(aDeviceId, aLangId, &aString));
-#ifdef __FLOG_ACTIVE
if ( !ret )
{
- LOGTEXT2(_L("\taString = \"%S\""), &aString);
- }
-#endif
- LOGTEXT2(_L8("\tret = %d"), ret);
+ OstTraceExt1( TRACE_NORMAL, RUSBHOSTSTACK_GETMANUFACTURERSTRINGDESCRIPTOR, "RUsbHostStack::GetManufacturerStringDescriptor;aString=%S", aString );
+
+ }
+
+ OstTrace1( TRACE_NORMAL, RUSBHOSTSTACK_GETMANUFACTURERSTRINGDESCRIPTOR_DUP1, "\tret = %d", ret );
+
+ OstTraceFunctionExit0( RUSBHOSTSTACK_GETMANUFACTURERSTRINGDESCRIPTOR_EXIT );
return ret;
}
EXPORT_C TInt RUsbHostStack::GetProductStringDescriptor(TUint aDeviceId, TUint aLangId, TName& aString)
{
- LOG_LINE
- LOG_FUNC
-
+ OstTraceFunctionEntry0( RUSBHOSTSTACK_GETPRODUCTSTRINGDESCRIPTOR_ENTRY );
+
TInt ret = SendReceive(EUsbFdfSrvGetProductStringDescriptor, TIpcArgs(aDeviceId, aLangId, &aString));
-#ifdef __FLOG_ACTIVE
if ( !ret )
{
- LOGTEXT2(_L("\taString = \"%S\""), &aString);
+ OstTraceExt1( TRACE_NORMAL, RUSBHOSTSTACK_GETPRODUCTSTRINGDESCRIPTOR, "\taString = \"%S\"", aString );
+
+
}
-#endif
- LOGTEXT2(_L8("\tret = %d"), ret);
+ OstTrace1( TRACE_NORMAL, RUSBHOSTSTACK_GETPRODUCTSTRINGDESCRIPTOR_DUP1, "\tret = %d", ret );
+
+
+ OstTraceFunctionExit0( RUSBHOSTSTACK_GETPRODUCTSTRINGDESCRIPTOR_EXIT );
return ret;
}
EXPORT_C TInt RUsbHostStack::GetOtgDescriptor(TUint aDeviceId, TOtgDescriptor& aDescriptor)
{
- LOG_LINE
- LOG_FUNC
+ OstTraceFunctionEntry0( RUSBHOSTSTACK_GETOTGDESCRIPTOR_ENTRY );
+
TPckg<TOtgDescriptor> otgDescriptorPckg(aDescriptor);
@@ -335,14 +359,14 @@
args.Set(1, &otgDescriptorPckg);
TInt ret = SendReceive(EUsbFdfSrvGetOtgDescriptor, args);
-#ifdef __FLOG_ACTIVE
if ( !ret )
{
- LOGTEXT2(_L("\taDescriptor.iDeviceId = %d"), aDescriptor.iDeviceId);
- LOGTEXT2(_L("\taDescriptor.iAttributes = %d"), aDescriptor.iAttributes);
+ OstTrace1( TRACE_NORMAL, RUSBHOSTSTACK_GETOTGDESCRIPTOR, "\taDescriptor.iDeviceId = %d", aDescriptor.iDeviceId );
+ OstTrace1( TRACE_NORMAL, RUSBHOSTSTACK_GETOTGDESCRIPTOR_DUP1, "\taDescriptor.iAttributes = %d", aDescriptor.iAttributes );
}
-#endif
- LOGTEXT2(_L8("\tret = %d"), ret);
+ OstTrace1( TRACE_NORMAL, RUSBHOSTSTACK_GETOTGDESCRIPTOR_DUP2, "\tret = %d", ret );
+
+ OstTraceFunctionExit0( RUSBHOSTSTACK_GETOTGDESCRIPTOR_EXIT );
return ret;
}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usbmgmt/usbmgr/host/fdf/production/client/traces/OstTraceDefinitions.h Wed Jul 07 15:08:54 2010 +0800
@@ -0,0 +1,7 @@
+#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
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usbmgmt/usbmgr/host/fdf/production/client/traces/fixed_id.definitions Wed Jul 07 15:08:54 2010 +0800
@@ -0,0 +1,73 @@
+#Fixed group and trace id definitions. If this file is removed, the identifiers are rebuilt.
+[GROUP]TRACE_FLOW=0x8a
+[GROUP]TRACE_NORMAL=0x86
+[TRACE]TRACE_FLOW[0x8A]_RUSBHOSTSTACK_CONNECT_ENTRY=0x6
+[TRACE]TRACE_FLOW[0x8A]_RUSBHOSTSTACK_COPYLANGIDSTOARRAY_ENTRY=0x19
+[TRACE]TRACE_FLOW[0x8A]_RUSBHOSTSTACK_COPYLANGIDSTOARRAY_EXIT=0x1a
+[TRACE]TRACE_FLOW[0x8A]_RUSBHOSTSTACK_DISABLEDRIVERLOADING_ENTRY=0xd
+[TRACE]TRACE_FLOW[0x8A]_RUSBHOSTSTACK_DISABLEDRIVERLOADING_EXIT=0xe
+[TRACE]TRACE_FLOW[0x8A]_RUSBHOSTSTACK_DOCONNECT_ENTRY=0x7
+[TRACE]TRACE_FLOW[0x8A]_RUSBHOSTSTACK_DOCONNECT_EXIT=0x8
+[TRACE]TRACE_FLOW[0x8A]_RUSBHOSTSTACK_DOCONNECT_EXIT_DUP1=0x24
+[TRACE]TRACE_FLOW[0x8A]_RUSBHOSTSTACK_DOCONNECT_EXIT_DUP2=0x25
+[TRACE]TRACE_FLOW[0x8A]_RUSBHOSTSTACK_ENABLEDRIVERLOADING_ENTRY=0xb
+[TRACE]TRACE_FLOW[0x8A]_RUSBHOSTSTACK_ENABLEDRIVERLOADING_EXIT=0xc
+[TRACE]TRACE_FLOW[0x8A]_RUSBHOSTSTACK_GETMANUFACTURERSTRINGDESCRIPTOR_ENTRY=0x1b
+[TRACE]TRACE_FLOW[0x8A]_RUSBHOSTSTACK_GETMANUFACTURERSTRINGDESCRIPTOR_EXIT=0x1c
+[TRACE]TRACE_FLOW[0x8A]_RUSBHOSTSTACK_GETOTGDESCRIPTOR_ENTRY=0x1f
+[TRACE]TRACE_FLOW[0x8A]_RUSBHOSTSTACK_GETOTGDESCRIPTOR_EXIT=0x20
+[TRACE]TRACE_FLOW[0x8A]_RUSBHOSTSTACK_GETPRODUCTSTRINGDESCRIPTOR_ENTRY=0x1d
+[TRACE]TRACE_FLOW[0x8A]_RUSBHOSTSTACK_GETPRODUCTSTRINGDESCRIPTOR_EXIT=0x1e
+[TRACE]TRACE_FLOW[0x8A]_RUSBHOSTSTACK_GETSUPPORTEDLANGUAGES_ENTRY=0x17
+[TRACE]TRACE_FLOW[0x8A]_RUSBHOSTSTACK_GETSUPPORTEDLANGUAGES_EXIT=0x18
+[TRACE]TRACE_FLOW[0x8A]_RUSBHOSTSTACK_NOTIFYDEVICEEVENTCANCEL_ENTRY=0x11
+[TRACE]TRACE_FLOW[0x8A]_RUSBHOSTSTACK_NOTIFYDEVICEEVENTCANCEL_EXIT=0x12
+[TRACE]TRACE_FLOW[0x8A]_RUSBHOSTSTACK_NOTIFYDEVICEEVENT_ENTRY=0xf
+[TRACE]TRACE_FLOW[0x8A]_RUSBHOSTSTACK_NOTIFYDEVICEEVENT_EXIT=0x10
+[TRACE]TRACE_FLOW[0x8A]_RUSBHOSTSTACK_NOTIFYDEVMONEVENTCANCEL_ENTRY=0x15
+[TRACE]TRACE_FLOW[0x8A]_RUSBHOSTSTACK_NOTIFYDEVMONEVENTCANCEL_EXIT=0x16
+[TRACE]TRACE_FLOW[0x8A]_RUSBHOSTSTACK_NOTIFYDEVMONEVENT_ENTRY=0x13
+[TRACE]TRACE_FLOW[0x8A]_RUSBHOSTSTACK_NOTIFYDEVMONEVENT_EXIT=0x14
+[TRACE]TRACE_FLOW[0x8A]_RUSBHOSTSTACK_RUSBHOSTSTACK_ENTRY=0x4
+[TRACE]TRACE_FLOW[0x8A]_RUSBHOSTSTACK_VERSION_ENTRY=0x5
+[TRACE]TRACE_FLOW[0x8A]__FDF_STARTSERVER_ENTRY=0x21
+[TRACE]TRACE_FLOW[0x8A]__FDF_STARTSERVER_EXIT=0x22
+[TRACE]TRACE_FLOW[0x8A]__FDF_STARTSERVER_EXIT_DUP1=0x23
+[TRACE]TRACE_NORMAL[0x86]_RUSBHOSTSTACK_CONNECT=0x7
+[TRACE]TRACE_NORMAL[0x86]_RUSBHOSTSTACK_COPYLANGIDSTOARRAY=0x16
+[TRACE]TRACE_NORMAL[0x86]_RUSBHOSTSTACK_COPYLANGIDSTOARRAY_DUP1=0x17
+[TRACE]TRACE_NORMAL[0x86]_RUSBHOSTSTACK_DISABLEDRIVERLOADING=0xe
+[TRACE]TRACE_NORMAL[0x86]_RUSBHOSTSTACK_DOCONNECT=0x8
+[TRACE]TRACE_NORMAL[0x86]_RUSBHOSTSTACK_DOCONNECT_DUP1=0x9
+[TRACE]TRACE_NORMAL[0x86]_RUSBHOSTSTACK_DOCONNECT_DUP2=0xa
+[TRACE]TRACE_NORMAL[0x86]_RUSBHOSTSTACK_DOCONNECT_DUP4=0xc
+[TRACE]TRACE_NORMAL[0x86]_RUSBHOSTSTACK_DOCONNECT_DUT3=0xb
+[TRACE]TRACE_NORMAL[0x86]_RUSBHOSTSTACK_ENABLEDRIVERLOADING=0xd
+[TRACE]TRACE_NORMAL[0x86]_RUSBHOSTSTACK_GETMANUFACTURERSTRINGDESCRIPTOR=0x19
+[TRACE]TRACE_NORMAL[0x86]_RUSBHOSTSTACK_GETMANUFACTURERSTRINGDESCRIPTOR_DUP1=0x1a
+[TRACE]TRACE_NORMAL[0x86]_RUSBHOSTSTACK_GETOTGDESCRIPTOR=0x18
+[TRACE]TRACE_NORMAL[0x86]_RUSBHOSTSTACK_GETOTGDESCRIPTOR_DUP1=0x1b
+[TRACE]TRACE_NORMAL[0x86]_RUSBHOSTSTACK_GETOTGDESCRIPTOR_DUP2=0x1c
+[TRACE]TRACE_NORMAL[0x86]_RUSBHOSTSTACK_GETPRODUCTSTRINGDESCRIPTOR=0x1d
+[TRACE]TRACE_NORMAL[0x86]_RUSBHOSTSTACK_GETPRODUCTSTRINGDESCRIPTOR_DUP1=0x15
+[TRACE]TRACE_NORMAL[0x86]_RUSBHOSTSTACK_GETSUPPORTEDLANGUAGES=0x11
+[TRACE]TRACE_NORMAL[0x86]_RUSBHOSTSTACK_GETSUPPORTEDLANGUAGES_DUP1=0x12
+[TRACE]TRACE_NORMAL[0x86]_RUSBHOSTSTACK_GETSUPPORTEDLANGUAGES_DUP2=0x13
+[TRACE]TRACE_NORMAL[0x86]_RUSBHOSTSTACK_NOTIFYDEVICEEVENTCANCEL=0xf
+[TRACE]TRACE_NORMAL[0x86]_RUSBHOSTSTACK_NOTIFYDEVMONEVENTCANCEL=0x10
+[TRACE]TRACE_NORMAL[0x86]_RUSBHOSTSTACK_RUSBHOSTSTACK=0x6
+[TRACE]TRACE_NORMAL[0x86]__FDF_STARTSERVER=0x1e
+[TRACE]TRACE_NORMAL[0x86]__FDF_STARTSERVER_DUP1=0x1f
+[TRACE]TRACE_NORMAL[0x86]__FDF_STARTSERVER_DUP2=0x20
+[TRACE]TRACE_NORMAL[0x86]__FDF_STARTSERVER_DUP3=0x21
+[TRACE]TRACE_NORMAL[0x86]__FDF_STARTSERVER_DUP4=0x22
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_RUSBHOSTSTACK_DOCONNECT_EXIT=0x9
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1__STARTSERVER_EXIT=0x3
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP2_RUSBHOSTSTACK_DOCONNECT_EXIT=0xa
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]__STARTSERVER_ENTRY=0x1
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]__STARTSERVER_EXIT=0x2
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]__STARTSERVER=0x1
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]__STARTSERVER_DUP1=0x2
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]__STARTSERVER_DUP2=0x3
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]__STARTSERVER_DUP3=0x4
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]__STARTSERVER_DUP4=0x5
--- a/usbmgmt/usbmgr/host/fdf/production/fdcbase/group/bld.inf Wed Jul 07 14:16:40 2010 +0800
+++ b/usbmgmt/usbmgr/host/fdf/production/fdcbase/group/bld.inf 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"
--- a/usbmgmt/usbmgr/host/fdf/production/fdcbase/group/fdcbase.mmp Wed Jul 07 14:16:40 2010 +0800
+++ b/usbmgmt/usbmgr/host/fdf/production/fdcbase/group/fdcbase.mmp 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"
@@ -37,5 +37,6 @@
LIBRARY euser.lib
LIBRARY ecom.lib
-#include <usb/usblogger.mmh>
+USERINCLUDE ../traces
+
#include <usbhost/internal/fdfcaps.mmh>
--- a/usbmgmt/usbmgr/host/fdf/production/fdcbase/group/fdcbase_base_bld.inf Wed Jul 07 14:16:40 2010 +0800
+++ b/usbmgmt/usbmgr/host/fdf/production/fdcbase/group/fdcbase_base_bld.inf 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"
--- a/usbmgmt/usbmgr/host/fdf/production/fdcbase/group/fdcbase_over_dummyusbdi_bld.inf Wed Jul 07 14:16:40 2010 +0800
+++ b/usbmgmt/usbmgr/host/fdf/production/fdcbase/group/fdcbase_over_dummyusbdi_bld.inf 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"
--- a/usbmgmt/usbmgr/host/fdf/production/fdcbase/public/fdcinterface.h Wed Jul 07 14:16:40 2010 +0800
+++ b/usbmgmt/usbmgr/host/fdf/production/fdcbase/public/fdcinterface.h 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"
--- a/usbmgmt/usbmgr/host/fdf/production/fdcbase/public/fdcplugin.h Wed Jul 07 14:16:40 2010 +0800
+++ b/usbmgmt/usbmgr/host/fdf/production/fdcbase/public/fdcplugin.h 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"
--- a/usbmgmt/usbmgr/host/fdf/production/fdcbase/public/fdcplugin.hrh Wed Jul 07 14:16:40 2010 +0800
+++ b/usbmgmt/usbmgr/host/fdf/production/fdcbase/public/fdcplugin.hrh 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"
--- a/usbmgmt/usbmgr/host/fdf/production/fdcbase/public/fdcpluginobserver.h Wed Jul 07 14:16:40 2010 +0800
+++ b/usbmgmt/usbmgr/host/fdf/production/fdcbase/public/fdcpluginobserver.h 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"
--- 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;
}
--- a/usbmgmt/usbmgr/host/fdf/production/fdcbase/src/fdcpluginobserver.cpp Wed Jul 07 14:16:40 2010 +0800
+++ b/usbmgmt/usbmgr/host/fdf/production/fdcbase/src/fdcpluginobserver.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"
@@ -21,15 +21,16 @@
*/
#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 "fdcpluginobserverTraces.h"
#endif
+
EXPORT_C TUint32 MFdcPluginObserver::TokenForInterface(TUint8 aInterface)
{
- LOG_FUNC
+ OstTraceFunctionEntry1( MFDCPLUGINOBSERVER_TOKENFORINTERFACE_ENTRY, this );
return MfpoTokenForInterface(aInterface);
}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usbmgmt/usbmgr/host/fdf/production/fdcbase/traces/OstTraceDefinitions.h Wed Jul 07 15:08:54 2010 +0800
@@ -0,0 +1,7 @@
+#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
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usbmgmt/usbmgr/host/fdf/production/fdcbase/traces/fixed_id.definitions Wed Jul 07 15:08:54 2010 +0800
@@ -0,0 +1,16 @@
+#Fixed group and trace id definitions. If this file is removed, the identifiers are rebuilt.
+[GROUP]TRACE_FLOW=0x8a
+[GROUP]TRACE_NORMAL=0x86
+[TRACE]TRACE_FLOW[0x8A]_CFDCPLUGIN_CFDCPLUGIN_CONS_ENTRY=0xb
+[TRACE]TRACE_FLOW[0x8A]_CFDCPLUGIN_CFDCPLUGIN_DES_ENTRY=0xa
+[TRACE]TRACE_FLOW[0x8A]_CFDCPLUGIN_NEWL_ENTRY=0x5
+[TRACE]TRACE_FLOW[0x8A]_MFDCPLUGINOBSERVER_TOKENFORINTERFACE_ENTRY=0x8
+[TRACE]TRACE_NORMAL[0x86]_CFDCPLUGIN_NEWL=0x3
+[TRACE]TRACE_NORMAL[0x86]_CFDCPLUGIN_NEWL_DUP1=0x2
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CFDCPLUGIN_CFDCPLUGIN_ENTRY=0x1
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CFDCPLUGIN_CFDCPLUGIN_ENTRY_DUP1=0x9
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CFDCPLUGIN_CFDCPLUGIN_ENTRY_DUP1_EXIT=0x4
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CFDCPLUGIN_CFDCPLUGIN_EXIT=0x2
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CFDCPLUGIN_NEWL_EXIT=0x6
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_CFDCPLUGIN_CFDCPLUGIN_ENTRY=0x7
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CFDCPLUGIN_NEWL=0x1
--- a/usbmgmt/usbmgr/host/fdf/production/server/group/fdf.mmp Wed Jul 07 14:16:40 2010 +0800
+++ b/usbmgmt/usbmgr/host/fdf/production/server/group/fdf.mmp 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"
--- a/usbmgmt/usbmgr/host/fdf/production/server/group/fdf_base.mmp Wed Jul 07 14:16:40 2010 +0800
+++ b/usbmgmt/usbmgr/host/fdf/production/server/group/fdf_base.mmp 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"
@@ -22,7 +22,6 @@
*/
#include <usbhost/internal/fdfcaps.mmh>
-#include <usb/usblogger.mmh>
TARGETTYPE exe
VENDORID 0x70000001
@@ -41,6 +40,7 @@
SOURCE utils.cpp
USERINCLUDE ../inc
+USERINCLUDE ../traces
USERINCLUDE ../public
USERINCLUDE ../../client/public
@@ -51,7 +51,4 @@
LIBRARY euser.lib
LIBRARY ecom.lib
LIBRARY fdcbase.lib
-
-#ifdef __FLOGGER_INCLUDED
LIBRARY efsrv.lib
-#endif
--- a/usbmgmt/usbmgr/host/fdf/production/server/group/fdf_over_dummyusbdi.mmp Wed Jul 07 14:16:40 2010 +0800
+++ b/usbmgmt/usbmgr/host/fdf/production/server/group/fdf_over_dummyusbdi.mmp 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"
--- a/usbmgmt/usbmgr/host/fdf/production/server/group/fdf_over_dummyusbdi_bld.inf Wed Jul 07 14:16:40 2010 +0800
+++ b/usbmgmt/usbmgr/host/fdf/production/server/group/fdf_over_dummyusbdi_bld.inf 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"
--- a/usbmgmt/usbmgr/host/fdf/production/server/inc/activewaitforbusevent.h Wed Jul 07 14:16:40 2010 +0800
+++ b/usbmgmt/usbmgr/host/fdf/production/server/inc/activewaitforbusevent.h 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"
--- a/usbmgmt/usbmgr/host/fdf/production/server/inc/activewaitforecomevent.h Wed Jul 07 14:16:40 2010 +0800
+++ b/usbmgmt/usbmgr/host/fdf/production/server/inc/activewaitforecomevent.h 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"
--- a/usbmgmt/usbmgr/host/fdf/production/server/inc/deviceproxy.h Wed Jul 07 14:16:40 2010 +0800
+++ b/usbmgmt/usbmgr/host/fdf/production/server/inc/deviceproxy.h 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"
--- a/usbmgmt/usbmgr/host/fdf/production/server/inc/event.h Wed Jul 07 14:16:40 2010 +0800
+++ b/usbmgmt/usbmgr/host/fdf/production/server/inc/event.h 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"
--- a/usbmgmt/usbmgr/host/fdf/production/server/inc/eventqueue.h Wed Jul 07 14:16:40 2010 +0800
+++ b/usbmgmt/usbmgr/host/fdf/production/server/inc/eventqueue.h Wed Jul 07 15:08:54 2010 +0800
@@ -65,7 +65,9 @@
CEventQueue(CFdf& aFdf);
private:
+#ifdef _DEBUG
void Log();
+#endif
void PokeSession();
private: // unowned
--- a/usbmgmt/usbmgr/host/fdf/production/server/inc/fdcproxy.h Wed Jul 07 14:16:40 2010 +0800
+++ b/usbmgmt/usbmgr/host/fdf/production/server/inc/fdcproxy.h 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"
--- a/usbmgmt/usbmgr/host/fdf/production/server/inc/fdf.h Wed Jul 07 14:16:40 2010 +0800
+++ b/usbmgmt/usbmgr/host/fdf/production/server/inc/fdf.h 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"
--- a/usbmgmt/usbmgr/host/fdf/production/server/inc/fdfserver.h Wed Jul 07 14:16:40 2010 +0800
+++ b/usbmgmt/usbmgr/host/fdf/production/server/inc/fdfserver.h 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"
--- a/usbmgmt/usbmgr/host/fdf/production/server/inc/fdfsession.h Wed Jul 07 14:16:40 2010 +0800
+++ b/usbmgmt/usbmgr/host/fdf/production/server/inc/fdfsession.h 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"
--- a/usbmgmt/usbmgr/host/fdf/production/server/inc/utils.h Wed Jul 07 14:16:40 2010 +0800
+++ b/usbmgmt/usbmgr/host/fdf/production/server/inc/utils.h 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"
@@ -37,47 +37,7 @@
#define CLEANUPSTACK_POP2(a, b) CleanupStack::Pop(2);
#endif // _DEBUG
-// What we want for internal programming errors in a server is a set of macros
-// which, to save effort all round, use __LINE__ as the panic code, and a
-// file-specific panic category. To make this non-standard pattern as helpful
-// to users as possible, we append ' line#' to the category. That means we
-// first have to check that the category is 10 characters long or less, so
-// that the whole thing is legible to users when it appears on the screen.
-template <TBool> struct ASSERTION_FAILURE;
-TEMPLATE_SPECIALIZATION struct ASSERTION_FAILURE<ETrue>{};
-template <TInt> struct __assertion_test;
-#define COMPILE_ASSERT( B ) void __compile_assert(::__assertion_test<sizeof(::ASSERTION_FAILURE<(B)>)>)
-// We want a 10-character string (but allow for the NULL terminator).
-#define PANICCATEGORY(aaa) COMPILE_ASSERT(sizeof(L##aaa)/2 <= 11); _LIT(KPanicCat, aaa)
-
-// A handy panic-self macro- the category is KPanicCat with " line#" appended;
-// the code is the line number.
-#define PANIC_LINENUM \
- { \
- _LIT(KLnNo, " line#"); \
- TBuf<KMaxExitCategoryName> cat = KPanicCat(); \
- cat.Append(KLnNo()); \
- _USB_PANIC(cat, __LINE__); \
- }
-
-// A handy assertion macro that panics with a locally-defined panic category
-// and the line number.
-#define ASSERT_ALWAYS(a) \
- { \
- if ( !(a) ) \
- { \
- PANIC_LINENUM; \
- } \
- }
-
-#ifdef _DEBUG
-#define ASSERT_DEBUG(a) ASSERT_ALWAYS(a)
-#define DEBUG_PANIC_LINENUM PANIC_LINENUM
-#else
-#define ASSERT_DEBUG(a)
-#define DEBUG_PANIC_LINENUM
-#endif // _DEBUG
// Undefine the e32def.h-defined ASSERT macro to make sure no-one uses it
// under the mistaken impression that it's useful. Use our informative one
--- a/usbmgmt/usbmgr/host/fdf/production/server/src/activewaitforbusevent.cpp Wed Jul 07 14:16:40 2010 +0800
+++ b/usbmgmt/usbmgr/host/fdf/production/server/src/activewaitforbusevent.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"
@@ -18,10 +18,12 @@
#include "activewaitforbusevent.h"
#include <usb/usblogger.h>
#include "utils.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "activewaitforbuseventTraces.h"
+#endif
-#ifdef __FLOG_ACTIVE
-_LIT8(KLogComponent, "fdf ");
-#endif
+
CActiveWaitForBusEvent::CActiveWaitForBusEvent(RUsbHubDriver& aHubDriver,
@@ -32,16 +34,18 @@
iBusEvent(aBusEvent),
iObserver(aObserver)
{
- LOG_FUNC
-
+ OstTraceFunctionEntry0( CACTIVEWAITFORBUSEVENT_CACTIVEWAITFORBUSEVENT_CONS_ENTRY );
+
CActiveScheduler::Add(this);
+ OstTraceFunctionExit0( CACTIVEWAITFORBUSEVENT_CACTIVEWAITFORBUSEVENT_CONS_EXIT );
}
CActiveWaitForBusEvent::~CActiveWaitForBusEvent()
{
- LOG_FUNC
-
+ OstTraceFunctionEntry0( CACTIVEWAITFORBUSEVENT_CACTIVEWAITFORBUSEVENT_DES_ENTRY );
+
Cancel();
+ OstTraceFunctionExit0( CACTIVEWAITFORBUSEVENT_CACTIVEWAITFORBUSEVENT_DES_EXIT );
}
CActiveWaitForBusEvent* CActiveWaitForBusEvent::NewL(RUsbHubDriver& aHubDriver,
@@ -54,24 +58,26 @@
void CActiveWaitForBusEvent::Wait()
{
- LOG_FUNC
-
+ OstTraceFunctionEntry0( CACTIVEWAITFORBUSEVENT_WAIT_ENTRY );
+
iHubDriver.WaitForBusEvent(iBusEvent, iStatus);
SetActive();
+ OstTraceFunctionExit0( CACTIVEWAITFORBUSEVENT_WAIT_EXIT );
}
void CActiveWaitForBusEvent::RunL()
{
- LOG_LINE
- LOG_FUNC
- LOGTEXT3(_L8("\tiStatus = %d , iBusEvent.iError=%d "), iStatus.Int(),iBusEvent.iError);
-
+ OstTraceFunctionEntry0( CACTIVEWAITFORBUSEVENT_RUNL_ENTRY );
+ OstTraceExt2( TRACE_NORMAL, CACTIVEWAITFORBUSEVENT_RUNL, "\tiStatus = %d , iBusEvent.iError=%d ", iStatus.Int(),iBusEvent.iError );
+
iObserver.MbeoBusEvent();
+ OstTraceFunctionExit0( CACTIVEWAITFORBUSEVENT_RUNL_EXIT );
}
void CActiveWaitForBusEvent::DoCancel()
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CACTIVEWAITFORBUSEVENT_DOCANCEL_ENTRY );
iHubDriver.CancelWaitForBusEvent();
+ OstTraceFunctionExit0( CACTIVEWAITFORBUSEVENT_DOCANCEL_EXIT );
}
--- a/usbmgmt/usbmgr/host/fdf/production/server/src/activewaitforecomevent.cpp Wed Jul 07 14:16:40 2010 +0800
+++ b/usbmgmt/usbmgr/host/fdf/production/server/src/activewaitforecomevent.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"
@@ -15,16 +15,13 @@
*
*/
-
+#include <usb/usblogger.h>
#include "activewaitforecomevent.h"
-#include <usb/usblogger.h>
#include "utils.h"
-
-
-#ifdef __FLOG_ACTIVE
-_LIT8(KLogComponent, "fdf ");
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "activewaitforecomeventTraces.h"
#endif
-
#ifdef _DEBUG
_LIT( KFdfEcomEventAOPanicCategory, "FdfEcomEventAO" );
#endif
@@ -33,17 +30,20 @@
: CActive(CActive::EPriorityStandard),
iObserver(aObserver)
{
- LOG_FUNC
-
+ OstTraceFunctionEntry0( CACTIVEWAITFORECOMEVENT_CACTIVEWAITFORECOMEVENT_CONS_ENTRY );
+
CActiveScheduler::Add(this);
+ OstTraceFunctionExit0( CACTIVEWAITFORECOMEVENT_CACTIVEWAITFORECOMEVENT_CONS_EXIT );
}
CActiveWaitForEComEvent::~CActiveWaitForEComEvent()
{
- LOG_FUNC
- Cancel();
+ OstTraceFunctionEntry0( CACTIVEWAITFORECOMEVENT_CACTIVEWAITFORECOMEVENT_DES_ENTRY );
+
+ Cancel();
iEComSession.Close();
REComSession::FinalClose();
+ OstTraceFunctionExit0( CACTIVEWAITFORECOMEVENT_CACTIVEWAITFORECOMEVENT_DES_EXIT );
}
CActiveWaitForEComEvent* CActiveWaitForEComEvent::NewL(MEComEventObserver& aObserver)
@@ -63,30 +63,36 @@
void CActiveWaitForEComEvent::Wait()
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CACTIVEWAITFORECOMEVENT_WAIT_ENTRY );
+
iEComSession.NotifyOnChange(iStatus);
SetActive();
+ OstTraceFunctionExit0( CACTIVEWAITFORECOMEVENT_WAIT_EXIT );
}
void CActiveWaitForEComEvent::RunL()
{
- LOG_LINE
- LOG_FUNC
- iObserver.EComEventReceived();
+ OstTraceFunctionEntry0( CACTIVEWAITFORECOMEVENT_RUNL_ENTRY );
+
+ iObserver.EComEventReceived();
Wait();
+ OstTraceFunctionExit0( CACTIVEWAITFORECOMEVENT_RUNL_EXIT );
}
void CActiveWaitForEComEvent::DoCancel()
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CACTIVEWAITFORECOMEVENT_DOCANCEL_ENTRY );
+
iEComSession.CancelNotifyOnChange(iStatus);
+ OstTraceFunctionExit0( CACTIVEWAITFORECOMEVENT_DOCANCEL_EXIT );
}
TInt CActiveWaitForEComEvent::RunError(TInt aError)
{
- LOG_LINE
- LOG_FUNC
- LOGTEXT2(_L8("ECOM change notification error = %d "), aError);
- __ASSERT_DEBUG(EFalse, _USB_PANIC(KFdfEcomEventAOPanicCategory, aError));
+ OstTraceFunctionEntry0( CACTIVEWAITFORECOMEVENT_RUNERROR_ENTRY );
+ OstTrace1( TRACE_FATAL, CACTIVEWAITFORECOMEVENT_RUNERROR, "ECOM change notification error = %d ", aError );
+
+ __ASSERT_DEBUG(EFalse,User::Panic(KFdfEcomEventAOPanicCategory, aError));
+ OstTraceFunctionExit0( CACTIVEWAITFORECOMEVENT_RUNERROR_EXIT );
return KErrNone;
}
--- a/usbmgmt/usbmgr/host/fdf/production/server/src/deviceproxy.cpp Wed Jul 07 14:16:40 2010 +0800
+++ b/usbmgmt/usbmgr/host/fdf/production/server/src/deviceproxy.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"
@@ -20,48 +20,54 @@
@internalComponent
*/
-#include "deviceproxy.h"
+
#include <usb/usblogger.h>
#include <usbhostdefs.h>
#include "utils.h"
#include "event.h"
-
-#ifdef __FLOG_ACTIVE
-_LIT8(KLogComponent, "fdf ");
+#include "deviceproxy.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "deviceproxyTraces.h"
#endif
#ifdef _DEBUG
-PANICCATEGORY("devproxy");
-#endif
-
-#ifdef __FLOG_ACTIVE
#define LOG Log()
+_LIT(KPanicCategory,"devproxy");
#else
#define LOG
#endif
+
+
CDeviceProxy* CDeviceProxy::NewL(RUsbHubDriver& aHubDriver, TUint aDeviceId)
{
- LOG_STATIC_FUNC_ENTRY
-
+ OstTraceFunctionEntry0( CDEVICEPROXY_NEWL_ENTRY );
+
CDeviceProxy* self = new(ELeave) CDeviceProxy(aDeviceId);
CleanupStack::PushL(self);
self->ConstructL(aHubDriver);
CLEANUPSTACK_POP1(self);
+ OstTraceFunctionExit0( CDEVICEPROXY_NEWL_EXIT );
return self;
}
CDeviceProxy::CDeviceProxy(TUint aDeviceId)
: iId(aDeviceId)
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CDEVICEPROXY_CDEVICEPROXY_CONS_ENTRY );
}
void CDeviceProxy::ConstructL(RUsbHubDriver& aHubDriver)
{
- LOG_FUNC
-
- LEAVEIFERRORL(iHandle.Open(aHubDriver, iId));
+ OstTraceFunctionEntry0( CDEVICEPROXY_CONSTRUCTL_ENTRY );
+
+ TInt err=iHandle.Open(aHubDriver, iId);
+ if (err<0)
+ {
+ OstTrace1( TRACE_NORMAL, CDEVICEPROXY_CONSTRUCTL, "handle open with error %d", err );
+ User::Leave(err);
+ }
// Pre-allocate objects relating to this device for the event queue.
iAttachmentEvent = new(ELeave) TDeviceEvent;
@@ -79,12 +85,13 @@
ReadStringDescriptorsL();
LOG;
+ OstTraceFunctionExit0( CDEVICEPROXY_CONSTRUCTL_EXIT );
}
void CDeviceProxy::ReadStringDescriptorsL()
{
- LOG_FUNC
-
+ OstTraceFunctionEntry0( CDEVICEPROXY_READSTRINGDESCRIPTORSL_ENTRY );
+
// wait 10 ms before reading any string descriptors
// to avoid IOP issues with some USB devices (e.g. PNY Attache)
User::After(10000);
@@ -101,8 +108,16 @@
// language IDs.
TBuf8<256> stringBuf;
TUsbStringDescriptor* stringDesc = NULL;
- ASSERT_DEBUG(iHandle.Handle());
- LEAVEIFERRORL(iHandle.GetStringDescriptor(stringDesc, stringBuf, 0));
+
+ if(!(iHandle.Handle()))
+ {
+ OstTrace0( TRACE_FATAL, CDEVICEPROXY_READSTRINGDESCRIPTORSL_DUP1, "Empty handler" );
+ __ASSERT_DEBUG(EFalse,User::Panic(KPanicCategory, __LINE__));
+ }
+
+ TInt err=iHandle.GetStringDescriptor(stringDesc, stringBuf, 0);
+ LEAVEIFERRORL(err, OstTrace1( TRACE_ERROR, CDEVICEPROXY_READSTRINGDESCRIPTORSL_DUP6,
+ "iHandle.GetStringDescriptor error %d", err ););
CleanupStack::PushL(*stringDesc);
// Copy the language IDs into our array.
@@ -110,7 +125,8 @@
TInt16 langId = stringDesc->GetLangId(index);
while ( langId != KErrNotFound )
{
- LOGTEXT2(_L8("\tsupported language: 0x%04x"), langId);
+ OstTrace1( TRACE_NORMAL, CDEVICEPROXY_READSTRINGDESCRIPTORSL, "\tsupported language: 0x%04x", langId );
+
iLangIds.AppendL(langId); // stored as TUint
++index;
langId = stringDesc->GetLangId(index);
@@ -120,17 +136,38 @@
// Get the actual strings for each supported language.
TUsbDeviceDescriptor deviceDescriptor;
- ASSERT_DEBUG(iHandle.Handle());
- LEAVEIFERRORL(iHandle.GetDeviceDescriptor(deviceDescriptor));
+ if(!(iHandle.Handle()))
+ {
+ OstTrace0( TRACE_FATAL, CDEVICEPROXY_READSTRINGDESCRIPTORSL_DUP2, "Empty handler" );
+ __ASSERT_DEBUG(EFalse,User::Panic(KPanicCategory, __LINE__));
+ }
+
+ err=iHandle.GetDeviceDescriptor(deviceDescriptor);
+ LEAVEIFERRORL(err, OstTrace1( TRACE_ERROR, CDEVICEPROXY_READSTRINGDESCRIPTORSL_DUP7,
+ "iHandle.GetDeviceDescriptor error %d", err ););
+
TUint8 manufacturerStringDescriptorIndex = deviceDescriptor.ManufacturerIndex();
TUint8 productStringDescriptorIndex = deviceDescriptor.ProductIndex();
TUint8 serialNumberStringDescriptorIndex = deviceDescriptor.SerialNumberIndex();
PopulateStringDescriptorsL(manufacturerStringDescriptorIndex, iManufacturerStrings);
PopulateStringDescriptorsL(productStringDescriptorIndex, iProductStrings);
PopulateStringDescriptorsL(serialNumberStringDescriptorIndex, iSerialNumberStrings);
- ASSERT_DEBUG(iManufacturerStrings.Count() == iLangIds.Count());
- ASSERT_DEBUG(iProductStrings.Count() == iLangIds.Count());
- ASSERT_DEBUG(iSerialNumberStrings.Count() == iLangIds.Count());
+ if(!(iManufacturerStrings.Count() == iLangIds.Count()))
+ {
+ OstTrace0( TRACE_FATAL, CDEVICEPROXY_READSTRINGDESCRIPTORSL_DUP3, "iLangIds error" );
+ __ASSERT_DEBUG(EFalse,User::Panic(KPanicCategory, __LINE__));
+ }
+ if(!(iProductStrings.Count() == iLangIds.Count()))
+ {
+ OstTrace0( TRACE_FATAL, CDEVICEPROXY_READSTRINGDESCRIPTORSL_DUP4, "iLangIds error" );
+ __ASSERT_DEBUG(EFalse,User::Panic(KPanicCategory, __LINE__));
+ }
+ if(!(iSerialNumberStrings.Count() == iLangIds.Count()))
+ {
+ OstTrace0( TRACE_FATAL, CDEVICEPROXY_READSTRINGDESCRIPTORSL_DUP5, "iLangIds error" );
+ __ASSERT_DEBUG(EFalse,User::Panic(KPanicCategory, __LINE__));
+ }
+ OstTraceFunctionExit0( CDEVICEPROXY_READSTRINGDESCRIPTORSL_EXIT );
}
// Populates the given array with the supported language variants of the given
@@ -139,8 +176,8 @@
// supported but serial number strings to *not* be.)
void CDeviceProxy::PopulateStringDescriptorsL(TUint8 aStringDescriptorIndex, RArray<TName>& aStringArray)
{
- LOG_FUNC
-
+ OstTraceFunctionEntry0( CDEVICEPROXY_POPULATESTRINGDESCRIPTORSL_ENTRY );
+
const TUint langCount = iLangIds.Count();
for ( TUint ii = 0 ; ii < langCount ; ++ii )
{
@@ -152,17 +189,20 @@
string = KNullDesC();
}
else
- {
- LEAVEIFERRORL(err);
+ {
+ LEAVEIFERRORL(err, OstTrace1( TRACE_NORMAL, CDEVICEPROXY_POPULATESTRINGDESCRIPTORSL, "err=%d", err ););
}
- LEAVEIFERRORL(aStringArray.Append(string));
+ err=aStringArray.Append(string);
+ LEAVEIFERRORL(err, OstTrace0( TRACE_NORMAL, CDEVICEPROXY_POPULATESTRINGDESCRIPTORSL_DUP1, "aStringArray append error"););
}
+ OstTraceFunctionExit0( CDEVICEPROXY_POPULATESTRINGDESCRIPTORSL_EXIT );
}
CDeviceProxy::~CDeviceProxy()
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CDEVICEPROXY_CDEVICEPROXY_DES_ENTRY );
+
LOG;
// In the design, the event objects should all have had ownership taken
@@ -182,76 +222,95 @@
iSerialNumberStrings.Reset();
iHandle.Close();
+ OstTraceFunctionExit0( CDEVICEPROXY_CDEVICEPROXY_DES_EXIT );
}
TInt CDeviceProxy::GetDeviceDescriptor(TUsbDeviceDescriptor& aDescriptor)
{
- LOG_FUNC
-
- ASSERT_DEBUG(iHandle.Handle());
+ OstTraceFunctionEntry0( CDEVICEPROXY_GETDEVICEDESCRIPTOR_ENTRY );
+ if(!(iHandle.Handle()))
+ {
+ OstTrace0( TRACE_FATAL, CDEVICEPROXY_GETDEVICEDESCRIPTOR_DUP1, "Empty handler" );
+ __ASSERT_DEBUG(EFalse,User::Panic(KPanicCategory, __LINE__));
+ }
TInt err = iHandle.GetDeviceDescriptor(aDescriptor);
- LOGTEXT2(_L8("\terr = %d"), err);
+ OstTrace1( TRACE_NORMAL, CDEVICEPROXY_GETDEVICEDESCRIPTOR, "\terr = %d", err );
+
+ OstTraceFunctionExit0( CDEVICEPROXY_GETDEVICEDESCRIPTOR_EXIT );
return err;
}
TInt CDeviceProxy::GetConfigurationDescriptor(TUsbConfigurationDescriptor& aDescriptor) const
{
- LOG_FUNC
-
- ASSERT_DEBUG(iHandle.Handle());
+ OstTraceFunctionEntry0( CDEVICEPROXY_GETCONFIGURATIONDESCRIPTOR_ENTRY );
+ if(!(iHandle.Handle()))
+ {
+ OstTrace0( TRACE_FATAL, CDEVICEPROXY_GETCONFIGURATIONDESCRIPTOR, "Empty handler" );
+ __ASSERT_DEBUG(EFalse,User::Panic(KPanicCategory, __LINE__));
+ }
TInt err = const_cast<RUsbDevice&>(iHandle).GetConfigurationDescriptor(aDescriptor);
- LOGTEXT2(_L8("\terr = %d"), err);
+ OstTrace1( TRACE_NORMAL, CDEVICEPROXY_GETCONFIGURATIONDESCRIPTOR_DUP1, "\terr = %d", err );
+
+ OstTraceFunctionExit0( CDEVICEPROXY_GETCONFIGURATIONDESCRIPTOR_EXIT );
return err;
}
TInt CDeviceProxy::GetTokenForInterface(TUint aIndex, TUint32& aToken) const
{
- LOG_FUNC
-
- ASSERT_DEBUG(iHandle.Handle());
- // We shouldn't need to worry about whether the device is suspended or
+ OstTraceFunctionEntry0( CDEVICEPROXY_GETTOKENFORINTERFACE_ENTRY );
+ if(!(iHandle.Handle()))
+ {
+ OstTrace0( TRACE_FATAL, CDEVICEPROXY_GETTOKENFORINTERFACE_DUP1, "Empty handler" );
+ __ASSERT_DEBUG(EFalse,User::Panic(KPanicCategory, __LINE__));
+ }
+ // We shouldn't need to worry about whether the device is suspended or
// resumed before doing this. This function is only called if we find FDs
// for the device, in which case we wouldn't have suspended it in the
// first place.
TInt err = const_cast<RUsbDevice&>(iHandle).GetTokenForInterface(aIndex, aToken);
- LOGTEXT2(_L8("\terr = %d"), err);
+ OstTrace1( TRACE_NORMAL, CDEVICEPROXY_GETTOKENFORINTERFACE, "\terr = %d", err );
+
+ OstTraceFunctionExit0( CDEVICEPROXY_GETTOKENFORINTERFACE_EXIT );
return err;
}
const RArray<TUint>& CDeviceProxy::GetSupportedLanguages() const
{
- LOG_FUNC
-
+ OstTraceFunctionEntry0( CDEVICEPROXY_GETSUPPORTEDLANGUAGES_ENTRY );
+
return iLangIds;
}
void CDeviceProxy::GetManufacturerStringDescriptorL(TUint32 aLangId, TName& aString) const
{
- LOG_FUNC
-
+ OstTraceFunctionEntry0( CDEVICEPROXY_GETMANUFACTURERSTRINGDESCRIPTORL_ENTRY );
+
GetStringDescriptorFromCacheL(aLangId, aString, iManufacturerStrings);
+ OstTraceFunctionExit0( CDEVICEPROXY_GETMANUFACTURERSTRINGDESCRIPTORL_EXIT );
}
void CDeviceProxy::GetProductStringDescriptorL(TUint32 aLangId, TName& aString) const
{
- LOG_FUNC
-
+ OstTraceFunctionEntry0( CDEVICEPROXY_GETPRODUCTSTRINGDESCRIPTORL_ENTRY );
+
GetStringDescriptorFromCacheL(aLangId, aString, iProductStrings);
+ OstTraceFunctionExit0( CDEVICEPROXY_GETPRODUCTSTRINGDESCRIPTORL_EXIT );
}
void CDeviceProxy::GetSerialNumberStringDescriptorL(TUint32 aLangId, TName& aString) const
{
- LOG_FUNC
-
+ OstTraceFunctionEntry0( CDEVICEPROXY_GETSERIALNUMBERSTRINGDESCRIPTORL_ENTRY );
+
GetStringDescriptorFromCacheL(aLangId, aString, iSerialNumberStrings);
+ OstTraceFunctionExit0( CDEVICEPROXY_GETSERIALNUMBERSTRINGDESCRIPTORL_EXIT );
}
void CDeviceProxy::GetOtgDescriptorL(TOtgDescriptor& aDescriptor) const
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CDEVICEPROXY_GETOTGDESCRIPTORL_ENTRY );
if (iOtgDescriptor)
{
@@ -259,8 +318,10 @@
}
else
{
- LEAVEL(KErrNotSupported);
+ OstTrace1( TRACE_NORMAL, CDEVICEPROXY_GETOTGDESCRIPTORL, "Error=%d", KErrNotSupported );
+ User::Leave(KErrNotSupported);
}
+ OstTraceFunctionExit0( CDEVICEPROXY_GETOTGDESCRIPTORL_EXIT );
}
void CDeviceProxy::SetOtgDescriptorL(const TUsbOTGDescriptor& aDescriptor)
@@ -279,31 +340,44 @@
// Used during instantiation to read supported strings.
void CDeviceProxy::GetStringDescriptorFromUsbdL(TUint32 aLangId, TName& aString, TUint8 aStringDescriptorIndex) const
{
- LOG_FUNC
- LOGTEXT3(_L8("\taLangId = 0x%04x, aStringDescriptorIndex = %d"), aLangId, aStringDescriptorIndex);
-
+ OstTraceFunctionEntry0( CDEVICEPROXY_GETSTRINGDESCRIPTORFROMUSBDL_ENTRY );
+
+ OstTraceExt2( TRACE_NORMAL, CDEVICEPROXY_GETSTRINGDESCRIPTORFROMUSBDL, "\taLangId = 0x%d, aStringDescriptorIndex = %d", aLangId, aStringDescriptorIndex );
+
// If the string is not defined by the device, leave.
if ( aStringDescriptorIndex == 0 )
{
- LEAVEL(KErrNotFound);
+ OstTrace1( TRACE_NORMAL, CDEVICEPROXY_GETSTRINGDESCRIPTORFROMUSBDL_DUP1, "err=%d", KErrNotFound );
+ User::Leave(KErrNotFound);
}
TBuf8<255> stringBuf;
TUsbStringDescriptor* stringDesc = NULL;
- ASSERT_DEBUG(iHandle.Handle());
- LEAVEIFERRORL(const_cast<RUsbDevice&>(iHandle).GetStringDescriptor(stringDesc, stringBuf, aStringDescriptorIndex, aLangId));
+ if(!(iHandle.Handle()))
+ {
+ OstTrace0( TRACE_FATAL, CDEVICEPROXY_GETSTRINGDESCRIPTORFROMUSBDL_DUP2, "Empty handler" );
+ __ASSERT_DEBUG(EFalse,User::Panic(KPanicCategory, __LINE__));
+ }
+ TInt err=const_cast<RUsbDevice&>(iHandle).GetStringDescriptor(stringDesc, stringBuf, aStringDescriptorIndex, aLangId);
+ if(err<0)
+ {
+ OstTrace0( TRACE_NORMAL, CDEVICEPROXY_GETSTRINGDESCRIPTORFROMUSBDL_DUP4, "GetStringDescriptor error" );
+ User::Leave(err);
+ }
stringDesc->StringData(aString);
stringDesc->DestroyTree();
delete stringDesc;
- LOGTEXT2(_L("\taString = \"%S\""), &aString);
+ OstTraceExt1( TRACE_NORMAL, CDEVICEPROXY_GETSTRINGDESCRIPTORFROMUSBDL_DUP3, "\taString = \"%S\"", aString );
+ OstTraceFunctionExit0( CDEVICEPROXY_GETSTRINGDESCRIPTORFROMUSBDL_EXIT );
}
// Called indirectly by users of this class to query a string descriptor.
void CDeviceProxy::GetStringDescriptorFromCacheL(TUint32 aLangId, TName& aString, const RArray<TName>& aStringArray) const
{
- LOG_FUNC
- LOGTEXT2(_L8("\taLangId = 0x%04x"), aLangId);
-
+ OstTraceFunctionEntry0( CDEVICEPROXY_GETSTRINGDESCRIPTORFROMCACHEL_ENTRY );
+
+ OstTrace1( TRACE_NORMAL, CDEVICEPROXY_GETSTRINGDESCRIPTORFROMCACHEL_DUP1, "\taLangId = 0x%04x", aLangId );
+
// If the lang ID is not supported by the device, leave. At the same time
// find the index of the required string in the given string array.
const TUint langCount = iLangIds.Count();
@@ -317,21 +391,29 @@
}
if ( index == langCount )
{
- LEAVEL(KErrNotFound);
+ OstTrace0( TRACE_NORMAL, CDEVICEPROXY_GETSTRINGDESCRIPTORFROMCACHEL, "CDeviceProxy::GetStringDescriptorFromCacheL" );
+ User::Leave(KErrNotFound);
}
aString = aStringArray[index];
- LOGTEXT2(_L("\taString = \"%S\""), &aString);
+ OstTraceExt1( TRACE_NORMAL, CDEVICEPROXY_GETSTRINGDESCRIPTORFROMCACHEL_DUP2, "\taString = \"%S\"", aString );
+
+ OstTraceFunctionExit0( CDEVICEPROXY_GETSTRINGDESCRIPTORFROMCACHEL_EXIT );
}
TInt CDeviceProxy::Suspend()
{
- LOG_FUNC
-
- ASSERT_DEBUG(iHandle.Handle());
+ OstTraceFunctionEntry0( CDEVICEPROXY_SUSPEND_ENTRY );
+ if(!(iHandle.Handle()))
+ {
+ OstTrace0( TRACE_FATAL, CDEVICEPROXY_SUSPEND_DUP1, "Empty handler" );
+ __ASSERT_DEBUG(EFalse,User::Panic(KPanicCategory, __LINE__));
+ }
TInt ret = iHandle.Suspend();
- LOGTEXT2(_L8("\tret = %d"), ret);
+ OstTrace1( TRACE_NORMAL, CDEVICEPROXY_SUSPEND, "\tret = %d", ret );
+
+ OstTraceFunctionExit0( CDEVICEPROXY_SUSPEND_EXIT );
return ret;
}
@@ -342,73 +424,100 @@
void CDeviceProxy::SetDriverLoadingEventData(TDriverLoadStatus aStatus, TInt aError)
{
- LOG_FUNC
- LOGTEXT3(_L8("\taStatus = %d, aError = %d"), aStatus, aError);
-
- ASSERT_DEBUG(iDriverLoadingEvent);
- iDriverLoadingEvent->iInfo.iDriverLoadStatus = aStatus;
+ OstTraceFunctionEntry0( CDEVICEPROXY_SETDRIVERLOADINGEVENTDATA_ENTRY );
+
+ OstTraceExt2( TRACE_NORMAL, CDEVICEPROXY_SETDRIVERLOADINGEVENTDATA, "\taStatus = %d, aError = %d", aStatus, aError );
+ if(!iDriverLoadingEvent)
+ {
+ OstTrace0( TRACE_FATAL, CDEVICEPROXY_SETDRIVERLOADINGEVENTDATA_DUP1, "Empty Driver Loading Event" );
+ __ASSERT_DEBUG(EFalse,User::Panic(KPanicCategory, __LINE__));
+ }
+ iDriverLoadingEvent->iInfo.iDriverLoadStatus = aStatus;
iDriverLoadingEvent->iInfo.iError = aError;
LOG;
+ OstTraceFunctionExit0( CDEVICEPROXY_SETDRIVERLOADINGEVENTDATA_EXIT );
}
TDeviceEvent* CDeviceProxy::GetAttachmentEventObject()
{
- LOG_FUNC
- LOG;
+ OstTraceFunctionEntry0( CDEVICEPROXY_GETATTACHMENTEVENTOBJECT_ENTRY );
+
+ LOG;
+ if(!iAttachmentEvent)
+ {
+ OstTrace0( TRACE_FATAL, CDEVICEPROXY_GETATTACHMENTEVENTOBJECT_DUP1, "Empty Attechment Event" );
+ __ASSERT_DEBUG(EFalse,User::Panic(KPanicCategory, __LINE__));
+ }
- ASSERT_DEBUG(iAttachmentEvent);
TDeviceEvent* const obj = iAttachmentEvent;
iAttachmentEvent = NULL;
- LOGTEXT2(_L8("\tobj = 0x%08x"), obj);
+ OstTrace1( TRACE_NORMAL, CDEVICEPROXY_GETATTACHMENTEVENTOBJECT, "\tobj = 0x%08x", obj );
+
+ OstTraceFunctionExit0( CDEVICEPROXY_GETATTACHMENTEVENTOBJECT_EXIT );
return obj;
}
TDeviceEvent* CDeviceProxy::GetDriverLoadingEventObject()
{
- LOG_FUNC
- LOG;
+ OstTraceFunctionEntry0( CDEVICEPROXY_GETDRIVERLOADINGEVENTOBJECT_ENTRY );
+
+ LOG;
+ if(!iDriverLoadingEvent)
+ {
+ OstTrace0( TRACE_FATAL, CDEVICEPROXY_GETDRIVERLOADINGEVENTOBJECT, "Empty Driver Loading Event" );
+ __ASSERT_DEBUG(EFalse,User::Panic(KPanicCategory, __LINE__));
+ }
- ASSERT_DEBUG(iDriverLoadingEvent);
TDeviceEvent* const obj = iDriverLoadingEvent;
iDriverLoadingEvent = NULL;
- LOGTEXT2(_L8("\tobj = 0x%08x"), obj);
+ OstTrace1( TRACE_NORMAL, CDEVICEPROXY_GETDRIVERLOADINGEVENTOBJECT_DUP1, "\tobj = 0x%08x", obj );
+
+ OstTraceFunctionExit0( CDEVICEPROXY_GETDRIVERLOADINGEVENTOBJECT_EXIT );
return obj;
}
TDeviceEvent* CDeviceProxy::GetDetachmentEventObject()
{
- LOG_FUNC
- LOG;
+ OstTraceFunctionEntry0( CDEVICEPROXY_GETDETACHMENTEVENTOBJECT_ENTRY );
+ LOG;
- ASSERT_DEBUG(iDetachmentEvent);
+ if(!iDetachmentEvent)
+ {
+ OstTrace0( TRACE_FATAL, CDEVICEPROXY_GETDETACHMENTEVENTOBJECT, "Empty Detachment Event" );
+ __ASSERT_DEBUG(EFalse,User::Panic(KPanicCategory, __LINE__));
+ }
TDeviceEvent* const obj = iDetachmentEvent;
iDetachmentEvent = NULL;
- LOGTEXT2(_L8("\tobj = 0x%08x"), obj);
+
+ OstTrace1( TRACE_NORMAL, CDEVICEPROXY_GETDETACHMENTEVENTOBJECT_DUP1, "\tobj = 0x%08x", obj );
+
+ OstTraceFunctionExit0( CDEVICEPROXY_GETDETACHMENTEVENTOBJECT_EXIT );
return obj;
}
-#ifdef __FLOG_ACTIVE
void CDeviceProxy::Log()
{
- LOG_FUNC
-
- LOGTEXT2(_L8("\tiId = %d"), iId);
- LOGTEXT2(_L8("\tiHandle.Handle() = %d"), iHandle.Handle());
- if ( iAttachmentEvent )
+ OstTraceFunctionEntry0( CDEVICEPROXY_LOG_ENTRY );
+
+ OstTrace1( TRACE_DUMP, CDEVICEPROXY_LOG, "\tiId = %d", iId );
+ OstTrace1( TRACE_DUMP, CDEVICEPROXY_LOG_DUP1, "\tiHandle.Handle() = %d", iHandle.Handle() );
+
+ if ( iAttachmentEvent )
{
- LOGTEXT(_L8("\tlogging iAttachmentEvent"));
- iAttachmentEvent->Log();
+ OstTrace0( TRACE_DUMP, CDEVICEPROXY_LOG_DUP2, "\tlogging iAttachmentEvent" );
+ iAttachmentEvent->Log();
}
if ( iDriverLoadingEvent )
{
- LOGTEXT(_L8("\tlogging iDriverLoadingEvent"));
+ OstTrace0( TRACE_DUMP, CDEVICEPROXY_LOG_DUP3, "\tlogging iDriverLoadingEvent" );
+
iDriverLoadingEvent->Log();
}
if ( iDetachmentEvent )
{
- LOGTEXT(_L8("\tlogging iDetachmentEvent"));
+ OstTrace0( TRACE_DUMP, CDEVICEPROXY_LOG_DUP4, "\tlogging iDetachmentEvent" );
iDetachmentEvent->Log();
}
const TUint langCount = iLangIds.Count();
@@ -421,24 +530,26 @@
// This has been done to protect in case there have been an incomplete construction etc..
// when logging the data
- LOGTEXT2(_L8("\tlangCount = %d"), langCount);
+ OstTrace1( TRACE_DUMP, CDEVICEPROXY_LOG_DUP5, "C\tlangCount = %d", langCount );
+
for ( TUint ii = 0 ; ii < langCount ; ++ii )
{
- LOGTEXT2(_L("\tlang ID 0x%04x:"), iLangIds[ii]);
+ OstTrace1( TRACE_FLOW, CDEVICEPROXY_LOG_DUP6, "\tlang ID 0x%04x:", iLangIds[ii] );
+
if(ii<manufacturerCount)
{
- LOGTEXT2(_L("\t\tmanufacturer string: \"%S\""), &iManufacturerStrings[ii]);
- }
+ OstTraceExt1( TRACE_FLOW, CDEVICEPROXY_LOG_DUP7, "\t\tmanufacturer string: \"%S\"", iManufacturerStrings[ii] );
+ }
if(ii<productCount)
{
- LOGTEXT2(_L("\t\tproduct string: \"%S\""), &iProductStrings[ii]);
- }
+ OstTraceExt1( TRACE_FLOW, CDEVICEPROXY_LOG_DUP8, "\t\tproduct string: \"%S\"", iProductStrings[ii]);
+ }
if(ii<serialNumberCount)
{
- LOGTEXT2(_L("\t\tserial number string: \"%S\""), &iSerialNumberStrings[ii]);
+ OstTraceExt1( TRACE_FLOW, CDEVICEPROXY_LOG_DUP9, "\t\tserial number string: \"%S\"", iSerialNumberStrings[ii]);
}
}
+ OstTraceFunctionExit0( CDEVICEPROXY_LOG_EXIT );
}
-#endif
--- a/usbmgmt/usbmgr/host/fdf/production/server/src/event.cpp Wed Jul 07 14:16:40 2010 +0800
+++ b/usbmgmt/usbmgr/host/fdf/production/server/src/event.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"
@@ -15,45 +15,46 @@
*
*/
+#include <usb/usblogger.h>
#include "event.h"
-#include <usb/usblogger.h>
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "eventTraces.h"
+#endif
-#ifdef __FLOG_ACTIVE
-_LIT8(KLogComponent, "fdf ");
-#endif
TDeviceEvent::TDeviceEvent()
{
- LOG_FUNC
- }
+ OstTraceFunctionEntry0( TDEVICEEVENT_TDEVICEEVENT_CONS_ENTRY );
+ }
TDeviceEvent::~TDeviceEvent()
{
- LOG_FUNC
+ OstTraceFunctionEntry0( TDEVICEEVENT_TDEVICEEVENT_DES_ENTRY );
}
-#ifdef __FLOG_ACTIVE
-
void TDeviceEvent::Log() const
{
- LOGTEXT2(_L8("\tLogging event 0x%08x"), this);
- LOGTEXT2(_L8("\t\tdevice ID = %d"), iInfo.iDeviceId);
- LOGTEXT2(_L8("\t\tevent type = %d"), iInfo.iEventType);
-
+ OstTrace1( TRACE_DUMP, TDEVICEEVENT_LOG, "\tLogging event 0x%08x", this );
+ OstTrace1( TRACE_DUMP, TDEVICEEVENT_LOG_DUP1, "\t\tdevice ID = %d", iInfo.iDeviceId );
+ OstTrace1( TRACE_DUMP, TDEVICEEVENT_LOG_DUP2, "\t\tevent type = %d", iInfo.iEventType );
+
switch ( iInfo.iEventType )
{
case EDeviceAttachment:
- LOGTEXT2(_L8("\t\terror = %d"), iInfo.iError);
- if ( !iInfo.iError )
+ OstTrace1( TRACE_DUMP, TDEVICEEVENT_LOG_DUP3, "\t\terror = %d", iInfo.iError );
+
+ if ( !iInfo.iError )
{
- LOGTEXT2(_L8("\t\tVID = 0x%04x"), iInfo.iVid);
- LOGTEXT2(_L8("\t\tPID = 0x%04x"), iInfo.iPid);
+ OstTrace1( TRACE_DUMP, TDEVICEEVENT_LOG_DUP4, "\t\tVID = 0x%04x", iInfo.iVid );
+ OstTrace1( TRACE_DUMP, TDEVICEEVENT_LOG_DUP5, "\t\tPID = 0x%04x", iInfo.iPid );
}
break;
case EDriverLoad:
- LOGTEXT2(_L8("\t\terror = %d"), iInfo.iError);
- LOGTEXT2(_L8("\t\t\tdriver load status = %d"), iInfo.iDriverLoadStatus);
+ OstTrace1( TRACE_DUMP, TDEVICEEVENT_LOG_DUP6, "\t\terror = %d", iInfo.iError );
+ OstTrace1( TRACE_DUMP, TDEVICEEVENT_LOG_DUP7, "\t\t\tdriver load status = %d", iInfo.iDriverLoadStatus);
+
break;
case EDeviceDetachment: // No break deliberate.
@@ -62,4 +63,3 @@
}
}
-#endif // __FLOG_ACTIVE
--- a/usbmgmt/usbmgr/host/fdf/production/server/src/eventqueue.cpp Wed Jul 07 14:16:40 2010 +0800
+++ b/usbmgmt/usbmgr/host/fdf/production/server/src/eventqueue.cpp Wed Jul 07 15:08:54 2010 +0800
@@ -15,33 +15,33 @@
*
*/
+#include <usb/usblogger.h>
#include "eventqueue.h"
-#include <usb/usblogger.h>
#include "fdf.h"
#include "fdfsession.h"
#include "utils.h"
-
-#ifdef __FLOG_ACTIVE
-_LIT8(KLogComponent, "fdf ");
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "eventqueueTraces.h"
#endif
-#ifdef __FLOG_ACTIVE
+#ifdef _DEBUG
#define LOG Log()
+_LIT(KPanicCategory, "eventqueue");
#else
#define LOG
#endif
-#ifdef _DEBUG
-PANICCATEGORY("eventq");
-#endif
+
class CFdfSession;
CEventQueue* CEventQueue::NewL(CFdf& aFdf)
{
- LOG_STATIC_FUNC_ENTRY
-
+ OstTraceFunctionEntry0( CEVENTQUEUE_NEWL_ENTRY );
+
CEventQueue* self = new(ELeave) CEventQueue(aFdf);
+ OstTraceFunctionExit0( CEVENTQUEUE_NEWL_EXIT );
return self;
}
@@ -49,12 +49,12 @@
: iFdf(aFdf),
iDeviceEvents(_FOFF(TDeviceEvent, iLink))
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CEVENTQUEUE_CEVENTQUEUE_CONS_ENTRY );
}
CEventQueue::~CEventQueue()
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CEVENTQUEUE_CEVENTQUEUE_DES_ENTRY );
// There will be things left on the queue at this time if USBMAN shuts us
// down without having picked up everything that was on the queue.
@@ -66,14 +66,16 @@
{
delete event;
}
+ OstTraceFunctionExit0( CEVENTQUEUE_CEVENTQUEUE_DES_EXIT );
}
// Increments the count of failed attachments.
void CEventQueue::AttachmentFailure(TInt aError)
{
- LOG_FUNC
- LOGTEXT2(_L8("\taError = %d"), aError);
- LOG;
+ OstTraceFunctionEntry0( CEVENTQUEUE_ATTACHMENTFAILURE_ENTRY );
+ OstTrace1( TRACE_NORMAL, CEVENTQUEUE_ATTACHMENTFAILURE, "\taError = %d", aError );
+
+ LOG;
TUint index = 0;
switch ( aError )
@@ -114,7 +116,8 @@
default:
// we must deal with every error we are ever given
- LOGTEXT2(_L8("\tFDF did not expect this error %d as a fail attachment"), aError);
+ OstTrace1( TRACE_NORMAL, CEVENTQUEUE_ATTACHMENTFAILURE_DUP1, "\tFDF did not expect this error %d as a fail attachment", aError );
+
index = KAttachmentFailureGeneralError;
break;
}
@@ -122,20 +125,23 @@
PokeSession();
LOG;
+ OstTraceFunctionExit0( CEVENTQUEUE_ATTACHMENTFAILURE_EXIT );
}
// Called to add an event to the tail of the queue.
// Takes ownership of aEvent.
void CEventQueue::AddDeviceEvent(TDeviceEvent& aEvent)
{
- LOG_FUNC
- LOGTEXT2(_L8("\t&aEvent = 0x%08x"), &aEvent);
+ OstTraceFunctionEntry0( CEVENTQUEUE_ADDDEVICEEVENT_ENTRY );
+
+ OstTrace1( TRACE_NORMAL, CEVENTQUEUE_ADDDEVICEEVENT, "\t&aEvent = 0x%08x", &aEvent );
LOG;
iDeviceEvents.AddLast(aEvent);
PokeSession();
LOG;
+ OstTraceFunctionExit0( CEVENTQUEUE_ADDDEVICEEVENT_EXIT );
}
// Poke the session object (if it exists) to complete any outstanding event
@@ -143,8 +149,7 @@
// It only makes sense to call this function if there's some event to give up.
void CEventQueue::PokeSession()
{
- LOG_FUNC
-
+ OstTraceFunctionEntry0( CEVENTQUEUE_POKESESSION_ENTRY );
// If the session exists, and has a notification outstanding, give them
// the head event.
CFdfSession* sess = iFdf.Session();
@@ -167,6 +172,7 @@
}
}
}
+ OstTraceFunctionExit0( CEVENTQUEUE_POKESESSION_EXIT );
}
// This is called to get a device event. Attachment failures are given up
@@ -175,7 +181,7 @@
// in aEvent.
TBool CEventQueue::GetDeviceEvent(TDeviceEvent& aEvent)
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CEVENTQUEUE_GETDEVICEEVENT_ENTRY );
LOG;
TBool ret = EFalse;
@@ -230,13 +236,13 @@
case KNumberOfAttachmentFailureTypes:
default:
// this switch should deal with every error type we store
- ASSERT_DEBUG(0);
-
+ OstTrace0( TRACE_FATAL, CEVENTQUEUE_GETDEVICEEVENT, "Empty handler" );
+ __ASSERT_DEBUG(EFalse, User::Panic(KPanicCategory,__LINE__));
}
ret = ETrue;
aEvent.iInfo.iEventType = EDeviceAttachment;
- LOGTEXT2(_L8("\treturning attachment failure event (code %d)"), aEvent.iInfo.iError);
+ OstTrace1( TRACE_NORMAL, CEVENTQUEUE_GETDEVICEEVENT_DUP1, "\treturning attachment failure event (code %d)", aEvent.iInfo.iError );
// Only give the client one error at a time.
break;
}
@@ -245,7 +251,7 @@
if ( !ret && !iDeviceEvents.IsEmpty() )
{
TDeviceEvent* const event = iDeviceEvents.First();
- LOGTEXT2(_L8("\tevent = 0x%08x"), event);
+ OstTrace1( TRACE_NORMAL, CEVENTQUEUE_GETDEVICEEVENT_DUP2, "\tevent = 0x%08x", event );
iDeviceEvents.Remove(*event);
(void)Mem::Copy(&aEvent, event, sizeof(TDeviceEvent));
delete event;
@@ -253,14 +259,15 @@
}
LOG;
- LOGTEXT2(_L8("\treturning %d"), ret);
+ OstTrace1( TRACE_NORMAL, CEVENTQUEUE_GETDEVICEEVENT_DUP3, "\treturning %d", ret );
+ OstTraceFunctionExit0( CEVENTQUEUE_GETDEVICEEVENT_EXIT );
return ret;
}
TBool CEventQueue::GetDevmonEvent(TInt& aEvent)
{
- LOG_FUNC
- LOG;
+ OstTraceFunctionEntry0( CEVENTQUEUE_GETDEVMONEVENT_ENTRY );
+ LOG;
TBool ret = EFalse;
@@ -294,8 +301,8 @@
case KNumberOfDevmonEventTypes:
default:
- LOGTEXT2(_L8("\tUnexpected devmon error, not handled properly %d"), ii);
- ASSERT_DEBUG(0);
+ OstTrace1( TRACE_FATAL, CEVENTQUEUE_GETDEVMONEVENT, "\tUnexpected devmon error, not handled properly %d", ii );
+ __ASSERT_DEBUG(EFalse,User::Panic(KPanicCategory,__LINE__));
aEvent = KErrUsbDeviceRejected;
// this switch should deal with every error type we store
}
@@ -307,16 +314,17 @@
}
LOG;
- LOGTEXT2(_L8("\treturning %d"), ret);
+ OstTrace1( TRACE_NORMAL, CEVENTQUEUE_GETDEVMONEVENT_DUP1, "\treturning %d", ret );
+ OstTraceFunctionExit0( CEVENTQUEUE_GETDEVMONEVENT_EXIT );
return ret;
}
void CEventQueue::AddDevmonEvent(TInt aEvent)
{
- LOG_FUNC
- LOGTEXT2(_L8("\taEvent = %d"), aEvent);
-
- // Increment the relevant count.
+ OstTraceFunctionEntry0( CEVENTQUEUE_ADDDEVMONEVENT_ENTRY );
+ OstTrace1( TRACE_NORMAL, CEVENTQUEUE_ADDDEVMONEVENT, "\taEvent = %d", aEvent );
+
+ // Increment the relevant count.
TInt index = 0;
switch ( aEvent )
{
@@ -341,30 +349,35 @@
break;
default:
- LOGTEXT2(_L8("\tUnexpected devmon error, not handled properly %d"), aEvent);
- ASSERT_DEBUG(0);
- // this switch should deal with every type of event we ever receive from devmon
- }
+
+ OstTrace1( TRACE_FATAL, CEVENTQUEUE_ADDDEVMONEVENT_DUP1, "Unexpected devmon error, not handled properly %d", aEvent );
+ // this switch should deal with every type of event we ever receive from devmon
+ __ASSERT_DEBUG(EFalse,User::Panic(KPanicCategory,__LINE__));
+ }
TUint& eventCount = iDevmonEventCount[index];
- ASSERT_DEBUG(eventCount < KMaxTUint);
+ if(!(eventCount < KMaxTUint))
+ {
+ OstTrace1( TRACE_FATAL, CEVENTQUEUE_ADDDEVMONEVENT_DUP2, "eventCount is too big;eventCount=%d", eventCount );
+ __ASSERT_DEBUG(EFalse,User::Panic(KPanicCategory,__LINE__));
+ }
++eventCount;
PokeSession();
+ OstTraceFunctionExit0( CEVENTQUEUE_ADDDEVMONEVENT_EXIT );
}
-#ifdef __FLOG_ACTIVE
-
+#ifdef _DEBUG
void CEventQueue::Log()
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CEVENTQUEUE_LOG_ENTRY );
for ( TUint ii = 0 ; ii < KNumberOfAttachmentFailureTypes ; ++ii )
{
const TInt& errorCount = iAttachmentFailureCount[ii];
if ( errorCount )
{
- LOGTEXT3(_L8("\tNumber of attachment failures of type %d is %d"), ii, errorCount);
- }
+ OstTraceExt2( TRACE_DUMP, CEVENTQUEUE_LOG, "Number of attachment failures of type %d is %d", ii, errorCount );
+ }
}
for ( TUint ii = 0 ; ii < KNumberOfDevmonEventTypes ; ++ii )
@@ -372,7 +385,7 @@
const TInt& eventCount = iDevmonEventCount[ii];
if ( eventCount )
{
- LOGTEXT3(_L8("\tNumber of devmon events of type %d is %d"), ii, eventCount);
+ OstTraceExt2( TRACE_DUMP, CEVENTQUEUE_LOG_DUP1, "Number of devmon events of type %d is %d", ii, eventCount );
}
}
@@ -382,11 +395,12 @@
TDeviceEvent* event;
while ( ( event = iter++ ) != NULL )
{
- LOGTEXT2(_L8("\tLogging event at position %d"), pos);
- event->Log();
+ OstTrace1( TRACE_DUMP, DUP1_CEVENTQUEUE_LOG_DUP2, "Logging event at position %d", pos );
+
+ event->Log();
++pos;
}
+ OstTraceFunctionExit0( CEVENTQUEUE_LOG_EXIT );
}
+#endif
-#endif // __FLOG_ACTIVE
-
--- a/usbmgmt/usbmgr/host/fdf/production/server/src/fdcproxy.cpp Wed Jul 07 14:16:40 2010 +0800
+++ b/usbmgmt/usbmgr/host/fdf/production/server/src/fdcproxy.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"
@@ -19,65 +19,63 @@
@file
@internalComponent
*/
+#include <ecom/ecom.h>
+#include <usbhost/internal/fdcplugin.h>
+#include <usbhost/internal/fdcinterface.h>
#include "fdcproxy.h"
-#include <ecom/ecom.h>
#include "utils.h"
-#include <usbhost/internal/fdcplugin.h>
-#include <usbhost/internal/fdcinterface.h>
#include "fdf.h"
#include "utils.h"
-
-#ifdef __FLOG_ACTIVE
-_LIT8(KLogComponent, "fdf ");
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "fdcproxyTraces.h"
#endif
-#ifdef __FLOG_ACTIVE
-#define LOG Log()
-#else
-#define LOG
-#endif
#ifdef _DEBUG
+#define LOG Log()
#define INVARIANT Invariant()
-#else
+#else
+#define LOG
#define INVARIANT
#endif
-PANICCATEGORY("fdcproxy");
-
-
+_LIT(KPanicCategory, "fdcproxy");
CFdcProxy* CFdcProxy::NewL(CFdf& aFdf, CImplementationInformation& aImplInfo)
{
- LOG_STATIC_FUNC_ENTRY
+ OstTraceFunctionEntry0( CFDCPROXY_NEWL_ENTRY );
CFdcProxy* self = new(ELeave) CFdcProxy(aFdf);
CleanupStack::PushL(self);
self->ConstructL(aImplInfo);
-#ifdef __FLOG_ACTIVE
+#ifdef _DEBUG
self->INVARIANT;
#endif
CleanupStack::Pop(self);
+ OstTraceFunctionExit0( CFDCPROXY_NEWL_EXIT );
return self;
}
void CFdcProxy::ConstructL(CImplementationInformation& aImplInfo)
{
- LOG_FUNC
-
- LOGTEXT2(_L8("\t\tFDC implementation UID: 0x%08x"), aImplInfo.ImplementationUid());
- LOGTEXT2(_L("\t\tFDC display name: \"%S\""), &aImplInfo.DisplayName());
- LOGTEXT2(_L8("\t\tFDC default_data: \"%S\""), &aImplInfo.DataType());
- LOGTEXT2(_L8("\t\tFDC version: %d"), aImplInfo.Version());
- LOGTEXT2(_L8("\t\tFDC disabled: %d"), aImplInfo.Disabled());
- TDriveName drvName = aImplInfo.Drive().Name();
- LOGTEXT2(_L8("\t\tFDC drive: %S"), &drvName);
- LOGTEXT2(_L8("\t\tFDC rom only: %d"), aImplInfo.RomOnly());
- LOGTEXT2(_L8("\t\tFDC rom based: %d"), aImplInfo.RomBased());
- LOGTEXT2(_L8("\t\tFDC vendor ID: %08x"), (TUint32)aImplInfo.VendorId());
-
+ OstTraceFunctionEntry0( CFDCPROXY_CONSTRUCTL_ENTRY );
+
+ OstTrace1( TRACE_DUMP, CFDCPROXY_CONSTRUCTL, "FDC implementation UID: 0x%08x", aImplInfo.ImplementationUid().iUid );
+ OstTraceExt1( TRACE_DUMP, CFDCPROXY_CONSTRUCTL_DUP1, "FDC display name: \"%S\"", aImplInfo.DisplayName() );
+ OstTraceExt1( TRACE_DUMP, CFDCPROXY_CONSTRUCTL_DUP2, "FDC default_data: \"%s\"", aImplInfo.DataType() );
+ OstTrace1( TRACE_DUMP, CFDCPROXY_CONSTRUCTL_DUP3, "FDC version: %d", aImplInfo.Version() );
+ OstTrace1( TRACE_DUMP, CFDCPROXY_CONSTRUCTL_DUP4, "FDC disabled: %d", aImplInfo.Disabled());
+ TDriveName drvName = aImplInfo.Drive().Name();
+
+ OstTraceExt1( TRACE_DUMP, CFDCPROXY_CONSTRUCTL_DUP5, "FDC drive: %S", drvName );
+ OstTrace1( TRACE_DUMP, CFDCPROXY_CONSTRUCTL_DUP6, "FDC rom only: %d", aImplInfo.RomOnly() );
+ OstTrace1( TRACE_DUMP, CFDCPROXY_CONSTRUCTL_DUP7, "FDC rom based: %d", aImplInfo.RomBased() );
+ OstTrace1( TRACE_DUMP, CFDCPROXY_CONSTRUCTL_DUP8, "FDC vendor ID: %08x", (TUint32)aImplInfo.VendorId() );
+
+
// Before PREQ2080 a reference to the CImplementationInformation object was held. This is no longer
// possible because as soon as REComSession::ListImplementations() is called the reference will be
// invalid.
@@ -85,20 +83,21 @@
iVersion = aImplInfo.Version();
iDefaultData.CreateL(aImplInfo.DataType());
iRomBased = aImplInfo.RomBased();
+ OstTraceFunctionExit0( CFDCPROXY_CONSTRUCTL_EXIT );
}
CFdcProxy::CFdcProxy(CFdf& aFdf)
: iFdf(aFdf),
i0thInterface(-1) // -1 means unassigned
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CFDCPROXY_CFDCPROXY_CONS_ENTRY );
}
CFdcProxy::~CFdcProxy()
{
- LOG_FUNC
- INVARIANT;
+ OstTraceFunctionEntry0( CFDCPROXY_CFDCPROXY_DES_ENTRY );
+ INVARIANT;
// Only executed when the FDF is finally shutting down.
// By this time detachment of all devices should have been signalled to
@@ -106,12 +105,22 @@
// If is safe to assert this because iPlugin and iDeviceIds are not
// allocated on construction so this doesn't have to safe against partial
// construction.
- ASSERT_DEBUG(!iPlugin);
- ASSERT_DEBUG(iDeviceIds.Count() == 0);
- iDeviceIds.Close();
+
+ if(iPlugin)
+ {
+ OstTrace0( TRACE_FATAL, CFDCPROXY_CFDCPROXY_DUP2, "Plugin should empty" );
+ __ASSERT_DEBUG(EFalse,User::Panic(KPanicCategory,__LINE__));
+ }
+ if(!(iDeviceIds.Count() == 0))
+ {
+ OstTrace0( TRACE_FATAL, CFDCPROXY_CFDCPROXY_DUP3, "DeviceCount should be 0" );
+ __ASSERT_DEBUG(EFalse,User::Panic(KPanicCategory,__LINE__));
+ }
+ iDeviceIds.Close();
iDefaultData.Close();
INVARIANT;
+ OstTraceFunctionExit0( CFDCPROXY_CFDCPROXY_DES_EXIT );
}
@@ -120,15 +129,17 @@
const TUsbDeviceDescriptor& aDeviceDescriptor,
const TUsbConfigurationDescriptor& aConfigurationDescriptor)
{
- LOG_FUNC
- LOGTEXT2(_L8("\taDeviceId = %d"), aDeviceId);
+ OstTraceFunctionEntry0( CFDCPROXY_NEWFUNCTION_ENTRY );
+
+ OstTrace1( TRACE_NORMAL, CFDCPROXY_NEWFUNCTION, "aDeviceId = %d", aDeviceId );
INVARIANT;
// Create a plugin object if required, call Mfi1NewFunction on it, and
// update our iDeviceIds.
TRAPD(err, NewFunctionL(aDeviceId, aInterfaces, aDeviceDescriptor, aConfigurationDescriptor));
INVARIANT;
- LOGTEXT2(_L8("\terr = %d"), err);
+ OstTrace1( TRACE_NORMAL, CFDCPROXY_NEWFUNCTION_DUP1, "err = %d", err );
+ OstTraceFunctionExit0( CFDCPROXY_NEWFUNCTION_EXIT );
return err;
}
@@ -138,7 +149,7 @@
const TUsbDeviceDescriptor& aDeviceDescriptor,
const TUsbConfigurationDescriptor& aConfigurationDescriptor)
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CFDCPROXY_NEWFUNCTIONL_ENTRY );
// We may already have aDeviceId in our collection of device IDs, if the
// device is offering multiple Functions of the same type. In this case we
@@ -159,8 +170,9 @@
break;
}
}
- LOGTEXT2(_L8("\talreadyKnowThisDevice = %d"), alreadyKnowThisDevice);
-
+
+ OstTrace1( TRACE_NORMAL, CFDCPROXY_NEWFUNCTIONL, "alreadyKnowThisDevice = %d", alreadyKnowThisDevice );
+
TArrayRemove arrayRemove(iDeviceIds, aDeviceId);
if ( !alreadyKnowThisDevice )
{
@@ -168,7 +180,9 @@
// Logically, it should be done *after* we call Mfi1NewFunction on the
// plugin, but we can't have the failable step of adding the device ID
// to the array after telling the FDC.
- LEAVEIFERRORL(iDeviceIds.Append(aDeviceId));
+ TInt error=iDeviceIds.Append(aDeviceId);
+ LEAVEIFERRORL(error,OstTrace0( TRACE_NORMAL, CFDCPROXY_NEWFUNCTIONL_DUT1, "iDeviceIds append fails" ););
+
// This cleanup item removes aDeviceId from iDeviceIds on a leave.
CleanupRemovePushL(arrayRemove);
}
@@ -179,53 +193,75 @@
if ( !plugin )
{
neededToMakePlugin = ETrue;
- LOGTEXT2(_L8("\t\tFDC implementation UID: 0x%08x"), iImplementationUid);
+ OstTrace1( TRACE_NORMAL, CFDCPROXY_NEWFUNCTIONL_DUP2, "FDC implementation UID: 0x%08x", iImplementationUid.iUid );
plugin = CFdcPlugin::NewL(iImplementationUid, *this);
CleanupStack::PushL(plugin);
iface = reinterpret_cast<MFdcInterfaceV1*>(plugin->GetInterface(TUid::Uid(KFdcInterfaceV1)));
}
- ASSERT_DEBUG(iface);
+
+ if(!iface)
+ {
+ OstTrace0( TRACE_FATAL, CFDCPROXY_NEWFUNCTIONL_DUP3, "Empty interface" );
+ __ASSERT_DEBUG(EFalse,User::Panic(KPanicCategory,__LINE__));
+ }
+
+
TInt err = KErrNone;
// Log the interfaces they're being offered.
-#ifdef __FLOG_ACTIVE
const TUint ifCount = aInterfaces.Count();
- LOGTEXT2(_L8("\toffering %d interfaces:"), ifCount);
+ OstTrace1( TRACE_NORMAL, CFDCPROXY_NEWFUNCTIONL_DUP4, "offering %d interfaces:", ifCount );
for ( TUint ii = 0 ; ii < ifCount ; ++ii )
{
- LOGTEXT2(_L8("\t\tinterface %d"), aInterfaces[ii]);
+ OstTrace1( TRACE_NORMAL, CFDCPROXY_NEWFUNCTIONL_DUP5, "interface %d", aInterfaces[ii] );
}
-#endif
iInMfi1NewFunction = ETrue;
// Check that the FDC always claims the 0th interface.
- ASSERT_DEBUG(i0thInterface == -1);
+ if(!(i0thInterface == -1))
+ {
+ OstTrace0( TRACE_FATAL, CFDCPROXY_NEWFUNCTIONL_DUP6, "the FDC not claims the 0th interface" );
+ __ASSERT_DEBUG(EFalse,User::Panic(KPanicCategory,__LINE__));
+ }
+
i0thInterface = aInterfaces[0];
err = iface->Mfi1NewFunction( aDeviceId,
aInterfaces.Array(), // actually pass them a TArray for const access
aDeviceDescriptor,
aConfigurationDescriptor);
- LOGTEXT2(_L8("\terr = %d"), err);
+ OstTrace1( TRACE_NORMAL, CFDCPROXY_NEWFUNCTIONL_DUP11, "err = %d", err);
iInMfi1NewFunction = EFalse;
// The implementation of Mfi1NewFunction may not leave.
// ASSERT_ALWAYS(leave_err == KErrNone);
// This is set back to -1 when the FDC claims the 0th interface.
- ASSERT_DEBUG(i0thInterface == -1);
-
+ if(!(i0thInterface == -1))
+ {
+ OstTrace0( TRACE_FATAL, CFDCPROXY_NEWFUNCTIONL_DUP7, "the FDC not claims the 0th interface" );
+ __ASSERT_DEBUG(EFalse,User::Panic(KPanicCategory,__LINE__));
+ }
+
// If this leaves, then:
// (a) aDeviceId will be removed from iDeviceIds (if we needed to add it).
// (b) the FDF will get the leave code.
// If this doesn't leave, then iPlugin, iInterface and iDeviceIds are
// populated OK and the FDF will get KErrNone.
- LEAVEIFERRORL(err);
+ LEAVEIFERRORL(err,OstTrace0( TRACE_NORMAL, CFDCPROXY_NEWFUNCTIONL_DUP8,"iface->Mfi1NewFunction function fails"););
if ( neededToMakePlugin )
{
CLEANUPSTACK_POP1(plugin);
// Now everything failable has been done we can assign iPlugin and
// iInterface.
- ASSERT_DEBUG(plugin);
- ASSERT_DEBUG(iface);
+ if(!plugin)
+ {
+ OstTrace0( TRACE_FATAL, CFDCPROXY_NEWFUNCTIONL_DUP9,"Empty plugin");
+ __ASSERT_DEBUG(EFalse,User::Panic(KPanicCategory,__LINE__));
+ }
+ if(!iface)
+ {
+ OstTrace0( TRACE_FATAL, CFDCPROXY_NEWFUNCTIONL_DUP10,"Empty iface");
+ __ASSERT_DEBUG(EFalse,User::Panic(KPanicCategory,__LINE__));
+ }
iPlugin = plugin;
iInterface = iface;
}
@@ -233,6 +269,7 @@
{
CLEANUPSTACK_POP1(&arrayRemove);
}
+ OstTraceFunctionExit0( CFDCPROXY_NEWFUNCTIONL_EXIT );
}
@@ -241,8 +278,9 @@
// detachment to the plugin.
void CFdcProxy::DeviceDetached(TUint aDeviceId)
{
- LOG_FUNC
- LOGTEXT2(_L8("\taDeviceId = %d"), aDeviceId);
+ OstTraceFunctionEntry0( CFDCPROXY_DEVICEDETACHED_ENTRY );
+ OstTrace1( TRACE_NORMAL, CFDCPROXY_DEVICEDETACHED, "aDeviceId = %d", aDeviceId );
+
INVARIANT;
const TUint count = iDeviceIds.Count();
@@ -250,8 +288,13 @@
{
if ( iDeviceIds[ii] == aDeviceId )
{
- LOGTEXT(_L8("\tmatching device id- calling Mfi1DeviceDetached!"));
- ASSERT_DEBUG(iInterface);
+ OstTrace0( TRACE_FATAL, CFDCPROXY_DEVICEDETACHED_DUP1, "matching device id- calling Mfi1DeviceDetached!");
+ if(!iInterface)
+ {
+ OstTrace0( TRACE_NORMAL, CFDCPROXY_DEVICEDETACHED_DUP2, "Empty iInterface" );
+ __ASSERT_DEBUG(EFalse,User::Panic(KPanicCategory,__LINE__));
+ }
+
iInterface->Mfi1DeviceDetached(aDeviceId);
// The implementation of Mfi1DeviceDetached may not leave.
// ASSERT_ALWAYS(err == KErrNone);
@@ -259,8 +302,8 @@
break;
}
}
-
- LOGTEXT2(_L8("\tiDeviceIds.Count() = %d"), iDeviceIds.Count());
+ OstTrace1( TRACE_NORMAL, CFDCPROXY_DEVICEDETACHED_DUP3, "iDeviceIds.Count() = %d", iDeviceIds.Count() );
+
if ( iDeviceIds.Count() == 0 )
{
delete iPlugin;
@@ -275,10 +318,10 @@
}
INVARIANT;
+ OstTraceFunctionExit0( CFDCPROXY_DEVICEDETACHED_EXIT );
}
-#ifdef _DEBUG
void CFdcProxy::Invariant() const
{
// If the class invariant fails hopefully it will be clear why from
@@ -288,7 +331,7 @@
// Either these are all 0 or none of them are:
// iDeviceIds.Count, iPlugin, iInterface
- ASSERT_DEBUG(
+ if(!(
(
iDeviceIds.Count() != 0 && iPlugin && iInterface
)
@@ -296,7 +339,12 @@
(
iDeviceIds.Count() == 0 && !iPlugin && !iInterface
)
- );
+ ))
+ {
+ OstTrace0( TRACE_FATAL, CFDCPROXY_INVARIANT, "iDeviceIds count error" );
+ __ASSERT_DEBUG(EFalse,User::Panic(KPanicCategory,__LINE__));
+ }
+
// Each device ID appears only once in the device ID array.
const TUint count = iDeviceIds.Count();
@@ -304,7 +352,12 @@
{
for ( TUint jj = ii+1 ; jj < count ; ++jj )
{
- ASSERT_DEBUG(iDeviceIds[ii] != iDeviceIds[jj]);
+ if(!(iDeviceIds[ii] != iDeviceIds[jj]))
+ {
+ OstTrace0( TRACE_FATAL, CFDCPROXY_INVARIANT_DUP1, "Repeated iDeviceIDs" );
+ __ASSERT_DEBUG(EFalse,User::Panic(KPanicCategory,__LINE__));
+ }
+
}
}
}
@@ -312,17 +365,17 @@
void CFdcProxy::Log() const
{
- LOGTEXT2(_L8("\tLogging CFdcProxy 0x%08x:"), this);
+ OstTrace1( TRACE_DUMP, CFDCPROXY_LOG, "Logging CFdcProxy 0x%08x:", this );
const TUint count = iDeviceIds.Count();
- LOGTEXT2(_L8("\t\tiDeviceIds.Count() = %d"), count);
+ OstTrace1( TRACE_DUMP, CFDCPROXY_LOG_DUP1, "iDeviceIds.Count() = %d", count );
+
for ( TUint i = 0 ; i < count ; ++i )
{
- LOGTEXT3(_L8("\t\t\tiDeviceIds[%d] = %d"), i, iDeviceIds[i]);
+ OstTraceExt2( TRACE_DUMP, CFDCPROXY_LOG_DUP2, "iDeviceIds[%u] = %u", i, iDeviceIds[i] );
}
- LOGTEXT2(_L8("\t\tiPlugin = 0x%08x"), iPlugin);
- LOGTEXT2(_L8("\t\tiInterface = 0x%08x"), iInterface);
+ OstTrace1( TRACE_DUMP, CFDCPROXY_LOG_DUP3, "iPlugin = 0x%08x", iPlugin );
+ OstTrace1( TRACE_DUMP, CFDCPROXY_LOG_DUP4, "iInterface = 0x%08x", iInterface );
}
-#endif // _DEBUG
const TDesC8& CFdcProxy::DefaultDataField() const
@@ -384,11 +437,16 @@
TUint32 CFdcProxy::MfpoTokenForInterface(TUint8 aInterface)
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CFDCPROXY_MFPOTOKENFORINTERFACE_ENTRY );
// This function must only be called from an implementation of
// Mfi1NewInterface.
- ASSERT_ALWAYS(iInMfi1NewFunction);
+ if(!iInMfi1NewFunction)
+ {
+ OstTrace0( TRACE_FATAL, CFDCPROXY_MFPOTOKENFORINTERFACE, "Empty iInMfi1NewFunction" );
+ User::Panic(KPanicCategory,__LINE__);
+ }
+
// Support our check that the FDC claims the 0th interface.
if ( aInterface == i0thInterface )
{
@@ -401,8 +459,8 @@
const RArray<TUint>& CFdcProxy::MfpoGetSupportedLanguagesL(TUint aDeviceId)
{
- LOG_FUNC
-
+ OstTraceFunctionEntry0( CFDCPROXY_MFPOGETSUPPORTEDLANGUAGESL_ENTRY );
+
CheckDeviceIdL(aDeviceId);
return iFdf.GetSupportedLanguagesL(aDeviceId);
@@ -411,60 +469,61 @@
TInt CFdcProxy::MfpoGetManufacturerStringDescriptor(TUint aDeviceId, TUint aLangId, TName& aString)
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CFDCPROXY_MFPOGETMANUFACTURERSTRINGDESCRIPTOR_ENTRY );
TRAPD(err,
CheckDeviceIdL(aDeviceId);
iFdf.GetManufacturerStringDescriptorL(aDeviceId, aLangId, aString)
);
-#ifdef __FLOG_ACTIVE
if ( !err )
{
- LOGTEXT2(_L("\taString = \"%S\""), &aString);
- }
-#endif
- LOGTEXT2(_L8("\terr = %d"), err);
+ OstTraceExt1( TRACE_NORMAL, CFDCPROXY_MFPOGETMANUFACTURERSTRINGDESCRIPTOR, "aString = \"%S\"", aString );
+ }
+
+ OstTrace1( TRACE_NORMAL, CFDCPROXY_MFPOGETMANUFACTURERSTRINGDESCRIPTOR_DUP1, "err = %d", err );
+
+ OstTraceFunctionExit0( CFDCPROXY_MFPOGETMANUFACTURERSTRINGDESCRIPTOR_EXIT );
return err;
}
TInt CFdcProxy::MfpoGetProductStringDescriptor(TUint aDeviceId, TUint aLangId, TName& aString)
{
- LOG_FUNC
-
+ OstTraceFunctionEntry0( CFDCPROXY_MFPOGETPRODUCTSTRINGDESCRIPTOR_ENTRY );
+
TRAPD(err,
CheckDeviceIdL(aDeviceId);
iFdf.GetProductStringDescriptorL(aDeviceId, aLangId, aString)
);
-#ifdef __FLOG_ACTIVE
if ( !err )
{
- LOGTEXT2(_L("\taString = \"%S\""), &aString);
+ OstTraceExt1( TRACE_NORMAL, CFDCPROXY_MFPOGETPRODUCTSTRINGDESCRIPTOR, "aString = \"%S\"", aString );
}
-#endif
- LOGTEXT2(_L8("\terr = %d"), err);
+
+ OstTrace1( TRACE_NORMAL, CFDCPROXY_MFPOGETPRODUCTSTRINGDESCRIPTOR_DUP1, "err = %d", err );
+ OstTraceFunctionExit0( CFDCPROXY_MFPOGETPRODUCTSTRINGDESCRIPTOR_EXIT );
return err;
}
TInt CFdcProxy::MfpoGetSerialNumberStringDescriptor(TUint aDeviceId, TUint aLangId, TName& aString)
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CFDCPROXY_MFPOGETSERIALNUMBERSTRINGDESCRIPTOR_ENTRY );
TRAPD(err,
CheckDeviceIdL(aDeviceId);
iFdf.GetSerialNumberStringDescriptorL(aDeviceId, aLangId, aString)
);
-#ifdef __FLOG_ACTIVE
if ( !err )
{
- LOGTEXT2(_L("\taString = \"%S\""), &aString);
- }
-#endif
- LOGTEXT2(_L8("\terr = %d"), err);
+ OstTraceExt1( TRACE_NORMAL, CFDCPROXY_MFPOGETSERIALNUMBERSTRINGDESCRIPTOR, "aString = \"%S\"", aString );
+ }
+
+ OstTrace1( TRACE_NORMAL, CFDCPROXY_MFPOGETSERIALNUMBERSTRINGDESCRIPTOR_DUP1, "err = %d", err );
+ OstTraceFunctionExit0( CFDCPROXY_MFPOGETSERIALNUMBERSTRINGDESCRIPTOR_EXIT );
return err;
}
@@ -475,9 +534,9 @@
*/
void CFdcProxy::CheckDeviceIdL(TUint aDeviceId) const
{
- LOG_FUNC
- LOGTEXT2(_L8("\taDeviceId = %d"), aDeviceId);
-
+ OstTraceFunctionEntry0( CFDCPROXY_CHECKDEVICEIDL_ENTRY );
+ OstTrace1( TRACE_NORMAL, CFDCPROXY_CHECKDEVICEIDL, "aDeviceId = %d", aDeviceId );
+
TBool found = EFalse;
const TUint count = iDeviceIds.Count();
for ( TUint i = 0 ; i < count ; ++i )
@@ -490,8 +549,10 @@
}
if ( !found )
{
- LEAVEL(KErrNotFound);
+ OstTrace1( TRACE_NORMAL, CFDCPROXY_CHECKDEVICEIDL_DUP1, "DeviceId=%d not found", aDeviceId);
+ User::Leave(KErrNotFound);
}
+ OstTraceFunctionExit0( CFDCPROXY_CHECKDEVICEIDL_EXIT );
}
--- a/usbmgmt/usbmgr/host/fdf/production/server/src/fdf.cpp Wed Jul 07 14:16:40 2010 +0800
+++ b/usbmgmt/usbmgr/host/fdf/production/server/src/fdf.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"
@@ -25,15 +25,16 @@
#include "utils.h"
#include <usbhost/internal/fdcplugin.hrh>
#include "eventqueue.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "fdfTraces.h"
+#endif
-#ifdef __FLOG_ACTIVE
-_LIT8(KLogComponent, "fdf ");
-#endif
_LIT(KDriverUsbhubLddFileName,"usbhubdriver");
_LIT(KDriverUsbdiLddFileName,"usbdi");
-PANICCATEGORY("fdf");
+_LIT(KPanicCategory, "fdf");
const TUint KVendorSpecificDeviceClassValue = 0xFF;
const TUint KVendorSpecificInterfaceClassValue = 0xFF;
@@ -42,24 +43,26 @@
// Factory function for TInterfaceInfo objects.
CFdf::TInterfaceInfo* CFdf::TInterfaceInfo::NewL(RPointerArray<CFdf::TInterfaceInfo>& aInterfaces)
{
- LOG_STATIC_FUNC_ENTRY
+ OstTraceFunctionEntry0( CFDF_TINTERFACEINFO_NEWL_ENTRY );
TInterfaceInfo* self = new(ELeave) TInterfaceInfo;
CleanupStack::PushL(self);
aInterfaces.AppendL(self);
CLEANUPSTACK_POP1(self);
+ OstTraceFunctionExit0( CFDF_TINTERFACEINFO_NEWL_EXIT );
return self;
}
CFdf* CFdf::NewL()
{
- LOG_STATIC_FUNC_ENTRY
+ OstTraceFunctionEntry0( CFDF_NEWL_ENTRY );
CFdf* self = new(ELeave) CFdf;
CleanupStack::PushL(self);
self->ConstructL();
CLEANUPSTACK_POP1(self);
+ OstTraceFunctionExit0( CFDF_NEWL_EXIT );
return self;
}
@@ -67,26 +70,30 @@
: iDevices(_FOFF(CDeviceProxy, iLink)),
iFunctionDrivers(_FOFF(CFdcProxy, iLink))
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CFDF_CFDF_CONS_ENTRY );
}
void CFdf::ConstructL()
{
- LOG_FUNC
-
+ OstTraceFunctionEntry0( CFDF_CONSTRUCTL_ENTRY );
+
#ifndef __OVER_DUMMYUSBDI__
// If we're using the DummyUSBDI we don't need the real USBDI.
TInt err = User::LoadLogicalDevice(KDriverUsbhubLddFileName);
if ( err != KErrAlreadyExists )
{
- LEAVEIFERRORL(err);
+ LEAVEIFERRORL(err,OstTrace1( TRACE_NORMAL, CFDF_CONSTRUCTL, "Error when loading KDriverUsbhubLddFileName OVER DUMMYUSBDI; err=%d", err ););
}
#endif // __OVER_DUMMYUSBDI__
- LEAVEIFERRORL(iHubDriver.Open());
+ TInt errDr=iHubDriver.Open();
+ LEAVEIFERRORL(errDr,OstTrace1( TRACE_NORMAL, CFDF_CONSTRUCTL_DUP1, "Error when open iHubDriver; errDr=%d", errDr ););
#ifdef __OVER_DUMMYUSBDI__
- LEAVEIFERRORL(iHubDriver.StartHost());
+ //LEAVEIFERRORL(iHubDriver.StartHost());
+ TInt errHo=iHubDriver.StartHost();
+ LEAVEIFERRORL(errHo,OstTrace1( TRACE_NORMAL, CFDF_CONSTRUCTL_DUP2, "Fail in iHubDriver.StartHost in dummy; errHo=%d", errHo ););
+
#endif
iActiveWaitForBusEvent = CActiveWaitForBusEvent::NewL(iHubDriver, iBusEvent, *this);
@@ -98,24 +105,27 @@
iActiveWaitForEComEvent->Wait();
iEventQueue = CEventQueue::NewL(*this);
+ OstTraceFunctionExit0( CFDF_CONSTRUCTL_EXIT );
}
void CFdf::CreateFunctionDriverProxiesL()
{
-
- LOG_FUNC
+ OstTraceFunctionEntry0( CFDF_CREATEFUNCTIONDRIVERPROXIESL_ENTRY );
REComSession::ListImplementationsL(TUid::Uid(KFdcEcomInterfaceUid), iImplInfoArray);
const TUint count = iImplInfoArray.Count();
- LOGTEXT2(_L8("\tiImplInfoArray.Count() upon FDF creation = %d"), count);
-#ifdef __FLOG_ACTIVE
+ OstTrace1( TRACE_NORMAL, CFDF_CREATEFUNCTIONDRIVERPROXIESL, "\tiImplInfoArray.Count() upon FDF creation = %d", count );
+#ifdef _DEBUG
if ( count == 0 )
{
- LOGTEXT(_L8("\tTHERE ARE NO FUNCTION DRIVERS PRESENT IN THE SYSTEM"));
- }
+ OstTrace0( TRACE_NORMAL, CFDF_CREATEFUNCTIONDRIVERPROXIESL_DUP1, "\tTHERE ARE NO FUNCTION DRIVERS PRESENT IN THE SYSTEM" );
+ }
else
{
- for (TInt kk = 0; kk < count; ++kk)
- LOGTEXT3(_L8("\t\tFDC implementation Index:%d UID: 0x%08x"), kk, iImplInfoArray[kk]->ImplementationUid());
+ for (TInt32 kk = 0; kk < count; ++kk)
+ OstTraceExt2( TRACE_NORMAL, CFDF_CREATEFUNCTIONDRIVERPROXIESL_DUP2,
+ "FDC implementation UID: 0x%08x Index:%d ",
+ iImplInfoArray[kk]->ImplementationUid().iUid, kk);
+
}
#endif
@@ -131,11 +141,12 @@
else
iFunctionDrivers.AddLast(*proxy);
}
+ OstTraceFunctionExit0( CFDF_CREATEFUNCTIONDRIVERPROXIESL_EXIT );
}
CFdf::~CFdf()
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CFDF_CFDF_DES_ENTRY );
// Mimic the detachment of each attached device.
TSglQueIter<CDeviceProxy> deviceIter(iDevices);
@@ -144,7 +155,7 @@
while ( ( device = deviceIter++ ) != NULL )
{
const TUint deviceId = device->DeviceId();
- LOGTEXT2(_L8("\tmimicking detachment of device with id %d"), device);
+ OstTrace1( TRACE_NORMAL, CFDF_CFDF, "mimicking detachment of device with id %d", device );
TellFdcsOfDeviceDetachment(deviceId);
iDevices.Remove(*device);
delete device;
@@ -174,10 +185,9 @@
#ifndef __OVER_DUMMYUSBDI__
//If we're using the DummyUSBDI the real USBDI isn't loaded.
TInt err = User::FreeLogicalDevice(KDriverUsbhubLddFileName);
- LOGTEXT2(_L8("\tFreeLogicalDevice( usbhubdriver ) returned %d"), err);
-
+ OstTrace1( TRACE_NORMAL, CFDF_CFDF_DUP1, "FreeLogicalDevice( usbhubdriver ) returned %d", err );
err = User::FreeLogicalDevice(KDriverUsbdiLddFileName);
- LOGTEXT2(_L8("\tFreeLogicalDevice( usbdi ) returned %d"), err);
+ OstTrace1( TRACE_NORMAL, CFDF_CFDF_DUP2, "FreeLogicalDevice( usbdi ) returned %d", err );
#endif // __OVER_DUMMYUSBDI__
delete iEventQueue;
@@ -185,31 +195,33 @@
// This is a worthwhile check to do at this point. If we ever don't clean
// up iInterfaces at the *right* time, then this will be easier to debug
// than a memory leak.
- ASSERT_DEBUG(iInterfaces.Count() == 0);
+ if(!(iInterfaces.Count() == 0))
+ {
+ OstTrace1( TRACE_FATAL, CFDF_CFDF_DUP3, "Memory leak from interface;Interface remains %d", iInterfaces.Count() );
+ __ASSERT_DEBUG(EFalse,User::Panic(KPanicCategory,__LINE__));
+ }
iImplInfoArray.ResetAndDestroy();
REComSession::FinalClose();
+ OstTraceFunctionExit0( CFDF_CFDF_DES_EXIT );
}
void CFdf::EnableDriverLoading()
{
- LOG_FUNC
-
+ OstTraceFunctionEntry0( CFDF_ENABLEDRIVERLOADING_ENTRY );
iDriverLoadingEnabled = ETrue;
}
void CFdf::DisableDriverLoading()
{
- LOG_FUNC
-
+ OstTraceFunctionEntry0( CFDF_DISABLEDRIVERLOADING_ENTRY );
iDriverLoadingEnabled = EFalse;
}
void CFdf::SetSession(CFdfSession* aSession)
{
- LOG_FUNC
- LOGTEXT2(_L8("\taSession = 0x%08x"), aSession);
-
+ OstTraceFunctionEntry0( CFDF_SETSESSION_ENTRY );
+ OstTrace1( TRACE_NORMAL, CFDF_SETSESSION, "aSession = 0x%08x", aSession );
iSession = aSession;
}
@@ -220,17 +232,27 @@
TBool CFdf::GetDeviceEvent(TDeviceEvent& aEvent)
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CFDF_GETDEVICEEVENT_ENTRY );
+ if(!iEventQueue)
+ {
+ OstTrace0( TRACE_FATAL, CFDF_GETDEVICEEVENT, "iEventQueue is empty" );
+ __ASSERT_DEBUG(EFalse,User::Panic(KPanicCategory,__LINE__));
+ }
- ASSERT_DEBUG(iEventQueue);
return iEventQueue->GetDeviceEvent(aEvent);
}
TBool CFdf::GetDevmonEvent(TInt& aEvent)
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CFDF_GETDEVMONEVENT_ENTRY );
+
+ if(!iEventQueue)
+ {
+ OstTrace0( TRACE_FATAL, CFDF_GETDEVMONEVENT, "iEventQueue is empty" );
+ __ASSERT_DEBUG(EFalse,User::Panic(KPanicCategory,__LINE__));
+ }
- ASSERT_DEBUG(iEventQueue);
+
return iEventQueue->GetDevmonEvent(aEvent);
}
@@ -246,40 +268,39 @@
void CFdf::HandleEComEventReceivedL()
{
- LOG_FUNC
-
+ OstTraceFunctionEntry0( CFDF_HANDLEECOMEVENTRECEIVEDL_ENTRY );
+
// There is no way to filter ecom notification to only receive ones we are interested in, also there is no way
// to query ecom as to what has changed. Hence there is no option but to call ListImplementations().
iImplInfoArray.ResetAndDestroy();
REComSession::ListImplementationsL(TUid::Uid(KFdcEcomInterfaceUid), iImplInfoArray);
TUint implementationsCount = iImplInfoArray.Count();
- LOGTEXT2(_L8("\tiImplInfoArray.Count() after ECom notification= %d"), implementationsCount);
+ OstTrace1( TRACE_NORMAL, CFDF_HANDLEECOMEVENTRECEIVEDL, "iImplInfoArray.Count() after ECom notification= %d", implementationsCount );
-#ifdef __FLOG_ACTIVE
if ( implementationsCount == 0 )
{
- LOGTEXT(_L8("\tTHERE ARE NO FUNCTION DRIVERS PRESENT IN THE SYSTEM"));
- }
+ OstTrace0( TRACE_NORMAL, CFDF_HANDLEECOMEVENTRECEIVEDL_DUP1, "THERE ARE NO FUNCTION DRIVERS PRESENT IN THE SYSTEM" );
+ }
TSglQueIter<CFdcProxy> proxiesIterDebug(iFunctionDrivers);
CFdcProxy* fdcDebug = NULL;
while ( ( fdcDebug = proxiesIterDebug++ ) != NULL )
{
TUid fdcUid = fdcDebug->ImplUid();
- LOGTEXT2(_L8("\t\tOld FDC Proxy implementation UID: 0x%08x"), fdcUid.iUid);
+ OstTrace1( TRACE_NORMAL, CFDF_HANDLEECOMEVENTRECEIVEDL_DUP2, "Old FDC Proxy implementation UID: 0x%08x", fdcUid.iUid );
TInt fdcVersion = fdcDebug->Version();
- LOGTEXT2(_L8("\t\tFDC Proxy version UID: %d"), fdcVersion);
- }
- LOGTEXT(_L8("\t\t------------------------------------------------------------------"));
+ OstTrace1( TRACE_NORMAL, CFDF_HANDLEECOMEVENTRECEIVEDL_DUP3, "FDC Proxy version UID: %d", fdcVersion );
+ }
+ OstTrace0( TRACE_NORMAL, CFDF_HANDLEECOMEVENTRECEIVEDL_DUP4, "------------------------------------------------------------------" );
+
for (TInt kk = 0; kk < implementationsCount; ++kk)
{
TUid fdcUid2 = iImplInfoArray[kk]->ImplementationUid();
- LOGTEXT2(_L8("\t\tNew FDC Proxy implementation UID: 0x%08x"), fdcUid2.iUid);
+ OstTrace1( TRACE_NORMAL, CFDF_HANDLEECOMEVENTRECEIVEDL_DUP5, "New FDC Proxy implementation UID: 0x%08x", fdcUid2.iUid );
TInt fdcVersion2 = iImplInfoArray[kk]->Version();
- LOGTEXT2(_L8("\t\tFDC Proxy version UID: %d"), fdcVersion2);
+ OstTrace1( TRACE_NORMAL, CFDF_HANDLEECOMEVENTRECEIVEDL_DUP6, "FDC Proxy version UID: %d", fdcVersion2 );
}
-#endif
// See if any relevant FDCs (or upgrades) have been installed or uninstalled:
@@ -379,15 +400,16 @@
iFunctionDrivers.AddLast(*proxy);
}
}
+ OstTraceFunctionExit0( CFDF_HANDLEECOMEVENTRECEIVEDL_EXIT );
}
// A bus event has occurred.
void CFdf::MbeoBusEvent()
{
- LOG_FUNC
- LOGTEXT2(_L8("\tiBusEvent.iEventType = %d"), iBusEvent.iEventType);
- LOGTEXT2(_L8("\tiBusEvent.iError = %d"), iBusEvent.iError);
- LOGTEXT2(_L8("\tiBusEvent.iDeviceHandle = %d"), iBusEvent.iDeviceHandle);
+ OstTraceFunctionEntry0( CFDF_MBEOBUSEVENT_ENTRY );
+ OstTrace1( TRACE_NORMAL, CFDF_MBEOBUSEVENT, "iBusEvent.iEventType = %d", iBusEvent.iEventType );
+ OstTrace1( TRACE_NORMAL, CFDF_MBEOBUSEVENT_DUP1, "iBusEvent.iError = %d", iBusEvent.iError );
+ OstTrace1( TRACE_NORMAL, CFDF_MBEOBUSEVENT_DUP2, "iBusEvent.iDeviceHandle = %d", iBusEvent.iDeviceHandle );
switch ( iBusEvent.iEventType )
{
@@ -400,7 +422,11 @@
else
{
// It was an attachment failure. Simply tell the event queue.
- ASSERT_DEBUG(iEventQueue);
+ if(!iEventQueue)
+ {
+ OstTrace0( TRACE_FATAL, CFDF_MBEOBUSEVENT_DUP3, "Empty iEventQueue" );
+ __ASSERT_DEBUG(EFalse,User::Panic(KPanicCategory,__LINE__));
+ }
iEventQueue->AttachmentFailure(iBusEvent.iError);
}
break;
@@ -410,7 +436,12 @@
// pseudo-detached due to an overcurrent condition (for instance) then
// the overcurrent condition is indicated through the devmon API (i.e.
// EDevMonEvent) and the detachment is still 'KErrNone'.
- ASSERT_DEBUG(iBusEvent.iError == KErrNone);
+ if(!(iBusEvent.iError == KErrNone))
+ {
+ OstTrace0( TRACE_NORMAL, CFDF_MBEOBUSEVENT_DUP4, "iBusEvent error" );
+ __ASSERT_DEBUG(EFalse,User::Panic(KPanicCategory,__LINE__));
+ }
+
HandleDeviceDetachment(iBusEvent.iDeviceHandle);
break;
@@ -427,6 +458,7 @@
// TBusEvent from the previous completion. (Otherwise it might get
// overwritten.)
iActiveWaitForBusEvent->Wait();
+ OstTraceFunctionExit0( CFDF_MBEOBUSEVENT_EXIT );
}
// This is the central handler for device attachment.
@@ -435,16 +467,21 @@
// The second phase is driver loading.
void CFdf::HandleDeviceAttachment(TUint aDeviceId)
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CFDF_HANDLEDEVICEATTACHMENT_ENTRY );
// This is filled in by HandleDeviceAttachmentL on success.
CDeviceProxy* device;
TRAPD(err, HandleDeviceAttachmentL(aDeviceId, device));
if ( err )
{
- LOGTEXT2(_L8("\terr = %d"), err);
+ OstTrace1( TRACE_NORMAL, CFDF_HANDLEDEVICEATTACHMENT, "err = %d", err );
// There was an attachment failure, so we just increment the count of
// attachment failures.
- ASSERT_DEBUG(iEventQueue);
+ if(!iEventQueue)
+ {
+ OstTrace0( TRACE_FATAL, CFDF_HANDLEDEVICEATTACHMENT_DUP1, "Empty iEventQueue" );
+ __ASSERT_DEBUG(EFalse,User::Panic(KPanicCategory,__LINE__));
+ }
+
iEventQueue->AttachmentFailure(err);
// If we failed the attachment phase, we can't try to load drivers for
// the device.
@@ -456,7 +493,12 @@
// device proxy created by HandleDeviceAttachmentL to the event queue.
// This event object is always populated with the correct status and
// error.
- ASSERT_DEBUG(device);
+ if(!device)
+ {
+ OstTrace0( TRACE_FATAL, CFDF_HANDLEDEVICEATTACHMENT_DUP2, "Empty device" );
+ __ASSERT_DEBUG(EFalse,User::Panic(KPanicCategory,__LINE__));
+ }
+
DoDriverLoading(*device);
}
@@ -465,62 +507,90 @@
// HandleDeviceAttachmentL.
iCurrentDevice = NULL;
iInterfaces.ResetAndDestroy();
+ OstTraceFunctionExit0( CFDF_HANDLEDEVICEATTACHMENT_EXIT );
}
// This does the 'device attachment' phase of the new device attachment only.
void CFdf::HandleDeviceAttachmentL(TUint aDeviceId, CDeviceProxy*& aDevice)
{
- LOG_FUNC
-
+ OstTraceFunctionEntry0( CFDF_HANDLEDEVICEATTACHMENTL_ENTRY );
// Create the device proxy
aDevice = CDeviceProxy::NewL(iHubDriver, aDeviceId);
CleanupStack::PushL(aDevice);
iCurrentDevice = aDevice;
// Get necessary descriptors (for this phase)
- LEAVEIFERRORL(aDevice->GetDeviceDescriptor(iDD));
- LOGTEXT2(_L8("\tiDD.USBBcd = 0x%04x"), iDD.USBBcd());
- LOGTEXT2(_L8("\tiDD.DeviceClass = 0x%02x"), iDD.DeviceClass());
- LOGTEXT2(_L8("\tiDD.DeviceSubClass = 0x%02x"), iDD.DeviceSubClass());
- LOGTEXT2(_L8("\tiDD.DeviceProtocol = 0x%02x"), iDD.DeviceProtocol());
- LOGTEXT2(_L8("\tiDD.MaxPacketSize0 = %d"), iDD.MaxPacketSize0());
- LOGTEXT2(_L8("\tiDD.VendorId = 0x%04x"), iDD.VendorId());
- LOGTEXT2(_L8("\tiDD.ProductId = 0x%04x"), iDD.ProductId());
- LOGTEXT2(_L8("\tiDD.DeviceBcd = 0x%04x"), iDD.DeviceBcd());
- LOGTEXT2(_L8("\tiDD.ManufacturerIndex = %d"), iDD.ManufacturerIndex());
- LOGTEXT2(_L8("\tiDD.ProductIndex = %d"), iDD.ProductIndex());
- LOGTEXT2(_L8("\tiDD.SerialNumberIndex = %d"), iDD.SerialNumberIndex());
- LOGTEXT2(_L8("\tiDD.NumConfigurations = %d"), iDD.NumConfigurations());
- LEAVEIFERRORL(aDevice->GetConfigurationDescriptor(iCD));
- LOGTEXT2(_L8("\tiCD.TotalLength = %d"), iCD.TotalLength());
- LOGTEXT2(_L8("\tiCD.NumInterfaces = %d"), iCD.NumInterfaces());
- LOGTEXT2(_L8("\tiCD.ConfigurationValue = %d"), iCD.ConfigurationValue());
- LOGTEXT2(_L8("\tiCD.ConfigurationIndex = %d"), iCD.ConfigurationIndex());
- LOGTEXT2(_L8("\tiCD.Attributes = %d"), iCD.Attributes());
- LOGTEXT2(_L8("\tiCD.MaxPower = %d"), iCD.MaxPower());
+ TInt err=aDevice->GetDeviceDescriptor(iDD);
+ if (err<0)
+ {
+ OstTrace1( TRACE_NORMAL, CFDF_HANDLEDEVICEATTACHMENTL, "GetDeviceDescriptor error=%d", err );
+ User::Leave(err);
+ }
+ OstTrace1( TRACE_DUMP, CFDF_HANDLEDEVICEATTACHMENTL_DUP1, "iDD.USBBcd = 0x%04x", iDD.USBBcd() );
+ OstTrace1( TRACE_DUMP, CFDF_HANDLEDEVICEATTACHMENTL_DUP2, "iDD.DeviceClass = 0x%02x", iDD.DeviceClass() );
+ OstTrace1( TRACE_DUMP, CFDF_HANDLEDEVICEATTACHMENTL_DUP3, "iDD.DeviceSubClass = 0x%02x", iDD.DeviceSubClass() );
+ OstTrace1( TRACE_DUMP, CFDF_HANDLEDEVICEATTACHMENTL_DUP4, "iDD.DeviceProtocol = 0x%02x", iDD.DeviceProtocol() );
+ OstTrace1( TRACE_DUMP, CFDF_HANDLEDEVICEATTACHMENTL_DUP5, "iDD.MaxPacketSize0 = %d", iDD.MaxPacketSize0() );
+ OstTrace1( TRACE_DUMP, CFDF_HANDLEDEVICEATTACHMENTL_DUP6, "iDD.VendorId = 0x%04x", iDD.VendorId() );
+ OstTrace1( TRACE_DUMP, CFDF_HANDLEDEVICEATTACHMENTL_DUP7, "iDD.ProductId = 0x%04x", iDD.ProductId() );
+ OstTrace1( TRACE_DUMP, CFDF_HANDLEDEVICEATTACHMENTL_DUP8, "iDD.DeviceBcd = 0x%04x", iDD.DeviceBcd() );
+ OstTrace1( TRACE_DUMP, CFDF_HANDLEDEVICEATTACHMENTL_DUP9, "iDD.ManufacturerIndex = %d", iDD.ManufacturerIndex() );
+ OstTrace1( TRACE_DUMP, CFDF_HANDLEDEVICEATTACHMENTL_DUP10, "iDD.ProductIndex = %d", iDD.ProductIndex() );
+ OstTrace1( TRACE_DUMP, CFDF_HANDLEDEVICEATTACHMENTL_DUP11, "iDD.SerialNumberIndex = %d", iDD.SerialNumberIndex() );
+ OstTrace1( TRACE_DUMP, CFDF_HANDLEDEVICEATTACHMENTL_DUP12, "iDD.NumConfigurations = %d", iDD.NumConfigurations() );
+ err=aDevice->GetConfigurationDescriptor(iCD);
+ if(err<0)
+ {
+ OstTrace1( TRACE_NORMAL, CFDF_HANDLEDEVICEATTACHMENTL_DUP13, "GetConfigurationDescriptor error=%d", err);
+ User::Leave(err);
+ }
+
+ OstTrace1( TRACE_DUMP, CFDF_HANDLEDEVICEATTACHMENTL_DUP14, "iCD.TotalLength = %d", iCD.TotalLength() );
+ OstTrace1( TRACE_DUMP, CFDF_HANDLEDEVICEATTACHMENTL_DUP15, "iCD.NumInterfaces = %d", iCD.NumInterfaces() );
+ OstTrace1( TRACE_DUMP, CFDF_HANDLEDEVICEATTACHMENTL_DUP16, "iCD.ConfigurationValue = %d", iCD.ConfigurationValue() );
+ OstTrace1( TRACE_DUMP, CFDF_HANDLEDEVICEATTACHMENTL_DUP17, "iCD.ConfigurationIndex = %d", iCD.ConfigurationIndex() );
+ OstTrace1( TRACE_DUMP, CFDF_HANDLEDEVICEATTACHMENTL_DUP18, "iCD.Attributes = %d", iCD.Attributes() );
+ OstTrace1( TRACE_DUMP, CFDF_HANDLEDEVICEATTACHMENTL_DUP19, "iCD.MaxPower = %d", iCD.MaxPower() );
+
const TUint8 numberOfInterfaces = iCD.NumInterfaces();
- LOGTEXT2(_L8("\tnumberOfInterfaces (field in config descriptor) = %d)"), numberOfInterfaces);
+ OstTrace1( TRACE_DUMP, CFDF_HANDLEDEVICEATTACHMENTL_DUP20, "numberOfInterfaces (field in config descriptor) = %d)", numberOfInterfaces );
if ( numberOfInterfaces == 0 )
{
- LEAVEL(KErrUsbConfigurationHasNoInterfaces);
+ OstTrace0( TRACE_NORMAL, CFDF_HANDLEDEVICEATTACHMENTL_DUP21, "Error: Usb Configuration Has No Interfaces");
+ User::Leave(KErrUsbConfigurationHasNoInterfaces);
}
// Walk the configuration bundle. Collect information on each interface
// (its number, class, subclass and protocol). This populates iInterfaces.
- ASSERT_DEBUG(iInterfaces.Count() == 0);
- ASSERT_ALWAYS(iCurrentDevice);
+ if(!(iInterfaces.Count() == 0))
+ {
+ OstTrace0( TRACE_FATAL, CFDF_HANDLEDEVICEATTACHMENTL_DUP22, "Error: Usb Configuration Has No Interfaces");
+ __ASSERT_DEBUG(EFalse,User::Panic(KPanicCategory,__LINE__));
+ }
+
+ if(!iCurrentDevice)
+ {
+ OstTrace0( TRACE_FATAL, CFDF_HANDLEDEVICEATTACHMENTL_DUP23, "Empty iCurrentDevice");
+ User::Panic(KPanicCategory,__LINE__);
+ }
+
ParseL(iCD);
// Log iInterfaces.
const TUint interfaceCount = iInterfaces.Count();
- LOGTEXT2(_L8("\tinterfaceCount (parsed from bundle) = %d"), interfaceCount);
-#ifdef __FLOG_ACTIVE
- LOGTEXT(_L8("\tLogging iInterfaces:"));
+ OstTrace1( TRACE_DUMP, CFDF_HANDLEDEVICEATTACHMENTL_DUP24, "interfaceCount (parsed from bundle) = %d", interfaceCount );
+#ifdef _DEBUG
+ OstTrace0( TRACE_DUMP, CFDF_HANDLEDEVICEATTACHMENTL_DUP25, "Logging iInterfaces:");
for ( TUint ii = 0 ; ii < interfaceCount ; ++ii )
{
const TInterfaceInfo* ifInfo = iInterfaces[ii];
- ASSERT_DEBUG(ifInfo);
- LOGTEXT6(_L8("\t\tiInterfaces[%d]: number %d, interface class 0x%02x subclass 0x%02x protocol 0x%02x"),
+ if(!ifInfo)
+ {
+ OstTrace0( TRACE_FATAL, CFDF_HANDLEDEVICEATTACHMENTL_DUP26, "Empty ifInfo");
+ __ASSERT_DEBUG(EFalse,User::Panic(KPanicCategory,__LINE__));
+ }
+
+ OstTraceExt5(TRACE_DUMP, CFDF_HANDLEDEVICEATTACHMENTL_DUP27, "\t\tiInterfaces[%d]: number %d, interface class 0x%02x subclass 0x%02x protocol 0x%02x",
ii,
ifInfo->iNumber,
ifInfo->iClass,
@@ -529,12 +599,13 @@
);
}
#endif
-
+
// Check that the config's NumInterfaces is the same as the actual number
// of interface descriptors we found. We rely on this later on.
if ( numberOfInterfaces != interfaceCount )
{
- LEAVEL(KErrUsbInterfaceCountMismatch);
+ OstTrace0( TRACE_NORMAL, CFDF_HANDLEDEVICEATTACHMENTL_DUP28, "KErrUsbInterfaceCountMismatch");
+ User::Leave(KErrUsbInterfaceCountMismatch);
}
// Check that each interface number in iInterfaces is unique.
@@ -543,14 +614,25 @@
for ( TUint ii = 0 ; ii < interfaceCount ; ++ii )
{
const TInterfaceInfo* lhs = iInterfaces[ii];
- ASSERT_DEBUG(lhs);
+ if(!lhs)
+ {
+ OstTrace0( TRACE_FATAL, CFDF_HANDLEDEVICEATTACHMENTL_DUP29, "Empty lhs");
+ __ASSERT_DEBUG(EFalse,User::Panic(KPanicCategory,__LINE__));
+ }
+
for ( TUint jj = ii+1 ; jj < interfaceCount ; ++jj )
{
const TInterfaceInfo* rhs = iInterfaces[jj];
- ASSERT_DEBUG(rhs);
+ if(!rhs)
+ {
+ OstTrace0( TRACE_FATAL, CFDF_HANDLEDEVICEATTACHMENTL_DUP30, "Empty rhs");
+ __ASSERT_DEBUG(EFalse,User::Panic(KPanicCategory,__LINE__));
+ }
+
if ( lhs->iNumber == rhs->iNumber )
{
- LEAVEL(KErrUsbDuplicateInterfaceNumbers);
+ OstTrace1( TRACE_NORMAL, CFDF_HANDLEDEVICEATTACHMENTL_DUP31, "KErrUsbDuplicateInterfaceNumbers; iNumber=%d", lhs->iNumber);
+ User::Leave(KErrUsbDuplicateInterfaceNumbers);
}
}
}
@@ -564,7 +646,7 @@
TInt err = User::LoadLogicalDevice(KDriverUsbdiLddFileName);
if ( err != KErrAlreadyExists )
{
- LEAVEIFERRORL(err);
+ LEAVEIFERRORL(err,OstTrace1( TRACE_NORMAL, CFDF_HANDLEDEVICEATTACHMENTL_DUP32, "Load Logical Device error; error=%d", err););
}
}
#endif // __OVER_DUMMYUSBDI__
@@ -575,19 +657,31 @@
iDevices.AddLast(*aDevice);
// Also put an event on the event queue.
TDeviceEvent* const attachmentEvent = aDevice->GetAttachmentEventObject();
- ASSERT_DEBUG(attachmentEvent);
+
+ if(!attachmentEvent)
+ {
+ OstTrace0( TRACE_FATAL, CFDF_HANDLEDEVICEATTACHMENTL_DUP33, "Empty attachmentEvent");
+ __ASSERT_DEBUG(EFalse,User::Panic(KPanicCategory,__LINE__));
+ }
+
attachmentEvent->iInfo.iVid = iDD.VendorId();
attachmentEvent->iInfo.iPid = iDD.ProductId();
attachmentEvent->iInfo.iError = KErrNone;
- ASSERT_DEBUG(iEventQueue);
+ if(!iEventQueue)
+ {
+ OstTrace0( TRACE_FATAL, CFDF_HANDLEDEVICEATTACHMENTL_DUP34, "Empty iEventQueue");
+ __ASSERT_DEBUG(EFalse,User::Panic(KPanicCategory,__LINE__));
+ }
+
iEventQueue->AddDeviceEvent(*attachmentEvent);
- LOGTEXT2(_L8("***USB HOST STACK: SUCCESSFUL ATTACHMENT OF DEVICE (id %d)"), aDeviceId);
+ OstTrace1( TRACE_DUMP, CFDF_HANDLEDEVICEATTACHMENTL_DUP35, "***USB HOST STACK: SUCCESSFUL ATTACHMENT OF DEVICE (id %d)", aDeviceId );
+
+ OstTraceFunctionExit0( CFDF_HANDLEDEVICEATTACHMENTL_EXIT );
}
void CFdf::DoDriverLoading(CDeviceProxy& aDevice)
{
- LOG_FUNC
-
+ OstTraceFunctionEntry0( CFDF_DODRIVERLOADING_ENTRY );
// Leaving or returning from DoDriverLoadingL is the trigger to put the
// 'driver loading' event object on the event queue. It must already have
// been populated correctly (the actual error code it left with doesn't
@@ -595,7 +689,12 @@
TRAP_IGNORE(DoDriverLoadingL(aDevice));
TDeviceEvent* const driverLoadingEvent = aDevice.GetDriverLoadingEventObject();
- ASSERT_DEBUG(driverLoadingEvent);
+ if(!driverLoadingEvent)
+ {
+ OstTrace0( TRACE_FATAL, CFDF_DODRIVERLOADING, "Empty driverLoadingEvent" );
+ __ASSERT_DEBUG(EFalse,User::Panic(KPanicCategory,__LINE__));
+ }
+
// The driver loading event object says whether driver loading succeeded
// (all interfaces were claimed without error), partly succeeded (not all
// interfaces were claimed without error), or failed (no interfaces were
@@ -608,22 +707,29 @@
// power-saving reasons and is not critical.
(void)aDevice.Suspend();
}
- ASSERT_DEBUG(iEventQueue);
+ if(!iEventQueue)
+ {
+ OstTrace0( TRACE_FATAL, CFDF_DODRIVERLOADING_DUP1, "Empty iEventQueue" );
+ __ASSERT_DEBUG(EFalse,User::Panic(KPanicCategory,__LINE__));
+ }
+
iEventQueue->AddDeviceEvent(*driverLoadingEvent);
+ OstTraceFunctionExit0( CFDF_DODRIVERLOADING_EXIT );
}
void CFdf::DoDriverLoadingL(CDeviceProxy& aDevice)
{
- LOG_FUNC
-
+ OstTraceFunctionEntry0( CFDF_DODRIVERLOADINGL_ENTRY );
// Check whether driver loading is enabled.
if ( !iDriverLoadingEnabled )
{
// Complete driver load failure scenario.
aDevice.SetDriverLoadingEventData(EDriverLoadFailure, KErrUsbDriverLoadingDisabled);
- LEAVEL(KErrGeneral);
- }
+
+ OstTrace1( TRACE_NORMAL, CFDF_DODRIVERLOADINGL, "Leave with error %d", KErrGeneral );
+ User::Leave(KErrGeneral);
+ }
// Set this member up so that when the FDC calls TokenForInterface we call
@@ -649,7 +755,8 @@
if (aDevice.HasIADFlag() && !functionDriverFound)
{
aDevice.SetDriverLoadingEventData(EDriverLoadFailure, KErrUsbUnsupportedDevice);
- LEAVEL(KErrGeneral);
+ OstTrace0( TRACE_NORMAL, CFDF_DODRIVERLOADINGL_DUP1, "Leave with function Driver not Found" );
+ User::Leave(KErrGeneral);
}
// If a device FD is found then it is supposed to claim all the interfaces, if it didn't then report
// a partial success but don't offer unclaimed interfaces to any other FD.
@@ -667,14 +774,19 @@
// Whether all interfaces were taken, some, or none, collectedErr may have
// an error in it or KErrNone. We use specific error codes in some cases.
TUint unclaimedInterfaces = UnclaimedInterfaceCount();
- LOGTEXT2(_L8("\tunclaimedInterfaces = %d"), unclaimedInterfaces);
- LOGTEXT2(_L8("\tanySuccess = %d"), anySuccess);
- LOGTEXT2(_L8("\tcollectedErr = %d"), collectedErr);
- ASSERT_DEBUG(unclaimedInterfaces <= interfaceCount);
+ OstTrace1( TRACE_DUMP, CFDF_DODRIVERLOADINGL_DUP2, "unclaimedInterfaces = %d", unclaimedInterfaces );
+ OstTrace1( TRACE_DUMP, CFDF_DODRIVERLOADINGL_DUP3, "anySuccess = %d", anySuccess );
+ OstTrace1( TRACE_DUMP, CFDF_DODRIVERLOADINGL_DUP4, "collectedErr = %d", collectedErr );
+ if(!(unclaimedInterfaces <= interfaceCount))
+ {
+ OstTrace0( TRACE_FATAL, CFDF_DODRIVERLOADINGL_DUP5, "interface Count error" );
+ __ASSERT_DEBUG(EFalse,User::Panic(KPanicCategory,__LINE__));
+ }
+
if(iDeviceDetachedTooEarly)
{
- LOGTEXT(_L8("\tDevice has been detached too early!"));
+ OstTrace0( TRACE_NORMAL, CFDF_DODRIVERLOADINGL_DUP6, "Device has been detached too early!" );
iDeviceDetachedTooEarly = EFalse;
// the choice of having the status to be EDriverLoadPartialSuccess
// was not to clash with trying to suspend the device because
@@ -690,6 +802,7 @@
SetFailureStatus(unclaimedInterfaces, interfaceCount, anySuccess, collectedErr, aDevice);
}// iDeviceDetachedTooEarly
+ OstTraceFunctionExit0( CFDF_DODRIVERLOADINGL_EXIT );
}
// Recursive function, originally called with the configuration descriptor.
@@ -697,26 +810,26 @@
// bundle.
void CFdf::ParseL(TUsbGenericDescriptor& aDesc)
{
- LOG_FUNC
- LOGTEXT2(_L8("\t&aDesc = 0x%08x"), &aDesc);
- LOGTEXT2(_L8("\taDesc.ibDescriptorType = %d"), aDesc.ibDescriptorType);
- LOGTEXT2(_L8("\taDesc.iFirstChild = 0x%08x"), aDesc.iFirstChild);
- LOGTEXT2(_L8("\taDesc.iNextPeer = 0x%08x"), aDesc.iNextPeer);
-
- if ( aDesc.ibDescriptorType == EInterface )
+ OstTraceFunctionEntry0( CFDF_PARSEL_ENTRY );
+ OstTrace1( TRACE_DUMP, CFDF_PARSEL, "&aDesc = 0x%08x", &aDesc );
+ OstTrace1( TRACE_DUMP, CFDF_PARSEL_DUP1, "aDesc.ibDescriptorType = %d", aDesc.ibDescriptorType );
+ OstTrace1( TRACE_DUMP, CFDF_PARSEL_DUP2, "aDesc.iFirstChild = 0x%08x", aDesc.iFirstChild );
+ OstTrace1( TRACE_DUMP, CFDF_PARSEL_DUP3, "aDesc.iNextPeer = 0x%08x", aDesc.iNextPeer );
+
+ if ( aDesc.ibDescriptorType == EInterface )
{
// Add interface information to collection, but only if it's alternate
// setting 0.
const TUsbInterfaceDescriptor& ifDesc = static_cast<TUsbInterfaceDescriptor&>(aDesc);
if ( ifDesc.AlternateSetting() == 0 ) // hard-coded '0' means the default (initial configuration) setting
{
- LOGTEXT2(_L8("\tifDesc.InterfaceNumber = %d"), ifDesc.InterfaceNumber());
- LOGTEXT2(_L8("\tifDesc.NumEndpoints = %d"), ifDesc.NumEndpoints());
- LOGTEXT2(_L8("\tifDesc.InterfaceClass = 0x%02x"), ifDesc.InterfaceClass());
- LOGTEXT2(_L8("\tifDesc.InterfaceSubClass = 0x%02x"), ifDesc.InterfaceSubClass());
- LOGTEXT2(_L8("\tifDesc.InterfaceProtocol = 0x%02x"), ifDesc.InterfaceProtocol());
- LOGTEXT2(_L8("\tifDesc.Interface = %d"), ifDesc.Interface());
-
+ OstTrace1( TRACE_DUMP, CFDF_PARSEL_DUP4, "ifDesc.InterfaceNumber = %d", ifDesc.InterfaceNumber() );
+ OstTrace1( TRACE_DUMP, CFDF_PARSEL_DUP5, "ifDesc.NumEndpoints = %d", ifDesc.NumEndpoints() );
+ OstTrace1( TRACE_DUMP, CFDF_PARSEL_DUP6, "ifDesc.InterfaceClass = 0x%02x", ifDesc.InterfaceClass() );
+ OstTrace1( TRACE_DUMP, CFDF_PARSEL_DUP7, "ifDesc.InterfaceSubClass = 0x%02x", ifDesc.InterfaceSubClass() );
+ OstTrace1( TRACE_DUMP, CFDF_PARSEL_DUP8, "ifDesc.InterfaceProtocol = 0x%02x", ifDesc.InterfaceProtocol() );
+ OstTrace1( TRACE_DUMP, CFDF_PARSEL_DUP9, "ifDesc.Interface = %d", ifDesc.Interface() );
+
TInterfaceInfo* ifInfo = TInterfaceInfo::NewL(iInterfaces);
ifInfo->iNumber = ifDesc.InterfaceNumber();
ifInfo->iClass = ifDesc.InterfaceClass();
@@ -735,10 +848,9 @@
{
// OTG descriptor found
const TUsbOTGDescriptor& otgDesc = static_cast<TUsbOTGDescriptor&>(aDesc);
-
- LOGTEXT2(_L8("\totgDesc.Attributes = %b"), otgDesc.Attributes());
- LOGTEXT2(_L8("\totgDesc.HNPSupported = %d"), otgDesc.HNPSupported());
- LOGTEXT2(_L8("\totgDesc.SRPSupported = %d"), otgDesc.SRPSupported());
+ OstTrace1( TRACE_DUMP, CFDF_PARSEL_DUP10, "otgDesc.Attributes = %d", otgDesc.Attributes() );
+ OstTrace1( TRACE_DUMP, CFDF_PARSEL_DUP11, "otgDesc.HNPSupported = %d", otgDesc.HNPSupported() );
+ OstTrace1( TRACE_DUMP, CFDF_PARSEL_DUP12, "otgDesc.SRPSupported = %d", otgDesc.SRPSupported() );
iCurrentDevice->SetOtgDescriptorL(otgDesc);
}
@@ -754,6 +866,7 @@
{
ParseL(*nextPeer);
}
+ OstTraceFunctionExit0( CFDF_PARSEL_EXIT );
}
// Method that uses only one array to hold the unclaimed interface numbers.
@@ -763,13 +876,17 @@
RArray<TUint>& aInterfacesNumberArray,
TInterfaceSearchKeys aKey)
{
- LOG_FUNC
-
+ OstTraceFunctionEntry0( CFDF_FINDDRIVERSFORINTERFACESUSINGSPECIFICKEYL_ENTRY );
+
const TUint interfaceCount = iInterfaces.Count();
for ( TUint ii = 0 ; ii < interfaceCount ; ++ii )
{
TInterfaceInfo* ifInfo = iInterfaces[ii];
- ASSERT_DEBUG(ifInfo);
+ if(!ifInfo)
+ {
+ OstTrace0( TRACE_FATAL, CFDF_FINDDRIVERSFORINTERFACESUSINGSPECIFICKEYL, "Empty ifInfo" );
+ __ASSERT_DEBUG(EFalse,User::Panic(KPanicCategory,__LINE__));
+ }
if ((ifInfo->iClaimed) ||
(aKey == EVendorInterfacesubclassInterfaceprotocol && ifInfo->iClass != KVendorSpecificInterfaceClassValue)||
@@ -785,8 +902,7 @@
TBuf8<KMaxSearchKeyLength> searchKey;
FormatInterfaceSearchKey(searchKey, aKey, *ifInfo);
-
- LOGTEXT2(_L8("\tsearchKey = \"%S\""), &searchKey);
+ OstTraceExt1( TRACE_NORMAL, CFDF_FINDDRIVERSFORINTERFACESUSINGSPECIFICKEYL_DUP1, "searchKey = \"%S\"", searchKey );
// RArray<TUint>* array = &aInterfacesNumberArray;
FindDriverForInterfaceUsingSpecificKey(aDevice, aCollectedErr, aAnySuccess, aInterfacesNumberArray, searchKey);
@@ -795,6 +911,7 @@
// the searching have been done.
RebuildUnClaimedInterfacesArrayL(aDevice, aInterfacesNumberArray, ii+1);
}
+ OstTraceFunctionExit0( CFDF_FINDDRIVERSFORINTERFACESUSINGSPECIFICKEYL_EXIT );
}
@@ -808,9 +925,8 @@
RArray<TUint>& aInterfacesGivenToFdc,
const TDesC8& aSearchKey)
{
-
- LOG_FUNC
- LOGTEXT2(_L8("\taSearchKey = \"%S\""), &aSearchKey);
+ OstTraceFunctionEntry0( CFDF_FINDDRIVERFORINTERFACEUSINGSPECIFICKEY_ENTRY );
+ OstTraceExt1( TRACE_NORMAL, CFDF_FINDDRIVERFORINTERFACEUSINGSPECIFICKEY, "aSearchKey = \"%S\"", aSearchKey );
// Find an FDC matching this search key.
TSglQueIter<CFdcProxy> iter(iFunctionDrivers);
@@ -819,7 +935,8 @@
while ( ( fdc = iter++ ) != NULL )
{
- LOGTEXT2(_L8("\tFDC's default_data field = \"%S\""), &fdc->DefaultDataField());
+ OstTraceExt1( TRACE_NORMAL, CFDF_FINDDRIVERFORINTERFACEUSINGSPECIFICKEY_DUP1, "FDC's default_data field = \"%S\"", fdc->DefaultDataField() );
+
#ifdef _DEBUG
// having these two together in the debug window is helpful for interactive debugging
TBuf8<KMaxSearchKeyLength > fd_key;
@@ -846,27 +963,28 @@
{
aDevice.SetMultipleDriversFlag();
}
-
- LOGTEXT2(_L8("\tfound matching FDC (0x%08x)"), fdc);
-#ifdef __FLOG_ACTIVE
+ OstTrace1( TRACE_NORMAL, CFDF_FINDDRIVERFORINTERFACEUSINGSPECIFICKEY_DUP2, "found matching FDC (0x%08x)", fdc );
+
const TUint count = aInterfacesGivenToFdc.Count();
- LOGTEXT2(_L8("\tlogging aInterfacesGivenToFdc (interfaces being offered to the FDC): count = %d"), count);
+ OstTrace1( TRACE_NORMAL, CFDF_FINDDRIVERFORINTERFACEUSINGSPECIFICKEY_DUP3, "logging aInterfacesGivenToFdc (interfaces being offered to the FDC): count = %d", count );
for ( TUint ii = 0 ; ii < count ; ++ii )
{
- LOGTEXT3(_L8("\t\tindex %d: interface number %d"), ii, aInterfacesGivenToFdc[ii]);
- }
-#endif
+ OstTraceExt2( TRACE_NORMAL, CFDF_FINDDRIVERFORINTERFACEUSINGSPECIFICKEY_DUP4,
+ "index %u: interface number %u",
+ ii, aInterfacesGivenToFdc[ii] );
+ }
TInt err = fdc->NewFunction(aDevice.DeviceId(), aInterfacesGivenToFdc, iDD, iCD);
- LOGTEXT2(_L8("\tNewFunction returned %d"), err);
+ OstTrace1( TRACE_NORMAL, CFDF_FINDDRIVERFORINTERFACEUSINGSPECIFICKEY_DUP5, "NewFunction returned %d", err );
+
// To correctly determine whether the driver load for the whole
// configuration was a complete failure, a partial success or a
// complete success, we need to collect any non-KErrNone error
// from this, and whether any handovers worked at all.
if ( err == KErrNone )
{
-#ifdef __FLOG_ACTIVE
- LOGTEXT3(_L8("***USB HOST STACK: THE FOLLOWING INTERFACES OF DEVICE %d WERE SUCCESSFULLY PASSED TO FUNCTION DRIVER WITH IMPL UID 0x%08x"),
- aDevice.DeviceId(), fdc->ImplUid());
+ OstTraceExt2(TRACE_NORMAL, CFDF_FINDDRIVERFORINTERFACEUSINGSPECIFICKEY_DUP6,
+ "***USB HOST STACK: THE FOLLOWING INTERFACES OF DEVICE %u WERE SUCCESSFULLY PASSED TO FUNCTION DRIVER WITH IMPL UID 0x%08x",
+ (TInt32) aDevice.DeviceId(), fdc->ImplUid().iUid);
// We want to log each interface that's in
// aInterfacesGivenToFdc AND is marked claimed in iInterfaces.
for ( TUint ii = 0 ; ii < aInterfacesGivenToFdc.Count() ; ++ii )
@@ -875,16 +993,20 @@
for ( TUint jj = 0 ; jj < iInterfaces.Count() ; ++jj )
{
const TInterfaceInfo* ifInfo = iInterfaces[jj];
- ASSERT_DEBUG(ifInfo);
+
+ if(!ifInfo)
+ {
+ OstTrace0( TRACE_FATAL, CFDF_FINDDRIVERFORINTERFACEUSINGSPECIFICKEY_DUP7, "Empty ifInfo" );
+ __ASSERT_DEBUG(EFalse,User::Panic(KPanicCategory,__LINE__));
+ }
if ( ifNum == ifInfo->iNumber
&& ifInfo->iClaimed
)
{
- LOGTEXT2(_L8("***USB HOST STACK: bInterfaceNumber %d"), ifNum);
+ OstTrace1( TRACE_NORMAL, CFDF_FINDDRIVERFORINTERFACEUSINGSPECIFICKEY_DUP8, "***USB HOST STACK: bInterfaceNumber %d", ifNum );
}
}
}
-#endif
aAnySuccess = ETrue;
}
else
@@ -895,13 +1017,13 @@
break;
}
}
+ OstTraceFunctionExit0( CFDF_FINDDRIVERFORINTERFACEUSINGSPECIFICKEY_EXIT );
}
void CFdf::HandleDeviceDetachment(TUint aDeviceId)
{
- LOG_FUNC
- LOGTEXT2(_L8("\taDeviceId = %d"), aDeviceId);
-
+ OstTraceFunctionEntry0( CFDF_HANDLEDEVICEDETACHMENT_ENTRY );
+ OstTrace1( TRACE_NORMAL, CFDF_HANDLEDEVICEDETACHMENT, "aDeviceId = %d", aDeviceId );
#ifdef _DEBUG
TBool found = EFalse;
@@ -919,16 +1041,24 @@
#ifdef _DEBUG
found = ETrue;
#endif
- LOGTEXT(_L8("\tfound matching device proxy"));
-
+ OstTrace0( TRACE_NORMAL, CFDF_HANDLEDEVICEDETACHMENT_DUP1, "found matching device proxy" );
+
iDevices.Remove(*device);
// Before destroying the device proxy, take the detachment event
// stored in it for the event queue.
TDeviceEvent* const detachmentEvent = device->GetDetachmentEventObject();
- ASSERT_DEBUG(detachmentEvent);
- ASSERT_DEBUG(iEventQueue);
+ if(!detachmentEvent)
+ {
+ OstTrace0( TRACE_FATAL, CFDF_HANDLEDEVICEDETACHMENT_DUP2, "Empty detachmentEvent" );
+ __ASSERT_DEBUG(EFalse,User::Panic(KPanicCategory,__LINE__));
+ }
+ if(!iEventQueue)
+ {
+ OstTrace0( TRACE_FATAL, CFDF_HANDLEDEVICEDETACHMENT_DUP3, "Empty iEventQueue" );
+ __ASSERT_DEBUG(EFalse,User::Panic(KPanicCategory,__LINE__));
+ }
iEventQueue->AddDeviceEvent(*detachmentEvent);
- LOGTEXT2(_L8("***USB HOST STACK: DETACHMENT OF DEVICE (id %d)"), aDeviceId);
+ OstTrace1( TRACE_NORMAL, CFDF_HANDLEDEVICEDETACHMENT_DUP4, "***USB HOST STACK: DETACHMENT OF DEVICE (id %d)", aDeviceId );
delete device;
TellFdcsOfDeviceDetachment(aDeviceId);
@@ -939,7 +1069,7 @@
if (iDevices.IsEmpty())
{
TInt err = User::FreeLogicalDevice(KDriverUsbdiLddFileName);
- LOGTEXT2(_L8("\tFreeLogicalDevice( usbdi ) returned %d"), err);
+ OstTrace1( TRACE_NORMAL, CFDF_HANDLEDEVICEDETACHMENT_DUP5, "FreeLogicalDevice( usbdi ) returned %d", err );
}
#endif // __OVER_DUMMYUSBDI__
@@ -950,25 +1080,32 @@
#ifdef _DEBUG
if ( !found )
{
- LOGTEXT(_L8("\tno matching device proxy found"));
+ OstTrace0( TRACE_NORMAL, CFDF_HANDLEDEVICEDETACHMENT_DUP6, "no matching device proxy found" );
}
#endif
+
+ OstTraceFunctionExit0( CFDF_HANDLEDEVICEDETACHMENT_EXIT );
}
void CFdf::HandleDevmonEvent(TInt aEvent)
{
- LOG_FUNC
- LOGTEXT2(_L8("\taEvent = %d"), aEvent);
+ OstTraceFunctionEntry0( CFDF_HANDLEDEVMONEVENT_ENTRY );
+ OstTrace1( TRACE_NORMAL, CFDF_HANDLEDEVMONEVENT, "aEvent = %d", aEvent );
- ASSERT_DEBUG(iEventQueue);
+ if(!iEventQueue)
+ {
+ OstTrace0( TRACE_FATAL, CFDF_HANDLEDEVMONEVENT_DUP1, "Empty iEventQueue" );
+ __ASSERT_DEBUG(EFalse,User::Panic(KPanicCategory,__LINE__));
+ }
iEventQueue->AddDevmonEvent(aEvent);
+ OstTraceFunctionExit0( CFDF_HANDLEDEVMONEVENT_EXIT );
}
void CFdf::TellFdcsOfDeviceDetachment(TUint aDeviceId)
{
- LOG_FUNC
- LOGTEXT2(_L8("\taDeviceId = %d"), aDeviceId);
-
+ OstTraceFunctionEntry0( CFDF_TELLFDCSOFDEVICEDETACHMENT_ENTRY );
+ OstTrace1( TRACE_NORMAL, CFDF_TELLFDCSOFDEVICEDETACHMENT, "aDeviceId = %d", aDeviceId );
+
TSglQueIter<CFdcProxy> iter(iFunctionDrivers);
iter.SetToFirst();
CFdcProxy* fdc;
@@ -982,12 +1119,14 @@
}
}
+ OstTraceFunctionExit0( CFDF_TELLFDCSOFDEVICEDETACHMENT_EXIT );
}
TUint32 CFdf::TokenForInterface(TUint8 aInterface)
{
- LOG_FUNC
- LOGTEXT2(_L8("\taInterface = %d"), aInterface);
+ OstTraceFunctionEntry0( CFDF_TOKENFORINTERFACE_ENTRY );
+ OstTrace1( TRACE_NORMAL, CFDF_TOKENFORINTERFACE, "aInterface = %d", aInterface );
+
TUint32 token = 0;
// Check that the interface was in the array given to the FD and mark it
@@ -997,21 +1136,37 @@
for ( TUint ii = 0 ; ii < interfaceCount ; ++ii )
{
TInterfaceInfo* ifInfo = iInterfaces[ii];
- ASSERT_DEBUG(ifInfo);
+ if(!ifInfo)
+ {
+ OstTrace0( TRACE_FATAL, CFDF_TOKENFORINTERFACE_DUP1, "Empty ifInfo" );
+ __ASSERT_DEBUG(EFalse,User::Panic(KPanicCategory,__LINE__));
+ }
if ( ifInfo->iNumber == aInterface )
{
found = ETrue;
// The FDC tried to claim an interface that was already claimed.
- ASSERT_ALWAYS(!ifInfo->iClaimed);
+ if(ifInfo->iClaimed)
+ {
+ OstTrace0( TRACE_FATAL, CFDF_TOKENFORINTERFACE_DUP2, "iClaimed error" );
+ User::Panic(KPanicCategory,__LINE__);
+ }
ifInfo->iClaimed = ETrue;
break;
}
}
// Could not find interface in the interface array- the FDC tried to claim
// an interface it had not been offered.
- ASSERT_ALWAYS(found);
+ if(!found)
+ {
+ OstTrace0( TRACE_FATAL, CFDF_TOKENFORINTERFACE_DUP3, "not found" );
+ User::Panic(KPanicCategory,__LINE__);
+ }
- ASSERT_DEBUG(iCurrentDevice);
+ if(!iCurrentDevice)
+ {
+ OstTrace0( TRACE_FATAL, CFDF_TOKENFORINTERFACE_DUP4, "Empty iCurrentDevice" );
+ __ASSERT_DEBUG(EFalse,User::Panic(KPanicCategory,__LINE__));
+ }
// GetTokenForInterface will return error in the following cases:
// 1/ KErrBadHandle: invalid device handle (the CDeviceProxy asserts that
@@ -1039,21 +1194,23 @@
break;
default:
- LOGTEXT3(_L8("\tUnexpected error %d when requesting token for aInterface %d"),err,aInterface);
- ASSERT_ALWAYS(0);
+ OstTraceExt2( TRACE_FATAL, CFDF_TOKENFORINTERFACE_DUP5, "Unexpected error %d when requesting token for aInterface %d",err,aInterface);
+ User::Panic(KPanicCategory,__LINE__);
break;
}
- LOGTEXT3(_L8("\tToken for interface %d is = %d"),aInterface, token);
-
+ OstTraceExt2( TRACE_NORMAL, CFDF_TOKENFORINTERFACE_DUP6,
+ "Token for interface %hhu is = %u",aInterface, token);
+
+ OstTraceFunctionExit0( CFDF_TOKENFORINTERFACE_EXIT );
return token;
}
CDeviceProxy* CFdf::DeviceProxyL(TUint aDeviceId) const
{
- LOG_FUNC
- LOGTEXT2(_L8("\taDeviceId = %d"), aDeviceId);
-
+ OstTraceFunctionEntry0( CFDF_DEVICEPROXYL_ENTRY );
+ OstTrace1( TRACE_NORMAL, CFDF_DEVICEPROXYL, "aDeviceId = %d", aDeviceId );
+
TSglQueIter<CDeviceProxy> iter(const_cast<CFdf*>(this)->iDevices);
iter.SetToFirst();
CDeviceProxy* device = NULL;
@@ -1061,66 +1218,74 @@
{
if ( device->DeviceId() == aDeviceId )
{
- LOGTEXT2(_L8("\tdevice = 0x%08x"), device);
+ OstTrace1( TRACE_NORMAL, CFDF_DEVICEPROXYL_DUP1, "device = 0x%08x", device );
+ OstTraceFunctionExit0( CFDF_DEVICEPROXYL_EXIT );
return device;
}
}
- LEAVEL(KErrNotFound);
+ OstTrace0( TRACE_NORMAL, CFDF_DEVICEPROXYL_DUP2, "KErrNotFound");
+ User::Leave(KErrNotFound);
+ OstTraceFunctionExit0( CFDF_DEVICEPROXYL_EXIT_DUP1 );
return NULL; // avoid warning
}
const RArray<TUint>& CFdf::GetSupportedLanguagesL(TUint aDeviceId) const
{
- LOG_FUNC
- LOGTEXT2(_L8("\taDeviceId = %d"), aDeviceId);
-
+ OstTraceFunctionEntry0( CFDF_GETSUPPORTEDLANGUAGESL_ENTRY );
+ OstTrace1( TRACE_NORMAL, CFDF_GETSUPPORTEDLANGUAGESL, "aDeviceId = %d", aDeviceId );
+
CDeviceProxy* deviceProxy = DeviceProxyL(aDeviceId);
return deviceProxy->GetSupportedLanguages();
}
void CFdf::GetManufacturerStringDescriptorL(TUint aDeviceId, TUint32 aLangId, TName& aString) const
{
- LOG_FUNC
- LOGTEXT3(_L8("\taDeviceId = %d, aLangId = 0x%04x"), aDeviceId, aLangId);
-
+ OstTraceFunctionEntry0( CFDF_GETMANUFACTURERSTRINGDESCRIPTORL_ENTRY );
+ OstTraceExt2( TRACE_NORMAL, CFDF_GETMANUFACTURERSTRINGDESCRIPTORL,
+ "aDeviceId = %u, aLangId = 0x%08x", (TUint32)aDeviceId, aLangId );
+
CDeviceProxy* deviceProxy = DeviceProxyL(aDeviceId);
deviceProxy->GetManufacturerStringDescriptorL(aLangId, aString);
- LOGTEXT2(_L("\taString = \"%S\""), &aString);
+ OstTraceExt1( TRACE_NORMAL, CFDF_GETMANUFACTURERSTRINGDESCRIPTORL_DUP1, "aString = \"%S\"", aString );
+ OstTraceFunctionExit0( CFDF_GETMANUFACTURERSTRINGDESCRIPTORL_EXIT );
}
void CFdf::GetProductStringDescriptorL(TUint aDeviceId, TUint32 aLangId, TName& aString) const
{
- LOG_FUNC
- LOGTEXT3(_L8("\taDeviceId = %d, aLangId = 0x%04x"), aDeviceId, aLangId);
+ OstTraceFunctionEntry0( CFDF_GETPRODUCTSTRINGDESCRIPTORL_ENTRY );
+ OstTraceExt2( TRACE_NORMAL, CFDF_GETPRODUCTSTRINGDESCRIPTORL,
+ "aDeviceId = %u, aLangId = 0x%04x", (TUint32)aDeviceId, aLangId );
CDeviceProxy* deviceProxy = DeviceProxyL(aDeviceId);
deviceProxy->GetProductStringDescriptorL(aLangId, aString);
- LOGTEXT2(_L("\taString = \"%S\""), &aString);
+ OstTraceExt1( TRACE_NORMAL, CFDF_GETPRODUCTSTRINGDESCRIPTORL_DUP1, "aString = \"%S\"", aString );
+ OstTraceFunctionExit0( CFDF_GETPRODUCTSTRINGDESCRIPTORL_EXIT );
}
void CFdf::GetOtgDeviceDescriptorL(TInt aDeviceId, TOtgDescriptor& aDescriptor) const
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CFDF_GETOTGDEVICEDESCRIPTORL_ENTRY );
DeviceProxyL(aDeviceId)->GetOtgDescriptorL(aDescriptor);
+ OstTraceFunctionExit0( CFDF_GETOTGDEVICEDESCRIPTORL_EXIT );
}
void CFdf::GetSerialNumberStringDescriptorL(TUint aDeviceId, TUint32 aLangId, TName& aString) const
{
- LOG_FUNC
- LOGTEXT3(_L8("\taDeviceId = %d, aLangId = 0x%04x"), aDeviceId, aLangId);
+ OstTraceFunctionEntry0( CFDF_GETSERIALNUMBERSTRINGDESCRIPTORL_ENTRY );
+ OstTraceExt2( TRACE_NORMAL, CFDF_GETSERIALNUMBERSTRINGDESCRIPTORL,
+ "aDeviceId = %u, aLangId = 0x%08x", (TUint32)aDeviceId, aLangId );
CDeviceProxy* deviceProxy = DeviceProxyL(aDeviceId);
deviceProxy->GetSerialNumberStringDescriptorL(aLangId, aString);
- LOGTEXT2(_L("\taString = \"%S\""), &aString);
+ OstTraceExt1( TRACE_NORMAL, CFDF_GETSERIALNUMBERSTRINGDESCRIPTORL_DUP1, "aString = \"%S\"", aString );
+ OstTraceFunctionExit0( CFDF_GETSERIALNUMBERSTRINGDESCRIPTORL_EXIT );
}
void CFdf::SearchForInterfaceFunctionDriversL(CDeviceProxy& aDevice, TBool& aAnySuccess, TInt& aCollectedErr)
{
RArray<TUint> interfacesNumberArray;
CleanupClosePushL(interfacesNumberArray);
-
-
for ( TUint ii = 0 ; ii < iInterfaces.Count() ; ++ii )
{
@@ -1172,8 +1337,9 @@
TInt err = aArray.Append(aInterfaceNo);
if ( err )
{
- aDevice.SetDriverLoadingEventData(EDriverLoadFailure, err);
- LEAVEL(err);
+ aDevice.SetDriverLoadingEventData(EDriverLoadFailure, err);
+ OstTrace1( TRACE_NORMAL, CFDF_APPENDINTERFACENUMBERTOARRAYL, "Leave with error: %d", err );
+ User::Leave(err);
}
}
@@ -1215,15 +1381,15 @@
{
if (fdc->MarkedForDeletion())
continue;
- LOGTEXT2(_L8("\tFDC's default_data field = \"%S\""), &fdc->DefaultDataField());
-#ifdef _DEBUG
+ OstTraceExt1( TRACE_NORMAL, CFDF_SEARCHFORADEVICEFUNCTIONDRIVERL, "FDC's default_data field = \"%S\"", fdc->DefaultDataField());
+
// having these two together in the debug window is helpful for interactive debugging
TBuf8<KMaxSearchKeyLength> fd_key;
fd_key.Append(fdc->DefaultDataField().Ptr(), fdc->DefaultDataField().Length() > KMaxSearchKeyLength ? KMaxSearchKeyLength : fdc->DefaultDataField().Length());
TBuf8<KMaxSearchKeyLength> search_key;
search_key.Append(searchKeyString.Ptr(), searchKeyString.Length() > KMaxSearchKeyLength ? KMaxSearchKeyLength : searchKeyString.Length());
TInt version = fdc->Version();
-#endif
+
if (searchKeyString.CompareF(fdc->DefaultDataField()) == 0)
{
@@ -1241,9 +1407,9 @@
}
foundFdc = ETrue;
- LOGTEXT2(_L8("\tfound matching FDC (0x%08x)"), fdc);
+ OstTrace1( TRACE_NORMAL, CFDF_SEARCHFORADEVICEFUNCTIONDRIVERL_DUP1, "found matching FDC (0x%08x)", fdc );
TInt err = fdc->NewFunction(aDevice.DeviceId(), interfaces, iDD, iCD);
- LOGTEXT2(_L8("\tNewFunction returned %d"), err);
+ OstTrace1( TRACE_NORMAL, CFDF_SEARCHFORADEVICEFUNCTIONDRIVERL_DUP2, "NewFunction returned %d", err);
// To correctly determine whether the driver load for the whole
// configuration was a complete failure, a partial success or a
// complete success, we need to collect any non-KErrNone error
@@ -1291,7 +1457,8 @@
//
void CFdf::FormatDeviceSearchKey(TDes8& aSearchKey, TDeviceSearchKeys aDeviceSearchKeys)
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CFDF_FORMATDEVICESEARCHKEY_ENTRY );
+
switch (aDeviceSearchKeys)
{
case EVendorProductDevice:
@@ -1331,12 +1498,13 @@
break;
}
default:
- {
- ASSERT_DEBUG(EFalse);
+ {
+ OstTrace1( TRACE_FATAL, CFDF_FORMATDEVICESEARCHKEY, "Invalid aDeviceSearchKeys=%d", aDeviceSearchKeys );
+ __ASSERT_DEBUG(EFalse,User::Panic(KPanicCategory,__LINE__));
}
}
-
- LOGTEXT2(_L8("\taSearchKey = \"%S\""), &aSearchKey);
+ OstTraceExt1( TRACE_NORMAL, CFDF_FORMATDEVICESEARCHKEY_DUP1, "aSearchKey = \"%s\"", aSearchKey );
+ OstTraceFunctionExit0( CFDF_FORMATDEVICESEARCHKEY_EXIT );
}
@@ -1348,7 +1516,8 @@
//
void CFdf::FormatInterfaceSearchKey(TDes8& aSearchKey, TInterfaceSearchKeys aSearchKeys, const TInterfaceInfo& aIfInfo)
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CFDF_FORMATINTERFACESEARCHKEY_ENTRY );
+
switch (aSearchKeys)
{
case EVendorProductDeviceConfigurationvalueInterfacenumber:
@@ -1389,28 +1558,37 @@
}
default:
{
- ASSERT_DEBUG(EFalse);
+ OstTrace1( TRACE_FATAL, CFDF_FORMATINTERFACESEARCHKEY, "Invalid aSearchKeys=%d", aSearchKeys );
+ __ASSERT_DEBUG(EFalse,User::Panic(KPanicCategory,__LINE__));
}
}
- LOGTEXT2(_L8("\taSearchKey = \"%S\""), &aSearchKey);
+ OstTraceExt1( TRACE_NORMAL, CFDF_FORMATINTERFACESEARCHKEY_DUP1, "aSearchKey = \"%s\"", aSearchKey );
+ OstTraceFunctionExit0( CFDF_FORMATINTERFACESEARCHKEY_EXIT );
}
TUint CFdf::UnclaimedInterfaceCount() const
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CFDF_UNCLAIMEDINTERFACECOUNT_ENTRY );
+
TUint unclaimedInterfaces = 0;
for ( TUint ii = 0 ; ii < iInterfaces.Count() ; ++ii )
{
TInterfaceInfo* ifInfo = iInterfaces[ii];
- ASSERT_DEBUG(ifInfo);
+
+ if(!ifInfo)
+ {
+ OstTrace0( TRACE_FATAL, CFDF_UNCLAIMEDINTERFACECOUNT, "Empty ifInfo" );
+ __ASSERT_DEBUG(EFalse,User::Panic(KPanicCategory,__LINE__));
+ }
if ( !ifInfo->iClaimed )
{
- LOGTEXT2(_L8("\tunclaimed interface: ifInfo->iNumber = %d"), ifInfo->iNumber);
+ OstTrace1( TRACE_NORMAL, CFDF_UNCLAIMEDINTERFACECOUNT_DUP1, "unclaimed interface: ifInfo->iNumber = %d", ifInfo->iNumber );
++unclaimedInterfaces;
}
}
- LOGTEXT2(_L("\tunclaimedInterfaces = \"%d\""), unclaimedInterfaces);
+ OstTrace1( TRACE_NORMAL, CFDF_UNCLAIMEDINTERFACECOUNT_DUP2, "unclaimedInterfaces = \"%d\"", unclaimedInterfaces );
+ OstTraceFunctionExit0( CFDF_UNCLAIMEDINTERFACECOUNT_EXIT );
return unclaimedInterfaces;
}
--- a/usbmgmt/usbmgr/host/fdf/production/server/src/fdfserver.cpp Wed Jul 07 14:16:40 2010 +0800
+++ b/usbmgmt/usbmgr/host/fdf/production/server/src/fdfserver.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"
@@ -26,32 +26,36 @@
#include "utils.h"
#include "fdfapi.h"
#include "fdf.h"
-
-#ifdef __FLOG_ACTIVE
-_LIT8(KLogComponent, "fdf ");
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "fdfserverTraces.h"
#endif
#ifdef _DEBUG
-PANICCATEGORY("fdfsrv");
+_LIT(KPanicCategory, "fdfsrv");
#endif
+
void CFdfServer::NewLC()
{
- LOG_STATIC_FUNC_ENTRY
-
+ OstTraceFunctionEntry0( CFDFSERVER_NEWLC_ENTRY );
+
CFdfServer* self = new(ELeave) CFdfServer;
CleanupStack::PushL(self);
// StartL is where the kernel checks that there isn't already an instance
// of the same server running, so do it before ConstructL.
self->StartL(KUsbFdfServerName);
self->ConstructL();
+ OstTraceFunctionExit0( CFDFSERVER_NEWLC_EXIT );
}
CFdfServer::~CFdfServer()
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CFDFSERVER_CFDFSERVER_DES_ENTRY );
+
delete iFdf;
+ OstTraceFunctionExit0( CFDFSERVER_CFDFSERVER_DES_EXIT );
}
CFdfServer::CFdfServer()
@@ -61,23 +65,25 @@
void CFdfServer::ConstructL()
{
- LOG_FUNC
-
+ OstTraceFunctionEntry0( CFDFSERVER_CONSTRUCTL_ENTRY );
+
iFdf = CFdf::NewL();
+ OstTraceFunctionExit0( CFDFSERVER_CONSTRUCTL_EXIT );
}
CSession2* CFdfServer::NewSessionL(const TVersion& aVersion,
const RMessage2& aMessage) const
{
- LOG_LINE
- LOG_FUNC;
- LOGTEXT4(_L8("\taVersion = (%d,%d,%d)"), aVersion.iMajor, aVersion.iMinor, aVersion.iBuild);
+ OstTraceFunctionEntry0( CFDFSERVER_NEWSESSIONL_ENTRY );
+ OstTraceExt3( TRACE_NORMAL, CFDFSERVER_NEWSESSIONL, "aVersion = (%d,%d,%d)", aVersion.iMajor, aVersion.iMinor, aVersion.iBuild );
(void)aMessage;
// Check if we already have a session open.
if ( iSession )
{
- LEAVEL(KErrInUse);
+ OstTrace0( TRACE_NORMAL, CFDFSERVER_NEWSESSIONL_DUP1,
+ "Session in use");
+ User::Leave(KErrInUse);
}
// In the production system, check the secure ID of the prospective
@@ -96,7 +102,8 @@
// check OFF to allow any client to pass and thereby break our
// architecture.
TInt error = ( aMessage.SecureId() == KUsbsvrSecureId ) ? KErrNone : KErrPermissionDenied;
- LEAVEIFERRORL(error);
+ LEAVEIFERRORL(error,OstTrace0( TRACE_NORMAL, CFDFSERVER_NEWSESSIONL_DUP2,
+ "SecureId error"););
#endif // __TEST_FDF__
#endif // __OVER_DUMMYUSBDI__
@@ -108,27 +115,41 @@
if ( !User::QueryVersionSupported(v, aVersion) )
{
- LEAVEL(KErrNotSupported);
+ OstTrace0( TRACE_NORMAL, CFDFSERVER_NEWSESSIONL_DUP3,
+ "Version not supported");
+ User::Leave(KErrNotSupported);
}
CFdfServer* ncThis = const_cast<CFdfServer*>(this);
ncThis->iSession = new(ELeave) CFdfSession(*iFdf, *ncThis);
- ASSERT_DEBUG(ncThis->iFdf);
+ if(!ncThis->iFdf)
+ {
+ OstTrace0( TRACE_FATAL, CFDFSERVER_NEWSESSIONL_DUP4,"ncThis->iFdf is empty");
+ __ASSERT_DEBUG(EFalse,User::Panic(KPanicCategory,__LINE__));
+ }
+
ncThis->iFdf->SetSession(iSession);
- LOGTEXT2(_L8("\tiSession = 0x%08x"), iSession);
+ OstTrace1( TRACE_NORMAL, CFDFSERVER_NEWSESSIONL_DUP5, "iSession = 0x%08x", iSession );
+ OstTraceFunctionExit0( CFDFSERVER_NEWSESSIONL_EXIT );
return iSession;
}
void CFdfServer::SessionClosed()
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CFDFSERVER_SESSIONCLOSED_ENTRY );
- ASSERT_DEBUG(iSession);
+ if(!iSession)
+ {
+ OstTrace0( TRACE_FATAL, CFDFSERVER_SESSIONCLOSED,"Empty iSession" );
+ __ASSERT_DEBUG(EFalse,User::Panic(KPanicCategory,__LINE__));
+ }
+
iSession = NULL;
iFdf->SetSession(NULL);
- LOGTEXT(_L8("\tno remaining sessions- shutting down"));
+ OstTrace0( TRACE_NORMAL, CFDFSERVER_SESSIONCLOSED_DUP1, "no remaining sessions- shutting down" );
+
// This returns control to the server boilerplate in main.cpp. This
// destroys all the objects, which includes signalling device detachment
// to any extant FDCs.
@@ -137,4 +158,5 @@
// that's created immediately before calling CActiveScheduler::Start in
// main.cpp.
CActiveScheduler::Stop();
+ OstTraceFunctionExit0( CFDFSERVER_SESSIONCLOSED_EXIT );
}
--- a/usbmgmt/usbmgr/host/fdf/production/server/src/fdfsession.cpp Wed Jul 07 14:16:40 2010 +0800
+++ b/usbmgmt/usbmgr/host/fdf/production/server/src/fdfsession.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"
@@ -28,36 +28,37 @@
#include "fdfapi.h"
#include "fdf.h"
#include "event.h"
-
-#ifdef __FLOG_ACTIVE
-_LIT8(KLogComponent, "fdf ");
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "fdfsessionTraces.h"
#endif
#ifdef _DEBUG
-PANICCATEGORY("fdfsession");
+_LIT(KPanicCategory, "fdfsession");
#endif
CFdfSession::CFdfSession(CFdf& aFdf, CFdfServer& aServer)
: iFdf(aFdf),
iServer(aServer)
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CFDFSESSION_CFDFSESSION_CONS_ENTRY );
+
+ OstTraceFunctionExit0( CFDFSESSION_CFDFSESSION_CONS_EXIT );
}
CFdfSession::~CFdfSession()
{
- LOG_LINE
- LOG_FUNC;
-
+ OstTraceFunctionEntry0( CFDFSESSION_CFDFSESSION_DES_ENTRY );
+
iServer.SessionClosed();
+ OstTraceFunctionExit0( CFDFSESSION_CFDFSESSION_DES_EXIT );
}
void CFdfSession::ServiceL(const RMessage2& aMessage)
{
- LOG_LINE
- LOG_FUNC;
- LOGTEXT2(_L8("\taMessage.Function() = %d"), aMessage.Function());
-
+ OstTraceFunctionEntry0( CFDFSESSION_SERVICEL_ENTRY );
+ OstTrace1( TRACE_NORMAL, CFDFSESSION_SERVICEL, "aMessage.Function() = %d", aMessage.Function() );
+
// Switch on the IPC number and call a 'message handler'. Message handlers
// complete aMessage (either with Complete or Panic), or make a note of
// the message for later asynchronous completion.
@@ -71,12 +72,22 @@
// This is a sync API- check that the message has been completed.
// (NB We don't check the converse for async APIs because the message
// may have been panicked synchronously.)
- ASSERT_DEBUG(aMessage.Handle() == 0);
+ if(!(aMessage.Handle() == 0))
+ {
+ OstTrace0( TRACE_FATAL, CFDFSESSION_SERVICEL_DUP1,
+ "Empty aMessage.Handle" );
+ __ASSERT_DEBUG(EFalse,User::Panic(KPanicCategory,__LINE__));
+ }
break;
case EUsbFdfSrvDisableDriverLoading:
DisableDriverLoading(aMessage);
- ASSERT_DEBUG(aMessage.Handle() == 0);
+ if(!(aMessage.Handle() == 0))
+ {
+ OstTrace0( TRACE_FATAL, CFDFSESSION_SERVICEL_DUP2,
+ "Empty aMessage.Handle" );
+ __ASSERT_DEBUG(EFalse,User::Panic(KPanicCategory,__LINE__));
+ }
break;
case EUsbFdfSrvNotifyDeviceEvent:
@@ -85,7 +96,12 @@
case EUsbFdfSrvNotifyDeviceEventCancel:
NotifyDeviceEventCancel(aMessage);
- ASSERT_DEBUG(aMessage.Handle() == 0);
+ if(!(aMessage.Handle() == 0))
+ {
+ OstTrace0( TRACE_FATAL, CFDFSESSION_SERVICEL_DUP3,
+ "Empty aMessage.Handle" );
+ __ASSERT_DEBUG(EFalse,User::Panic(KPanicCategory,__LINE__));
+ }
break;
case EUsbFdfSrvNotifyDevmonEvent:
@@ -94,39 +110,71 @@
case EUsbFdfSrvNotifyDevmonEventCancel:
NotifyDevmonEventCancel(aMessage);
- ASSERT_DEBUG(aMessage.Handle() == 0);
+ if(!(aMessage.Handle() == 0))
+ {
+ OstTrace0( TRACE_FATAL, CFDFSESSION_SERVICEL_DUP4,
+ "Empty aMessage.Handle" );
+ __ASSERT_DEBUG(EFalse,User::Panic(KPanicCategory,__LINE__));
+ }
break;
case EUsbFdfSrvGetSingleSupportedLanguageOrNumberOfSupportedLanguages:
GetSingleSupportedLanguageOrNumberOfSupportedLanguages(aMessage);
- ASSERT_DEBUG(aMessage.Handle() == 0);
+ if(!(aMessage.Handle() == 0))
+ {
+ OstTrace0( TRACE_FATAL, CFDFSESSION_SERVICEL_DUP5,
+ "Empty aMessage.Handle" );
+ __ASSERT_DEBUG(EFalse,User::Panic(KPanicCategory,__LINE__));
+ }
break;
case EUsbFdfSrvGetSupportedLanguages:
GetSupportedLanguages(aMessage);
- ASSERT_DEBUG(aMessage.Handle() == 0);
+ if(!(aMessage.Handle() == 0))
+ {
+ OstTrace0( TRACE_FATAL, CFDFSESSION_SERVICEL_DUP6,
+ "Empty aMessage.Handle" );
+ __ASSERT_DEBUG(EFalse,User::Panic(KPanicCategory,__LINE__));
+ }
break;
case EUsbFdfSrvGetManufacturerStringDescriptor:
GetManufacturerStringDescriptor(aMessage);
- ASSERT_DEBUG(aMessage.Handle() == 0);
+ if(!(aMessage.Handle() == 0))
+ {
+ OstTrace0( TRACE_FATAL, CFDFSESSION_SERVICEL_DUP7,
+ "Empty aMessage.Handle" );
+ __ASSERT_DEBUG(EFalse,User::Panic(KPanicCategory,__LINE__));
+ }
break;
case EUsbFdfSrvGetProductStringDescriptor:
GetProductStringDescriptor(aMessage);
- ASSERT_DEBUG(aMessage.Handle() == 0);
+ if(!(aMessage.Handle() == 0))
+ {
+ OstTrace0( TRACE_FATAL, CFDFSESSION_SERVICEL_DUP8,
+ "Empty aMessage.Handle" );
+ __ASSERT_DEBUG(EFalse,User::Panic(KPanicCategory,__LINE__));
+ }
break;
case EUsbFdfSrvGetOtgDescriptor:
GetOtgDeviceDescriptor(aMessage);
- ASSERT_DEBUG(aMessage.Handle() == 0);
+ if(!(aMessage.Handle() == 0))
+ {
+ OstTrace0( TRACE_FATAL, CFDFSESSION_SERVICEL_DUP9,
+ "Empty aMessage.Handle" );
+ __ASSERT_DEBUG(EFalse,User::Panic(KPanicCategory,__LINE__));
+ }
break;
// Heap failure testing APIs.
case EUsbFdfSrvDbgFailNext:
#ifdef _DEBUG
{
- LOGTEXT2(_L8("\tfail next (simulating failure after %d allocation(s))"), aMessage.Int0());
+ OstTrace1( TRACE_NORMAL, CFDFSESSION_SERVICEL_DUP10,
+ "fail next (simulating failure after %d allocation(s))",
+ aMessage.Int0() );
if ( aMessage.Int0() == 0 )
{
__UHEAP_RESET;
@@ -136,7 +184,7 @@
__UHEAP_FAILNEXT(aMessage.Int0());
}
}
-#endif // _DEBUG
+#endif
CompleteClient(aMessage, KErrNone);
break;
@@ -144,60 +192,70 @@
{
TInt err = KErrNone;
#ifdef _DEBUG
- LOGTEXT(_L8("\tallocate on the heap"));
+ OstTrace0( TRACE_NORMAL, CFDFSESSION_SERVICEL_DUP11, "allocate on the heap" );
TInt* x = NULL;
TRAP(err, x = new(ELeave) TInt);
delete x;
-
-#endif // _DEBUG
+#endif
CompleteClient(aMessage, err);
}
break;
default:
- PANIC_MSG(aMessage, KUsbFdfServerName, EBadIpc);
+ OstTrace0( TRACE_FATAL, CFDFSESSION_SERVICEL_DUP12,
+ "Invalid message function" );
+ aMessage.Panic(KUsbFdfServerName,EBadIpc);
+
break;
}
+ OstTraceFunctionExit0( CFDFSESSION_SERVICEL_EXIT );
}
void CFdfSession::CompleteClient(const RMessage2& aMessage, TInt aError)
{
- LOGTEXT2(_L8("\tcompleting client message with %d"), aError);
- aMessage.Complete(aError);
+ OstTrace1( TRACE_NORMAL, CFDFSESSION_COMPLETECLIENT, "completing client message with %d", aError );
+ aMessage.Complete(aError);
}
void CFdfSession::EnableDriverLoading(const RMessage2& aMessage)
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CFDFSESSION_ENABLEDRIVERLOADING_ENTRY );
iFdf.EnableDriverLoading();
CompleteClient(aMessage, KErrNone);
+ OstTraceFunctionExit0( CFDFSESSION_ENABLEDRIVERLOADING_EXIT );
}
void CFdfSession::DisableDriverLoading(const RMessage2& aMessage)
{
- LOG_FUNC
-
+ OstTraceFunctionEntry0( CFDFSESSION_DISABLEDRIVERLOADING_ENTRY );
+
iFdf.DisableDriverLoading();
CompleteClient(aMessage, KErrNone);
+ OstTraceFunctionExit0( CFDFSESSION_DISABLEDRIVERLOADING_EXIT );
}
TBool CFdfSession::NotifyDeviceEventOutstanding() const
{
const TBool ret = ( iNotifyDeviceEventMsg.Handle() != 0 );
- LOGTEXT2(_L("CFdfSession::NotifyDeviceEventOutstanding returning %d"), ret);
+ OstTrace1( TRACE_NORMAL, CFDFSESSION_NOTIFYDEVICEEVENTOUTSTANDING,
+ "CFdfSession::NotifyDeviceEventOutstanding returning %d", ret );
+
return ret;
}
void CFdfSession::NotifyDeviceEvent(const RMessage2& aMessage)
{
- LOG_FUNC
-
+ OstTraceFunctionEntry0( CFDFSESSION_NOTIFYDEVICEEVENT_ENTRY );
+
if ( iNotifyDeviceEventMsg.Handle() )
{
- PANIC_MSG(iNotifyDeviceEventMsg, KUsbFdfServerName, ENotifyDeviceEventAlreadyOutstanding);
+ OstTrace0( TRACE_FATAL, CFDFSESSION_NOTIFYDEVICEEVENT,
+ "Empty iNotifyDeviceEventMsg" );
+ iNotifyDeviceEventMsg.Panic( KUsbFdfServerName,
+ ENotifyDeviceEventAlreadyOutstanding);
}
else
{
@@ -208,68 +266,90 @@
CompleteDeviceEventNotification(event);
}
}
+ OstTraceFunctionExit0( CFDFSESSION_NOTIFYDEVICEEVENT_EXIT );
}
void CFdfSession::NotifyDeviceEventCancel(const RMessage2& aMessage)
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CFDFSESSION_NOTIFYDEVICEEVENTCANCEL_ENTRY );
if ( iNotifyDeviceEventMsg.Handle() )
{
CompleteClient(iNotifyDeviceEventMsg, KErrCancel);
}
CompleteClient(aMessage, KErrNone);
+ OstTraceFunctionExit0( CFDFSESSION_NOTIFYDEVICEEVENTCANCEL_EXIT );
}
void CFdfSession::DeviceEvent(const TDeviceEvent& aEvent)
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CFDFSESSION_DEVICEEVENT_ENTRY );
// This function should only be called if there is a request outstanding.
- ASSERT_DEBUG(iNotifyDeviceEventMsg.Handle());
-
+ if(!iNotifyDeviceEventMsg.Handle())
+ {
+ OstTrace0( TRACE_FATAL, CFDFSESSION_DEVICEEVENT,
+ "iNotifyDeviceEventMsg.Handle" );
+ __ASSERT_DEBUG(EFalse,User::Panic(KPanicCategory,__LINE__));
+ }
CompleteDeviceEventNotification(aEvent);
+ OstTraceFunctionExit0( CFDFSESSION_DEVICEEVENT_EXIT );
}
void CFdfSession::CompleteDeviceEventNotification(const TDeviceEvent& aEvent)
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CFDFSESSION_COMPLETEDEVICEEVENTNOTIFICATION_ENTRY );
+
TRAPD(err, CompleteDeviceEventNotificationL(aEvent));
if ( err )
{
- PANIC_MSG(iNotifyDeviceEventMsg, KUsbFdfServerName, EBadNotifyDeviceEventData);
+ OstTrace0( TRACE_FATAL, CFDFSESSION_COMPLETEDEVICEEVENTNOTIFICATION,
+ "CompleteDeviceEventNotificationL error" );
+ iNotifyDeviceEventMsg.Panic( KUsbFdfServerName,
+ EBadNotifyDeviceEventData);
}
+ OstTraceFunctionExit0( CFDFSESSION_COMPLETEDEVICEEVENTNOTIFICATION_EXIT );
}
void CFdfSession::CompleteDeviceEventNotificationL(const TDeviceEvent& aEvent)
{
- LOG_FUNC
-
+ OstTraceFunctionEntry0( CFDFSESSION_COMPLETEDEVICEEVENTNOTIFICATIONL_ENTRY );
+
// iNotifyDeviceEventMsg has one IPC arg: a TDeviceEventInformation
-
- ASSERT_DEBUG(iNotifyDeviceEventMsg.Handle());
+ if(!iNotifyDeviceEventMsg.Handle())
+ {
+ OstTrace0( TRACE_FATAL, CFDFSESSION_COMPLETEDEVICEEVENTNOTIFICATIONL,
+ "Empty iNotifyDeviceEventMsg.Handle" );
+ __ASSERT_DEBUG(EFalse,User::Panic(KPanicCategory,__LINE__));
+ }
TPckg<TDeviceEventInformation> info(aEvent.iInfo);
iNotifyDeviceEventMsg.WriteL(0, info);
CompleteClient(iNotifyDeviceEventMsg, KErrNone);
+ OstTraceFunctionExit0( CFDFSESSION_COMPLETEDEVICEEVENTNOTIFICATIONL_EXIT );
}
TBool CFdfSession::NotifyDevmonEventOutstanding() const
{
const TBool ret = ( iNotifyDevmonEventMsg.Handle() != 0 );
- LOGTEXT2(_L("CFdfSession::NotifyDevmonEventOutstanding returning %d"), ret);
+ OstTrace1( TRACE_NORMAL, CFDFSESSION_NOTIFYDEVMONEVENTOUTSTANDING,
+ "CFdfSession::NotifyDevmonEventOutstanding returning %d", ret );
return ret;
}
void CFdfSession::NotifyDevmonEvent(const RMessage2& aMessage)
{
- LOG_FUNC
-
+ OstTraceFunctionEntry0( CFDFSESSION_NOTIFYDEVMONEVENT_ENTRY );
+
if ( iNotifyDevmonEventMsg.Handle() )
{
- PANIC_MSG(iNotifyDevmonEventMsg, KUsbFdfServerName, ENotifyDevmonEventAlreadyOutstanding);
+ OstTrace0( TRACE_FATAL, CFDFSESSION_NOTIFYDEVMONEVENT,
+ "iNotifyDevmonEventMsg.Handle should empty" );
+ iNotifyDevmonEventMsg.Panic( KUsbFdfServerName,
+ ENotifyDevmonEventAlreadyOutstanding);
+
}
else
{
@@ -280,59 +360,80 @@
CompleteDevmonEventNotification(event);
}
}
+ OstTraceFunctionExit0( CFDFSESSION_NOTIFYDEVMONEVENT_EXIT );
}
void CFdfSession::NotifyDevmonEventCancel(const RMessage2& aMessage)
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CFDFSESSION_NOTIFYDEVMONEVENTCANCEL_ENTRY );
+
if ( iNotifyDevmonEventMsg.Handle() )
{
CompleteClient(iNotifyDevmonEventMsg, KErrCancel);
}
CompleteClient(aMessage, KErrNone);
+ OstTraceFunctionExit0( CFDFSESSION_NOTIFYDEVMONEVENTCANCEL_EXIT );
}
void CFdfSession::DevmonEvent(TInt aError)
{
- LOG_FUNC
-
+ OstTraceFunctionEntry0( CFDFSESSION_DEVMONEVENT_ENTRY );
+
// This function should only be called if there is a request outstanding.
- ASSERT_DEBUG(iNotifyDevmonEventMsg.Handle());
+
+
+ if(!iNotifyDevmonEventMsg.Handle())
+ {
+ OstTrace0( TRACE_FATAL, CFDFSESSION_DEVMONEVENT,
+ "Empty iNotifyDevmonEventMsg.Handle()" );
+ __ASSERT_DEBUG(EFalse,User::Panic(KPanicCategory,__LINE__));
+ }
CompleteDevmonEventNotification(aError);
+ OstTraceFunctionExit0( CFDFSESSION_DEVMONEVENT_EXIT );
}
void CFdfSession::CompleteDevmonEventNotification(TInt aError)
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CFDFSESSION_COMPLETEDEVMONEVENTNOTIFICATION_ENTRY );
+
TRAPD(err, CompleteDevmonEventNotificationL(aError));
if ( err )
{
- PANIC_MSG(iNotifyDevmonEventMsg, KUsbFdfServerName, EBadNotifyDevmonEventData);
+ OstTrace0( TRACE_FATAL, CFDFSESSION_COMPLETEDEVMONEVENTNOTIFICATION,
+ "Bad Notify Devmon Event Data" );
+ iNotifyDevmonEventMsg.Panic(KUsbFdfServerName,
+ EBadNotifyDevmonEventData);
}
+ OstTraceFunctionExit0( CFDFSESSION_COMPLETEDEVMONEVENTNOTIFICATION_EXIT );
}
void CFdfSession::CompleteDevmonEventNotificationL(TInt aEvent)
{
- LOG_FUNC
-
+ OstTraceFunctionEntry0( CFDFSESSION_COMPLETEDEVMONEVENTNOTIFICATIONL_ENTRY );
+
// iNotifyDevmonEventMsg has the following IPC args:
// 0- TInt& aError
-
- ASSERT_DEBUG(iNotifyDevmonEventMsg.Handle());
+ if(!iNotifyDevmonEventMsg.Handle())
+ {
+ OstTrace0( TRACE_FATAL, CFDFSESSION_COMPLETEDEVMONEVENTNOTIFICATIONL,
+ "Empty iNotifyDevmonEventMsg.Handle" );
+ __ASSERT_DEBUG(EFalse,User::Panic(KPanicCategory,__LINE__));
+ }
TPckg<TInt> event(aEvent);
iNotifyDevmonEventMsg.WriteL(0, event);
CompleteClient(iNotifyDevmonEventMsg, KErrNone);
+ OstTraceFunctionExit0( CFDFSESSION_COMPLETEDEVMONEVENTNOTIFICATIONL_EXIT );
}
void CFdfSession::GetSingleSupportedLanguageOrNumberOfSupportedLanguages(const RMessage2& aMessage)
{
- LOG_FUNC
-
+ OstTraceFunctionEntry0( CFDFSESSION_GETSINGLESUPPORTEDLANGUAGEORNUMBEROFSUPPORTEDLANGUAGES_ENTRY );
+
// To save IPC operations between client and server, we make use of the
// fact that the majority of devices only support a single language.
// The client is expected to have a buffer big enough to hold a single
@@ -348,30 +449,37 @@
// them all.
TRAPD(err, GetSingleSupportedLanguageOrNumberOfSupportedLanguagesL(aMessage));
CompleteClient(aMessage, err);
+ OstTraceFunctionExit0( CFDFSESSION_GETSINGLESUPPORTEDLANGUAGEORNUMBEROFSUPPORTEDLANGUAGES_EXIT );
}
void CFdfSession::GetSingleSupportedLanguageOrNumberOfSupportedLanguagesL(const RMessage2& aMessage)
{
- LOG_FUNC
-
+ OstTraceFunctionEntry0( CFDFSESSION_GETSINGLESUPPORTEDLANGUAGEORNUMBEROFSUPPORTEDLANGUAGESL_ENTRY );
+
const TUint deviceId = aMessage.Int0();
- LOGTEXT2(_L8("\tdeviceId = %d"), deviceId);
+ OstTrace1( TRACE_NORMAL, CFDFSESSION_GETSINGLESUPPORTEDLANGUAGEORNUMBEROFSUPPORTEDLANGUAGESL,
+ "deviceId = %d", deviceId );
const RArray<TUint>& langIds = iFdf.GetSupportedLanguagesL(deviceId);
const TUint count = langIds.Count();
- LOGTEXT2(_L8("\tcount = %d"), count);
+ OstTrace1( TRACE_NORMAL, CFDFSESSION_GETSINGLESUPPORTEDLANGUAGEORNUMBEROFSUPPORTEDLANGUAGESL_DUP1,
+ "count = %d", count );
switch ( count )
{
case 0:
// Nothing to write to the client's address space, complete with
- LEAVEL(KErrNotFound);
- break;
+ OstTrace0( TRACE_NORMAL, CFDFSESSION_GETSINGLESUPPORTEDLANGUAGEORNUMBEROFSUPPORTEDLANGUAGESL_DUP2,
+ "Nothing to write to the client's address space" );
+ User::Leave(KErrNotFound);
+ break;
case 1:
{
// Write the single supported language to the client, complete with
// KErrNone (or error of course, if their buffer isn't big enough).
TPckg<TUint> buf(langIds[0]);
- LEAVEIFERRORL(aMessage.Write(1, buf));
+ TInt err=aMessage.Write(1, buf);
+ LEAVEIFERRORL(err,OstTrace1( TRACE_ERROR, CFDFSESSION_GETSINGLESUPPORTEDLANGUAGEORNUMBEROFSUPPORTEDLANGUAGESL_DUP3,
+ "aMessage.Write with err: %d", err ););
}
break;
@@ -382,31 +490,40 @@
// This is the point at which this mechanism depends on
// RMessagePtr2::WriteL itself not leaving with KErrTooBig!
TPckg<TUint> buf(count);
- LEAVEIFERRORL(aMessage.Write(1, buf));
- LEAVEL(KErrTooBig);
+ TInt error=aMessage.Write(1, buf);
+
+ LEAVEIFERRORL(error, OstTrace1( TRACE_ERROR, CFDFSESSION_GETSINGLESUPPORTEDLANGUAGEORNUMBEROFSUPPORTEDLANGUAGESL_DUP4,
+ "aMessage.Write with err: %d", error ););
+ OstTrace0( TRACE_ERROR, CFDFSESSION_GETSINGLESUPPORTEDLANGUAGEORNUMBEROFSUPPORTEDLANGUAGESL_DUP5,
+ "message error too big" );
+ User::Leave(KErrTooBig);
}
break;
}
+ OstTraceFunctionExit0( CFDFSESSION_GETSINGLESUPPORTEDLANGUAGEORNUMBEROFSUPPORTEDLANGUAGESL_EXIT );
}
void CFdfSession::GetSupportedLanguages(const RMessage2& aMessage)
{
- LOG_FUNC
-
+ OstTraceFunctionEntry0( CFDFSESSION_GETSUPPORTEDLANGUAGES_ENTRY );
+
TRAPD(err, GetSupportedLanguagesL(aMessage));
CompleteClient(aMessage, err);
+ OstTraceFunctionExit0( CFDFSESSION_GETSUPPORTEDLANGUAGES_EXIT );
}
void CFdfSession::GetSupportedLanguagesL(const RMessage2& aMessage)
{
- LOG_FUNC
-
+ OstTraceFunctionEntry0( CFDFSESSION_GETSUPPORTEDLANGUAGESL_ENTRY );
+
const TUint deviceId = aMessage.Int0();
- LOGTEXT2(_L8("\tdeviceId = %d"), deviceId);
+ OstTrace1( TRACE_NORMAL, CFDFSESSION_GETSUPPORTEDLANGUAGESL,
+ "deviceId = %d", deviceId );
const RArray<TUint>& langIds = iFdf.GetSupportedLanguagesL(deviceId);
const TUint count = langIds.Count();
- LOGTEXT2(_L8("\tcount = %d"), count);
+ OstTrace1( TRACE_NORMAL, CFDFSESSION_GETSUPPORTEDLANGUAGESL_DUP1,
+ "count = %d", count );
RBuf8 buf;
buf.CreateL(count * sizeof(TUint));
CleanupClosePushL(buf);
@@ -416,38 +533,50 @@
}
// Write back to the client.
- LEAVEIFERRORL(aMessage.Write(1, buf));
+ TInt err=aMessage.Write(1, buf);
+ LEAVEIFERRORL(err,OstTrace1( TRACE_ERROR, CFDFSESSION_GETSUPPORTEDLANGUAGESL_DUP2,
+ "aMessage.Write with error: %d", err ););
CleanupStack::PopAndDestroy(&buf);
+ OstTraceFunctionExit0( CFDFSESSION_GETSUPPORTEDLANGUAGESL_EXIT );
}
void CFdfSession::GetManufacturerStringDescriptor(const RMessage2& aMessage)
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CFDFSESSION_GETMANUFACTURERSTRINGDESCRIPTOR_ENTRY );
+
GetStringDescriptor(aMessage, EManufacturer);
+ OstTraceFunctionExit0( CFDFSESSION_GETMANUFACTURERSTRINGDESCRIPTOR_EXIT );
}
void CFdfSession::GetProductStringDescriptor(const RMessage2& aMessage)
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CFDFSESSION_GETPRODUCTSTRINGDESCRIPTOR_ENTRY );
+
GetStringDescriptor(aMessage, EProduct);
+ OstTraceFunctionExit0( CFDFSESSION_GETPRODUCTSTRINGDESCRIPTOR_EXIT );
}
void CFdfSession::GetStringDescriptor(const RMessage2& aMessage, TStringType aStringType)
{
- LOG_FUNC
-
+ OstTraceFunctionEntry0( CFDFSESSION_GETSTRINGDESCRIPTOR_ENTRY );
+
TRAPD(err, GetStringDescriptorL(aMessage, aStringType));
CompleteClient(aMessage, err);
+ OstTraceFunctionExit0( CFDFSESSION_GETSTRINGDESCRIPTOR_EXIT );
}
void CFdfSession::GetStringDescriptorL(const RMessage2& aMessage, TStringType aStringType)
{
- LOG_FUNC
-
- ASSERT_DEBUG(aStringType == EManufacturer || aStringType == EProduct);
-
+ OstTraceFunctionEntry0( CFDFSESSION_GETSTRINGDESCRIPTORL_ENTRY );
+
+ if(!(aStringType == EManufacturer || aStringType == EProduct))
+ {
+ OstTrace0( TRACE_FATAL, CFDFSESSION_GETSTRINGDESCRIPTORL,
+ "String Type error" );
+ __ASSERT_DEBUG(EFalse,User::Panic(KPanicCategory,__LINE__));
+ }
TName string;
const TUint deviceId = aMessage.Int0();
const TUint langId = aMessage.Int1();
@@ -459,13 +588,18 @@
{
iFdf.GetProductStringDescriptorL(deviceId, langId, string);
}
- LOGTEXT2(_L("\tstring = \"%S\""), &string);
- LEAVEIFERRORL(aMessage.Write(2, string));
+ OstTraceExt1( TRACE_NORMAL, CFDFSESSION_GETSTRINGDESCRIPTORL_DUP1,
+ "string = \"%S\"", string );
+
+ TInt err=aMessage.Write(2, string);
+ LEAVEIFERRORL(err,OstTrace1( TRACE_ERROR, CFDFSESSION_GETSTRINGDESCRIPTORL_DUP2,
+ "Message write with err: %d", err ););
+ OstTraceFunctionExit0( CFDFSESSION_GETSTRINGDESCRIPTORL_EXIT );
}
void CFdfSession::GetOtgDeviceDescriptor(const RMessage2& aMessage)
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CFDFSESSION_GETOTGDEVICEDESCRIPTOR_ENTRY );
TOtgDescriptor otgDesc;
const TUint deviceId = aMessage.Int0();
@@ -476,4 +610,5 @@
err = aMessage.Write(1, buf);
}
CompleteClient(aMessage, err);
+ OstTraceFunctionExit0( CFDFSESSION_GETOTGDEVICEDESCRIPTOR_EXIT );
}
--- a/usbmgmt/usbmgr/host/fdf/production/server/src/main.cpp Wed Jul 07 14:16:40 2010 +0800
+++ b/usbmgmt/usbmgr/host/fdf/production/server/src/main.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"
@@ -23,16 +23,18 @@
#include <e32base.h>
#include "fdfserver.h"
#include <usb/usblogger.h>
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "mainTraces.h"
+#endif
+
static void RunFdfL();
-#ifdef __FLOG_ACTIVE
-_LIT8(KLogComponent, "fdf ");
-#endif
GLDEF_C TInt E32Main()
{
- LOGTEXT(_L8(">>E32Main"));
+ OstTrace0( TRACE_NORMAL, FDF_SERVER_SRC_E32MAIN, ">>E32Main" );
TInt ret = KErrNoMemory;
@@ -43,22 +45,17 @@
if ( cleanup )
{
// Create the logger object
-#ifdef __FLOG_ACTIVE
- (void)CUsbLog::Connect();
-#endif
TRAP(ret, RunFdfL());
-#ifdef __FLOG_ACTIVE
- CUsbLog::Close();
-#endif
delete cleanup;
}
__UHEAP_MARKEND;
- LOGTEXT2(_L8("<<E32Main ret = %d"), ret);
+ OstTrace1( TRACE_NORMAL, FDF_SERVER_SRC_E32MAIN_DUP1,
+ "<<E32Main ret = %d", ret );
return ret;
}
--- a/usbmgmt/usbmgr/host/fdf/production/server/src/utils.cpp Wed Jul 07 14:16:40 2010 +0800
+++ b/usbmgmt/usbmgr/host/fdf/production/server/src/utils.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"
@@ -22,16 +22,13 @@
#include "utils.h"
#include <usb/usblogger.h>
-
-#ifdef __FLOG_ACTIVE
-_LIT8(KLogComponent, "fdf ");
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "utilsTraces.h"
#endif
-#ifdef __FLOG_ACTIVE
+
#define LOG Log()
-#else
-#define LOG
-#endif
//*****************************************************************************
// Code relating to the cleanup stack item which 'Remove's a given TUint from
@@ -49,8 +46,8 @@
void Remove(TAny* aArrayRemove)
{
- LOG_STATIC_FUNC_ENTRY
-
+ OstTraceFunctionEntry0( FDF_UTILS_REMOVE_ENTRY );
+
TArrayRemove* arrayRemove = reinterpret_cast<TArrayRemove*>(aArrayRemove);
const TUint count = arrayRemove->iDeviceIds.Count();
@@ -58,11 +55,12 @@
{
if ( arrayRemove->iDeviceIds[ii] == arrayRemove->iDeviceId )
{
- LOGTEXT(_L8("\tmatching device id"));
+ OstTrace0( TRACE_NORMAL, FDF_UTILS_REMOVE, "::matching device id" );
arrayRemove->iDeviceIds.Remove(ii);
break;
}
}
+ OstTraceFunctionExit0( FDF_UTILS_REMOVE_EXIT );
}
void CleanupRemovePushL(TArrayRemove& aArrayRemove)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usbmgmt/usbmgr/host/fdf/production/server/traces/OstTraceDefinitions.h Wed Jul 07 15:08:54 2010 +0800
@@ -0,0 +1,7 @@
+#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
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usbmgmt/usbmgr/host/fdf/production/server/traces/fixed_id.definitions Wed Jul 07 15:08:54 2010 +0800
@@ -0,0 +1,620 @@
+#Fixed group and trace id definitions. If this file is removed, the identifiers are rebuilt.
+[GROUP]TRACE_DUMP=0x89
+[GROUP]TRACE_ERROR=0x82
+[GROUP]TRACE_FATAL=0x81
+[GROUP]TRACE_FLOW=0x8a
+[GROUP]TRACE_NORMAL=0x86
+[TRACE]TRACE_DUMP[0x89]_CDEVICEPROXY_LOG=0x1
+[TRACE]TRACE_DUMP[0x89]_CDEVICEPROXY_LOG_DUP1=0x2
+[TRACE]TRACE_DUMP[0x89]_CDEVICEPROXY_LOG_DUP2=0x3
+[TRACE]TRACE_DUMP[0x89]_CDEVICEPROXY_LOG_DUP3=0x4
+[TRACE]TRACE_DUMP[0x89]_CDEVICEPROXY_LOG_DUP4=0x5
+[TRACE]TRACE_DUMP[0x89]_CDEVICEPROXY_LOG_DUP5=0x6
+[TRACE]TRACE_DUMP[0x89]_CEVENTQUEUE_LOG=0xf
+[TRACE]TRACE_DUMP[0x89]_CEVENTQUEUE_LOG_DUP1=0x10
+[TRACE]TRACE_DUMP[0x89]_CFDCPROXY_CONSTRUCTL=0x12
+[TRACE]TRACE_DUMP[0x89]_CFDCPROXY_CONSTRUCTL_DUP1=0x13
+[TRACE]TRACE_DUMP[0x89]_CFDCPROXY_CONSTRUCTL_DUP2=0x14
+[TRACE]TRACE_DUMP[0x89]_CFDCPROXY_CONSTRUCTL_DUP3=0x15
+[TRACE]TRACE_DUMP[0x89]_CFDCPROXY_CONSTRUCTL_DUP4=0x16
+[TRACE]TRACE_DUMP[0x89]_CFDCPROXY_CONSTRUCTL_DUP5=0x17
+[TRACE]TRACE_DUMP[0x89]_CFDCPROXY_CONSTRUCTL_DUP6=0x18
+[TRACE]TRACE_DUMP[0x89]_CFDCPROXY_CONSTRUCTL_DUP7=0x19
+[TRACE]TRACE_DUMP[0x89]_CFDCPROXY_CONSTRUCTL_DUP8=0x1a
+[TRACE]TRACE_DUMP[0x89]_CFDCPROXY_LOG=0x1b
+[TRACE]TRACE_DUMP[0x89]_CFDCPROXY_LOG_DUP1=0x1c
+[TRACE]TRACE_DUMP[0x89]_CFDCPROXY_LOG_DUP2=0x1d
+[TRACE]TRACE_DUMP[0x89]_CFDCPROXY_LOG_DUP3=0x1e
+[TRACE]TRACE_DUMP[0x89]_CFDCPROXY_LOG_DUP4=0x1f
+[TRACE]TRACE_DUMP[0x89]_CFDF_DODRIVERLOADINGL_DUP2=0x38
+[TRACE]TRACE_DUMP[0x89]_CFDF_DODRIVERLOADINGL_DUP3=0x39
+[TRACE]TRACE_DUMP[0x89]_CFDF_DODRIVERLOADINGL_DUP4=0x3a
+[TRACE]TRACE_DUMP[0x89]_CFDF_HANDLEDEVICEATTACHMENTL_DUP1=0x20
+[TRACE]TRACE_DUMP[0x89]_CFDF_HANDLEDEVICEATTACHMENTL_DUP10=0x29
+[TRACE]TRACE_DUMP[0x89]_CFDF_HANDLEDEVICEATTACHMENTL_DUP11=0x2a
+[TRACE]TRACE_DUMP[0x89]_CFDF_HANDLEDEVICEATTACHMENTL_DUP12=0x2b
+[TRACE]TRACE_DUMP[0x89]_CFDF_HANDLEDEVICEATTACHMENTL_DUP14=0x2d
+[TRACE]TRACE_DUMP[0x89]_CFDF_HANDLEDEVICEATTACHMENTL_DUP15=0x32
+[TRACE]TRACE_DUMP[0x89]_CFDF_HANDLEDEVICEATTACHMENTL_DUP16=0x2e
+[TRACE]TRACE_DUMP[0x89]_CFDF_HANDLEDEVICEATTACHMENTL_DUP17=0x2f
+[TRACE]TRACE_DUMP[0x89]_CFDF_HANDLEDEVICEATTACHMENTL_DUP18=0x30
+[TRACE]TRACE_DUMP[0x89]_CFDF_HANDLEDEVICEATTACHMENTL_DUP19=0x31
+[TRACE]TRACE_DUMP[0x89]_CFDF_HANDLEDEVICEATTACHMENTL_DUP2=0x21
+[TRACE]TRACE_DUMP[0x89]_CFDF_HANDLEDEVICEATTACHMENTL_DUP20=0x33
+[TRACE]TRACE_DUMP[0x89]_CFDF_HANDLEDEVICEATTACHMENTL_DUP24=0x34
+[TRACE]TRACE_DUMP[0x89]_CFDF_HANDLEDEVICEATTACHMENTL_DUP25=0x35
+[TRACE]TRACE_DUMP[0x89]_CFDF_HANDLEDEVICEATTACHMENTL_DUP27=0x36
+[TRACE]TRACE_DUMP[0x89]_CFDF_HANDLEDEVICEATTACHMENTL_DUP3=0x22
+[TRACE]TRACE_DUMP[0x89]_CFDF_HANDLEDEVICEATTACHMENTL_DUP35=0x37
+[TRACE]TRACE_DUMP[0x89]_CFDF_HANDLEDEVICEATTACHMENTL_DUP4=0x23
+[TRACE]TRACE_DUMP[0x89]_CFDF_HANDLEDEVICEATTACHMENTL_DUP5=0x24
+[TRACE]TRACE_DUMP[0x89]_CFDF_HANDLEDEVICEATTACHMENTL_DUP6=0x25
+[TRACE]TRACE_DUMP[0x89]_CFDF_HANDLEDEVICEATTACHMENTL_DUP7=0x26
+[TRACE]TRACE_DUMP[0x89]_CFDF_HANDLEDEVICEATTACHMENTL_DUP8=0x27
+[TRACE]TRACE_DUMP[0x89]_CFDF_HANDLEDEVICEATTACHMENTL_DUP9=0x28
+[TRACE]TRACE_DUMP[0x89]_CFDF_PARSEL=0x3b
+[TRACE]TRACE_DUMP[0x89]_CFDF_PARSEL_DUP1=0x3c
+[TRACE]TRACE_DUMP[0x89]_CFDF_PARSEL_DUP10=0x45
+[TRACE]TRACE_DUMP[0x89]_CFDF_PARSEL_DUP11=0x46
+[TRACE]TRACE_DUMP[0x89]_CFDF_PARSEL_DUP12=0x47
+[TRACE]TRACE_DUMP[0x89]_CFDF_PARSEL_DUP2=0x3d
+[TRACE]TRACE_DUMP[0x89]_CFDF_PARSEL_DUP3=0x3e
+[TRACE]TRACE_DUMP[0x89]_CFDF_PARSEL_DUP4=0x3f
+[TRACE]TRACE_DUMP[0x89]_CFDF_PARSEL_DUP5=0x40
+[TRACE]TRACE_DUMP[0x89]_CFDF_PARSEL_DUP6=0x41
+[TRACE]TRACE_DUMP[0x89]_CFDF_PARSEL_DUP7=0x42
+[TRACE]TRACE_DUMP[0x89]_CFDF_PARSEL_DUP8=0x43
+[TRACE]TRACE_DUMP[0x89]_CFDF_PARSEL_DUP9=0x44
+[TRACE]TRACE_DUMP[0x89]_DUP1_CEVENTQUEUE_LOG_DUP2=0x11
+[TRACE]TRACE_DUMP[0x89]_TDEVICEEVENT_LOG=0x7
+[TRACE]TRACE_DUMP[0x89]_TDEVICEEVENT_LOG_DUP1=0x8
+[TRACE]TRACE_DUMP[0x89]_TDEVICEEVENT_LOG_DUP2=0x9
+[TRACE]TRACE_DUMP[0x89]_TDEVICEEVENT_LOG_DUP3=0xa
+[TRACE]TRACE_DUMP[0x89]_TDEVICEEVENT_LOG_DUP4=0xb
+[TRACE]TRACE_DUMP[0x89]_TDEVICEEVENT_LOG_DUP5=0xc
+[TRACE]TRACE_DUMP[0x89]_TDEVICEEVENT_LOG_DUP6=0xd
+[TRACE]TRACE_DUMP[0x89]_TDEVICEEVENT_LOG_DUP7=0xe
+[TRACE]TRACE_ERROR[0x82]_CDEVICEPROXY_READSTRINGDESCRIPTORSL_DUP6=0x6
+[TRACE]TRACE_ERROR[0x82]_CDEVICEPROXY_READSTRINGDESCRIPTORSL_DUP7=0x7
+[TRACE]TRACE_ERROR[0x82]_CFDFSESSION_GETSINGLESUPPORTEDLANGUAGEORNUMBEROFSUPPORTEDLANGUAGESL_DUP3=0x1
+[TRACE]TRACE_ERROR[0x82]_CFDFSESSION_GETSINGLESUPPORTEDLANGUAGEORNUMBEROFSUPPORTEDLANGUAGESL_DUP4=0x2
+[TRACE]TRACE_ERROR[0x82]_CFDFSESSION_GETSINGLESUPPORTEDLANGUAGEORNUMBEROFSUPPORTEDLANGUAGESL_DUP5=0x3
+[TRACE]TRACE_ERROR[0x82]_CFDFSESSION_GETSTRINGDESCRIPTORL_DUP2=0x5
+[TRACE]TRACE_ERROR[0x82]_CFDFSESSION_GETSUPPORTEDLANGUAGESL_DUP2=0x4
+[TRACE]TRACE_FATAL[0x81]_CACTIVEWAITFORECOMEVENT_RUNERROR=0x4b
+[TRACE]TRACE_FATAL[0x81]_CDEVICEPROXY_GETATTACHMENTEVENTOBJECT_DUP1=0xd
+[TRACE]TRACE_FATAL[0x81]_CDEVICEPROXY_GETCONFIGURATIONDESCRIPTOR=0x17
+[TRACE]TRACE_FATAL[0x81]_CDEVICEPROXY_GETDETACHMENTEVENTOBJECT=0xf
+[TRACE]TRACE_FATAL[0x81]_CDEVICEPROXY_GETDEVICEDESCRIPTOR_DUP1=0x7
+[TRACE]TRACE_FATAL[0x81]_CDEVICEPROXY_GETDRIVERLOADINGEVENTOBJECT=0xe
+[TRACE]TRACE_FATAL[0x81]_CDEVICEPROXY_GETSTRINGDESCRIPTORFROMUSBDL_DUP2=0xa
+[TRACE]TRACE_FATAL[0x81]_CDEVICEPROXY_GETTOKENFORINTERFACE_DUP1=0x9
+[TRACE]TRACE_FATAL[0x81]_CDEVICEPROXY_READSTRINGDESCRIPTORSL_DUP1=0x1
+[TRACE]TRACE_FATAL[0x81]_CDEVICEPROXY_READSTRINGDESCRIPTORSL_DUP2=0x3
+[TRACE]TRACE_FATAL[0x81]_CDEVICEPROXY_READSTRINGDESCRIPTORSL_DUP3=0x4
+[TRACE]TRACE_FATAL[0x81]_CDEVICEPROXY_READSTRINGDESCRIPTORSL_DUP4=0x5
+[TRACE]TRACE_FATAL[0x81]_CDEVICEPROXY_READSTRINGDESCRIPTORSL_DUP5=0x6
+[TRACE]TRACE_FATAL[0x81]_CDEVICEPROXY_SETDRIVERLOADINGEVENTDATA_DUP1=0xc
+[TRACE]TRACE_FATAL[0x81]_CDEVICEPROXY_SUSPEND_DUP1=0xb
+[TRACE]TRACE_FATAL[0x81]_CEVENTQUEUE_ADDDEVMONEVENT_DUP1=0x4d
+[TRACE]TRACE_FATAL[0x81]_CEVENTQUEUE_ADDDEVMONEVENT_DUP2=0x4e
+[TRACE]TRACE_FATAL[0x81]_CEVENTQUEUE_GETDEVICEEVENT=0x10
+[TRACE]TRACE_FATAL[0x81]_CEVENTQUEUE_GETDEVMONEVENT=0x4c
+[TRACE]TRACE_FATAL[0x81]_CFDCPROXY_CFDCPROXY_DUP2=0x11
+[TRACE]TRACE_FATAL[0x81]_CFDCPROXY_CFDCPROXY_DUP3=0x12
+[TRACE]TRACE_FATAL[0x81]_CFDCPROXY_DEVICEDETACHED_DUP1=0x26
+[TRACE]TRACE_FATAL[0x81]_CFDCPROXY_INVARIANT=0x27
+[TRACE]TRACE_FATAL[0x81]_CFDCPROXY_INVARIANT_DUP1=0x28
+[TRACE]TRACE_FATAL[0x81]_CFDCPROXY_MFPOTOKENFORINTERFACE=0x4f
+[TRACE]TRACE_FATAL[0x81]_CFDCPROXY_NEWFUNCTIONL_DUP10=0x1c
+[TRACE]TRACE_FATAL[0x81]_CFDCPROXY_NEWFUNCTIONL_DUP3=0x18
+[TRACE]TRACE_FATAL[0x81]_CFDCPROXY_NEWFUNCTIONL_DUP6=0x19
+[TRACE]TRACE_FATAL[0x81]_CFDCPROXY_NEWFUNCTIONL_DUP7=0x1a
+[TRACE]TRACE_FATAL[0x81]_CFDCPROXY_NEWFUNCTIONL_DUP9=0x1b
+[TRACE]TRACE_FATAL[0x81]_CFDFSERVER_NEWSESSIONL_DUP4=0x3e
+[TRACE]TRACE_FATAL[0x81]_CFDFSERVER_SESSIONCLOSED=0x3f
+[TRACE]TRACE_FATAL[0x81]_CFDFSESSION_COMPLETEDEVICEEVENTNOTIFICATION=0x43
+[TRACE]TRACE_FATAL[0x81]_CFDFSESSION_COMPLETEDEVICEEVENTNOTIFICATIONL=0x44
+[TRACE]TRACE_FATAL[0x81]_CFDFSESSION_COMPLETEDEVMONEVENTNOTIFICATION=0x47
+[TRACE]TRACE_FATAL[0x81]_CFDFSESSION_COMPLETEDEVMONEVENTNOTIFICATIONL=0x48
+[TRACE]TRACE_FATAL[0x81]_CFDFSESSION_DEVICEEVENT=0x42
+[TRACE]TRACE_FATAL[0x81]_CFDFSESSION_DEVMONEVENT=0x46
+[TRACE]TRACE_FATAL[0x81]_CFDFSESSION_GETSTRINGDESCRIPTORL=0x49
+[TRACE]TRACE_FATAL[0x81]_CFDFSESSION_NOTIFYDEVICEEVENT=0x41
+[TRACE]TRACE_FATAL[0x81]_CFDFSESSION_NOTIFYDEVMONEVENT=0x45
+[TRACE]TRACE_FATAL[0x81]_CFDFSESSION_SERVICEL_DUP1=0x50
+[TRACE]TRACE_FATAL[0x81]_CFDFSESSION_SERVICEL_DUP12=0x40
+[TRACE]TRACE_FATAL[0x81]_CFDFSESSION_SERVICEL_DUP2=0x51
+[TRACE]TRACE_FATAL[0x81]_CFDFSESSION_SERVICEL_DUP3=0x52
+[TRACE]TRACE_FATAL[0x81]_CFDFSESSION_SERVICEL_DUP4=0x53
+[TRACE]TRACE_FATAL[0x81]_CFDFSESSION_SERVICEL_DUP5=0x54
+[TRACE]TRACE_FATAL[0x81]_CFDFSESSION_SERVICEL_DUP6=0x55
+[TRACE]TRACE_FATAL[0x81]_CFDFSESSION_SERVICEL_DUP7=0x56
+[TRACE]TRACE_FATAL[0x81]_CFDFSESSION_SERVICEL_DUP8=0x57
+[TRACE]TRACE_FATAL[0x81]_CFDFSESSION_SERVICEL_DUP9=0x58
+[TRACE]TRACE_FATAL[0x81]_CFDF_CFDF_DUP3=0x29
+[TRACE]TRACE_FATAL[0x81]_CFDF_DODRIVERLOADING=0x24
+[TRACE]TRACE_FATAL[0x81]_CFDF_DODRIVERLOADINGL_DUP5=0x2f
+[TRACE]TRACE_FATAL[0x81]_CFDF_DODRIVERLOADING_DUP1=0x25
+[TRACE]TRACE_FATAL[0x81]_CFDF_FINDDRIVERFORINTERFACEUSINGSPECIFICKEY_DUP7=0x31
+[TRACE]TRACE_FATAL[0x81]_CFDF_FINDDRIVERSFORINTERFACESUSINGSPECIFICKEYL=0x30
+[TRACE]TRACE_FATAL[0x81]_CFDF_FORMATDEVICESEARCHKEY=0x3d
+[TRACE]TRACE_FATAL[0x81]_CFDF_FORMATINTERFACESEARCHKEY=0x3b
+[TRACE]TRACE_FATAL[0x81]_CFDF_GETDEVICEEVENT=0x2a
+[TRACE]TRACE_FATAL[0x81]_CFDF_GETDEVMONEVENT=0x2b
+[TRACE]TRACE_FATAL[0x81]_CFDF_HANDLEDEVICEATTACHMENTL_DUP22=0x1d
+[TRACE]TRACE_FATAL[0x81]_CFDF_HANDLEDEVICEATTACHMENTL_DUP23=0x1e
+[TRACE]TRACE_FATAL[0x81]_CFDF_HANDLEDEVICEATTACHMENTL_DUP26=0x1f
+[TRACE]TRACE_FATAL[0x81]_CFDF_HANDLEDEVICEATTACHMENTL_DUP29=0x20
+[TRACE]TRACE_FATAL[0x81]_CFDF_HANDLEDEVICEATTACHMENTL_DUP30=0x21
+[TRACE]TRACE_FATAL[0x81]_CFDF_HANDLEDEVICEATTACHMENTL_DUP33=0x22
+[TRACE]TRACE_FATAL[0x81]_CFDF_HANDLEDEVICEATTACHMENTL_DUP34=0x23
+[TRACE]TRACE_FATAL[0x81]_CFDF_HANDLEDEVICEATTACHMENT_DUP1=0x2d
+[TRACE]TRACE_FATAL[0x81]_CFDF_HANDLEDEVICEATTACHMENT_DUP2=0x2e
+[TRACE]TRACE_FATAL[0x81]_CFDF_HANDLEDEVICEDETACHMENT_DUP2=0x32
+[TRACE]TRACE_FATAL[0x81]_CFDF_HANDLEDEVICEDETACHMENT_DUP3=0x33
+[TRACE]TRACE_FATAL[0x81]_CFDF_HANDLEDEVMONEVENT_DUP1=0x4a
+[TRACE]TRACE_FATAL[0x81]_CFDF_MBEOBUSEVENT_DUP3=0x2c
+[TRACE]TRACE_FATAL[0x81]_CFDF_TOKENFORINTERFACE_DUP1=0x34
+[TRACE]TRACE_FATAL[0x81]_CFDF_TOKENFORINTERFACE_DUP2=0x35
+[TRACE]TRACE_FATAL[0x81]_CFDF_TOKENFORINTERFACE_DUP3=0x36
+[TRACE]TRACE_FATAL[0x81]_CFDF_TOKENFORINTERFACE_DUP4=0x37
+[TRACE]TRACE_FATAL[0x81]_CFDF_TOKENFORINTERFACE_DUP5=0x38
+[TRACE]TRACE_FATAL[0x81]_CFDF_UNCLAIMEDINTERFACECOUNT=0x3c
+[TRACE]TRACE_FLOW[0x8A]_CACTIVEWAITFORBUSEVENT_CACTIVEWAITFORBUSEVENT_CONS_ENTRY=0x90
+[TRACE]TRACE_FLOW[0x8A]_CACTIVEWAITFORBUSEVENT_CACTIVEWAITFORBUSEVENT_CONS_EXIT=0x91
+[TRACE]TRACE_FLOW[0x8A]_CACTIVEWAITFORBUSEVENT_CACTIVEWAITFORBUSEVENT_DES_ENTRY=0x92
+[TRACE]TRACE_FLOW[0x8A]_CACTIVEWAITFORBUSEVENT_CACTIVEWAITFORBUSEVENT_DES_EXIT=0x93
+[TRACE]TRACE_FLOW[0x8A]_CACTIVEWAITFORBUSEVENT_DOCANCEL_ENTRY=0x9
+[TRACE]TRACE_FLOW[0x8A]_CACTIVEWAITFORBUSEVENT_DOCANCEL_EXIT=0xa
+[TRACE]TRACE_FLOW[0x8A]_CACTIVEWAITFORBUSEVENT_RUNL_ENTRY=0x7
+[TRACE]TRACE_FLOW[0x8A]_CACTIVEWAITFORBUSEVENT_RUNL_EXIT=0x8
+[TRACE]TRACE_FLOW[0x8A]_CACTIVEWAITFORBUSEVENT_WAIT_ENTRY=0x5
+[TRACE]TRACE_FLOW[0x8A]_CACTIVEWAITFORBUSEVENT_WAIT_EXIT=0x6
+[TRACE]TRACE_FLOW[0x8A]_CACTIVEWAITFORECOMEVENT_CACTIVEWAITFORECOMEVENT_CONS_ENTRY=0x94
+[TRACE]TRACE_FLOW[0x8A]_CACTIVEWAITFORECOMEVENT_CACTIVEWAITFORECOMEVENT_CONS_EXIT=0x95
+[TRACE]TRACE_FLOW[0x8A]_CACTIVEWAITFORECOMEVENT_CACTIVEWAITFORECOMEVENT_DES_ENTRY=0x96
+[TRACE]TRACE_FLOW[0x8A]_CACTIVEWAITFORECOMEVENT_CACTIVEWAITFORECOMEVENT_DES_EXIT=0x97
+[TRACE]TRACE_FLOW[0x8A]_CACTIVEWAITFORECOMEVENT_DOCANCEL_ENTRY=0x15
+[TRACE]TRACE_FLOW[0x8A]_CACTIVEWAITFORECOMEVENT_DOCANCEL_EXIT=0x16
+[TRACE]TRACE_FLOW[0x8A]_CACTIVEWAITFORECOMEVENT_RUNERROR_ENTRY=0x17
+[TRACE]TRACE_FLOW[0x8A]_CACTIVEWAITFORECOMEVENT_RUNERROR_EXIT=0x18
+[TRACE]TRACE_FLOW[0x8A]_CACTIVEWAITFORECOMEVENT_RUNL_ENTRY=0x13
+[TRACE]TRACE_FLOW[0x8A]_CACTIVEWAITFORECOMEVENT_RUNL_EXIT=0x14
+[TRACE]TRACE_FLOW[0x8A]_CACTIVEWAITFORECOMEVENT_WAIT_ENTRY=0x11
+[TRACE]TRACE_FLOW[0x8A]_CACTIVEWAITFORECOMEVENT_WAIT_EXIT=0x12
+[TRACE]TRACE_FLOW[0x8A]_CDEVICEPROXY_CDEVICEPROXY_CONS_ENTRY=0x111
+[TRACE]TRACE_FLOW[0x8A]_CDEVICEPROXY_CDEVICEPROXY_DES_ENTRY=0x98
+[TRACE]TRACE_FLOW[0x8A]_CDEVICEPROXY_CDEVICEPROXY_DES_EXIT=0x99
+[TRACE]TRACE_FLOW[0x8A]_CDEVICEPROXY_CONSTRUCTL_ENTRY=0x1c
+[TRACE]TRACE_FLOW[0x8A]_CDEVICEPROXY_CONSTRUCTL_EXIT=0x1d
+[TRACE]TRACE_FLOW[0x8A]_CDEVICEPROXY_GETATTACHMENTEVENTOBJECT_ENTRY=0x41
+[TRACE]TRACE_FLOW[0x8A]_CDEVICEPROXY_GETATTACHMENTEVENTOBJECT_EXIT=0x42
+[TRACE]TRACE_FLOW[0x8A]_CDEVICEPROXY_GETCONFIGURATIONDESCRIPTOR_ENTRY=0x26
+[TRACE]TRACE_FLOW[0x8A]_CDEVICEPROXY_GETCONFIGURATIONDESCRIPTOR_EXIT=0x27
+[TRACE]TRACE_FLOW[0x8A]_CDEVICEPROXY_GETDETACHMENTEVENTOBJECT_ENTRY=0x45
+[TRACE]TRACE_FLOW[0x8A]_CDEVICEPROXY_GETDETACHMENTEVENTOBJECT_EXIT=0x46
+[TRACE]TRACE_FLOW[0x8A]_CDEVICEPROXY_GETDEVICEDESCRIPTOR_ENTRY=0x24
+[TRACE]TRACE_FLOW[0x8A]_CDEVICEPROXY_GETDEVICEDESCRIPTOR_EXIT=0x25
+[TRACE]TRACE_FLOW[0x8A]_CDEVICEPROXY_GETDRIVERLOADINGEVENTOBJECT_ENTRY=0x43
+[TRACE]TRACE_FLOW[0x8A]_CDEVICEPROXY_GETDRIVERLOADINGEVENTOBJECT_EXIT=0x44
+[TRACE]TRACE_FLOW[0x8A]_CDEVICEPROXY_GETMANUFACTURERSTRINGDESCRIPTORL_ENTRY=0x2b
+[TRACE]TRACE_FLOW[0x8A]_CDEVICEPROXY_GETMANUFACTURERSTRINGDESCRIPTORL_EXIT=0x2c
+[TRACE]TRACE_FLOW[0x8A]_CDEVICEPROXY_GETOTGDESCRIPTORL_ENTRY=0x31
+[TRACE]TRACE_FLOW[0x8A]_CDEVICEPROXY_GETOTGDESCRIPTORL_EXIT=0x32
+[TRACE]TRACE_FLOW[0x8A]_CDEVICEPROXY_GETPRODUCTSTRINGDESCRIPTORL_ENTRY=0x2d
+[TRACE]TRACE_FLOW[0x8A]_CDEVICEPROXY_GETPRODUCTSTRINGDESCRIPTORL_EXIT=0x2e
+[TRACE]TRACE_FLOW[0x8A]_CDEVICEPROXY_GETSERIALNUMBERSTRINGDESCRIPTORL_ENTRY=0x2f
+[TRACE]TRACE_FLOW[0x8A]_CDEVICEPROXY_GETSERIALNUMBERSTRINGDESCRIPTORL_EXIT=0x30
+[TRACE]TRACE_FLOW[0x8A]_CDEVICEPROXY_GETSTRINGDESCRIPTORFROMCACHEL_ENTRY=0x3b
+[TRACE]TRACE_FLOW[0x8A]_CDEVICEPROXY_GETSTRINGDESCRIPTORFROMCACHEL_EXIT=0x3c
+[TRACE]TRACE_FLOW[0x8A]_CDEVICEPROXY_GETSTRINGDESCRIPTORFROMUSBDL_ENTRY=0x33
+[TRACE]TRACE_FLOW[0x8A]_CDEVICEPROXY_GETSTRINGDESCRIPTORFROMUSBDL_EXIT=0x34
+[TRACE]TRACE_FLOW[0x8A]_CDEVICEPROXY_GETSUPPORTEDLANGUAGES_ENTRY=0x2a
+[TRACE]TRACE_FLOW[0x8A]_CDEVICEPROXY_GETTOKENFORINTERFACE_ENTRY=0x28
+[TRACE]TRACE_FLOW[0x8A]_CDEVICEPROXY_GETTOKENFORINTERFACE_EXIT=0x29
+[TRACE]TRACE_FLOW[0x8A]_CDEVICEPROXY_LOG_DUP6=0x36
+[TRACE]TRACE_FLOW[0x8A]_CDEVICEPROXY_LOG_DUP7=0x37
+[TRACE]TRACE_FLOW[0x8A]_CDEVICEPROXY_LOG_DUP8=0x38
+[TRACE]TRACE_FLOW[0x8A]_CDEVICEPROXY_LOG_DUP9=0x39
+[TRACE]TRACE_FLOW[0x8A]_CDEVICEPROXY_LOG_ENTRY=0x35
+[TRACE]TRACE_FLOW[0x8A]_CDEVICEPROXY_LOG_EXIT=0x3a
+[TRACE]TRACE_FLOW[0x8A]_CDEVICEPROXY_NEWL_ENTRY=0x19
+[TRACE]TRACE_FLOW[0x8A]_CDEVICEPROXY_NEWL_EXIT=0x1a
+[TRACE]TRACE_FLOW[0x8A]_CDEVICEPROXY_POPULATESTRINGDESCRIPTORSL_ENTRY=0x20
+[TRACE]TRACE_FLOW[0x8A]_CDEVICEPROXY_POPULATESTRINGDESCRIPTORSL_EXIT=0x21
+[TRACE]TRACE_FLOW[0x8A]_CDEVICEPROXY_READSTRINGDESCRIPTORSL_ENTRY=0x1e
+[TRACE]TRACE_FLOW[0x8A]_CDEVICEPROXY_READSTRINGDESCRIPTORSL_EXIT=0x1f
+[TRACE]TRACE_FLOW[0x8A]_CDEVICEPROXY_SETDRIVERLOADINGEVENTDATA_ENTRY=0x3f
+[TRACE]TRACE_FLOW[0x8A]_CDEVICEPROXY_SETDRIVERLOADINGEVENTDATA_EXIT=0x40
+[TRACE]TRACE_FLOW[0x8A]_CDEVICEPROXY_SUSPEND_ENTRY=0x3d
+[TRACE]TRACE_FLOW[0x8A]_CDEVICEPROXY_SUSPEND_EXIT=0x3e
+[TRACE]TRACE_FLOW[0x8A]_CEVENTQUEUE_ADDDEVICEEVENT_ENTRY=0x51
+[TRACE]TRACE_FLOW[0x8A]_CEVENTQUEUE_ADDDEVICEEVENT_EXIT=0x52
+[TRACE]TRACE_FLOW[0x8A]_CEVENTQUEUE_ADDDEVMONEVENT_ENTRY=0x59
+[TRACE]TRACE_FLOW[0x8A]_CEVENTQUEUE_ADDDEVMONEVENT_EXIT=0x5a
+[TRACE]TRACE_FLOW[0x8A]_CEVENTQUEUE_ATTACHMENTFAILURE_ENTRY=0x4e
+[TRACE]TRACE_FLOW[0x8A]_CEVENTQUEUE_ATTACHMENTFAILURE_EXIT=0x50
+[TRACE]TRACE_FLOW[0x8A]_CEVENTQUEUE_CEVENTQUEUE_CONS_ENTRY=0x9c
+[TRACE]TRACE_FLOW[0x8A]_CEVENTQUEUE_CEVENTQUEUE_DES_ENTRY=0x9d
+[TRACE]TRACE_FLOW[0x8A]_CEVENTQUEUE_CEVENTQUEUE_DES_EXIT=0x9e
+[TRACE]TRACE_FLOW[0x8A]_CEVENTQUEUE_GETDEVICEEVENT_ENTRY=0x55
+[TRACE]TRACE_FLOW[0x8A]_CEVENTQUEUE_GETDEVICEEVENT_EXIT=0x56
+[TRACE]TRACE_FLOW[0x8A]_CEVENTQUEUE_GETDEVMONEVENT_ENTRY=0x57
+[TRACE]TRACE_FLOW[0x8A]_CEVENTQUEUE_GETDEVMONEVENT_EXIT=0x58
+[TRACE]TRACE_FLOW[0x8A]_CEVENTQUEUE_LOG_ENTRY=0x5b
+[TRACE]TRACE_FLOW[0x8A]_CEVENTQUEUE_LOG_EXIT=0x5c
+[TRACE]TRACE_FLOW[0x8A]_CEVENTQUEUE_NEWL_ENTRY=0x49
+[TRACE]TRACE_FLOW[0x8A]_CEVENTQUEUE_NEWL_EXIT=0x4a
+[TRACE]TRACE_FLOW[0x8A]_CEVENTQUEUE_POKESESSION_ENTRY=0x53
+[TRACE]TRACE_FLOW[0x8A]_CEVENTQUEUE_POKESESSION_EXIT=0x54
+[TRACE]TRACE_FLOW[0x8A]_CFDCPROXY_CFDCPROXY_CONS_ENTRY=0x9f
+[TRACE]TRACE_FLOW[0x8A]_CFDCPROXY_CFDCPROXY_DES_ENTRY=0xa0
+[TRACE]TRACE_FLOW[0x8A]_CFDCPROXY_CFDCPROXY_DES_EXIT=0xa1
+[TRACE]TRACE_FLOW[0x8A]_CFDCPROXY_CHECKDEVICEIDL_ENTRY=0x72
+[TRACE]TRACE_FLOW[0x8A]_CFDCPROXY_CHECKDEVICEIDL_EXIT=0x73
+[TRACE]TRACE_FLOW[0x8A]_CFDCPROXY_CONSTRUCTL_ENTRY=0x5f
+[TRACE]TRACE_FLOW[0x8A]_CFDCPROXY_CONSTRUCTL_EXIT=0x60
+[TRACE]TRACE_FLOW[0x8A]_CFDCPROXY_DEVICEDETACHED_ENTRY=0x68
+[TRACE]TRACE_FLOW[0x8A]_CFDCPROXY_DEVICEDETACHED_EXIT=0x69
+[TRACE]TRACE_FLOW[0x8A]_CFDCPROXY_MFPOGETMANUFACTURERSTRINGDESCRIPTOR_ENTRY=0x6c
+[TRACE]TRACE_FLOW[0x8A]_CFDCPROXY_MFPOGETMANUFACTURERSTRINGDESCRIPTOR_EXIT=0x6d
+[TRACE]TRACE_FLOW[0x8A]_CFDCPROXY_MFPOGETPRODUCTSTRINGDESCRIPTOR_ENTRY=0x6e
+[TRACE]TRACE_FLOW[0x8A]_CFDCPROXY_MFPOGETPRODUCTSTRINGDESCRIPTOR_EXIT=0x6f
+[TRACE]TRACE_FLOW[0x8A]_CFDCPROXY_MFPOGETSERIALNUMBERSTRINGDESCRIPTOR_ENTRY=0x70
+[TRACE]TRACE_FLOW[0x8A]_CFDCPROXY_MFPOGETSERIALNUMBERSTRINGDESCRIPTOR_EXIT=0x71
+[TRACE]TRACE_FLOW[0x8A]_CFDCPROXY_MFPOGETSUPPORTEDLANGUAGESL_ENTRY=0x6b
+[TRACE]TRACE_FLOW[0x8A]_CFDCPROXY_MFPOTOKENFORINTERFACE_ENTRY=0x6a
+[TRACE]TRACE_FLOW[0x8A]_CFDCPROXY_NEWFUNCTIONL_ENTRY=0x66
+[TRACE]TRACE_FLOW[0x8A]_CFDCPROXY_NEWFUNCTIONL_EXIT=0x67
+[TRACE]TRACE_FLOW[0x8A]_CFDCPROXY_NEWFUNCTION_ENTRY=0x64
+[TRACE]TRACE_FLOW[0x8A]_CFDCPROXY_NEWFUNCTION_EXIT=0x65
+[TRACE]TRACE_FLOW[0x8A]_CFDCPROXY_NEWL_ENTRY=0x5d
+[TRACE]TRACE_FLOW[0x8A]_CFDCPROXY_NEWL_EXIT=0x5e
+[TRACE]TRACE_FLOW[0x8A]_CFDFSERVER_CFDFSERVER_DES_ENTRY=0xc7
+[TRACE]TRACE_FLOW[0x8A]_CFDFSERVER_CFDFSERVER_DES_EXIT=0xc8
+[TRACE]TRACE_FLOW[0x8A]_CFDFSERVER_CONSTRUCTL_ENTRY=0xc9
+[TRACE]TRACE_FLOW[0x8A]_CFDFSERVER_CONSTRUCTL_EXIT=0xca
+[TRACE]TRACE_FLOW[0x8A]_CFDFSERVER_NEWLC_ENTRY=0xc5
+[TRACE]TRACE_FLOW[0x8A]_CFDFSERVER_NEWLC_EXIT=0xc6
+[TRACE]TRACE_FLOW[0x8A]_CFDFSERVER_NEWSESSIONL_ENTRY=0xcb
+[TRACE]TRACE_FLOW[0x8A]_CFDFSERVER_NEWSESSIONL_EXIT=0xcc
+[TRACE]TRACE_FLOW[0x8A]_CFDFSERVER_SESSIONCLOSED_ENTRY=0xcd
+[TRACE]TRACE_FLOW[0x8A]_CFDFSERVER_SESSIONCLOSED_EXIT=0xce
+[TRACE]TRACE_FLOW[0x8A]_CFDFSESSION_CFDFSESSION_CONS_ENTRY=0xcf
+[TRACE]TRACE_FLOW[0x8A]_CFDFSESSION_CFDFSESSION_CONS_EXIT=0xd0
+[TRACE]TRACE_FLOW[0x8A]_CFDFSESSION_CFDFSESSION_DES_ENTRY=0xd1
+[TRACE]TRACE_FLOW[0x8A]_CFDFSESSION_CFDFSESSION_DES_EXIT=0xd2
+[TRACE]TRACE_FLOW[0x8A]_CFDFSESSION_COMPLETEDEVICEEVENTNOTIFICATIONL_ENTRY=0xf1
+[TRACE]TRACE_FLOW[0x8A]_CFDFSESSION_COMPLETEDEVICEEVENTNOTIFICATIONL_EXIT=0xf2
+[TRACE]TRACE_FLOW[0x8A]_CFDFSESSION_COMPLETEDEVICEEVENTNOTIFICATION_ENTRY=0xef
+[TRACE]TRACE_FLOW[0x8A]_CFDFSESSION_COMPLETEDEVICEEVENTNOTIFICATION_EXIT=0xf0
+[TRACE]TRACE_FLOW[0x8A]_CFDFSESSION_COMPLETEDEVMONEVENTNOTIFICATIONL_ENTRY=0xfb
+[TRACE]TRACE_FLOW[0x8A]_CFDFSESSION_COMPLETEDEVMONEVENTNOTIFICATIONL_EXIT=0xfc
+[TRACE]TRACE_FLOW[0x8A]_CFDFSESSION_COMPLETEDEVMONEVENTNOTIFICATION_ENTRY=0xf9
+[TRACE]TRACE_FLOW[0x8A]_CFDFSESSION_COMPLETEDEVMONEVENTNOTIFICATION_EXIT=0xfa
+[TRACE]TRACE_FLOW[0x8A]_CFDFSESSION_DEVICEEVENT_ENTRY=0xdd
+[TRACE]TRACE_FLOW[0x8A]_CFDFSESSION_DEVICEEVENT_EXIT=0xde
+[TRACE]TRACE_FLOW[0x8A]_CFDFSESSION_DEVMONEVENT_ENTRY=0xf7
+[TRACE]TRACE_FLOW[0x8A]_CFDFSESSION_DEVMONEVENT_EXIT=0xf8
+[TRACE]TRACE_FLOW[0x8A]_CFDFSESSION_DISABLEDRIVERLOADING_ENTRY=0xd7
+[TRACE]TRACE_FLOW[0x8A]_CFDFSESSION_DISABLEDRIVERLOADING_EXIT=0xd8
+[TRACE]TRACE_FLOW[0x8A]_CFDFSESSION_ENABLEDRIVERLOADING_ENTRY=0xd5
+[TRACE]TRACE_FLOW[0x8A]_CFDFSESSION_ENABLEDRIVERLOADING_EXIT=0xd6
+[TRACE]TRACE_FLOW[0x8A]_CFDFSESSION_GETMANUFACTURERSTRINGDESCRIPTOR_ENTRY=0x105
+[TRACE]TRACE_FLOW[0x8A]_CFDFSESSION_GETMANUFACTURERSTRINGDESCRIPTOR_EXIT=0x106
+[TRACE]TRACE_FLOW[0x8A]_CFDFSESSION_GETOTGDEVICEDESCRIPTOR_ENTRY=0x10d
+[TRACE]TRACE_FLOW[0x8A]_CFDFSESSION_GETOTGDEVICEDESCRIPTOR_EXIT=0x10e
+[TRACE]TRACE_FLOW[0x8A]_CFDFSESSION_GETPRODUCTSTRINGDESCRIPTOR_ENTRY=0x107
+[TRACE]TRACE_FLOW[0x8A]_CFDFSESSION_GETPRODUCTSTRINGDESCRIPTOR_EXIT=0x108
+[TRACE]TRACE_FLOW[0x8A]_CFDFSESSION_GETSINGLESUPPORTEDLANGUAGEORNUMBEROFSUPPORTEDLANGUAGESL_ENTRY=0xff
+[TRACE]TRACE_FLOW[0x8A]_CFDFSESSION_GETSINGLESUPPORTEDLANGUAGEORNUMBEROFSUPPORTEDLANGUAGESL_EXIT=0x100
+[TRACE]TRACE_FLOW[0x8A]_CFDFSESSION_GETSINGLESUPPORTEDLANGUAGEORNUMBEROFSUPPORTEDLANGUAGES_ENTRY=0xfd
+[TRACE]TRACE_FLOW[0x8A]_CFDFSESSION_GETSINGLESUPPORTEDLANGUAGEORNUMBEROFSUPPORTEDLANGUAGES_EXIT=0xfe
+[TRACE]TRACE_FLOW[0x8A]_CFDFSESSION_GETSTRINGDESCRIPTORL_ENTRY=0x10b
+[TRACE]TRACE_FLOW[0x8A]_CFDFSESSION_GETSTRINGDESCRIPTORL_EXIT=0x10c
+[TRACE]TRACE_FLOW[0x8A]_CFDFSESSION_GETSTRINGDESCRIPTOR_ENTRY=0x109
+[TRACE]TRACE_FLOW[0x8A]_CFDFSESSION_GETSTRINGDESCRIPTOR_EXIT=0x10a
+[TRACE]TRACE_FLOW[0x8A]_CFDFSESSION_GETSUPPORTEDLANGUAGESL_ENTRY=0x103
+[TRACE]TRACE_FLOW[0x8A]_CFDFSESSION_GETSUPPORTEDLANGUAGESL_EXIT=0x104
+[TRACE]TRACE_FLOW[0x8A]_CFDFSESSION_GETSUPPORTEDLANGUAGES_ENTRY=0x101
+[TRACE]TRACE_FLOW[0x8A]_CFDFSESSION_GETSUPPORTEDLANGUAGES_EXIT=0x102
+[TRACE]TRACE_FLOW[0x8A]_CFDFSESSION_NOTIFYDEVICEEVENTCANCEL_ENTRY=0xdb
+[TRACE]TRACE_FLOW[0x8A]_CFDFSESSION_NOTIFYDEVICEEVENTCANCEL_EXIT=0xdc
+[TRACE]TRACE_FLOW[0x8A]_CFDFSESSION_NOTIFYDEVICEEVENT_ENTRY=0xd9
+[TRACE]TRACE_FLOW[0x8A]_CFDFSESSION_NOTIFYDEVICEEVENT_EXIT=0xda
+[TRACE]TRACE_FLOW[0x8A]_CFDFSESSION_NOTIFYDEVMONEVENTCANCEL_ENTRY=0xf5
+[TRACE]TRACE_FLOW[0x8A]_CFDFSESSION_NOTIFYDEVMONEVENTCANCEL_EXIT=0xf6
+[TRACE]TRACE_FLOW[0x8A]_CFDFSESSION_NOTIFYDEVMONEVENT_ENTRY=0xf3
+[TRACE]TRACE_FLOW[0x8A]_CFDFSESSION_NOTIFYDEVMONEVENT_EXIT=0xf4
+[TRACE]TRACE_FLOW[0x8A]_CFDFSESSION_SERVICEL_ENTRY=0xd3
+[TRACE]TRACE_FLOW[0x8A]_CFDFSESSION_SERVICEL_EXIT=0xd4
+[TRACE]TRACE_FLOW[0x8A]_CFDF_CFDF_CONS_ENTRY=0xa2
+[TRACE]TRACE_FLOW[0x8A]_CFDF_CFDF_DES_ENTRY=0xa3
+[TRACE]TRACE_FLOW[0x8A]_CFDF_CFDF_DES_EXIT=0xa4
+[TRACE]TRACE_FLOW[0x8A]_CFDF_CONSTRUCTL_ENTRY=0x79
+[TRACE]TRACE_FLOW[0x8A]_CFDF_CONSTRUCTL_EXIT=0x7a
+[TRACE]TRACE_FLOW[0x8A]_CFDF_CREATEFUNCTIONDRIVERPROXIESL_ENTRY=0x7b
+[TRACE]TRACE_FLOW[0x8A]_CFDF_CREATEFUNCTIONDRIVERPROXIESL_EXIT=0x7c
+[TRACE]TRACE_FLOW[0x8A]_CFDF_DEVICEPROXYL_ENTRY=0xb3
+[TRACE]TRACE_FLOW[0x8A]_CFDF_DEVICEPROXYL_EXIT=0xb4
+[TRACE]TRACE_FLOW[0x8A]_CFDF_DEVICEPROXYL_EXIT_DUP1=0xb5
+[TRACE]TRACE_FLOW[0x8A]_CFDF_DISABLEDRIVERLOADING_ENTRY=0x80
+[TRACE]TRACE_FLOW[0x8A]_CFDF_DODRIVERLOADINGL_ENTRY=0x8e
+[TRACE]TRACE_FLOW[0x8A]_CFDF_DODRIVERLOADINGL_EXIT=0x8f
+[TRACE]TRACE_FLOW[0x8A]_CFDF_DODRIVERLOADING_ENTRY=0x8c
+[TRACE]TRACE_FLOW[0x8A]_CFDF_DODRIVERLOADING_EXIT=0x8d
+[TRACE]TRACE_FLOW[0x8A]_CFDF_ENABLEDRIVERLOADING_ENTRY=0x7f
+[TRACE]TRACE_FLOW[0x8A]_CFDF_FINDDRIVERFORINTERFACEUSINGSPECIFICKEY_ENTRY=0xa9
+[TRACE]TRACE_FLOW[0x8A]_CFDF_FINDDRIVERFORINTERFACEUSINGSPECIFICKEY_EXIT=0xaa
+[TRACE]TRACE_FLOW[0x8A]_CFDF_FINDDRIVERSFORINTERFACESUSINGSPECIFICKEYL_ENTRY=0xa7
+[TRACE]TRACE_FLOW[0x8A]_CFDF_FINDDRIVERSFORINTERFACESUSINGSPECIFICKEYL_EXIT=0xa8
+[TRACE]TRACE_FLOW[0x8A]_CFDF_FORMATDEVICESEARCHKEY_ENTRY=0xbf
+[TRACE]TRACE_FLOW[0x8A]_CFDF_FORMATDEVICESEARCHKEY_EXIT=0xc0
+[TRACE]TRACE_FLOW[0x8A]_CFDF_FORMATINTERFACESEARCHKEY_ENTRY=0xc1
+[TRACE]TRACE_FLOW[0x8A]_CFDF_FORMATINTERFACESEARCHKEY_EXIT=0xc2
+[TRACE]TRACE_FLOW[0x8A]_CFDF_GETDEVICEEVENT_ENTRY=0x82
+[TRACE]TRACE_FLOW[0x8A]_CFDF_GETDEVMONEVENT_ENTRY=0x83
+[TRACE]TRACE_FLOW[0x8A]_CFDF_GETMANUFACTURERSTRINGDESCRIPTORL_ENTRY=0xb7
+[TRACE]TRACE_FLOW[0x8A]_CFDF_GETMANUFACTURERSTRINGDESCRIPTORL_EXIT=0xb8
+[TRACE]TRACE_FLOW[0x8A]_CFDF_GETOTGDEVICEDESCRIPTORL_ENTRY=0xbb
+[TRACE]TRACE_FLOW[0x8A]_CFDF_GETOTGDEVICEDESCRIPTORL_EXIT=0xbc
+[TRACE]TRACE_FLOW[0x8A]_CFDF_GETPRODUCTSTRINGDESCRIPTORL_ENTRY=0xb9
+[TRACE]TRACE_FLOW[0x8A]_CFDF_GETPRODUCTSTRINGDESCRIPTORL_EXIT=0xba
+[TRACE]TRACE_FLOW[0x8A]_CFDF_GETSERIALNUMBERSTRINGDESCRIPTORL_ENTRY=0xbd
+[TRACE]TRACE_FLOW[0x8A]_CFDF_GETSERIALNUMBERSTRINGDESCRIPTORL_EXIT=0xbe
+[TRACE]TRACE_FLOW[0x8A]_CFDF_GETSUPPORTEDLANGUAGESL_ENTRY=0xb6
+[TRACE]TRACE_FLOW[0x8A]_CFDF_HANDLEDEVICEATTACHMENTL_ENTRY=0x8a
+[TRACE]TRACE_FLOW[0x8A]_CFDF_HANDLEDEVICEATTACHMENTL_EXIT=0x8b
+[TRACE]TRACE_FLOW[0x8A]_CFDF_HANDLEDEVICEATTACHMENT_ENTRY=0x88
+[TRACE]TRACE_FLOW[0x8A]_CFDF_HANDLEDEVICEATTACHMENT_EXIT=0x89
+[TRACE]TRACE_FLOW[0x8A]_CFDF_HANDLEDEVICEDETACHMENT_ENTRY=0xab
+[TRACE]TRACE_FLOW[0x8A]_CFDF_HANDLEDEVICEDETACHMENT_EXIT=0xac
+[TRACE]TRACE_FLOW[0x8A]_CFDF_HANDLEDEVMONEVENT_ENTRY=0xad
+[TRACE]TRACE_FLOW[0x8A]_CFDF_HANDLEDEVMONEVENT_EXIT=0xae
+[TRACE]TRACE_FLOW[0x8A]_CFDF_HANDLEECOMEVENTRECEIVEDL_ENTRY=0x84
+[TRACE]TRACE_FLOW[0x8A]_CFDF_HANDLEECOMEVENTRECEIVEDL_EXIT=0x85
+[TRACE]TRACE_FLOW[0x8A]_CFDF_MBEOBUSEVENT_ENTRY=0x86
+[TRACE]TRACE_FLOW[0x8A]_CFDF_MBEOBUSEVENT_EXIT=0x87
+[TRACE]TRACE_FLOW[0x8A]_CFDF_NEWL_ENTRY=0x76
+[TRACE]TRACE_FLOW[0x8A]_CFDF_NEWL_EXIT=0x77
+[TRACE]TRACE_FLOW[0x8A]_CFDF_PARSEL_ENTRY=0xa5
+[TRACE]TRACE_FLOW[0x8A]_CFDF_PARSEL_EXIT=0xa6
+[TRACE]TRACE_FLOW[0x8A]_CFDF_SETSESSION_ENTRY=0x81
+[TRACE]TRACE_FLOW[0x8A]_CFDF_TELLFDCSOFDEVICEDETACHMENT_ENTRY=0xaf
+[TRACE]TRACE_FLOW[0x8A]_CFDF_TELLFDCSOFDEVICEDETACHMENT_EXIT=0xb0
+[TRACE]TRACE_FLOW[0x8A]_CFDF_TINTERFACEINFO_NEWL_ENTRY=0x74
+[TRACE]TRACE_FLOW[0x8A]_CFDF_TINTERFACEINFO_NEWL_EXIT=0x75
+[TRACE]TRACE_FLOW[0x8A]_CFDF_TOKENFORINTERFACE_ENTRY=0xb1
+[TRACE]TRACE_FLOW[0x8A]_CFDF_TOKENFORINTERFACE_EXIT=0xb2
+[TRACE]TRACE_FLOW[0x8A]_CFDF_UNCLAIMEDINTERFACECOUNT_ENTRY=0xc3
+[TRACE]TRACE_FLOW[0x8A]_CFDF_UNCLAIMEDINTERFACECOUNT_EXIT=0xc4
+[TRACE]TRACE_FLOW[0x8A]_FDF_UTILS_REMOVE_ENTRY=0x10f
+[TRACE]TRACE_FLOW[0x8A]_FDF_UTILS_REMOVE_EXIT=0x110
+[TRACE]TRACE_FLOW[0x8A]_TDEVICEEVENT_TDEVICEEVENT_CONS_ENTRY=0x9a
+[TRACE]TRACE_FLOW[0x8A]_TDEVICEEVENT_TDEVICEEVENT_DES_ENTRY=0x9b
+[TRACE]TRACE_NORMAL[0x86]_CACTIVEWAITFORBUSEVENT_RUNL=0x1
+[TRACE]TRACE_NORMAL[0x86]_CDEVICEPROXY_CONSTRUCTL=0x6d
+[TRACE]TRACE_NORMAL[0x86]_CDEVICEPROXY_GETATTACHMENTEVENTOBJECT=0x11
+[TRACE]TRACE_NORMAL[0x86]_CDEVICEPROXY_GETCONFIGURATIONDESCRIPTOR_DUP1=0x2a
+[TRACE]TRACE_NORMAL[0x86]_CDEVICEPROXY_GETDETACHMENTEVENTOBJECT_DUP1=0x14
+[TRACE]TRACE_NORMAL[0x86]_CDEVICEPROXY_GETDEVICEDESCRIPTOR=0x4
+[TRACE]TRACE_NORMAL[0x86]_CDEVICEPROXY_GETDRIVERLOADINGEVENTOBJECT_DUP1=0x13
+[TRACE]TRACE_NORMAL[0x86]_CDEVICEPROXY_GETOTGDESCRIPTORL=0x7
+[TRACE]TRACE_NORMAL[0x86]_CDEVICEPROXY_GETSTRINGDESCRIPTORFROMCACHEL=0x9
+[TRACE]TRACE_NORMAL[0x86]_CDEVICEPROXY_GETSTRINGDESCRIPTORFROMCACHEL_DUP1=0xd
+[TRACE]TRACE_NORMAL[0x86]_CDEVICEPROXY_GETSTRINGDESCRIPTORFROMCACHEL_DUP2=0xe
+[TRACE]TRACE_NORMAL[0x86]_CDEVICEPROXY_GETSTRINGDESCRIPTORFROMUSBDL=0x8
+[TRACE]TRACE_NORMAL[0x86]_CDEVICEPROXY_GETSTRINGDESCRIPTORFROMUSBDL_DUP1=0xc
+[TRACE]TRACE_NORMAL[0x86]_CDEVICEPROXY_GETSTRINGDESCRIPTORFROMUSBDL_DUP3=0x12
+[TRACE]TRACE_NORMAL[0x86]_CDEVICEPROXY_GETSTRINGDESCRIPTORFROMUSBDL_DUP4=0x60
+[TRACE]TRACE_NORMAL[0x86]_CDEVICEPROXY_GETTOKENFORINTERFACE=0x6
+[TRACE]TRACE_NORMAL[0x86]_CDEVICEPROXY_POPULATESTRINGDESCRIPTORSL=0xb
+[TRACE]TRACE_NORMAL[0x86]_CDEVICEPROXY_POPULATESTRINGDESCRIPTORSL_DUP1=0x6c
+[TRACE]TRACE_NORMAL[0x86]_CDEVICEPROXY_READSTRINGDESCRIPTORSL=0x3
+[TRACE]TRACE_NORMAL[0x86]_CDEVICEPROXY_SETDRIVERLOADINGEVENTDATA=0x10
+[TRACE]TRACE_NORMAL[0x86]_CDEVICEPROXY_SUSPEND=0xf
+[TRACE]TRACE_NORMAL[0x86]_CEVENTQUEUE_ADDDEVICEEVENT=0x16
+[TRACE]TRACE_NORMAL[0x86]_CEVENTQUEUE_ADDDEVMONEVENT=0x1c
+[TRACE]TRACE_NORMAL[0x86]_CEVENTQUEUE_ATTACHMENTFAILURE=0x15
+[TRACE]TRACE_NORMAL[0x86]_CEVENTQUEUE_ATTACHMENTFAILURE_DUP1=0xab
+[TRACE]TRACE_NORMAL[0x86]_CEVENTQUEUE_GETDEVICEEVENT_DUP1=0x17
+[TRACE]TRACE_NORMAL[0x86]_CEVENTQUEUE_GETDEVICEEVENT_DUP2=0x18
+[TRACE]TRACE_NORMAL[0x86]_CEVENTQUEUE_GETDEVICEEVENT_DUP3=0x19
+[TRACE]TRACE_NORMAL[0x86]_CEVENTQUEUE_GETDEVMONEVENT_DUP1=0x1b
+[TRACE]TRACE_NORMAL[0x86]_CFDCPROXY_CHECKDEVICEIDL=0x3b
+[TRACE]TRACE_NORMAL[0x86]_CFDCPROXY_CHECKDEVICEIDL_DUP1=0x3c
+[TRACE]TRACE_NORMAL[0x86]_CFDCPROXY_DEVICEDETACHED=0x2f
+[TRACE]TRACE_NORMAL[0x86]_CFDCPROXY_DEVICEDETACHED_DUP2=0x31
+[TRACE]TRACE_NORMAL[0x86]_CFDCPROXY_DEVICEDETACHED_DUP3=0x32
+[TRACE]TRACE_NORMAL[0x86]_CFDCPROXY_MFPOGETMANUFACTURERSTRINGDESCRIPTOR=0x36
+[TRACE]TRACE_NORMAL[0x86]_CFDCPROXY_MFPOGETMANUFACTURERSTRINGDESCRIPTOR_DUP1=0x37
+[TRACE]TRACE_NORMAL[0x86]_CFDCPROXY_MFPOGETPRODUCTSTRINGDESCRIPTOR=0x38
+[TRACE]TRACE_NORMAL[0x86]_CFDCPROXY_MFPOGETPRODUCTSTRINGDESCRIPTOR_DUP1=0x39
+[TRACE]TRACE_NORMAL[0x86]_CFDCPROXY_MFPOGETSERIALNUMBERSTRINGDESCRIPTOR=0x3a
+[TRACE]TRACE_NORMAL[0x86]_CFDCPROXY_MFPOGETSERIALNUMBERSTRINGDESCRIPTOR_DUP1=0x3d
+[TRACE]TRACE_NORMAL[0x86]_CFDCPROXY_NEWFUNCTION=0x20
+[TRACE]TRACE_NORMAL[0x86]_CFDCPROXY_NEWFUNCTIONL=0x2e
+[TRACE]TRACE_NORMAL[0x86]_CFDCPROXY_NEWFUNCTIONL_DUP11=0x61
+[TRACE]TRACE_NORMAL[0x86]_CFDCPROXY_NEWFUNCTIONL_DUP2=0x2c
+[TRACE]TRACE_NORMAL[0x86]_CFDCPROXY_NEWFUNCTIONL_DUP4=0x2d
+[TRACE]TRACE_NORMAL[0x86]_CFDCPROXY_NEWFUNCTIONL_DUP5=0x25
+[TRACE]TRACE_NORMAL[0x86]_CFDCPROXY_NEWFUNCTIONL_DUP8=0x26
+[TRACE]TRACE_NORMAL[0x86]_CFDCPROXY_NEWFUNCTIONL_DUT1=0x2b
+[TRACE]TRACE_NORMAL[0x86]_CFDCPROXY_NEWFUNCTION_DUP1=0x21
+[TRACE]TRACE_NORMAL[0x86]_CFDFSERVER_NEWSESSIONL=0x8c
+[TRACE]TRACE_NORMAL[0x86]_CFDFSERVER_NEWSESSIONL_DUP1=0x8d
+[TRACE]TRACE_NORMAL[0x86]_CFDFSERVER_NEWSESSIONL_DUP2=0x8e
+[TRACE]TRACE_NORMAL[0x86]_CFDFSERVER_NEWSESSIONL_DUP3=0x8f
+[TRACE]TRACE_NORMAL[0x86]_CFDFSERVER_NEWSESSIONL_DUP5=0x90
+[TRACE]TRACE_NORMAL[0x86]_CFDFSERVER_SESSIONCLOSED_DUP1=0x91
+[TRACE]TRACE_NORMAL[0x86]_CFDFSESSION_COMPLETECLIENT=0x9e
+[TRACE]TRACE_NORMAL[0x86]_CFDFSESSION_GETSINGLESUPPORTEDLANGUAGEORNUMBEROFSUPPORTEDLANGUAGESL=0xa3
+[TRACE]TRACE_NORMAL[0x86]_CFDFSESSION_GETSINGLESUPPORTEDLANGUAGEORNUMBEROFSUPPORTEDLANGUAGESL_DUP1=0xa4
+[TRACE]TRACE_NORMAL[0x86]_CFDFSESSION_GETSINGLESUPPORTEDLANGUAGEORNUMBEROFSUPPORTEDLANGUAGESL_DUP2=0xa5
+[TRACE]TRACE_NORMAL[0x86]_CFDFSESSION_GETSTRINGDESCRIPTORL_DUP1=0xa8
+[TRACE]TRACE_NORMAL[0x86]_CFDFSESSION_GETSUPPORTEDLANGUAGESL=0xa6
+[TRACE]TRACE_NORMAL[0x86]_CFDFSESSION_GETSUPPORTEDLANGUAGESL_DUP1=0xa7
+[TRACE]TRACE_NORMAL[0x86]_CFDFSESSION_NOTIFYDEVICEEVENTOUTSTANDING=0x9f
+[TRACE]TRACE_NORMAL[0x86]_CFDFSESSION_NOTIFYDEVMONEVENTOUTSTANDING=0xa2
+[TRACE]TRACE_NORMAL[0x86]_CFDFSESSION_SERVICEL=0x92
+[TRACE]TRACE_NORMAL[0x86]_CFDFSESSION_SERVICEL_DUP10=0x9c
+[TRACE]TRACE_NORMAL[0x86]_CFDFSESSION_SERVICEL_DUP11=0x9d
+[TRACE]TRACE_NORMAL[0x86]_CFDF_APPENDINTERFACENUMBERTOARRAYL=0x84
+[TRACE]TRACE_NORMAL[0x86]_CFDF_CFDF=0x44
+[TRACE]TRACE_NORMAL[0x86]_CFDF_CFDF_DUP1=0x45
+[TRACE]TRACE_NORMAL[0x86]_CFDF_CFDF_DUP2=0x46
+[TRACE]TRACE_NORMAL[0x86]_CFDF_CONSTRUCTL=0x3e
+[TRACE]TRACE_NORMAL[0x86]_CFDF_CONSTRUCTL_DUP1=0x3f
+[TRACE]TRACE_NORMAL[0x86]_CFDF_CONSTRUCTL_DUP2=0x40
+[TRACE]TRACE_NORMAL[0x86]_CFDF_CREATEFUNCTIONDRIVERPROXIESL=0x41
+[TRACE]TRACE_NORMAL[0x86]_CFDF_CREATEFUNCTIONDRIVERPROXIESL_DUP1=0x42
+[TRACE]TRACE_NORMAL[0x86]_CFDF_CREATEFUNCTIONDRIVERPROXIESL_DUP2=0x79
+[TRACE]TRACE_NORMAL[0x86]_CFDF_DEVICEPROXYL=0x7a
+[TRACE]TRACE_NORMAL[0x86]_CFDF_DEVICEPROXYL_DUP1=0x7b
+[TRACE]TRACE_NORMAL[0x86]_CFDF_DEVICEPROXYL_DUP2=0x7c
+[TRACE]TRACE_NORMAL[0x86]_CFDF_DODRIVERLOADINGL=0x62
+[TRACE]TRACE_NORMAL[0x86]_CFDF_DODRIVERLOADINGL_DUP1=0x63
+[TRACE]TRACE_NORMAL[0x86]_CFDF_DODRIVERLOADINGL_DUP6=0x64
+[TRACE]TRACE_NORMAL[0x86]_CFDF_FINDDRIVERFORINTERFACEUSINGSPECIFICKEY=0x66
+[TRACE]TRACE_NORMAL[0x86]_CFDF_FINDDRIVERFORINTERFACEUSINGSPECIFICKEY_DUP1=0x67
+[TRACE]TRACE_NORMAL[0x86]_CFDF_FINDDRIVERFORINTERFACEUSINGSPECIFICKEY_DUP2=0x68
+[TRACE]TRACE_NORMAL[0x86]_CFDF_FINDDRIVERFORINTERFACEUSINGSPECIFICKEY_DUP3=0x69
+[TRACE]TRACE_NORMAL[0x86]_CFDF_FINDDRIVERFORINTERFACEUSINGSPECIFICKEY_DUP4=0x6a
+[TRACE]TRACE_NORMAL[0x86]_CFDF_FINDDRIVERFORINTERFACEUSINGSPECIFICKEY_DUP5=0x6b
+[TRACE]TRACE_NORMAL[0x86]_CFDF_FINDDRIVERFORINTERFACEUSINGSPECIFICKEY_DUP6=0x6e
+[TRACE]TRACE_NORMAL[0x86]_CFDF_FINDDRIVERFORINTERFACEUSINGSPECIFICKEY_DUP8=0x6f
+[TRACE]TRACE_NORMAL[0x86]_CFDF_FINDDRIVERSFORINTERFACESUSINGSPECIFICKEYL_DUP1=0x65
+[TRACE]TRACE_NORMAL[0x86]_CFDF_FORMATDEVICESEARCHKEY_DUP1=0x88
+[TRACE]TRACE_NORMAL[0x86]_CFDF_FORMATINTERFACESEARCHKEY_DUP1=0x8b
+[TRACE]TRACE_NORMAL[0x86]_CFDF_GETMANUFACTURERSTRINGDESCRIPTORL=0x7e
+[TRACE]TRACE_NORMAL[0x86]_CFDF_GETMANUFACTURERSTRINGDESCRIPTORL_DUP1=0x7f
+[TRACE]TRACE_NORMAL[0x86]_CFDF_GETPRODUCTSTRINGDESCRIPTORL=0x80
+[TRACE]TRACE_NORMAL[0x86]_CFDF_GETPRODUCTSTRINGDESCRIPTORL_DUP1=0x81
+[TRACE]TRACE_NORMAL[0x86]_CFDF_GETSERIALNUMBERSTRINGDESCRIPTORL=0x82
+[TRACE]TRACE_NORMAL[0x86]_CFDF_GETSERIALNUMBERSTRINGDESCRIPTORL_DUP1=0x83
+[TRACE]TRACE_NORMAL[0x86]_CFDF_GETSUPPORTEDLANGUAGESL=0x7d
+[TRACE]TRACE_NORMAL[0x86]_CFDF_HANDLEDEVICEATTACHMENT=0x57
+[TRACE]TRACE_NORMAL[0x86]_CFDF_HANDLEDEVICEATTACHMENTL=0x5a
+[TRACE]TRACE_NORMAL[0x86]_CFDF_HANDLEDEVICEATTACHMENTL_DUP13=0x5b
+[TRACE]TRACE_NORMAL[0x86]_CFDF_HANDLEDEVICEATTACHMENTL_DUP21=0x5c
+[TRACE]TRACE_NORMAL[0x86]_CFDF_HANDLEDEVICEATTACHMENTL_DUP28=0x5d
+[TRACE]TRACE_NORMAL[0x86]_CFDF_HANDLEDEVICEATTACHMENTL_DUP31=0x5e
+[TRACE]TRACE_NORMAL[0x86]_CFDF_HANDLEDEVICEATTACHMENTL_DUP32=0x5f
+[TRACE]TRACE_NORMAL[0x86]_CFDF_HANDLEDEVICEDETACHMENT=0x70
+[TRACE]TRACE_NORMAL[0x86]_CFDF_HANDLEDEVICEDETACHMENT_DUP1=0x71
+[TRACE]TRACE_NORMAL[0x86]_CFDF_HANDLEDEVICEDETACHMENT_DUP4=0x72
+[TRACE]TRACE_NORMAL[0x86]_CFDF_HANDLEDEVICEDETACHMENT_DUP5=0x73
+[TRACE]TRACE_NORMAL[0x86]_CFDF_HANDLEDEVICEDETACHMENT_DUP6=0x74
+[TRACE]TRACE_NORMAL[0x86]_CFDF_HANDLEDEVMONEVENT=0x75
+[TRACE]TRACE_NORMAL[0x86]_CFDF_HANDLEECOMEVENTRECEIVEDL=0x4b
+[TRACE]TRACE_NORMAL[0x86]_CFDF_HANDLEECOMEVENTRECEIVEDL_DUP1=0x4c
+[TRACE]TRACE_NORMAL[0x86]_CFDF_HANDLEECOMEVENTRECEIVEDL_DUP2=0x4d
+[TRACE]TRACE_NORMAL[0x86]_CFDF_HANDLEECOMEVENTRECEIVEDL_DUP3=0x4e
+[TRACE]TRACE_NORMAL[0x86]_CFDF_HANDLEECOMEVENTRECEIVEDL_DUP4=0x4f
+[TRACE]TRACE_NORMAL[0x86]_CFDF_HANDLEECOMEVENTRECEIVEDL_DUP5=0x50
+[TRACE]TRACE_NORMAL[0x86]_CFDF_HANDLEECOMEVENTRECEIVEDL_DUP6=0x51
+[TRACE]TRACE_NORMAL[0x86]_CFDF_MBEOBUSEVENT=0x52
+[TRACE]TRACE_NORMAL[0x86]_CFDF_MBEOBUSEVENT_DUP1=0x53
+[TRACE]TRACE_NORMAL[0x86]_CFDF_MBEOBUSEVENT_DUP2=0x54
+[TRACE]TRACE_NORMAL[0x86]_CFDF_MBEOBUSEVENT_DUP4=0x56
+[TRACE]TRACE_NORMAL[0x86]_CFDF_SEARCHFORADEVICEFUNCTIONDRIVERL=0x85
+[TRACE]TRACE_NORMAL[0x86]_CFDF_SEARCHFORADEVICEFUNCTIONDRIVERL_DUP1=0xac
+[TRACE]TRACE_NORMAL[0x86]_CFDF_SEARCHFORADEVICEFUNCTIONDRIVERL_DUP2=0xad
+[TRACE]TRACE_NORMAL[0x86]_CFDF_SETSESSION=0x48
+[TRACE]TRACE_NORMAL[0x86]_CFDF_TELLFDCSOFDEVICEDETACHMENT=0x77
+[TRACE]TRACE_NORMAL[0x86]_CFDF_TOKENFORINTERFACE=0x78
+[TRACE]TRACE_NORMAL[0x86]_CFDF_TOKENFORINTERFACE_DUP6=0xaa
+[TRACE]TRACE_NORMAL[0x86]_CFDF_UNCLAIMEDINTERFACECOUNT_DUP1=0x89
+[TRACE]TRACE_NORMAL[0x86]_CFDF_UNCLAIMEDINTERFACECOUNT_DUP2=0x8a
+[TRACE]TRACE_NORMAL[0x86]_FDF_SERVER_SRC_E32MAIN=0xa0
+[TRACE]TRACE_NORMAL[0x86]_FDF_SERVER_SRC_E32MAIN_DUP1=0xa1
+[TRACE]TRACE_NORMAL[0x86]_FDF_UTILS_REMOVE=0xa9
+[[OBSOLETE]][GROUP]a=0xdf
+[[OBSOLETE]][TRACE]TRACE_DUMP[0x89]_CFDF_HANDLEDEVICEATTACHMENTL_DUP13=0x2c
+[[OBSOLETE]][TRACE]TRACE_FATAL[0x81]_CDEVICEPROXY_GETCONFIGURATIONDESCRIPTOR_DUP1=0x8
+[[OBSOLETE]][TRACE]TRACE_FATAL[0x81]_CDEVICEPROXY_NEWL=0x2
+[[OBSOLETE]][TRACE]TRACE_FATAL[0x81]_CFDCPROXY_NEWFUNCTIONL_DUP3=0x13
+[[OBSOLETE]][TRACE]TRACE_FATAL[0x81]_CFDCPROXY_NEWFUNCTIONL_DUP4=0x16
+[[OBSOLETE]][TRACE]TRACE_FATAL[0x81]_CFDCPROXY_NEWFUNCTIONL_DUP6=0x14
+[[OBSOLETE]][TRACE]TRACE_FATAL[0x81]_CFDCPROXY_NEWFUNCTIONL_DUP7=0x15
+[[OBSOLETE]][TRACE]TRACE_FATAL[0x81]_CFDF_FORMATDEVICESEARCHKEY=0x3a
+[[OBSOLETE]][TRACE]TRACE_FATAL[0x81]_CFDF_TOKENFORINTERFACE_DUP6=0x39
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CACTIVEWAITFORBUSEVENT_CACTIVEWAITFORBUSEVENT_ENTRY=0x1
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CACTIVEWAITFORBUSEVENT_CACTIVEWAITFORBUSEVENT_ENTRY_DUP1=0xb
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CACTIVEWAITFORBUSEVENT_CACTIVEWAITFORBUSEVENT_EXIT=0x2
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CACTIVEWAITFORBUSEVENT_CACTIVEWAITFORBUSEVENT_EXIT_DUP1=0xc
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CACTIVEWAITFORECOMEVENT_CACTIVEWAITFORECOMEVENT_ENTRY=0xd
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CACTIVEWAITFORECOMEVENT_CACTIVEWAITFORECOMEVENT_ENTRY_DUP1=0xf
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CACTIVEWAITFORECOMEVENT_CACTIVEWAITFORECOMEVENT_EXIT=0xe
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CACTIVEWAITFORECOMEVENT_CACTIVEWAITFORECOMEVENT_EXIT_DUP1=0x10
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDEVICEPROXY_CDEVICEPROXY_ENTRY=0x1b
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDEVICEPROXY_CDEVICEPROXY_ENTRY_DUP1=0x22
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDEVICEPROXY_CDEVICEPROXY_ENTRY_DUP1_EXIT=0x23
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CEVENTQUEUE_ATTACHMENTFAILURE_DUP1=0x4f
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CEVENTQUEUE_CEVENTQUEUE_ENTRY=0x4b
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CEVENTQUEUE_CEVENTQUEUE_EXIT=0x4d
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CFDCPROXY_CFDCPROXY_DUP1_EXIT=0x63
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CFDCPROXY_CFDCPROXY_ENTRY=0x61
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CFDCPROXY_CFDCPROXY_ENTRY_DUP1=0x62
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CFDFSESSION_COMPLETEDEVICEEVENTNOTIFICATION=0xdf
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CFDFSESSION_COMPLETEDEVICEEVENTNOTIFICATIONL=0xe0
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CFDFSESSION_COMPLETEDEVMONEVENTNOTIFICATION=0xe4
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CFDFSESSION_COMPLETEDEVMONEVENTNOTIFICATIONL=0xe5
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CFDFSESSION_DEVMONEVENT=0xe3
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CFDFSESSION_GETMANUFACTURERSTRINGDESCRIPTOR=0xea
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CFDFSESSION_GETOTGDEVICEDESCRIPTOR=0xee
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CFDFSESSION_GETPRODUCTSTRINGDESCRIPTOR=0xeb
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CFDFSESSION_GETSINGLESUPPORTEDLANGUAGEORNUMBEROFSUPPORTEDLANGUAGES=0xe6
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CFDFSESSION_GETSINGLESUPPORTEDLANGUAGEORNUMBEROFSUPPORTEDLANGUAGESL=0xe7
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CFDFSESSION_GETSTRINGDESCRIPTOR=0xec
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CFDFSESSION_GETSTRINGDESCRIPTORL=0xed
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CFDFSESSION_GETSUPPORTEDLANGUAGES=0xe8
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CFDFSESSION_GETSUPPORTEDLANGUAGESL=0xe9
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CFDFSESSION_NOTIFYDEVMONEVENT=0xe1
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CFDFSESSION_NOTIFYDEVMONEVENTCANCEL=0xe2
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CFDF_CFDF_ENTRY=0x78
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CFDF_CFDF_ENTRY_DUP1=0x7d
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CFDF_CFDF_ENTRY_DUP1_EXIT=0x7e
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_CACTIVEWAITFORBUSEVENT_CACTIVEWAITFORBUSEVENT_ENTRY=0x3
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_CACTIVEWAITFORBUSEVENT_CACTIVEWAITFORBUSEVENT_EXIT=0x4
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_CEVENTQUEUE_CEVENTQUEUE_ENTRY=0x4c
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_TDEVICEEVENT_TDEVICEEVENT_ENTRY=0x47
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_TDEVICEEVENT_TDEVICEEVENT_ENTRY_DUP1=0x48
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CACTIVEWAITFORECOMEVENT_RUNERROR=0x2
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CDEVICEPROXY_GETCONFIGURATIONDESCRIPTOR=0x5
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CDEVICEPROXY_GETSTRINGDESCRIPTORFROMUSBDL_DUP2=0xa
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CEVENTQUEUE_ADDDEVMONEVENT_DUP1=0x1f
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CEVENTQUEUE_ADDDEVMONEVENT_DUP2=0x1e
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CEVENTQUEUE_GETDEVMONEVENT=0x1a
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CFDCPROXY_DEVICEDETACHED_DUP1=0x30
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CFDCPROXY_INVARIANT=0x33
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CFDCPROXY_INVARIANT_DUP1=0x34
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CFDCPROXY_MFPOTOKENFORINTERFACE=0x35
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CFDCPROXY_NEWFUNCTIONL_DUP2=0x23
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CFDCPROXY_NEWFUNCTIONL_DUP3=0x28
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CFDCPROXY_NEWFUNCTIONL_DUP4=0x24
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CFDCPROXY_NEWFUNCTIONL_DUP6=0x29
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CFDCPROXY_NEWFUNCTIONL_DUT1=0x22
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CFDCPROXY_NEWFUNCTIONL_DUT2=0x27
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CFDFSESSION_SERVICEL_DUP1=0x93
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CFDFSESSION_SERVICEL_DUP2=0x94
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CFDFSESSION_SERVICEL_DUP3=0x95
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CFDFSESSION_SERVICEL_DUP4=0x96
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CFDFSESSION_SERVICEL_DUP5=0x97
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CFDFSESSION_SERVICEL_DUP6=0x98
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CFDFSESSION_SERVICEL_DUP7=0x99
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CFDFSESSION_SERVICEL_DUP8=0x9a
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CFDFSESSION_SERVICEL_DUP9=0x9b
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CFDF_CFDF_DUP3=0x47
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CFDF_CREATEFUNCTIONDRIVERPROXIESL_DUP2=0x43
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CFDF_GETDEVICEEVENT=0x49
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CFDF_GETDEVMONEVENT=0x4a
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CFDF_HANDLEDEVICEATTACHMENT_DUP1=0x58
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CFDF_HANDLEDEVICEATTACHMENT_DUP2=0x59
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CFDF_HANDLEDEVMONEVENT_DUP1=0x76
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CFDF_MBEOBUSEVENT_DUP3=0x55
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP1_CFDF_SEARCHFORADEVICEFUNCTIONDRIVERL_DUP1=0x86
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP1_CFDF_SEARCHFORADEVICEFUNCTIONDRIVERL_DUP2=0x87
+[[OBSOLETE]][TRACE]a[0xDE]_b=0x1
+[[OBSOLETE]][TRACE]a[0xDF]_b=0x1
--- a/usbmgmt/usbmgr/host/fdf/reference/reffdc/group/reffdc.mmp Wed Jul 07 14:16:40 2010 +0800
+++ b/usbmgmt/usbmgr/host/fdf/reference/reffdc/group/reffdc.mmp 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"
@@ -35,9 +35,10 @@
RESOURCE reffdc.rss
-SYSTEMINCLUDE \epoc32\include
+OS_LAYER_SYSTEMINCLUDE_SYMBIAN
USERINCLUDE ..\inc
+USERINCLUDE ..\traces
LIBRARY euser.lib
LIBRARY fdcbase.lib
@@ -45,4 +46,4 @@
NOEXPORTLIBRARY
#include <usbhost/internal/fdfcaps.mmh>
-#include <usb/usblogger.mmh>
+
--- a/usbmgmt/usbmgr/host/fdf/reference/reffdc/src/reffdc.cpp Wed Jul 07 14:16:40 2010 +0800
+++ b/usbmgmt/usbmgr/host/fdf/reference/reffdc/src/reffdc.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"
@@ -23,27 +23,29 @@
#include "reffdc.h"
#include <usb/usblogger.h>
#include <usbhost/internal/fdcpluginobserver.h>
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "reffdcTraces.h"
+#endif
-#ifdef __FLOG_ACTIVE
-_LIT8(KLogComponent, "reffdc ");
-#endif
+
CRefFdc* CRefFdc::NewL(MFdcPluginObserver& aObserver)
{
- LOG_LINE
- LOG_STATIC_FUNC_ENTRY
-
+ OstTraceFunctionEntry0( CREFFDC_NEWL_ENTRY );
+
CRefFdc* self = new(ELeave) CRefFdc(aObserver);
CleanupStack::PushL(self);
self->ConstructL();
CleanupStack::Pop(self);
+ OstTraceFunctionExit0( CREFFDC_NEWL_EXIT );
return self;
}
CRefFdc::~CRefFdc()
{
- LOG_LINE
- LOG_FUNC
+ OstTraceFunctionEntry0( CREFFDC_CREFFDC_DES_ENTRY );
+ OstTraceFunctionExit0( CREFFDC_CREFFDC_DES_EXIT );
}
CRefFdc::CRefFdc(MFdcPluginObserver& aObserver)
@@ -53,7 +55,10 @@
void CRefFdc::ConstructL()
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CREFFDC_CONSTRUCTL_ENTRY );
+
+
+ OstTraceFunctionExit0( CREFFDC_CONSTRUCTL_EXIT );
}
TInt CRefFdc::Mfi1NewFunction(TUint aDeviceId,
@@ -61,16 +66,20 @@
const TUsbDeviceDescriptor& aDeviceDescriptor,
const TUsbConfigurationDescriptor& aConfigurationDescriptor)
{
- LOG_LINE
- LOG_FUNC
- LOGTEXT2(_L8("\t***** Ref FD offered chance to claim one function from device with ID %d"), aDeviceId);
+ OstTraceFunctionEntry0( CREFFDC_MFI1NEWFUNCTION_ENTRY );
+ OstTrace1( TRACE_NORMAL, CREFFDC_MFI1NEWFUNCTION,
+ "***** Ref FD offered chance to claim one function from device with ID %d",
+ aDeviceId );
+
(void)aDeviceId;
TRAPD(err, NewFunctionL(aDeviceId, aInterfaces, aDeviceDescriptor, aConfigurationDescriptor));
// If any error is returned, RUsbInterface (etc) handles opened from this
// call must be closed.
- LOGTEXT2(_L8("\terr = %d"), err);
+ OstTrace1( TRACE_NORMAL, CREFFDC_MFI1NEWFUNCTION_DUP1,
+ "err = %d", err );
+ OstTraceFunctionExit0( CREFFDC_MFI1NEWFUNCTION_EXIT );
return err;
}
@@ -79,9 +88,8 @@
const TUsbDeviceDescriptor& /*aDeviceDescriptor*/,
const TUsbConfigurationDescriptor& /*aConfigurationDescriptor*/)
{
- LOG_LINE
- LOG_FUNC
-
+ OstTraceFunctionEntry0( CREFFDC_NEWFUNCTIONL_ENTRY );
+
// We are obliged to claim the first interface because it has
// interface class/subclass(/protocol) settings matching our default_data
// field.
@@ -101,58 +109,70 @@
// subsystem-specific purposes.
const RArray<TUint>& langIds = Observer().GetSupportedLanguagesL(aDeviceId);
const TUint langCount = langIds.Count();
- LOGTEXT2(_L8("\tdevice supports %d language(s):"), langCount);
+ OstTrace1( TRACE_NORMAL, CREFFDC_NEWFUNCTIONL,
+ "device supports %d language(s):", langCount );
+
for ( TUint ii = 0 ; ii < langCount ; ++ii )
{
- LOGTEXT2(_L8("\t\tlang code: 0x%04x"), langIds[ii]);
- TName string;
+ OstTrace1( TRACE_NORMAL, CREFFDC_NEWFUNCTIONL_DUP1,
+ "lang code: 0x%04x", langIds[ii] );
+
+ TName string;
TInt err = Observer().GetManufacturerStringDescriptor(aDeviceId, langIds[ii], string);
if ( !err )
{
- LOGTEXT2(_L("\t\t\tmanufacturer string descriptor = \"%S\""), &string);
- err = Observer().GetProductStringDescriptor(aDeviceId, langIds[ii], string);
+ OstTraceExt1( TRACE_NORMAL, CREFFDC_NEWFUNCTIONL_DUP2,
+ "manufacturer string descriptor = \"%S\"", string );
+ err = Observer().GetProductStringDescriptor(aDeviceId, langIds[ii], string);
if ( !err )
{
- LOGTEXT2(_L("\t\t\tproduct string descriptor = \"%S\""), &string);
+ OstTraceExt1( TRACE_NORMAL, CREFFDC_NEWFUNCTIONL_DUP3,
+ "product string descriptor = \"%S\"", string );
err = Observer().GetSerialNumberStringDescriptor(aDeviceId, langIds[ii], string);
if ( !err )
{
- LOGTEXT2(_L("\t\t\tserial number string descriptor = \"%S\""), &string);
+ OstTraceExt1( TRACE_NORMAL, CREFFDC_NEWFUNCTIONL_DUP4,
+ "serial number string descriptor = \"%S\"", string );
}
else
{
- LOGTEXT2(_L("\t\t\tGetSerialNumberStringDescriptor returned %d"), err);
+ OstTrace1( TRACE_NORMAL, CREFFDC_NEWFUNCTIONL_DUP5,
+ "GetSerialNumberStringDescriptor returned %d", err );
}
}
else
{
- LOGTEXT2(_L("\t\t\tGetProductStringDescriptor returned %d"), err);
- }
+ OstTrace1( TRACE_NORMAL, CREFFDC_NEWFUNCTIONL_DUP6,
+ "GetProductStringDescriptor returned %d", err );
+ }
}
else
{
- LOGTEXT2(_L("\t\t\tGetManufacturerStringDescriptor returned %d"), err);
+ OstTrace1( TRACE_NORMAL, CREFFDC_NEWFUNCTIONL_DUP7,
+ "GetManufacturerStringDescriptor returned %d", err );
}
}
+ OstTraceFunctionExit0( CREFFDC_NEWFUNCTIONL_EXIT );
}
void CRefFdc::Mfi1DeviceDetached(TUint aDeviceId)
{
- LOG_LINE
- LOG_FUNC
- LOGTEXT2(_L8("\t***** Ref FD notified of detachment of device with ID %d"), aDeviceId);
+ OstTraceFunctionEntry0( CREFFDC_MFI1DEVICEDETACHED_ENTRY );
+ OstTrace1( TRACE_NORMAL, CREFFDC_MFI1DEVICEDETACHED,
+ "***** Ref FD notified of detachment of device with ID %d", aDeviceId );
(void)aDeviceId;
// Any RUsbInterface (etc) handles opened as a result of any calls to
// MfiNewFunction with this device ID should be closed.
+ OstTraceFunctionExit0( CREFFDC_MFI1DEVICEDETACHED_EXIT );
}
TAny* CRefFdc::GetInterface(TUid aUid)
{
- LOG_LINE
- LOG_FUNC;
- LOGTEXT2(_L8("\taUid = 0x%08x"), aUid);
-
+ OstTraceFunctionEntry0( CREFFDC_GETINTERFACE_ENTRY );
+ OstTrace1( TRACE_NORMAL, CREFFDC_GETINTERFACE,
+ "aUid = 0x%08x", aUid.iUid );
+
TAny* ret = NULL;
if ( aUid == TUid::Uid(KFdcInterfaceV1) )
{
@@ -161,6 +181,9 @@
);
}
- LOGTEXT2(_L8("\tret = [0x%08x]"), ret);
+ OstTrace1( TRACE_NORMAL, CREFFDC_GETINTERFACE_DUP1,
+ "ret = [0x%08x]", ret );
+
+ OstTraceFunctionExit0( CREFFDC_GETINTERFACE_EXIT );
return ret;
}
--- a/usbmgmt/usbmgr/host/fdf/reference/reffdc/src/reffdcmain.cpp Wed Jul 07 14:16:40 2010 +0800
+++ b/usbmgmt/usbmgr/host/fdf/reference/reffdc/src/reffdcmain.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"
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usbmgmt/usbmgr/host/fdf/reference/reffdc/traces/OstTraceDefinitions.h Wed Jul 07 15:08:54 2010 +0800
@@ -0,0 +1,7 @@
+#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
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usbmgmt/usbmgr/host/fdf/reference/reffdc/traces/fixed_id.definitions Wed Jul 07 15:08:54 2010 +0800
@@ -0,0 +1,32 @@
+#Fixed group and trace id definitions. If this file is removed, the identifiers are rebuilt.
+[GROUP]TRACE_FLOW=0x8a
+[GROUP]TRACE_NORMAL=0x86
+[TRACE]TRACE_FLOW[0x8A]_CREFFDC_CONSTRUCTL_ENTRY=0x5
+[TRACE]TRACE_FLOW[0x8A]_CREFFDC_CONSTRUCTL_EXIT=0x6
+[TRACE]TRACE_FLOW[0x8A]_CREFFDC_CREFFDC_DES_ENTRY=0xf
+[TRACE]TRACE_FLOW[0x8A]_CREFFDC_CREFFDC_DES_EXIT=0x10
+[TRACE]TRACE_FLOW[0x8A]_CREFFDC_GETINTERFACE_ENTRY=0xd
+[TRACE]TRACE_FLOW[0x8A]_CREFFDC_GETINTERFACE_EXIT=0xe
+[TRACE]TRACE_FLOW[0x8A]_CREFFDC_MFI1DEVICEDETACHED_ENTRY=0xb
+[TRACE]TRACE_FLOW[0x8A]_CREFFDC_MFI1DEVICEDETACHED_EXIT=0xc
+[TRACE]TRACE_FLOW[0x8A]_CREFFDC_MFI1NEWFUNCTION_ENTRY=0x7
+[TRACE]TRACE_FLOW[0x8A]_CREFFDC_MFI1NEWFUNCTION_EXIT=0x8
+[TRACE]TRACE_FLOW[0x8A]_CREFFDC_NEWFUNCTIONL_ENTRY=0x9
+[TRACE]TRACE_FLOW[0x8A]_CREFFDC_NEWFUNCTIONL_EXIT=0xa
+[TRACE]TRACE_FLOW[0x8A]_CREFFDC_NEWL_ENTRY=0x1
+[TRACE]TRACE_FLOW[0x8A]_CREFFDC_NEWL_EXIT=0x2
+[TRACE]TRACE_NORMAL[0x86]_CREFFDC_GETINTERFACE=0xc
+[TRACE]TRACE_NORMAL[0x86]_CREFFDC_GETINTERFACE_DUP1=0xd
+[TRACE]TRACE_NORMAL[0x86]_CREFFDC_MFI1DEVICEDETACHED=0xb
+[TRACE]TRACE_NORMAL[0x86]_CREFFDC_MFI1NEWFUNCTION=0x1
+[TRACE]TRACE_NORMAL[0x86]_CREFFDC_MFI1NEWFUNCTION_DUP1=0x2
+[TRACE]TRACE_NORMAL[0x86]_CREFFDC_NEWFUNCTIONL=0x3
+[TRACE]TRACE_NORMAL[0x86]_CREFFDC_NEWFUNCTIONL_DUP1=0x4
+[TRACE]TRACE_NORMAL[0x86]_CREFFDC_NEWFUNCTIONL_DUP2=0x5
+[TRACE]TRACE_NORMAL[0x86]_CREFFDC_NEWFUNCTIONL_DUP3=0x6
+[TRACE]TRACE_NORMAL[0x86]_CREFFDC_NEWFUNCTIONL_DUP4=0x7
+[TRACE]TRACE_NORMAL[0x86]_CREFFDC_NEWFUNCTIONL_DUP5=0x8
+[TRACE]TRACE_NORMAL[0x86]_CREFFDC_NEWFUNCTIONL_DUP6=0x9
+[TRACE]TRACE_NORMAL[0x86]_CREFFDC_NEWFUNCTIONL_DUP7=0xa
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CREFFDC_CREFFDC_CONS_ENTRY=0x3
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CREFFDC_CREFFDC_EXIT=0x4
--- a/usbmgmt/usbmgr/host/functiondrivers/ms/msfdc/group/msfdc.mmp Wed Jul 07 14:16:40 2010 +0800
+++ b/usbmgmt/usbmgr/host/functiondrivers/ms/msfdc/group/msfdc.mmp Wed Jul 07 15:08:54 2010 +0800
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2008-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"
@@ -39,6 +39,8 @@
USERINCLUDE ../inc
USERINCLUDE ../../msmm/client/public
USERINCLUDE ../../msmm/server/public
+USERINCLUDE ../traces
+
LIBRARY euser.lib
@@ -47,4 +49,3 @@
NOEXPORTLIBRARY
#include <usbhost/internal/fdfcaps.mmh>
-#include <usb/usblogger.mmh>
--- a/usbmgmt/usbmgr/host/functiondrivers/ms/msfdc/src/msfdc.cpp Wed Jul 07 14:16:40 2010 +0800
+++ b/usbmgmt/usbmgr/host/functiondrivers/ms/msfdc/src/msfdc.cpp Wed Jul 07 15:08:54 2010 +0800
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2008-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"
@@ -26,10 +26,12 @@
#include <usbhost/internal/fdcpluginobserver.h>
#include <d32usbdi.h>
#include <d32usbdescriptors.h>
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "msfdcTraces.h"
+#endif
-#ifdef __FLOG_ACTIVE
-_LIT8(KLogComponent, "MsFdc");
-#endif
+
/**
NewL function of CMsFdc, allocate the memory that needed for instantiating this object.
@@ -39,12 +41,13 @@
*/
CMsFdc* CMsFdc::NewL(MFdcPluginObserver& aObserver)
{
- LOG_STATIC_FUNC_ENTRY
-
+ OstTraceFunctionEntry0( CMSFDC_NEWL_ENTRY );
+
CMsFdc* self = new(ELeave) CMsFdc(aObserver);
CleanupStack::PushL(self);
self->ConstructL();
CleanupStack::Pop(self);
+ OstTraceFunctionExit0( CMSFDC_NEWL_EXIT );
return self;
}
@@ -53,13 +56,11 @@
*/
CMsFdc::~CMsFdc()
{
- LOG_FUNC
-
+ OstTraceFunctionEntry0( CMSFDC_CMSFDC_DES_ENTRY );
iMsmmSession.Disconnect();
- LOGTEXT(_L("Disconnected to MSMM OK"));
-#ifdef __FLOG_ACTIVE
- CUsbLog::Close();
-#endif
+ OstTrace0( TRACE_NORMAL, CMSFDC_CMSFDC, "Disconnected to MSMM OK" );
+
+ OstTraceFunctionExit0( CMSFDC_CMSFDC_DES_EXIT );
}
/**
Constructor of CMsFdc.
@@ -73,23 +74,22 @@
*/
void CMsFdc::ConstructL()
{
-
-#ifdef __FLOG_ACTIVE
- CUsbLog::Connect();
-#endif
- LOG_FUNC
+ OstTraceFunctionEntry0( CMSFDC_CONSTRUCTL_ENTRY );
//Set up the connection with mount manager
TInt error = iMsmmSession.Connect();
if ( error )
{
- LOGTEXT2(_L("Failed to connect to MSMM %d"),error);
- User::Leave(error);
+ OstTrace1( TRACE_NORMAL, CMSFDC_CONSTRUCTL,
+ "Failed to connect to MSMM %d",error );
+ User::Leave(error);
}
else
{
- LOGTEXT(_L("Connected to MSMM OK"));
- }
+ OstTrace0( TRACE_NORMAL, CMSFDC_CONSTRUCTL_DUP1,
+ "Connected to MSMM OK" );
+ }
+ OstTraceFunctionExit0( CMSFDC_CONSTRUCTL_EXIT );
}
/**
Get called when FDF is trying to load the driver for Mass Storage Device.
@@ -106,17 +106,23 @@
const TUsbDeviceDescriptor& aDeviceDescriptor,
const TUsbConfigurationDescriptor& aConfigurationDescriptor)
{
- LOG_FUNC // this is the evidence that the message got through.
- LOGTEXT2(_L8("\t***** Mass Storage FD notified of device (ID %d) attachment!"), aDeviceId);
-
+ OstTraceFunctionEntry0( CMSFDC_MFI1NEWFUNCTION_ENTRY );
+
+ // this is the evidence that the message got through.
+ OstTrace1( TRACE_NORMAL, CMSFDC_MFI1NEWFUNCTION,
+ "***** Mass Storage FD notified of device (ID %d) attachment!", aDeviceId );
// Mass Storage FDC only claims one interface.
- LOGTEXT2(_L8("\t***** Mass Storage FD interface to request token is %d"), aInterfaces[0]);
+ OstTrace1( TRACE_NORMAL, CMSFDC_MFI1NEWFUNCTION_DUP1,
+ "***** Mass Storage FD interface to request token is %d", aInterfaces[0] );
TUint32 token = Observer().TokenForInterface(aInterfaces[0]);
- LOGTEXT2(_L8("\t***** Mass Storage FD tokenInterface %d"), token);
+ OstTrace1( TRACE_NORMAL, CMSFDC_MFI1NEWFUNCTION_DUP2,
+ "***** Mass Storage FD tokenInterface %d", token );
if (token == 0)
{
- LOGTEXT(_L8("\t***** Mass Storage FDC device containing this function is removed."));
+ OstTrace0( TRACE_ERROR, CMSFDC_MFI1NEWFUNCTION_DUP3,
+ "***** Mass Storage FDC device containing this function is removed." );
+ OstTraceFunctionExit0( CMSFDC_MFI1NEWFUNCTION_EXIT );
return KErrGeneral;
}
@@ -126,7 +132,9 @@
if (error)
{
- LOGTEXT(_L8("\t***** Mass Storage FDC getting language array failed"));
+ OstTrace0( TRACE_ERROR, CMSFDC_MFI1NEWFUNCTION_DUP4,
+ "***** Mass Storage FDC getting language array failed" );
+ OstTraceFunctionExit0( CMSFDC_MFI1NEWFUNCTION_EXIT_DUP1 );
return error;
}
@@ -134,7 +142,9 @@
TRAP(error, data = new (ELeave) TUSBMSDeviceDescription);
if (error)
{
- LOGTEXT(_L8("\t***** Mass Storage FDC Memory allocation Failed"));
+ OstTrace0( TRACE_ERROR, CMSFDC_MFI1NEWFUNCTION_DUP5,
+ "***** Mass Storage FDC Memory allocation Failed" );
+ OstTraceFunctionExit0( CMSFDC_MFI1NEWFUNCTION_EXIT_DUP2 );
return error;
}
@@ -144,27 +154,33 @@
if (error)
{
- LOGTEXT(_L8("\t***** Mass Storage FDC getting Serial Number failed"));
+ OstTrace0( TRACE_ERROR, CMSFDC_MFI1NEWFUNCTION_DUP6,
+ "***** Mass Storage FDC getting Serial Number Failed" );
delete data;
+ OstTraceFunctionExit0( CMSFDC_MFI1NEWFUNCTION_EXIT_DUP3 );
return error;
}
else
{
- LOGTEXT2(_L("\t***** Mass Storage FDC Serial String is %S"), &data->iSerialNumber);
- }
+ OstTraceExt1( TRACE_ERROR, CMSFDC_MFI1NEWFUNCTION_DUP7,
+ "***** Mass Storage FDC Serial String is %S", data->iSerialNumber );
+ }
//Get Product string descriptor
error = Observer().GetProductStringDescriptor(aDeviceId, defaultlangid, data->iProductString);
if (error)
{
- LOGTEXT(_L8("\t***** Mass Storage FDC getting Product string failed"));
- delete data;
+ OstTrace0( TRACE_ERROR, CMSFDC_MFI1NEWFUNCTION_DUP8,
+ "***** Mass Storage FDC getting Product string Failed" );
+ delete data;
+ OstTraceFunctionExit0( CMSFDC_MFI1NEWFUNCTION_EXIT_DUP4 );
return error;
}
else
{
- LOGTEXT2(_L("\t***** Mass Storage FDC Product String is %S"), &data->iProductString);
+ OstTraceExt1( TRACE_NORMAL, CMSFDC_MFI1NEWFUNCTION_DUP9,
+ "***** Mass Storage FDC Product String is %S", data->iProductString );
}
//Get Manufacturer string descriptor
@@ -173,14 +189,16 @@
if (error)
{
- LOGTEXT(_L8("\t***** Mass Storage FDC getting Manufacturer string failed"));
+ OstTrace0( TRACE_ERROR, CMSFDC_MFI1NEWFUNCTION_DUP10,
+ "***** Mass Storage FDC getting Manufacturer string Failed" );
delete data;
+ OstTraceFunctionExit0( CMSFDC_MFI1NEWFUNCTION_EXIT_DUP5 );
return error;
}
else
{
- LOGTEXT2(_L("\t***** Mass Storage FDC Manufacturer String is %S"),
- &data->iManufacturerString);
+ OstTraceExt1( TRACE_NORMAL, CMSFDC_MFI1NEWFUNCTION_DUP11,
+ "***** Mass Storage FDC Manufacturer String is %S", data->iManufacturerString );
}
/************************Remote Wakeup Attribute acquiring***********************/
@@ -192,26 +210,32 @@
error = interface_ep0.Open(token);
if (error)
{
- LOGTEXT(_L8("\t***** Mass Storage FDC Open interface handle failed"));
- delete data;
+ OstTrace0( TRACE_ERROR, CMSFDC_MFI1NEWFUNCTION_DUP12,
+ "***** Mass Storage FDC Open interface handle Failed" );
+ delete data;
+ OstTraceFunctionExit0( CMSFDC_MFI1NEWFUNCTION_EXIT_DUP6 );
return error;
}
else
{
- LOGTEXT(_L8("\t***** Mass Storage FDC Open interface handle OK"));
+ OstTrace0( TRACE_NORMAL, CMSFDC_MFI1NEWFUNCTION_DUP13,
+ "***** Mass Storage FDC Open interface handle OK" );
}
error = interface_ep0.GetInterfaceDescriptor(ifDescriptor);
if (error)
{
- LOGTEXT(_L8("\t***** Mass Storage FDC get interface descriptor failed"));
- interface_ep0.Close();
+ OstTrace0( TRACE_ERROR, CMSFDC_MFI1NEWFUNCTION_DUP14,
+ "***** Mass Storage FDC get interface descriptor Failed" );
+ interface_ep0.Close();
delete data;
+ OstTraceFunctionExit0( CMSFDC_MFI1NEWFUNCTION_EXIT_DUP7 );
return error;
}
else
{
- LOGTEXT(_L8("\t***** Mass Storage FDC get interface descriptor OK"));
+ OstTrace0( TRACE_NORMAL, CMSFDC_MFI1NEWFUNCTION_DUP15,
+ "***** Mass Storage FDC get interface descriptor OK" );
}
/*********************************************************************************/
@@ -239,6 +263,7 @@
interface_ep0.Close();
delete data;
+ OstTraceFunctionExit0( CMSFDC_MFI1NEWFUNCTION_EXIT_DUP8 );
return error;
}
/**
@@ -248,10 +273,13 @@
*/
void CMsFdc::Mfi1DeviceDetached(TUint aDeviceId)
{
- LOG_FUNC // this is the evidence that the message got through.
- LOGTEXT2(_L8("\t***** Mass Storage FD notified of device (ID %d) detachment!"), aDeviceId);
+ OstTraceFunctionEntry0( CMSFDC_MFI1DEVICEDETACHED_ENTRY );
+ // this is the evidence that the message got through.
+ OstTrace1( TRACE_NORMAL, CMSFDC_MFI1DEVICEDETACHED,
+ "***** Mass Storage FD notified of device (ID %d) detachment!", aDeviceId );
iMsmmSession.RemoveDevice(aDeviceId);
+ OstTraceFunctionExit0( CMSFDC_MFI1DEVICEDETACHED_EXIT );
}
/**
@@ -262,10 +290,9 @@
*/
TAny* CMsFdc::GetInterface(TUid aUid)
{
- LOG_LINE
- LOG_FUNC;
- LOGTEXT2(_L8("\taUid = 0x%08x"), aUid);
-
+ OstTraceFunctionEntry0( CMSFDC_GETINTERFACE_ENTRY );
+ OstTrace1( TRACE_NORMAL, CMSFDC_GETINTERFACE, "aUid = 0x%08x", aUid.iUid );
+
TAny* ret = NULL;
if ( aUid == TUid::Uid(KFdcInterfaceV1) )
{
@@ -273,8 +300,9 @@
static_cast<MFdcInterfaceV1*>(this)
);
}
-
- LOGTEXT2(_L8("\tret = [0x%08x]"), ret);
+ OstTrace1( TRACE_NORMAL, CMSFDC_GETINTERFACE_DUP1,
+ "ret = [0x%08x]", ret );
+ OstTraceFunctionExit0( CMSFDC_GETINTERFACE_EXIT );
return ret;
}
/**
--- a/usbmgmt/usbmgr/host/functiondrivers/ms/msfdc/src/msfdcmain.cpp Wed Jul 07 14:16:40 2010 +0800
+++ b/usbmgmt/usbmgr/host/functiondrivers/ms/msfdc/src/msfdcmain.cpp Wed Jul 07 15:08:54 2010 +0800
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2008-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"
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usbmgmt/usbmgr/host/functiondrivers/ms/msfdc/traces/OstTraceDefinitions.h Wed Jul 07 15:08:54 2010 +0800
@@ -0,0 +1,7 @@
+#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
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usbmgmt/usbmgr/host/functiondrivers/ms/msfdc/traces/fixed_id.definitions Wed Jul 07 15:08:54 2010 +0800
@@ -0,0 +1,54 @@
+#Fixed group and trace id definitions. If this file is removed, the identifiers are rebuilt.
+[GROUP]TRACE_ERROR=0x82
+[GROUP]TRACE_FLOW=0x8a
+[GROUP]TRACE_NORMAL=0x86
+[TRACE]TRACE_ERROR[0x82]_CMSFDC_MFI1NEWFUNCTION_DUP10=0x7
+[TRACE]TRACE_ERROR[0x82]_CMSFDC_MFI1NEWFUNCTION_DUP12=0x8
+[TRACE]TRACE_ERROR[0x82]_CMSFDC_MFI1NEWFUNCTION_DUP14=0x9
+[TRACE]TRACE_ERROR[0x82]_CMSFDC_MFI1NEWFUNCTION_DUP3=0x1
+[TRACE]TRACE_ERROR[0x82]_CMSFDC_MFI1NEWFUNCTION_DUP4=0x2
+[TRACE]TRACE_ERROR[0x82]_CMSFDC_MFI1NEWFUNCTION_DUP5=0x3
+[TRACE]TRACE_ERROR[0x82]_CMSFDC_MFI1NEWFUNCTION_DUP6=0x4
+[TRACE]TRACE_ERROR[0x82]_CMSFDC_MFI1NEWFUNCTION_DUP7=0x5
+[TRACE]TRACE_ERROR[0x82]_CMSFDC_MFI1NEWFUNCTION_DUP8=0x6
+[TRACE]TRACE_FLOW[0x8A]_CMSFDC_CMSFDC_DES_ENTRY=0x3
+[TRACE]TRACE_FLOW[0x8A]_CMSFDC_CMSFDC_DES_EXIT=0x4
+[TRACE]TRACE_FLOW[0x8A]_CMSFDC_CONSTRUCTL_ENTRY=0x5
+[TRACE]TRACE_FLOW[0x8A]_CMSFDC_CONSTRUCTL_EXIT=0x6
+[TRACE]TRACE_FLOW[0x8A]_CMSFDC_GETINTERFACE_ENTRY=0x1b
+[TRACE]TRACE_FLOW[0x8A]_CMSFDC_GETINTERFACE_EXIT=0x1c
+[TRACE]TRACE_FLOW[0x8A]_CMSFDC_MFI1DEVICEDETACHED_ENTRY=0x19
+[TRACE]TRACE_FLOW[0x8A]_CMSFDC_MFI1DEVICEDETACHED_EXIT=0x1a
+[TRACE]TRACE_FLOW[0x8A]_CMSFDC_MFI1NEWFUNCTION_ENTRY=0x7
+[TRACE]TRACE_FLOW[0x8A]_CMSFDC_MFI1NEWFUNCTION_EXIT=0x8
+[TRACE]TRACE_FLOW[0x8A]_CMSFDC_MFI1NEWFUNCTION_EXIT_DUP1=0x11
+[TRACE]TRACE_FLOW[0x8A]_CMSFDC_MFI1NEWFUNCTION_EXIT_DUP2=0x12
+[TRACE]TRACE_FLOW[0x8A]_CMSFDC_MFI1NEWFUNCTION_EXIT_DUP3=0x13
+[TRACE]TRACE_FLOW[0x8A]_CMSFDC_MFI1NEWFUNCTION_EXIT_DUP4=0x14
+[TRACE]TRACE_FLOW[0x8A]_CMSFDC_MFI1NEWFUNCTION_EXIT_DUP5=0x15
+[TRACE]TRACE_FLOW[0x8A]_CMSFDC_MFI1NEWFUNCTION_EXIT_DUP6=0x16
+[TRACE]TRACE_FLOW[0x8A]_CMSFDC_MFI1NEWFUNCTION_EXIT_DUP7=0x17
+[TRACE]TRACE_FLOW[0x8A]_CMSFDC_MFI1NEWFUNCTION_EXIT_DUP8=0x18
+[TRACE]TRACE_FLOW[0x8A]_CMSFDC_NEWL_ENTRY=0x1
+[TRACE]TRACE_FLOW[0x8A]_CMSFDC_NEWL_EXIT=0x2
+[TRACE]TRACE_NORMAL[0x86]_CMSFDC_CMSFDC=0x1
+[TRACE]TRACE_NORMAL[0x86]_CMSFDC_CONSTRUCTL=0x2
+[TRACE]TRACE_NORMAL[0x86]_CMSFDC_CONSTRUCTL_DUP1=0x3
+[TRACE]TRACE_NORMAL[0x86]_CMSFDC_GETINTERFACE=0xc
+[TRACE]TRACE_NORMAL[0x86]_CMSFDC_GETINTERFACE_DUP1=0xd
+[TRACE]TRACE_NORMAL[0x86]_CMSFDC_MFI1DEVICEDETACHED=0xb
+[TRACE]TRACE_NORMAL[0x86]_CMSFDC_MFI1NEWFUNCTION=0x4
+[TRACE]TRACE_NORMAL[0x86]_CMSFDC_MFI1NEWFUNCTION_DUP1=0x5
+[TRACE]TRACE_NORMAL[0x86]_CMSFDC_MFI1NEWFUNCTION_DUP11=0x8
+[TRACE]TRACE_NORMAL[0x86]_CMSFDC_MFI1NEWFUNCTION_DUP13=0x9
+[TRACE]TRACE_NORMAL[0x86]_CMSFDC_MFI1NEWFUNCTION_DUP15=0xa
+[TRACE]TRACE_NORMAL[0x86]_CMSFDC_MFI1NEWFUNCTION_DUP2=0x6
+[TRACE]TRACE_NORMAL[0x86]_CMSFDC_MFI1NEWFUNCTION_DUP9=0x7
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_CMSFDC_MFI1NEWFUNCTION_EXIT=0x9
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP2_CMSFDC_MFI1NEWFUNCTION_EXIT=0xa
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP3_CMSFDC_MFI1NEWFUNCTION_EXIT=0xb
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP4_CMSFDC_MFI1NEWFUNCTION_EXIT=0xc
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP5_CMSFDC_MFI1NEWFUNCTION_EXIT=0xd
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP6_CMSFDC_MFI1NEWFUNCTION_EXIT=0xe
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP7_CMSFDC_MFI1NEWFUNCTION_EXIT=0xf
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP8_CMSFDC_MFI1NEWFUNCTION_EXIT=0x10
--- a/usbmgmt/usbmgr/host/functiondrivers/ms/msmm/client/group/msmmclient_base.mmp Wed Jul 07 14:16:40 2010 +0800
+++ b/usbmgmt/usbmgr/host/functiondrivers/ms/msmm/client/group/msmmclient_base.mmp Wed Jul 07 15:08:54 2010 +0800
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2008-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"
@@ -20,8 +20,6 @@
@internalComponent
*/
-#include <usb/usblogger.mmh>
-
OS_LAYER_SYSTEMINCLUDE_SYMBIAN
LIBRARY euser.lib
@@ -33,5 +31,6 @@
USERINCLUDE ../../inc
USERINCLUDE ../public
USERINCLUDE ../../server/public
+USERINCLUDE ../traces
VENDORID 0x70000001
--- a/usbmgmt/usbmgr/host/functiondrivers/ms/msmm/client/group/msmmindicatorclient_base.mmp Wed Jul 07 14:16:40 2010 +0800
+++ b/usbmgmt/usbmgr/host/functiondrivers/ms/msmm/client/group/msmmindicatorclient_base.mmp Wed Jul 07 15:08:54 2010 +0800
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2008-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"
@@ -20,8 +20,6 @@
@internalComponent
*/
-#include <usb/usblogger.mmh>
-
OS_LAYER_SYSTEMINCLUDE_SYMBIAN
LIBRARY euser.lib
@@ -33,5 +31,6 @@
USERINCLUDE ../../inc
USERINCLUDE ../public
USERINCLUDE ../../server/public
+USERINCLUDE ../traces
VENDORID 0x70000001
--- a/usbmgmt/usbmgr/host/functiondrivers/ms/msmm/client/src/msmmclient.cpp Wed Jul 07 14:16:40 2010 +0800
+++ b/usbmgmt/usbmgr/host/functiondrivers/ms/msmm/client/src/msmmclient.cpp Wed Jul 07 15:08:54 2010 +0800
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2008-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"
@@ -26,11 +26,12 @@
#include <e32cmn.h>
#include "srvdef.h"
-
-#ifdef __FLOG_ACTIVE
-_LIT8(KLogComponent, "UsbHostMsmmClient");
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "msmmclientTraces.h"
#endif
+
// Costants
const TInt KConnectRetry = 0x2;
@@ -40,7 +41,7 @@
static TInt StartServer()
{
- LOG_STATIC_FUNC_ENTRY
+ OstTraceFunctionEntry0( MSMMCLIENT_SRC_STARTSERVER_ENTRY );
TInt ret = KErrNone;
@@ -53,6 +54,7 @@
// Was server process created OK?
if (KErrNone != ret)
{
+ OstTraceFunctionExit0( MSMMCLIENT_SRC_STARTSERVER_EXIT );
return ret;
}
@@ -77,6 +79,7 @@
TInt exitReason = (EExitPanic == server.ExitType()) ?
KErrGeneral : serverDiedRequestStatus.Int();
server.Close();
+ OstTraceFunctionExit0( MSMMCLIENT_SRC_STARTSERVER_EXIT_DUP1 );
return exitReason;
}
@@ -87,7 +90,7 @@
EXPORT_C TInt RMsmmSession::Connect()
{
- LOG_FUNC
+ OstTraceFunctionEntry0( RMSMMSESSION_CONNECT_ENTRY );
TInt retry = KConnectRetry; // Attempt connect twice then give up
TInt ret(KErrNone);
@@ -113,25 +116,28 @@
if (KErrNone != ret)
{
- LOGTEXT2(_L("Underlying error value = %d"), ret)
+ OstTrace1( TRACE_ERROR, RMSMMSESSION_CONNECT,
+ "Underlying error value = %d", ret );
+
ret = KErrCouldNotConnect;
}
+ OstTraceFunctionExit0( RMSMMSESSION_CONNECT_EXIT );
return ret;
}
EXPORT_C TInt RMsmmSession::Disconnect()
{
- LOG_FUNC
-
+ OstTraceFunctionEntry0( RMSMMSESSION_DISCONNECT_ENTRY );
Close();
+ OstTraceFunctionExit0( RMSMMSESSION_DISCONNECT_EXIT );
return KErrNone;
}
// Called to provide the version number of the server we require for this API
EXPORT_C TVersion RMsmmSession::Version() const
{
- LOG_FUNC
+ OstTraceFunctionEntry0( RMSMMSESSION_VERSION_ENTRY );
return TVersion(KMsmmServMajorVersionNumber,
KMsmmServMinorVersionNumber,
@@ -142,7 +148,7 @@
const TUSBMSDeviceDescription& aDevice,
TUint8 aInterfaceNumber, TUint32 aInterfaceToken)
{
- LOG_FUNC
+ OstTraceFunctionEntry0( RMSMMSESSION_ADDFUNCTION_ENTRY );
TInt ret(KErrNone);
@@ -154,12 +160,13 @@
ret = SendReceive(EHostMsmmServerAddFunction, usbmsIpcArgs);
+ OstTraceFunctionExit0( RMSMMSESSION_ADDFUNCTION_EXIT );
return ret;
}
EXPORT_C TInt RMsmmSession::RemoveDevice(TUint aDevice)
{
- LOG_FUNC
+ OstTraceFunctionEntry0( RMSMMSESSION_REMOVEDEVICE_ENTRY );
TInt ret(KErrNone);
@@ -167,28 +174,31 @@
ret = SendReceive(EHostMsmmServerRemoveDevice, usbmsIpcArgs);
+ OstTraceFunctionExit0( RMSMMSESSION_REMOVEDEVICE_EXIT );
return ret;
}
EXPORT_C TInt RMsmmSession::__DbgFailNext(TInt aCount)
{
- LOG_FUNC
+ OstTraceFunctionEntry0( RMSMMSESSION_DBGFAILNEXT_ENTRY );
#ifdef _DEBUG
return SendReceive(EHostMsmmServerDbgFailNext, TIpcArgs(aCount));
#else
(void)aCount;
+ OstTraceFunctionExit0( RMSMMSESSION_DBGFAILNEXT_EXIT );
return KErrNone;
#endif
}
EXPORT_C TInt RMsmmSession::__DbgAlloc()
{
- LOG_FUNC
+ OstTraceFunctionEntry0( RMSMMSESSION_DBGALLOC_ENTRY );
#ifdef _DEBUG
return SendReceive(EHostMsmmServerDbgAlloc);
#else
+ OstTraceFunctionExit0( RMSMMSESSION_DBGALLOC_EXIT );
return KErrNone;
#endif
}
--- a/usbmgmt/usbmgr/host/functiondrivers/ms/msmm/client/src/msmmindicatorclient.cpp Wed Jul 07 14:16:40 2010 +0800
+++ b/usbmgmt/usbmgr/host/functiondrivers/ms/msmm/client/src/msmmindicatorclient.cpp Wed Jul 07 15:08:54 2010 +0800
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2008-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"
@@ -25,10 +25,12 @@
#include "srvdef.h"
#include "msmmindicatorclient.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "msmmindicatorclientTraces.h"
+#endif
+
-#ifdef __FLOG_ACTIVE
-_LIT8(KLogComponent, "UsbHostMsmmIndicatorClient");
-#endif
// Costants
const TInt KConnectRetry = 0x2;
@@ -41,7 +43,7 @@
EXPORT_C TInt RHostMassStorage::Connect()
{
- LOG_FUNC
+ OstTraceFunctionEntry0( RHOSTMASSSTORAGE_CONNECT_ENTRY );
TInt retry = KConnectRetry; // Attempt to add a session to MSMM Server twice
TInt ret(KErrNone);
@@ -51,7 +53,8 @@
// We are not allowed to start the server
if ((KErrNotFound == ret) || (KErrServerTerminated == ret))
{
- LOGTEXT2(_L("Underlying error value = %d"), ret)
+ OstTrace1( TRACE_NORMAL, RHOSTMASSSTORAGE_CONNECT,
+ "Underlying error value = %d", ret );
return KErrNotReady;
}
if ( KErrNone == ret )
@@ -63,14 +66,16 @@
break;
}
}
+ OstTraceFunctionExit0( RHOSTMASSSTORAGE_CONNECT_EXIT );
return ret;
}
EXPORT_C TInt RHostMassStorage::Disconnect()
{
- LOG_FUNC
+ OstTraceFunctionEntry0( RHOSTMASSSTORAGE_DISCONNECT_ENTRY );
Close();
+ OstTraceFunctionExit0( RHOSTMASSSTORAGE_DISCONNECT_EXIT );
return KErrNone;
}
@@ -80,7 +85,7 @@
*/
EXPORT_C TVersion RHostMassStorage::Version() const
{
- LOG_FUNC
+ OstTraceFunctionEntry0( RHOSTMASSSTORAGE_VERSION_ENTRY );
return TVersion(KMsmmServMajorVersionNumber,
KMsmmServMinorVersionNumber,
@@ -95,7 +100,7 @@
EXPORT_C TInt RHostMassStorage::EjectUsbDrives()
{
- LOG_FUNC
+ OstTraceFunctionEntry0( RHOSTMASSSTORAGE_EJECTUSBDRIVES_ENTRY );
TInt ret(KErrNone);
@@ -103,6 +108,7 @@
ret = Send(EHostMsmmServerEjectUsbDrives, usbmsIpcArgs);
+ OstTraceFunctionExit0( RHOSTMASSSTORAGE_EJECTUSBDRIVES_EXIT );
return ret;
}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usbmgmt/usbmgr/host/functiondrivers/ms/msmm/client/traces/OstTraceDefinitions.h Wed Jul 07 15:08:54 2010 +0800
@@ -0,0 +1,7 @@
+#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
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usbmgmt/usbmgr/host/functiondrivers/ms/msmm/client/traces/fixed_id.definitions Wed Jul 07 15:08:54 2010 +0800
@@ -0,0 +1,28 @@
+#Fixed group and trace id definitions. If this file is removed, the identifiers are rebuilt.
+[GROUP]TRACE_FLOW=0x8a
+[GROUP]TRACE_NORMAL=0x86
+[TRACE]TRACE_FLOW[0x8A]_RHOSTMASSSTORAGE_CONNECT_ENTRY=0x11
+[TRACE]TRACE_FLOW[0x8A]_RHOSTMASSSTORAGE_CONNECT_EXIT=0x12
+[TRACE]TRACE_FLOW[0x8A]_RHOSTMASSSTORAGE_DISCONNECT_ENTRY=0x13
+[TRACE]TRACE_FLOW[0x8A]_RHOSTMASSSTORAGE_DISCONNECT_EXIT=0x14
+[TRACE]TRACE_FLOW[0x8A]_RHOSTMASSSTORAGE_EJECTUSBDRIVES_ENTRY=0x16
+[TRACE]TRACE_FLOW[0x8A]_RHOSTMASSSTORAGE_EJECTUSBDRIVES_EXIT=0x17
+[TRACE]TRACE_FLOW[0x8A]_RHOSTMASSSTORAGE_VERSION_ENTRY=0x15
+[TRACE]TRACE_NORMAL[0x86]_RHOSTMASSSTORAGE_CONNECT=0x1
+[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_RMSMMSESSION_CONNECT=0x1
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_MSMMCLIENT_SRC_STARTSERVER_ENTRY=0x1
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_MSMMCLIENT_SRC_STARTSERVER_EXIT=0x2
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_MSMMCLIENT_SRC_STARTSERVER_EXIT_DUP1=0x3
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_RMSMMSESSION_ADDFUNCTION_ENTRY=0x9
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_RMSMMSESSION_ADDFUNCTION_EXIT=0xa
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_RMSMMSESSION_CONNECT_ENTRY=0x4
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_RMSMMSESSION_CONNECT_EXIT=0x5
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_RMSMMSESSION_DBGALLOC_ENTRY=0xf
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_RMSMMSESSION_DBGALLOC_EXIT=0x10
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_RMSMMSESSION_DBGFAILNEXT_ENTRY=0xd
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_RMSMMSESSION_DBGFAILNEXT_EXIT=0xe
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_RMSMMSESSION_DISCONNECT_ENTRY=0x6
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_RMSMMSESSION_DISCONNECT_EXIT=0x7
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_RMSMMSESSION_REMOVEDEVICE_ENTRY=0xb
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_RMSMMSESSION_REMOVEDEVICE_EXIT=0xc
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_RMSMMSESSION_VERSION_ENTRY=0x8
--- a/usbmgmt/usbmgr/host/functiondrivers/ms/msmm/referencepolicyplugin/group/referencepolicyplugin.mmh Wed Jul 07 14:16:40 2010 +0800
+++ b/usbmgmt/usbmgr/host/functiondrivers/ms/msmm/referencepolicyplugin/group/referencepolicyplugin.mmh Wed Jul 07 15:08:54 2010 +0800
@@ -24,7 +24,6 @@
UID 0x10009D8d 0x10285c46
#include "../../server/public/hostmscaps.mmh"
-#include <usb/usblogger.mmh>
OS_LAYER_SYSTEMINCLUDE_SYMBIAN
@@ -41,6 +40,8 @@
USERINCLUDE ../inc
USERINCLUDE ../../inc
+USERINCLUDE ../traces
+
SOURCEPATH ../data
NOEXPORTLIBRARY
--- a/usbmgmt/usbmgr/host/functiondrivers/ms/msmm/referencepolicyplugin/group/refpp_over_dummycomponent.mmp Wed Jul 07 14:16:40 2010 +0800
+++ b/usbmgmt/usbmgr/host/functiondrivers/ms/msmm/referencepolicyplugin/group/refpp_over_dummycomponent.mmp Wed Jul 07 15:08:54 2010 +0800
@@ -29,4 +29,6 @@
TARGET dummyreferencepolicyplugin.rsc
END
+LIBRARY dummynotifier.lib
+
MACRO __OVER_DUMMYCOMPONENT__
--- a/usbmgmt/usbmgr/host/functiondrivers/ms/msmm/referencepolicyplugin/inc/refppnotificationman.h Wed Jul 07 14:16:40 2010 +0800
+++ b/usbmgmt/usbmgr/host/functiondrivers/ms/msmm/referencepolicyplugin/inc/refppnotificationman.h Wed Jul 07 15:08:54 2010 +0800
@@ -27,6 +27,10 @@
#include <usb/hostms/msmm_policy_def.h>
#include <usb/hostms/srverr.h>
+#ifdef __OVER_DUMMYCOMPONENT__
+ #include <usb/hostms/dummycomponent/dummynotifier.h>
+#endif
+
typedef RArray<THostMsErrorDataPckg> THostMsErrDataQueue;
const TInt KMaxResponseStringLen = 16;
@@ -54,7 +58,11 @@
private:
THostMsErrDataQueue iErrorQueue;
TBuf8<16> iResponse;
+#ifdef __OVER_DUMMYCOMPONENT__
+ RDummyNotifier iNotifier;
+#else
RNotifier iNotifier;
+#endif
};
#endif /*REFPPNOTIFICATIONMAN_H*/
--- a/usbmgmt/usbmgr/host/functiondrivers/ms/msmm/referencepolicyplugin/src/proxy.cpp Wed Jul 07 14:16:40 2010 +0800
+++ b/usbmgmt/usbmgr/host/functiondrivers/ms/msmm/referencepolicyplugin/src/proxy.cpp Wed Jul 07 15:08:54 2010 +0800
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2008-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"
@@ -27,10 +27,12 @@
#include "referencepolicyplugin.h"
#include "referenceplugin.hrh"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "proxyTraces.h"
+#endif
+
-#ifdef __FLOG_ACTIVE
-_LIT8(KLogComponent, "UsbHostMsmmRefPP");
-#endif
// Provides a key value pair table, this is used to identify
// the correct construction function for the requested interface.
@@ -44,9 +46,11 @@
EXPORT_C const TImplementationProxy* ImplementationGroupProxy(
TInt& aTableCount)
{
- LOGTEXT(_L(">>ImplementationGroupProxy()"));
+ OstTrace0( TRACE_NORMAL, REF_REFERENCEPOLICYPLUGIN_SRC_IMPLEMENTATIONGROUPPROXY,
+ ">>ImplementationGroupProxy()" );
aTableCount = sizeof(ImplementationTable) / sizeof(TImplementationProxy);
- LOGTEXT(_L("<<ImplementationGroupProxy()"));
+ OstTrace0( TRACE_NORMAL, REF_REFERENCEPOLICYPLUGIN_SRC_IMPLEMENTATIONGROUPPROXY_DUP1,
+ "<<ImplementationGroupProxy()" );
return ImplementationTable;
}
--- a/usbmgmt/usbmgr/host/functiondrivers/ms/msmm/referencepolicyplugin/src/referencepolicyplugin.cpp Wed Jul 07 14:16:40 2010 +0800
+++ b/usbmgmt/usbmgr/host/functiondrivers/ms/msmm/referencepolicyplugin/src/referencepolicyplugin.cpp Wed Jul 07 15:08:54 2010 +0800
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2008-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"
@@ -27,10 +27,12 @@
#include <usb/hostms/msmm_policy_def.h>
#include "refppnotificationman.h"
#include "srvpanic.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "referencepolicypluginTraces.h"
+#endif
+
-#ifdef __FLOG_ACTIVE
-_LIT8(KLogComponent, "UsbHostMsmmRefPP");
-#endif
// Global Variables
const TUid KHostMsRepositoryUid = {0x10285c46};
@@ -47,29 +49,34 @@
CReferencePolicyPlugin::~CReferencePolicyPlugin()
{
- LOG_FUNC
+ OstTraceFunctionEntry0( REF_CREFERENCEPOLICYPLUGIN_CREFERENCEPOLICYPLUGIN_DES_ENTRY );
+
Cancel();
ClearHistory(); // Remove all buffered history record.
delete iRepository;
delete iNotificationMan;
iFs.Close();
+ OstTraceFunctionExit0( REF_CREFERENCEPOLICYPLUGIN_CREFERENCEPOLICYPLUGIN_DES_EXIT );
}
CReferencePolicyPlugin* CReferencePolicyPlugin::NewL()
{
- LOG_STATIC_FUNC_ENTRY
+ OstTraceFunctionEntry0( REF_CREFERENCEPOLICYPLUGIN_NEWL_ENTRY );
+
CReferencePolicyPlugin* self = new (ELeave) CReferencePolicyPlugin;
CleanupStack::PushL(self);
self->ConstructL();
CleanupStack::Pop(self);
+ OstTraceFunctionExit0( REF_CREFERENCEPOLICYPLUGIN_NEWL_EXIT );
return self;
}
void CReferencePolicyPlugin::RetrieveDriveLetterL(TText& aDriveName,
const TPolicyRequestData& aData, TRequestStatus& aStatus)
{
- LOG_FUNC
+ OstTraceFunctionEntry0( REF_CREFERENCEPOLICYPLUGIN_RETRIEVEDRIVELETTERL_TTEXT_TPOLICYREQUESTDATA_TREQUESTSTATUS_ENTRY );
+
Cancel();
aStatus = KRequestPending;
iClientStatus = &aStatus;
@@ -78,18 +85,22 @@
// In a licensee owned policy plugin, it shall complete client
// request in RunL() in general
Complete(KErrNone);
+ OstTraceFunctionExit0( REF_CREFERENCEPOLICYPLUGIN_RETRIEVEDRIVELETTERL_TTEXT_TPOLICYREQUESTDATA_TREQUESTSTATUS_EXIT );
}
void CReferencePolicyPlugin::CancelRetrieveDriveLetter()
{
- LOG_FUNC
+ OstTraceFunctionEntry0( REF_CREFERENCEPOLICYPLUGIN_CANCELRETRIEVEDRIVELETTER_ENTRY );
+
Cancel();
+ OstTraceFunctionExit0( REF_CREFERENCEPOLICYPLUGIN_CANCELRETRIEVEDRIVELETTER_EXIT );
}
void CReferencePolicyPlugin::SaveLatestMountInfoL(
const TPolicyMountRecord& aData, TRequestStatus& aStatus)
{
- LOG_FUNC
+ OstTraceFunctionEntry0( REF_CREFERENCEPOLICYPLUGIN_SAVELATESTMOUNTINFOL_TPOLICYMOUNTRECORD_TREQUESTSTATUS_ENTRY );
+
Cancel();
aStatus = KRequestPending;
iClientStatus = &aStatus;
@@ -98,56 +109,70 @@
// In a licensee owned policy plugin, it shall complete client
// request in RunL() in general
Complete(KErrNone);
+ OstTraceFunctionExit0( REF_CREFERENCEPOLICYPLUGIN_SAVELATESTMOUNTINFOL_TPOLICYMOUNTRECORD_TREQUESTSTATUS_EXIT );
}
void CReferencePolicyPlugin::CancelSaveLatestMountInfo()
{
- LOG_FUNC
+ OstTraceFunctionEntry0( REF_CREFERENCEPOLICYPLUGIN_CANCELSAVELATESTMOUNTINFO_ENTRY );
+
Cancel();
+ OstTraceFunctionExit0( REF_CREFERENCEPOLICYPLUGIN_CANCELSAVELATESTMOUNTINFO_EXIT );
}
void CReferencePolicyPlugin::SendErrorNotificationL(
const THostMsErrData& aErrData)
{
- LOG_FUNC
+ OstTraceFunctionEntry0( REF_CREFERENCEPOLICYPLUGIN_SENDERRORNOTIFICATIONL_ENTRY );
+
iNotificationMan->SendErrorNotificationL(aErrData);
+ OstTraceFunctionExit0( REF_CREFERENCEPOLICYPLUGIN_SENDERRORNOTIFICATIONL_EXIT );
}
void CReferencePolicyPlugin::GetSuspensionPolicy(TSuspensionPolicy& aPolicy)
{
- LOG_FUNC
+ OstTraceFunctionEntry0( REF_CREFERENCEPOLICYPLUGIN_GETSUSPENSIONPOLICY_ENTRY );
+
aPolicy = iSuspensionPolicy;
+ OstTraceFunctionExit0( REF_CREFERENCEPOLICYPLUGIN_GETSUSPENSIONPOLICY_EXIT );
}
void CReferencePolicyPlugin::DoCancel()
{
- LOG_FUNC
+ OstTraceFunctionEntry0( REF_CREFERENCEPOLICYPLUGIN_DOCANCEL_ENTRY );
+
// No more work need to do in current implementation of reference
// policy plugin.
// In a licensee owned policy plugin, it shall complete client
// request here with KErrCancel.
+ OstTraceFunctionExit0( REF_CREFERENCEPOLICYPLUGIN_DOCANCEL_EXIT );
}
void CReferencePolicyPlugin::RunL()
{
- LOG_FUNC
+ OstTraceFunctionEntry0( REF_CREFERENCEPOLICYPLUGIN_RUNL_ENTRY );
+
// No more work need to do in current implementation of reference
// policy plugin.
// In a licensee owned policy plugin, it shall complete client
// request here with a proper error code.
+ OstTraceFunctionExit0( REF_CREFERENCEPOLICYPLUGIN_RUNL_EXIT );
}
CReferencePolicyPlugin::CReferencePolicyPlugin() :
CMsmmPolicyPluginBase(),
iHistory(KHistoryGranularity)
{
- LOG_FUNC
+ OstTraceFunctionEntry0( REF_CREFERENCEPOLICYPLUGIN_CREFERENCEPOLICYPLUGIN_CONS_ENTRY );
+
CActiveScheduler::Add(this);
+ OstTraceFunctionExit0( REF_CREFERENCEPOLICYPLUGIN_CREFERENCEPOLICYPLUGIN_CONS_EXIT );
}
void CReferencePolicyPlugin::ConstructL()
{
- LOG_FUNC
+ OstTraceFunctionEntry0( REF_CREFERENCEPOLICYPLUGIN_CONSTRUCTL_ENTRY );
+
iRepository = CRepository::NewL(KHostMsRepositoryUid);
User::LeaveIfError(iFs.Connect());
iNotificationMan = CMsmmPolicyNotificationManager::NewL();
@@ -160,13 +185,14 @@
User::LeaveIfError(iRepository->Get(
KMediaPollingTimeUid, value));
iSuspensionPolicy.iStatusPollingInterval = value;
+ OstTraceFunctionExit0( REF_CREFERENCEPOLICYPLUGIN_CONSTRUCTL_EXIT );
}
void CReferencePolicyPlugin::RetrieveDriveLetterL(TText& aDriveName,
const TPolicyRequestData& aData)
{
- LOG_FUNC
-
+ OstTraceFunctionEntry0( REF_CREFERENCEPOLICYPLUGIN_RETRIEVEDRIVELETTERL_TTEXT_TPOLICYREQUESTDATA_ENTRY );
+
TDriveList availableNames;
FilterFsForbiddenDriveListL(availableNames);
@@ -201,15 +227,17 @@
aDriveName = history.iDriveName;
}
}
+ OstTraceFunctionExit0( REF_CREFERENCEPOLICYPLUGIN_RETRIEVEDRIVELETTERL_TTEXT_TPOLICYREQUESTDATA_EXIT );
}
void CReferencePolicyPlugin::SaveLatestMountInfoL(
const TPolicyMountRecord& aData)
{
- LOG_FUNC
-
+ OstTraceFunctionEntry0( REF_CREFERENCEPOLICYPLUGIN_SAVELATESTMOUNTINFOL_TPOLICYMOUNTRECORD_ENTRY );
+
if (iMaxHistoryRecCount == 0) // This policy disable history
{
+ OstTraceFunctionExit0( REF_CREFERENCEPOLICYPLUGIN_SAVELATESTMOUNTINFOL_TPOLICYMOUNTRECORD_EXIT );
return;
}
@@ -243,24 +271,30 @@
TPckg<TPolicyMountRecord> historyPckg(*iHistory[index]);
User::LeaveIfError(iRepository->Set(historyRecordUid++, historyPckg));
}
+ OstTraceFunctionExit0( REF_CREFERENCEPOLICYPLUGIN_SAVELATESTMOUNTINFOL_TPOLICYMOUNTRECORD_EXIT_DUP1 );
}
void CReferencePolicyPlugin::Complete(TInt aError)
{
- LOG_FUNC
+ OstTraceFunctionEntry0( REF_CREFERENCEPOLICYPLUGIN_COMPLETE_ENTRY );
+
User::RequestComplete(iClientStatus, aError);
+ OstTraceFunctionExit0( REF_CREFERENCEPOLICYPLUGIN_COMPLETE_EXIT );
}
void CReferencePolicyPlugin::PrepareAvailableDriveList()
{
- LOG_FUNC
+ OstTraceFunctionEntry0( REF_CREFERENCEPOLICYPLUGIN_PREPAREAVAILABLEDRIVELIST_ENTRY );
+
iAvailableDrvList.SetLength(KMaxDrives);
iAvailableDrvList.Fill(0, KMaxDrives);
+ OstTraceFunctionExit0( REF_CREFERENCEPOLICYPLUGIN_PREPAREAVAILABLEDRIVELIST_EXIT );
}
void CReferencePolicyPlugin::AvailableDriveListL()
{
- LOG_FUNC
+ OstTraceFunctionEntry0( REF_CREFERENCEPOLICYPLUGIN_AVAILABLEDRIVELISTL_ENTRY );
+
TBuf8<KPermittedDrvRangeBufLen> permittedRange;
TDriveList forbiddenList;
@@ -280,12 +314,14 @@
}
}
}
+ OstTraceFunctionExit0( REF_CREFERENCEPOLICYPLUGIN_AVAILABLEDRIVELISTL_EXIT );
}
void CReferencePolicyPlugin::FilterFsForbiddenDriveListL(
TDriveList& aAvailableNames)
{
- LOG_FUNC
+ OstTraceFunctionEntry0( REF_CREFERENCEPOLICYPLUGIN_FILTERFSFORBIDDENDRIVELISTL_ENTRY );
+
TDriveList names;
names.SetLength(KMaxDrives);
@@ -302,13 +338,15 @@
}
names.SetLength(count);
aAvailableNames = names;
+ OstTraceFunctionExit0( REF_CREFERENCEPOLICYPLUGIN_FILTERFSFORBIDDENDRIVELISTL_EXIT );
}
void CReferencePolicyPlugin::FindFirstNotUsedDriveLetter(
const TDriveList& aAvailableNames,
TText& aDriveName)
{
- LOG_FUNC
+ OstTraceFunctionEntry0( REF_CREFERENCEPOLICYPLUGIN_FINDFIRSTNOTUSEDDRIVELETTER_ENTRY );
+
TDriveList usedLetter;
TUint index = 0;
for (index = 0; index < iHistory.Count(); index++)
@@ -321,15 +359,18 @@
if (usedLetter.Locate(aAvailableNames[index]) == KErrNotFound)
{
aDriveName = aAvailableNames[index];
+ OstTraceFunctionExit0( REF_CREFERENCEPOLICYPLUGIN_FINDFIRSTNOTUSEDDRIVELETTER_EXIT );
return; // A unused drive letter found out
}
}
+ OstTraceFunctionExit0( REF_CREFERENCEPOLICYPLUGIN_FINDFIRSTNOTUSEDDRIVELETTER_EXIT_DUP1 );
}
// Retrieve history from CR
void CReferencePolicyPlugin::RetrieveHistoryL()
{
- LOG_FUNC
+ OstTraceFunctionEntry0( REF_CREFERENCEPOLICYPLUGIN_RETRIEVEHISTORYL_ENTRY );
+
// Read history record number from CR
TInt historyCount(0);
User::LeaveIfError(
@@ -352,21 +393,25 @@
CleanupStack::Pop(record);
}
}
+ OstTraceFunctionExit0( REF_CREFERENCEPOLICYPLUGIN_RETRIEVEHISTORYL_EXIT );
}
// Remove all buffered history
void CReferencePolicyPlugin::ClearHistory()
{
- LOG_FUNC
+ OstTraceFunctionEntry0( REF_CREFERENCEPOLICYPLUGIN_CLEARHISTORY_ENTRY );
+
iHistory.ResetAndDestroy();
iHistory.Close();
+ OstTraceFunctionExit0( REF_CREFERENCEPOLICYPLUGIN_CLEARHISTORY_EXIT );
}
// Search in history for a logic unit
TInt CReferencePolicyPlugin::SearchHistoryByLogicUnit(
const TPolicyRequestData& aLogicUnit) const
{
- LOG_FUNC
+ OstTraceFunctionEntry0( REF_CREFERENCEPOLICYPLUGIN_SEARCHHISTORYBYLOGICUNIT_ENTRY );
+
TInt ret(KErrNotFound);
TUint count = iHistory.Count();
for (TUint index = 0; index < count; index ++)
@@ -383,10 +428,12 @@
(logicalUnit.iOtgInformation == aLogicUnit.iOtgInformation))
{
// Matched
+ OstTraceFunctionExit0( REF_CREFERENCEPOLICYPLUGIN_SEARCHHISTORYBYLOGICUNIT_EXIT );
return index;
}
}
// Can't find any matched records
+ OstTraceFunctionExit0( REF_CREFERENCEPOLICYPLUGIN_SEARCHHISTORYBYLOGICUNIT_EXIT_DUP1 );
return ret;
}
--- a/usbmgmt/usbmgr/host/functiondrivers/ms/msmm/referencepolicyplugin/src/refppnotificationman.cpp Wed Jul 07 14:16:40 2010 +0800
+++ b/usbmgmt/usbmgr/host/functiondrivers/ms/msmm/referencepolicyplugin/src/refppnotificationman.cpp Wed Jul 07 15:08:54 2010 +0800
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2008-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,11 +24,12 @@
#include <usb/usblogger.h>
#include <usb/hostms/policypluginnotifier.hrh>
#include "srvpanic.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "refppnotificationmanTraces.h"
+#endif
-
-#ifdef __FLOG_ACTIVE
-_LIT8(KLogComponent, "UsbHostMsmmRefPP");
-#endif
+
#ifdef __OVER_DUMMYCOMPONENT__
const TUid KMountPolicyNotifierUid = {0x1028653E};
@@ -38,89 +39,112 @@
CMsmmPolicyNotificationManager::~CMsmmPolicyNotificationManager()
{
- LOG_FUNC
+ OstTraceFunctionEntry0( REF_CMSMMPOLICYNOTIFICATIONMANAGER_CMSMMPOLICYNOTIFICATIONMANAGER_DES_ENTRY );
+
Cancel();
iErrorQueue.Close();
iNotifier.Close();
+ OstTraceFunctionExit0( REF_CMSMMPOLICYNOTIFICATIONMANAGER_CMSMMPOLICYNOTIFICATIONMANAGER_DES_EXIT );
}
CMsmmPolicyNotificationManager* CMsmmPolicyNotificationManager::NewL()
{
- LOG_STATIC_FUNC_ENTRY
+ OstTraceFunctionEntry0( REF_CMSMMPOLICYNOTIFICATIONMANAGER_NEWL_ENTRY );
+
CMsmmPolicyNotificationManager* self =
CMsmmPolicyNotificationManager::NewLC();
CleanupStack::Pop(self);
+ OstTraceFunctionExit0( REF_CMSMMPOLICYNOTIFICATIONMANAGER_NEWL_EXIT );
return self;
}
CMsmmPolicyNotificationManager* CMsmmPolicyNotificationManager::NewLC()
{
- LOG_STATIC_FUNC_ENTRY
+ OstTraceFunctionEntry0( REF_CMSMMPOLICYNOTIFICATIONMANAGER_NEWLC_ENTRY );
+
CMsmmPolicyNotificationManager* self =
new (ELeave) CMsmmPolicyNotificationManager();
CleanupStack::PushL(self);
self->ConstructL();
+ OstTraceFunctionExit0( REF_CMSMMPOLICYNOTIFICATIONMANAGER_NEWLC_EXIT );
return self;
}
void CMsmmPolicyNotificationManager::SendErrorNotificationL(
const THostMsErrData& aErrData)
{
- LOG_FUNC
+ OstTraceFunctionEntry0( REF_CMSMMPOLICYNOTIFICATIONMANAGER_SENDERRORNOTIFICATIONL_ENTRY );
+
// Print error notification data to log
- LOGTEXT2(_L("Err:iError = %d"), aErrData.iError);
- LOGTEXT2(_L("Err:iE32Error = %d"), aErrData.iE32Error);
- LOGTEXT2(_L("Err:iDriveName = %d"), aErrData.iDriveName);
- LOGTEXT2(_L("Err:iManufacturerString = %S"), &aErrData.iManufacturerString);
- LOGTEXT2(_L("Err:iProductString = %S"), &aErrData.iProductString);
-
+ OstTrace1( TRACE_NORMAL, REF_CMSMMPOLICYNOTIFICATIONMANAGER_SENDERRORNOTIFICATIONL,
+ "Err:iError = %d", aErrData.iError );
+ OstTrace1( TRACE_NORMAL, REF_CMSMMPOLICYNOTIFICATIONMANAGER_SENDERRORNOTIFICATIONL_DUP1,
+ "Err:iE32Error = %d", aErrData.iE32Error );
+ OstTrace1( TRACE_NORMAL, REF_CMSMMPOLICYNOTIFICATIONMANAGER_SENDERRORNOTIFICATIONL_DUP2,
+ "Err:iDriveName = %d", aErrData.iDriveName );
+ OstTraceExt1( TRACE_NORMAL, REF_CMSMMPOLICYNOTIFICATIONMANAGER_SENDERRORNOTIFICATIONL_DUP3,
+ "Err:iManufacturerString = %S", aErrData.iManufacturerString );
+ OstTraceExt1( TRACE_NORMAL, REF_CMSMMPOLICYNOTIFICATIONMANAGER_SENDERRORNOTIFICATIONL_DUP4,
+ "Err:iProductString = %S", aErrData.iProductString );
+
THostMsErrorDataPckg errPckg = aErrData;
iErrorQueue.AppendL(errPckg);
if (!IsActive())
{
SendNotification();
}
+ OstTraceFunctionExit0( REF_CMSMMPOLICYNOTIFICATIONMANAGER_SENDERRORNOTIFICATIONL_EXIT );
}
void CMsmmPolicyNotificationManager::RunL()
{
- LOG_FUNC
+ OstTraceFunctionEntry0( REF_CMSMMPOLICYNOTIFICATIONMANAGER_RUNL_ENTRY );
+
iErrorQueue.Remove(0);
if (iErrorQueue.Count() > 0)
{
SendNotification();
}
+ OstTraceFunctionExit0( REF_CMSMMPOLICYNOTIFICATIONMANAGER_RUNL_EXIT );
}
void CMsmmPolicyNotificationManager::DoCancel()
{
- LOG_FUNC
+ OstTraceFunctionEntry0( REF_CMSMMPOLICYNOTIFICATIONMANAGER_DOCANCEL_ENTRY );
+
iErrorQueue.Reset();
iNotifier.CancelNotifier(KMountPolicyNotifierUid);
+ OstTraceFunctionExit0( REF_CMSMMPOLICYNOTIFICATIONMANAGER_DOCANCEL_EXIT );
}
CMsmmPolicyNotificationManager::CMsmmPolicyNotificationManager():
CActive(EPriorityStandard)
{
- LOG_FUNC
+ OstTraceFunctionEntry0( REF_CMSMMPOLICYNOTIFICATIONMANAGER_CMSMMPOLICYNOTIFICATIONMANAGER_ENTRY );
+
CActiveScheduler::Add(this);
+ OstTraceFunctionExit0( REF_CMSMMPOLICYNOTIFICATIONMANAGER_CMSMMPOLICYNOTIFICATIONMANAGER_EXIT );
}
void CMsmmPolicyNotificationManager::ConstructL()
{
- LOG_FUNC
+ OstTraceFunctionEntry0( REF_CMSMMPOLICYNOTIFICATIONMANAGER_CONSTRUCTL_ENTRY );
+
User::LeaveIfError(iNotifier.Connect());
+ OstTraceFunctionExit0( REF_CMSMMPOLICYNOTIFICATIONMANAGER_CONSTRUCTL_EXIT );
}
void CMsmmPolicyNotificationManager::SendNotification()
{
- LOG_FUNC
+ OstTraceFunctionEntry0( REF_CMSMMPOLICYNOTIFICATIONMANAGER_SENDNOTIFICATION_ENTRY );
+
iNotifier.StartNotifierAndGetResponse(
iStatus, KMountPolicyNotifierUid, iErrorQueue[0], iResponse);
SetActive();
+ OstTraceFunctionExit0( REF_CMSMMPOLICYNOTIFICATIONMANAGER_SENDNOTIFICATION_EXIT );
}
// End of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usbmgmt/usbmgr/host/functiondrivers/ms/msmm/referencepolicyplugin/traces/OstTraceDefinitions.h Wed Jul 07 15:08:54 2010 +0800
@@ -0,0 +1,7 @@
+#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
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usbmgmt/usbmgr/host/functiondrivers/ms/msmm/referencepolicyplugin/traces/fixed_id.definitions Wed Jul 07 15:08:54 2010 +0800
@@ -0,0 +1,86 @@
+#Fixed group and trace id definitions. If this file is removed, the identifiers are rebuilt.
+[GROUP]TRACE_FLOW=0x8a
+[GROUP]TRACE_NORMAL=0x86
+[TRACE]TRACE_FLOW[0x8A]_REF_CMSMMPOLICYNOTIFICATIONMANAGER_CMSMMPOLICYNOTIFICATIONMANAGER_DES_ENTRY=0x30
+[TRACE]TRACE_FLOW[0x8A]_REF_CMSMMPOLICYNOTIFICATIONMANAGER_CMSMMPOLICYNOTIFICATIONMANAGER_DES_EXIT=0x31
+[TRACE]TRACE_FLOW[0x8A]_REF_CMSMMPOLICYNOTIFICATIONMANAGER_CMSMMPOLICYNOTIFICATIONMANAGER_ENTRY=0x3c
+[TRACE]TRACE_FLOW[0x8A]_REF_CMSMMPOLICYNOTIFICATIONMANAGER_CMSMMPOLICYNOTIFICATIONMANAGER_EXIT=0x3d
+[TRACE]TRACE_FLOW[0x8A]_REF_CMSMMPOLICYNOTIFICATIONMANAGER_CONSTRUCTL_ENTRY=0x3e
+[TRACE]TRACE_FLOW[0x8A]_REF_CMSMMPOLICYNOTIFICATIONMANAGER_CONSTRUCTL_EXIT=0x3f
+[TRACE]TRACE_FLOW[0x8A]_REF_CMSMMPOLICYNOTIFICATIONMANAGER_DOCANCEL_ENTRY=0x3a
+[TRACE]TRACE_FLOW[0x8A]_REF_CMSMMPOLICYNOTIFICATIONMANAGER_DOCANCEL_EXIT=0x3b
+[TRACE]TRACE_FLOW[0x8A]_REF_CMSMMPOLICYNOTIFICATIONMANAGER_NEWLC_ENTRY=0x34
+[TRACE]TRACE_FLOW[0x8A]_REF_CMSMMPOLICYNOTIFICATIONMANAGER_NEWLC_EXIT=0x35
+[TRACE]TRACE_FLOW[0x8A]_REF_CMSMMPOLICYNOTIFICATIONMANAGER_NEWL_ENTRY=0x32
+[TRACE]TRACE_FLOW[0x8A]_REF_CMSMMPOLICYNOTIFICATIONMANAGER_NEWL_EXIT=0x33
+[TRACE]TRACE_FLOW[0x8A]_REF_CMSMMPOLICYNOTIFICATIONMANAGER_RUNL_ENTRY=0x38
+[TRACE]TRACE_FLOW[0x8A]_REF_CMSMMPOLICYNOTIFICATIONMANAGER_RUNL_EXIT=0x39
+[TRACE]TRACE_FLOW[0x8A]_REF_CMSMMPOLICYNOTIFICATIONMANAGER_SENDERRORNOTIFICATIONL_ENTRY=0x36
+[TRACE]TRACE_FLOW[0x8A]_REF_CMSMMPOLICYNOTIFICATIONMANAGER_SENDERRORNOTIFICATIONL_EXIT=0x37
+[TRACE]TRACE_FLOW[0x8A]_REF_CMSMMPOLICYNOTIFICATIONMANAGER_SENDNOTIFICATION_ENTRY=0x40
+[TRACE]TRACE_FLOW[0x8A]_REF_CMSMMPOLICYNOTIFICATIONMANAGER_SENDNOTIFICATION_EXIT=0x41
+[TRACE]TRACE_FLOW[0x8A]_REF_CREFERENCEPOLICYPLUGIN_AVAILABLEDRIVELISTL_ENTRY=0x22
+[TRACE]TRACE_FLOW[0x8A]_REF_CREFERENCEPOLICYPLUGIN_AVAILABLEDRIVELISTL_EXIT=0x23
+[TRACE]TRACE_FLOW[0x8A]_REF_CREFERENCEPOLICYPLUGIN_CANCELRETRIEVEDRIVELETTER_ENTRY=0x7
+[TRACE]TRACE_FLOW[0x8A]_REF_CREFERENCEPOLICYPLUGIN_CANCELRETRIEVEDRIVELETTER_EXIT=0x8
+[TRACE]TRACE_FLOW[0x8A]_REF_CREFERENCEPOLICYPLUGIN_CANCELSAVELATESTMOUNTINFO_ENTRY=0xb
+[TRACE]TRACE_FLOW[0x8A]_REF_CREFERENCEPOLICYPLUGIN_CANCELSAVELATESTMOUNTINFO_EXIT=0xc
+[TRACE]TRACE_FLOW[0x8A]_REF_CREFERENCEPOLICYPLUGIN_CLEARHISTORY_ENTRY=0x2b
+[TRACE]TRACE_FLOW[0x8A]_REF_CREFERENCEPOLICYPLUGIN_CLEARHISTORY_EXIT=0x2c
+[TRACE]TRACE_FLOW[0x8A]_REF_CREFERENCEPOLICYPLUGIN_COMPLETE_ENTRY=0x1e
+[TRACE]TRACE_FLOW[0x8A]_REF_CREFERENCEPOLICYPLUGIN_COMPLETE_EXIT=0x1f
+[TRACE]TRACE_FLOW[0x8A]_REF_CREFERENCEPOLICYPLUGIN_CONSTRUCTL_ENTRY=0x17
+[TRACE]TRACE_FLOW[0x8A]_REF_CREFERENCEPOLICYPLUGIN_CONSTRUCTL_EXIT=0x18
+[TRACE]TRACE_FLOW[0x8A]_REF_CREFERENCEPOLICYPLUGIN_CREFERENCEPOLICYPLUGIN_CONS_ENTRY=0x15
+[TRACE]TRACE_FLOW[0x8A]_REF_CREFERENCEPOLICYPLUGIN_CREFERENCEPOLICYPLUGIN_CONS_EXIT=0x16
+[TRACE]TRACE_FLOW[0x8A]_REF_CREFERENCEPOLICYPLUGIN_CREFERENCEPOLICYPLUGIN_DES_ENTRY=0x1
+[TRACE]TRACE_FLOW[0x8A]_REF_CREFERENCEPOLICYPLUGIN_CREFERENCEPOLICYPLUGIN_DES_EXIT=0x2
+[TRACE]TRACE_FLOW[0x8A]_REF_CREFERENCEPOLICYPLUGIN_DOCANCEL_ENTRY=0x11
+[TRACE]TRACE_FLOW[0x8A]_REF_CREFERENCEPOLICYPLUGIN_DOCANCEL_EXIT=0x12
+[TRACE]TRACE_FLOW[0x8A]_REF_CREFERENCEPOLICYPLUGIN_FILTERFSFORBIDDENDRIVELISTL_ENTRY=0x24
+[TRACE]TRACE_FLOW[0x8A]_REF_CREFERENCEPOLICYPLUGIN_FILTERFSFORBIDDENDRIVELISTL_EXIT=0x25
+[TRACE]TRACE_FLOW[0x8A]_REF_CREFERENCEPOLICYPLUGIN_FINDFIRSTNOTUSEDDRIVELETTER_ENTRY=0x26
+[TRACE]TRACE_FLOW[0x8A]_REF_CREFERENCEPOLICYPLUGIN_FINDFIRSTNOTUSEDDRIVELETTER_EXIT=0x27
+[TRACE]TRACE_FLOW[0x8A]_REF_CREFERENCEPOLICYPLUGIN_FINDFIRSTNOTUSEDDRIVELETTER_EXIT_DUP1=0x28
+[TRACE]TRACE_FLOW[0x8A]_REF_CREFERENCEPOLICYPLUGIN_GETSUSPENSIONPOLICY_ENTRY=0xf
+[TRACE]TRACE_FLOW[0x8A]_REF_CREFERENCEPOLICYPLUGIN_GETSUSPENSIONPOLICY_EXIT=0x10
+[TRACE]TRACE_FLOW[0x8A]_REF_CREFERENCEPOLICYPLUGIN_NEWL_ENTRY=0x3
+[TRACE]TRACE_FLOW[0x8A]_REF_CREFERENCEPOLICYPLUGIN_NEWL_EXIT=0x4
+[TRACE]TRACE_FLOW[0x8A]_REF_CREFERENCEPOLICYPLUGIN_PREPAREAVAILABLEDRIVELIST_ENTRY=0x20
+[TRACE]TRACE_FLOW[0x8A]_REF_CREFERENCEPOLICYPLUGIN_PREPAREAVAILABLEDRIVELIST_EXIT=0x21
+[TRACE]TRACE_FLOW[0x8A]_REF_CREFERENCEPOLICYPLUGIN_RETRIEVEDRIVELETTERL_TTEXT_TPOLICYREQUESTDATA_ENTRY=0x58
+[TRACE]TRACE_FLOW[0x8A]_REF_CREFERENCEPOLICYPLUGIN_RETRIEVEDRIVELETTERL_TTEXT_TPOLICYREQUESTDATA_EXIT=0x59
+[TRACE]TRACE_FLOW[0x8A]_REF_CREFERENCEPOLICYPLUGIN_RETRIEVEDRIVELETTERL_TTEXT_TPOLICYREQUESTDATA_TREQUESTSTATUS_ENTRY=0x54
+[TRACE]TRACE_FLOW[0x8A]_REF_CREFERENCEPOLICYPLUGIN_RETRIEVEDRIVELETTERL_TTEXT_TPOLICYREQUESTDATA_TREQUESTSTATUS_EXIT=0x55
+[TRACE]TRACE_FLOW[0x8A]_REF_CREFERENCEPOLICYPLUGIN_RETRIEVEHISTORYL_ENTRY=0x29
+[TRACE]TRACE_FLOW[0x8A]_REF_CREFERENCEPOLICYPLUGIN_RETRIEVEHISTORYL_EXIT=0x2a
+[TRACE]TRACE_FLOW[0x8A]_REF_CREFERENCEPOLICYPLUGIN_RUNL_ENTRY=0x13
+[TRACE]TRACE_FLOW[0x8A]_REF_CREFERENCEPOLICYPLUGIN_RUNL_EXIT=0x14
+[TRACE]TRACE_FLOW[0x8A]_REF_CREFERENCEPOLICYPLUGIN_SAVELATESTMOUNTINFOL_TPOLICYMOUNTRECORD_ENTRY=0x5a
+[TRACE]TRACE_FLOW[0x8A]_REF_CREFERENCEPOLICYPLUGIN_SAVELATESTMOUNTINFOL_TPOLICYMOUNTRECORD_EXIT=0x5b
+[TRACE]TRACE_FLOW[0x8A]_REF_CREFERENCEPOLICYPLUGIN_SAVELATESTMOUNTINFOL_TPOLICYMOUNTRECORD_EXIT_DUP1=0x5c
+[TRACE]TRACE_FLOW[0x8A]_REF_CREFERENCEPOLICYPLUGIN_SAVELATESTMOUNTINFOL_TPOLICYMOUNTRECORD_TREQUESTSTATUS_ENTRY=0x56
+[TRACE]TRACE_FLOW[0x8A]_REF_CREFERENCEPOLICYPLUGIN_SAVELATESTMOUNTINFOL_TPOLICYMOUNTRECORD_TREQUESTSTATUS_EXIT=0x57
+[TRACE]TRACE_FLOW[0x8A]_REF_CREFERENCEPOLICYPLUGIN_SEARCHHISTORYBYLOGICUNIT_ENTRY=0x2d
+[TRACE]TRACE_FLOW[0x8A]_REF_CREFERENCEPOLICYPLUGIN_SEARCHHISTORYBYLOGICUNIT_EXIT=0x2e
+[TRACE]TRACE_FLOW[0x8A]_REF_CREFERENCEPOLICYPLUGIN_SEARCHHISTORYBYLOGICUNIT_EXIT_DUP1=0x2f
+[TRACE]TRACE_FLOW[0x8A]_REF_CREFERENCEPOLICYPLUGIN_SENDERRORNOTIFICATIONL_ENTRY=0xd
+[TRACE]TRACE_FLOW[0x8A]_REF_CREFERENCEPOLICYPLUGIN_SENDERRORNOTIFICATIONL_EXIT=0xe
+[TRACE]TRACE_NORMAL[0x86]_REF_CMSMMPOLICYNOTIFICATIONMANAGER_SENDERRORNOTIFICATIONL=0x3
+[TRACE]TRACE_NORMAL[0x86]_REF_CMSMMPOLICYNOTIFICATIONMANAGER_SENDERRORNOTIFICATIONL_DUP1=0x4
+[TRACE]TRACE_NORMAL[0x86]_REF_CMSMMPOLICYNOTIFICATIONMANAGER_SENDERRORNOTIFICATIONL_DUP2=0x5
+[TRACE]TRACE_NORMAL[0x86]_REF_CMSMMPOLICYNOTIFICATIONMANAGER_SENDERRORNOTIFICATIONL_DUP3=0x6
+[TRACE]TRACE_NORMAL[0x86]_REF_CMSMMPOLICYNOTIFICATIONMANAGER_SENDERRORNOTIFICATIONL_DUP4=0x7
+[TRACE]TRACE_NORMAL[0x86]_REF_REFERENCEPOLICYPLUGIN_SRC_IMPLEMENTATIONGROUPPROXY=0x1
+[TRACE]TRACE_NORMAL[0x86]_REF_REFERENCEPOLICYPLUGIN_SRC_IMPLEMENTATIONGROUPPROXY_DUP1=0x2
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CREFERENCEPOLICYPLUGIN_RETRIEVEDRIVELETTERL_ENTRY=0x42
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_REF_CREFERENCEPOLICYPLUGIN_RETRIEVEDRIVELETTERL_DUP1_ENTRY=0x4f
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_REF_CREFERENCEPOLICYPLUGIN_RETRIEVEDRIVELETTERL_DUP1_EXIT=0x50
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_REF_CREFERENCEPOLICYPLUGIN_RETRIEVEDRIVELETTERL_ENTRY=0x4d
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_REF_CREFERENCEPOLICYPLUGIN_RETRIEVEDRIVELETTERL_EXIT=0x4e
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_REF_CREFERENCEPOLICYPLUGIN_SAVELATESTMOUNTINFOL_DUP1_ENTRY=0x51
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_REF_CREFERENCEPOLICYPLUGIN_SAVELATESTMOUNTINFOL_DUP1_EXIT=0x52
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_REF_CREFERENCEPOLICYPLUGIN_SAVELATESTMOUNTINFOL_DUP1_EXIT_DUP1=0x53
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_REF_CREFERENCEPOLICYPLUGIN_SAVELATESTMOUNTINFOL_ENTRY=0x4b
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_REF_CREFERENCEPOLICYPLUGIN_SAVELATESTMOUNTINFOL_EXIT=0x4c
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_REF_CREFERENCEPOLICYPLUGIN_SAVELATESTMOUNTINFOL_EXIT_DUP1=0x1d
--- a/usbmgmt/usbmgr/host/functiondrivers/ms/msmm/server/group/msmmserver_base.mmp Wed Jul 07 14:16:40 2010 +0800
+++ b/usbmgmt/usbmgr/host/functiondrivers/ms/msmm/server/group/msmmserver_base.mmp Wed Jul 07 15:08:54 2010 +0800
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2008-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"
@@ -23,7 +23,6 @@
OS_LAYER_SYSTEMINCLUDE_SYMBIAN
#include "../public/hostmscaps.mmh"
-#include <usb/usblogger.mmh>
LIBRARY euser.lib
LIBRARY ecom.lib
@@ -45,5 +44,6 @@
USERINCLUDE ../inc
USERINCLUDE ../public
USERINCLUDE ../../inc
+USERINCLUDE ../traces
VENDORID 0x70000001
--- a/usbmgmt/usbmgr/host/functiondrivers/ms/msmm/server/src/eventhandler.cpp Wed Jul 07 14:16:40 2010 +0800
+++ b/usbmgmt/usbmgr/host/functiondrivers/ms/msmm/server/src/eventhandler.cpp Wed Jul 07 15:08:54 2010 +0800
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2008-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"
@@ -27,27 +27,32 @@
#include "msmmengine.h"
#include "subcommands.h"
#include "msmmnodebase.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "eventhandlerTraces.h"
+#endif
-#ifdef __FLOG_ACTIVE
-_LIT8(KLogComponent, "UsbHostMsmmServer");
-#endif
+
// Push a sub-command into the queue and transfer the owership
// to the queue
void RSubCommandQueue::PushL(TSubCommandBase* aCommand)
{
- LOG_FUNC
+ OstTraceFunctionEntry0( RSUBCOMMANDQUEUE_PUSHL_ENTRY );
+
CleanupStack::PushL(aCommand);
iQueue.AppendL(aCommand);
CleanupStack::Pop(aCommand);
+ OstTraceFunctionExit0( RSUBCOMMANDQUEUE_PUSHL_EXIT );
}
// Pop the head entity from the queue and destroy it
void RSubCommandQueue::Pop()
{
- LOG_FUNC
+ OstTraceFunctionEntry0( RSUBCOMMANDQUEUE_POP_ENTRY );
if (iQueue.Count() == 0)
{
+ OstTraceFunctionExit0( RSUBCOMMANDQUEUE_POP_EXIT );
return;
}
@@ -55,39 +60,45 @@
iQueue.Remove(0);
delete command;
command = NULL;
+ OstTraceFunctionExit0( RSUBCOMMANDQUEUE_POP_EXIT_DUP1 );
}
// Insert a sub-command sequence after head entities
void RSubCommandQueue::InsertAfterHeadL(TSubCommandBase* aCommand)
{
- LOG_FUNC
+ OstTraceFunctionEntry0( RSUBCOMMANDQUEUE_INSERTAFTERHEADL_ENTRY );
+
if (!aCommand)
{
User::Leave(KErrArgument);
}
iQueue.InsertL(aCommand, 1);
+ OstTraceFunctionExit0( RSUBCOMMANDQUEUE_INSERTAFTERHEADL_EXIT );
}
// Execute the head sub-comment
void RSubCommandQueue::ExecuteHeadL()
{
- LOG_FUNC
+ OstTraceFunctionEntry0( RSUBCOMMANDQUEUE_EXECUTEHEADL_ENTRY );
Head().ExecuteL();
+ OstTraceFunctionExit0( RSUBCOMMANDQUEUE_EXECUTEHEADL_EXIT );
}
// Get a reference of head sub-command in queue
TSubCommandBase& RSubCommandQueue::Head()
{
- LOG_FUNC
+ OstTraceFunctionEntry0( RSUBCOMMANDQUEUE_HEAD_ENTRY );
return *iQueue[0];
}
// Destory all entities and release the memory of queue
void RSubCommandQueue::Release()
{
- LOG_FUNC
+ OstTraceFunctionEntry0( RSUBCOMMANDQUEUE_RELEASE_ENTRY );
+
iQueue.ResetAndDestroy();
+ OstTraceFunctionExit0( RSUBCOMMANDQUEUE_RELEASE_EXIT );
}
/*
@@ -95,36 +106,43 @@
*/
CDeviceEventHandler::~CDeviceEventHandler()
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CDEVICEEVENTHANDLER_CDEVICEEVENTHANDLER_DES_ENTRY );
+
Cancel();
delete iErrNotiData;
iSubCommandQueue.Release();
+ OstTraceFunctionExit0( CDEVICEEVENTHANDLER_CDEVICEEVENTHANDLER_DES_EXIT );
}
CDeviceEventHandler* CDeviceEventHandler::NewL(MMsmmSrvProxy& aServer)
{
- LOG_STATIC_FUNC_ENTRY
+ OstTraceFunctionEntry0( CDEVICEEVENTHANDLER_NEWL_ENTRY );
+
CDeviceEventHandler* self = CDeviceEventHandler::NewLC(aServer);
CleanupStack::Pop(self);
+ OstTraceFunctionExit0( CDEVICEEVENTHANDLER_NEWL_EXIT );
return self;
}
CDeviceEventHandler* CDeviceEventHandler::NewLC(MMsmmSrvProxy& aServer)
{
- LOG_STATIC_FUNC_ENTRY
+ OstTraceFunctionEntry0( CDEVICEEVENTHANDLER_NEWLC_ENTRY );
+
CDeviceEventHandler* self =
new (ELeave) CDeviceEventHandler(aServer);
CleanupStack::PushL(self);
self->ConstructL();
+ OstTraceFunctionExit0( CDEVICEEVENTHANDLER_NEWLC_EXIT );
return self;
}
void CDeviceEventHandler::CreateSubCmdForRetrieveDriveLetterL(
TInt aLogicalUnitCount)
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CDEVICEEVENTHANDLER_CREATESUBCMDFORRETRIEVEDRIVELETTERL_ENTRY );
+
TRetrieveDriveLetter* command(NULL);
THostMsSubCommandParam parameter(iServer, *this, *this, iIncomingEvent);
for (TInt index = 0; index < aLogicalUnitCount; index++)
@@ -132,49 +150,60 @@
command = new (ELeave) TRetrieveDriveLetter(parameter, index);
iSubCommandQueue.PushL(command);
}
+ OstTraceFunctionExit0( CDEVICEEVENTHANDLER_CREATESUBCMDFORRETRIEVEDRIVELETTERL_EXIT );
}
void CDeviceEventHandler::CreateSubCmdForMountingLogicalUnitL(TText aDrive,
TInt aLuNumber)
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CDEVICEEVENTHANDLER_CREATESUBCMDFORMOUNTINGLOGICALUNITL_ENTRY );
+
THostMsSubCommandParam parameter(iServer, *this, *this, iIncomingEvent);
TMountLogicalUnit* command = new (ELeave) TMountLogicalUnit(
parameter, aDrive, aLuNumber);
iSubCommandQueue.InsertAfterHeadL(command);
+ OstTraceFunctionExit0( CDEVICEEVENTHANDLER_CREATESUBCMDFORMOUNTINGLOGICALUNITL_EXIT );
}
void CDeviceEventHandler::CreateSubCmdForSaveLatestMountInfoL(TText aDrive,
TInt aLuNumber)
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CDEVICEEVENTHANDLER_CREATESUBCMDFORSAVELATESTMOUNTINFOL_ENTRY );
+
THostMsSubCommandParam parameter(iServer, *this, *this, iIncomingEvent);
TSaveLatestMountInfo* command =
new (ELeave) TSaveLatestMountInfo(parameter, aDrive, aLuNumber);
iSubCommandQueue.InsertAfterHeadL(command);
+ OstTraceFunctionExit0( CDEVICEEVENTHANDLER_CREATESUBCMDFORSAVELATESTMOUNTINFOL_EXIT );
}
void CDeviceEventHandler::Start()
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CDEVICEEVENTHANDLER_START_ENTRY );
+
if (IsActive())
{
+ OstTraceFunctionExit0( CDEVICEEVENTHANDLER_START_EXIT );
return;
}
iStatus = KRequestPending;
SetActive();
+ OstTraceFunctionExit0( CDEVICEEVENTHANDLER_START_EXIT_DUP1 );
}
void CDeviceEventHandler::Complete(TInt aError)
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CDEVICEEVENTHANDLER_COMPLETE_ENTRY );
+
TRequestStatus* status = &iStatus;
User::RequestComplete(status, aError);
+ OstTraceFunctionExit0( CDEVICEEVENTHANDLER_COMPLETE_EXIT );
}
TRequestStatus& CDeviceEventHandler::Status() const
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CDEVICEEVENTHANDLER_STATUS_ENTRY );
+
const TRequestStatus& status = iStatus;
return const_cast<TRequestStatus&>(status);
}
@@ -182,7 +211,8 @@
void CDeviceEventHandler::HandleEventL(TRequestStatus& aStatus,
const TDeviceEvent& aEvent)
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CDEVICEEVENTHANDLER_HANDLEEVENTL_ENTRY );
+
if (IsActive())
{
// An event is being handled. Currently handler is busy.
@@ -201,6 +231,7 @@
// Start the handler to handle the incoming event
Start();
Complete();
+ OstTraceFunctionExit0( CDEVICEEVENTHANDLER_HANDLEEVENTL_EXIT );
}
/*
@@ -209,25 +240,28 @@
void CDeviceEventHandler::DoCancel()
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CDEVICEEVENTHANDLER_DOCANCEL_ENTRY );
+
// Complete client with KErrCancel
CompleteClient(KErrCancel);
// Cancel current pending command
- if (iSubCommandQueue.Count())
+ if (iSubCommandQueue.Count())
{
- iSubCommandQueue.Head().CancelAsyncCmd();
- }
+ iSubCommandQueue.Head().CancelAsyncCmd();
+ }
+ OstTraceFunctionExit0( CDEVICEEVENTHANDLER_DOCANCEL_EXIT );
}
void CDeviceEventHandler::RunL( )
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CDEVICEEVENTHANDLER_RUNL_ENTRY );
if (iSubCommandQueue.Count() == 0)
{
// Error occurs in lastest sub-command's DoExecuteL()
// Or current command has been cancelled.
+ OstTraceFunctionExit0( CDEVICEEVENTHANDLER_RUNL_EXIT );
return;
}
@@ -249,26 +283,27 @@
// Complete client
CompleteClient();
}
+ OstTraceFunctionExit0( CDEVICEEVENTHANDLER_RUNL_EXIT_DUP1 );
}
TInt CDeviceEventHandler::RunError(TInt aError)
{
- LOG_FUNC
-
- if (iSubCommandQueue.Count())
+ OstTraceFunctionEntry0( CDEVICEEVENTHANDLER_RUNERROR_ENTRY );
+
+ if (iSubCommandQueue.Count())
{
- // Retrieve sub-command related error notification data
- iSubCommandQueue.Head().HandleError(*iErrNotiData, aError);
+ // Retrieve sub-command related error notification data
+ iSubCommandQueue.Head().HandleError(*iErrNotiData, aError);
- // If current sub-command isn't a key one, the handler will continue to
- // execute rest sub-command in the queue. But, if current sub-command
- // is the last one in the queue, handler shall complete the client also.
- if (iSubCommandQueue.Head().IsKeyCommand() ||
- (iSubCommandQueue.Count() == 1))
- {
- CompleteClient(aError);
- }
- iSubCommandQueue.Pop();
+ // If current sub-command isn't a key one, the handler will continue to
+ // execute rest sub-command in the queue. But, if current sub-command
+ // is the last one in the queue, handler shall complete the client also.
+ if (iSubCommandQueue.Head().IsKeyCommand() ||
+ (iSubCommandQueue.Count() == 1))
+ {
+ CompleteClient(aError);
+ }
+ iSubCommandQueue.Pop();
}
if( IsActive() )
@@ -281,6 +316,7 @@
Complete();
}
+ OstTraceFunctionExit0( CDEVICEEVENTHANDLER_RUNERROR_EXIT );
return KErrNone;
}
@@ -289,20 +325,25 @@
CActive(EPriorityStandard),
iServer(aServer)
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CDEVICEEVENTHANDLER_CDEVICEEVENTHANDLER_ENTRY );
+
CActiveScheduler::Add(this);
+ OstTraceFunctionExit0( CDEVICEEVENTHANDLER_CDEVICEEVENTHANDLER_EXIT );
}
void CDeviceEventHandler::ConstructL()
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CDEVICEEVENTHANDLER_CONSTRUCTL_ENTRY );
+
iErrNotiData = new (ELeave) THostMsErrData;
ResetHandler();
+ OstTraceFunctionExit0( CDEVICEEVENTHANDLER_CONSTRUCTL_EXIT );
}
void CDeviceEventHandler::CreateSubCmdForDeviceEventL()
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CDEVICEEVENTHANDLER_CREATESUBCMDFORDEVICEEVENTL_ENTRY );
+
switch (iIncomingEvent.iEvent)
{
case EDeviceEventAddFunction:
@@ -312,19 +353,23 @@
CreateSubCmdForRemovingUsbMsDeviceL();
break;
}
+ OstTraceFunctionExit0( CDEVICEEVENTHANDLER_CREATESUBCMDFORDEVICEEVENTL_EXIT );
}
void CDeviceEventHandler::CreateSubCmdForAddingUsbMsFunctionL()
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CDEVICEEVENTHANDLER_CREATESUBCMDFORADDINGUSBMSFUNCTIONL_ENTRY );
+
THostMsSubCommandParam parameter(iServer, *this, *this, iIncomingEvent);
TRegisterInterface* command = new (ELeave) TRegisterInterface(parameter);
iSubCommandQueue.PushL(command);
+ OstTraceFunctionExit0( CDEVICEEVENTHANDLER_CREATESUBCMDFORADDINGUSBMSFUNCTIONL_EXIT );
}
void CDeviceEventHandler::CreateSubCmdForRemovingUsbMsDeviceL()
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CDEVICEEVENTHANDLER_CREATESUBCMDFORREMOVINGUSBMSDEVICEL_ENTRY );
+
CMsmmEngine& engine = iServer.Engine();
TUsbMsDevice* device = engine.SearchDevice(iIncomingEvent.iDeviceId);
if (!device)
@@ -352,18 +397,22 @@
TRemoveUsbMsDeviceNode* removeNode =
new (ELeave) TRemoveUsbMsDeviceNode(parameter, device);
iSubCommandQueue.PushL(removeNode);
+ OstTraceFunctionExit0( CDEVICEEVENTHANDLER_CREATESUBCMDFORREMOVINGUSBMSDEVICEL_EXIT );
}
void CDeviceEventHandler::ResetHandler()
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CDEVICEEVENTHANDLER_RESETHANDLER_ENTRY );
+
ResetHandlerData();
ResetHandlerError();
+ OstTraceFunctionExit0( CDEVICEEVENTHANDLER_RESETHANDLER_EXIT );
}
void CDeviceEventHandler::ResetHandlerData()
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CDEVICEEVENTHANDLER_RESETHANDLERDATA_ENTRY );
+
// Reset event buffer
iIncomingEvent.iDeviceId = 0;
iIncomingEvent.iEvent = EDeviceEventEndMark;
@@ -371,25 +420,30 @@
// Destory sub-command queue
iSubCommandQueue.Release();
+ OstTraceFunctionExit0( CDEVICEEVENTHANDLER_RESETHANDLERDATA_EXIT );
}
void CDeviceEventHandler::ResetHandlerError()
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CDEVICEEVENTHANDLER_RESETHANDLERERROR_ENTRY );
+
// Reset error notification data
iErrNotiData->iDriveName = 0x0;
iErrNotiData->iError = EHostMsErrorEndMarker;
iErrNotiData->iE32Error = KErrNone;
iErrNotiData->iManufacturerString.Zero();
+ OstTraceFunctionExit0( CDEVICEEVENTHANDLER_RESETHANDLERERROR_EXIT );
}
void CDeviceEventHandler::CompleteClient(TInt aError/* = KErrNone*/)
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CDEVICEEVENTHANDLER_COMPLETECLIENT_ENTRY );
+
if (iEvtQueueStatus)
{
User::RequestComplete(iEvtQueueStatus, aError);
}
+ OstTraceFunctionExit0( CDEVICEEVENTHANDLER_COMPLETECLIENT_EXIT );
}
// End of file
--- a/usbmgmt/usbmgr/host/functiondrivers/ms/msmm/server/src/eventqueue.cpp Wed Jul 07 14:16:40 2010 +0800
+++ b/usbmgmt/usbmgr/host/functiondrivers/ms/msmm/server/src/eventqueue.cpp Wed Jul 07 15:08:54 2010 +0800
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2008-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"
@@ -27,47 +27,55 @@
#include "msmmengine.h"
#include <usb/hostms/msmmpolicypluginbase.h>
#include <usb/usblogger.h>
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "eventqueueTraces.h"
+#endif
-#ifdef __FLOG_ACTIVE
-_LIT8(KLogComponent, "UsbHostMsmmServer");
-#endif
// Public member functions
CDeviceEventQueue::~CDeviceEventQueue( )
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CDEVICEEVENTQUEUE_CDEVICEEVENTQUEUE_DES_ENTRY );
+
Cancel();
delete iHandler;
iEventArray.Close();
+ OstTraceFunctionExit0( CDEVICEEVENTQUEUE_CDEVICEEVENTQUEUE_DES_EXIT );
}
CDeviceEventQueue* CDeviceEventQueue::NewL(MMsmmSrvProxy& aServer)
{
- LOG_STATIC_FUNC_ENTRY
+ OstTraceFunctionEntry0( CDEVICEEVENTQUEUE_NEWL_ENTRY );
+
CDeviceEventQueue* self = CDeviceEventQueue::NewLC(aServer);
CleanupStack::Pop(self);
+ OstTraceFunctionExit0( CDEVICEEVENTQUEUE_NEWL_EXIT );
return self;
}
CDeviceEventQueue* CDeviceEventQueue::NewLC(MMsmmSrvProxy& aServer)
{
- LOG_STATIC_FUNC_ENTRY
+ OstTraceFunctionEntry0( CDEVICEEVENTQUEUE_NEWLC_ENTRY );
+
CDeviceEventQueue* self = new (ELeave) CDeviceEventQueue(aServer);
CleanupStack::PushL(self);
self->ConstructL();
+ OstTraceFunctionExit0( CDEVICEEVENTQUEUE_NEWLC_EXIT );
return self;
}
void CDeviceEventQueue::PushL(const TDeviceEvent& aEvent)
{
- LOG_FUNC
-
+ OstTraceFunctionEntry0( CDEVICEEVENTQUEUE_PUSHL_ENTRY );
+
// Perform optimization for remove device event
AppendAndOptimizeL(aEvent);
// Start handling first event in queue
StartL();
+ OstTraceFunctionExit0( CDEVICEEVENTQUEUE_PUSHL_EXIT );
}
void CDeviceEventQueue::Finalize()
@@ -95,14 +103,17 @@
// Protected member functions
void CDeviceEventQueue::DoCancel()
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CDEVICEEVENTQUEUE_DOCANCEL_ENTRY );
+
iEventArray.Reset();
iHandler->Cancel();
+ OstTraceFunctionExit0( CDEVICEEVENTQUEUE_DOCANCEL_EXIT );
}
void CDeviceEventQueue::RunL()
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CDEVICEEVENTQUEUE_RUNL_ENTRY );
+
// Check the completion code from CDeviceEventHandler. If there
// is some error occured. We need issue error notification here.
TInt err = iStatus.Int();
@@ -116,11 +127,13 @@
{
SendEventL();
}
+ OstTraceFunctionExit0( CDEVICEEVENTQUEUE_RUNL_EXIT );
}
TInt CDeviceEventQueue::RunError(TInt aError)
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CDEVICEEVENTQUEUE_RUNERROR_ENTRY );
+
THostMsErrData errData;
switch (aError)
{
@@ -144,6 +157,7 @@
errData.iDriveName = 0x0;
TInt err(KErrNone);
TRAP(err, iServer.PolicyPlugin()->SendErrorNotificationL(errData));
+ OstTraceFunctionExit0( CDEVICEEVENTQUEUE_RUNERROR_EXIT );
return KErrNone;
}
@@ -152,19 +166,24 @@
CActive(EPriorityStandard),
iServer(aServer)
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CDEVICEEVENTQUEUE_CDEVICEEVENTQUEUE_CONS_ENTRY );
+
CActiveScheduler::Add(this);
+ OstTraceFunctionExit0( CDEVICEEVENTQUEUE_CDEVICEEVENTQUEUE_CONS_EXIT );
}
void CDeviceEventQueue::ConstructL()
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CDEVICEEVENTQUEUE_CONSTRUCTL_ENTRY );
+
iHandler = CDeviceEventHandler::NewL(iServer);
+ OstTraceFunctionExit0( CDEVICEEVENTQUEUE_CONSTRUCTL_EXIT );
}
void CDeviceEventQueue::AppendAndOptimizeL(const TDeviceEvent& aEvent)
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CDEVICEEVENTQUEUE_APPENDANDOPTIMIZEL_ENTRY );
+
if (EDeviceEventRemoveDevice == aEvent.iEvent)
{
// Scan the event queue to discard all pending related adding
@@ -196,19 +215,23 @@
if (aEvent.iDeviceId == iHandler->Event().iDeviceId && IsActive())
{
// Discard duplicated removing event.
+ OstTraceFunctionExit0( CDEVICEEVENTQUEUE_APPENDANDOPTIMIZEL_EXIT );
return;
}
break;
}
}
iEventArray.AppendL(aEvent);
+ OstTraceFunctionExit0( CDEVICEEVENTQUEUE_APPENDANDOPTIMIZEL_EXIT_DUP1 );
}
void CDeviceEventQueue::StartL()
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CDEVICEEVENTQUEUE_STARTL_ENTRY );
+
if (IsActive())
{
+ OstTraceFunctionExit0( CDEVICEEVENTQUEUE_STARTL_EXIT );
return;
}
@@ -216,24 +239,29 @@
{
SendEventL();
}
+ OstTraceFunctionExit0( CDEVICEEVENTQUEUE_STARTL_EXIT_DUP1 );
}
void CDeviceEventQueue::SendEventL()
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CDEVICEEVENTQUEUE_SENDEVENTL_ENTRY );
+
// If the handler is available, sending oldest event to it
iHandler->HandleEventL(iStatus, Pop());
// Activiate the manager again to wait for the handler
// finish current event
SetActive();
+ OstTraceFunctionExit0( CDEVICEEVENTQUEUE_SENDEVENTL_EXIT );
}
TDeviceEvent CDeviceEventQueue::Pop()
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CDEVICEEVENTQUEUE_POP_ENTRY );
+
TDeviceEvent event = iEventArray[0];
iEventArray.Remove(0);
+ OstTraceFunctionExit0( CDEVICEEVENTQUEUE_POP_EXIT );
return event;
}
--- a/usbmgmt/usbmgr/host/functiondrivers/ms/msmm/server/src/main.cpp Wed Jul 07 14:16:40 2010 +0800
+++ b/usbmgmt/usbmgr/host/functiondrivers/ms/msmm/server/src/main.cpp Wed Jul 07 15:08:54 2010 +0800
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2008-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"
--- a/usbmgmt/usbmgr/host/functiondrivers/ms/msmm/server/src/msmmdismountusbdrives.cpp Wed Jul 07 14:16:40 2010 +0800
+++ b/usbmgmt/usbmgr/host/functiondrivers/ms/msmm/server/src/msmmdismountusbdrives.cpp Wed Jul 07 15:08:54 2010 +0800
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2007-2008 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"
@@ -21,20 +21,23 @@
#include <usb/hostms/msmmpolicypluginbase.h>
#include "msmmdismountusbdrives.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "msmmdismountusbdrivesTraces.h"
+#endif
+
const TInt KDismountTimeOut = 6000000; // 6 seconds
-#ifdef __FLOG_ACTIVE
-_LIT8(KLogComponent, "UsbHostMsmmServer");
-#endif
-
CMsmmDismountUsbDrives::~CMsmmDismountUsbDrives()
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CMSMMDISMOUNTUSBDRIVES_CMSMMDISMOUNTUSBDRIVES_DES_ENTRY );
+
Cancel();
delete iDismountTimer;
iRFs.Close();
+ OstTraceFunctionExit0( CMSMMDISMOUNTUSBDRIVES_CMSMMDISMOUNTUSBDRIVES_DES_EXIT );
}
/**
@@ -42,9 +45,11 @@
*/
CMsmmDismountUsbDrives* CMsmmDismountUsbDrives::NewL()
{
- LOG_STATIC_FUNC_ENTRY
+ OstTraceFunctionEntry0( CMSMMDISMOUNTUSBDRIVES_NEWL_ENTRY );
+
CMsmmDismountUsbDrives* self = CMsmmDismountUsbDrives::NewLC();
CleanupStack::Pop(self);
+ OstTraceFunctionExit0( CMSMMDISMOUNTUSBDRIVES_NEWL_EXIT );
return self;
}
@@ -53,10 +58,12 @@
*/
CMsmmDismountUsbDrives* CMsmmDismountUsbDrives::NewLC()
{
- LOG_STATIC_FUNC_ENTRY
+ OstTraceFunctionEntry0( CMSMMDISMOUNTUSBDRIVES_NEWLC_ENTRY );
+
CMsmmDismountUsbDrives* self = new (ELeave) CMsmmDismountUsbDrives();
CleanupStack::PushL(self);
self->ConstructL();
+ OstTraceFunctionExit0( CMSMMDISMOUNTUSBDRIVES_NEWLC_EXIT );
return self;
}
@@ -65,7 +72,7 @@
*/
void CMsmmDismountUsbDrives::RunL()
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CMSMMDISMOUNTUSBDRIVES_RUNL_ENTRY );
iDismountTimer->CancelTimer();
@@ -85,6 +92,7 @@
{
DoDismount();
}
+ OstTraceFunctionExit0( CMSMMDISMOUNTUSBDRIVES_RUNL_EXIT );
}
/**
@@ -92,22 +100,28 @@
*/
void CMsmmDismountUsbDrives::DoCancel()
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CMSMMDISMOUNTUSBDRIVES_DOCANCEL_ENTRY );
+
iRFs.NotifyDismountCancel(iStatus);
+ OstTraceFunctionExit0( CMSMMDISMOUNTUSBDRIVES_DOCANCEL_EXIT );
}
CMsmmDismountUsbDrives::CMsmmDismountUsbDrives()
: CActive(EPriorityStandard)
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CMSMMDISMOUNTUSBDRIVES_CMSMMDISMOUNTUSBDRIVES_ENTRY );
+
CActiveScheduler::Add(this);
+ OstTraceFunctionExit0( CMSMMDISMOUNTUSBDRIVES_CMSMMDISMOUNTUSBDRIVES_EXIT );
}
void CMsmmDismountUsbDrives::ConstructL()
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CMSMMDISMOUNTUSBDRIVES_CONSTRUCTL_ENTRY );
+
User::LeaveIfError( iRFs.Connect());
iDismountTimer = CDismountTimer::NewL(this);
+ OstTraceFunctionExit0( CMSMMDISMOUNTUSBDRIVES_CONSTRUCTL_EXIT );
}
/**
@@ -115,7 +129,8 @@
*/
void CMsmmDismountUsbDrives::DismountUsbDrives(CMsmmPolicyPluginBase& aPlugin, TUSBMSDeviceDescription& aDevice)
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CMSMMDISMOUNTUSBDRIVES_DISMOUNTUSBDRIVES_ENTRY );
+
Cancel();
iPlugin = &aPlugin;
TUSBMSDeviceDescription& device = iDevicePkgInfo();
@@ -123,6 +138,7 @@
iDriveIndex = 0;
iRFs.DriveList( iDriveList );
DoDismount();
+ OstTraceFunctionExit0( CMSMMDISMOUNTUSBDRIVES_DISMOUNTUSBDRIVES_EXIT );
}
/**
@@ -148,7 +164,8 @@
*/
void CMsmmDismountUsbDrives::DoDismount()
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CMSMMDISMOUNTUSBDRIVES_DODISMOUNT_ENTRY );
+
TDriveInfo info;
TInt err = KErrNone;
for ( ; iDriveIndex < KMaxDrives; iDriveIndex++ )
@@ -160,16 +177,19 @@
info.iDriveAtt & KDriveAttExternal &&
err == KErrNone )
{
- LOGTEXT(_L("CMsmmDismountUsbDrives::DoDismount Dismount notify request "));
+ OstTrace0( TRACE_NORMAL, CMSMMDISMOUNTUSBDRIVES_DODISMOUNT,
+ "CMsmmDismountUsbDrives::DoDismount Dismount notify request" );
iRFs.NotifyDismount( iDriveIndex, iStatus, EFsDismountNotifyClients );
iDismountTimer->StartTimer();
SetActive();
+ OstTraceFunctionExit0( CMSMMDISMOUNTUSBDRIVES_DODISMOUNT_EXIT );
return;
}
}
}
// Indicates we have gone through all the drives and no more usb drives left to request dismount
CompleteDismountRequest( KErrNone );
+ OstTraceFunctionExit0( CMSMMDISMOUNTUSBDRIVES_DODISMOUNT_EXIT_DUP1 );
}
@@ -178,29 +198,34 @@
*/
void CMsmmDismountUsbDrives::TimerExpired()
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CMSMMDISMOUNTUSBDRIVES_TIMEREXPIRED_ENTRY );
Cancel();
iDismountTimer->CancelTimer();
CompleteDismountRequest( KErrInUse );
+ OstTraceFunctionExit0( CMSMMDISMOUNTUSBDRIVES_TIMEREXPIRED_EXIT );
}
//CDismountTimer
CDismountTimer* CDismountTimer::NewL( MTimerNotifier* aTimeOutNotify)
{
- LOG_STATIC_FUNC_ENTRY
+ OstTraceFunctionEntry0( CDISMOUNTTIMER_NEWL_ENTRY );
+
CDismountTimer* self = CDismountTimer::NewLC( aTimeOutNotify );
CleanupStack::Pop(self);
+ OstTraceFunctionExit0( CDISMOUNTTIMER_NEWL_EXIT );
return self;
}
CDismountTimer* CDismountTimer::NewLC( MTimerNotifier* aTimeOutNotify )
{
- LOG_STATIC_FUNC_ENTRY
+ OstTraceFunctionEntry0( CDISMOUNTTIMER_NEWLC_ENTRY );
+
CDismountTimer* self = new (ELeave) CDismountTimer( aTimeOutNotify );
CleanupStack::PushL(self);
self->ConstructL();
+ OstTraceFunctionExit0( CDISMOUNTTIMER_NEWLC_EXIT );
return self;
}
@@ -208,41 +233,51 @@
CTimer(EPriorityStandard),
iNotify(aTimeOutNotify)
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CDISMOUNTTIMER_CDISMOUNTTIMER_CONS_ENTRY );
}
CDismountTimer::~CDismountTimer()
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CDISMOUNTTIMER_CDISMOUNTTIMER_DES_ENTRY );
+
Cancel();
+ OstTraceFunctionExit0( CDISMOUNTTIMER_CDISMOUNTTIMER_DES_EXIT );
}
void CDismountTimer::ConstructL()
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CDISMOUNTTIMER_CONSTRUCTL_ENTRY );
+
if ( !iNotify )
{
User::Leave(KErrArgument);
}
CTimer::ConstructL();
CActiveScheduler::Add(this);
+ OstTraceFunctionExit0( CDISMOUNTTIMER_CONSTRUCTL_EXIT );
}
void CDismountTimer::RunL()
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CDISMOUNTTIMER_RUNL_ENTRY );
+
// Timer request has completed, so notify the timer's owner
iNotify->TimerExpired();
+ OstTraceFunctionExit0( CDISMOUNTTIMER_RUNL_EXIT );
}
void CDismountTimer::CancelTimer()
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CDISMOUNTTIMER_CANCELTIMER_ENTRY );
+
Cancel();
+ OstTraceFunctionExit0( CDISMOUNTTIMER_CANCELTIMER_EXIT );
}
void CDismountTimer::StartTimer()
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CDISMOUNTTIMER_STARTTIMER_ENTRY );
+
After( KDismountTimeOut );
+ OstTraceFunctionExit0( CDISMOUNTTIMER_STARTTIMER_EXIT );
}
// End of File
--- a/usbmgmt/usbmgr/host/functiondrivers/ms/msmm/server/src/msmmengine.cpp Wed Jul 07 14:16:40 2010 +0800
+++ b/usbmgmt/usbmgr/host/functiondrivers/ms/msmm/server/src/msmmengine.cpp Wed Jul 07 15:08:54 2010 +0800
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2008-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,54 +24,64 @@
#include "msmmnodebase.h"
#include <usb/usblogger.h>
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "msmmengineTraces.h"
+#endif
-#ifdef __FLOG_ACTIVE
-_LIT8(KLogComponent, "UsbHostMsmmServer");
-#endif
CMsmmEngine::~CMsmmEngine()
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CMSMMENGINE_CMSMMENGINE_DES_ENTRY );
+
if (iDataEntrys)
{
delete iDataEntrys;
}
+ OstTraceFunctionExit0( CMSMMENGINE_CMSMMENGINE_DES_EXIT );
}
CMsmmEngine* CMsmmEngine::NewL()
{
- LOG_STATIC_FUNC_ENTRY
+ OstTraceFunctionEntry0( CMSMMENGINE_NEWL_ENTRY );
+
CMsmmEngine* self = CMsmmEngine::NewLC();
CleanupStack::Pop(self);
+ OstTraceFunctionExit0( CMSMMENGINE_NEWL_EXIT );
return self;
}
CMsmmEngine* CMsmmEngine::NewLC()
{
- LOG_STATIC_FUNC_ENTRY
+ OstTraceFunctionEntry0( CMSMMENGINE_NEWLC_ENTRY );
+
CMsmmEngine* self = new (ELeave) CMsmmEngine();
CleanupStack::PushL(self);
self->ConstructL();
+ OstTraceFunctionExit0( CMSMMENGINE_NEWLC_EXIT );
return self;
}
void CMsmmEngine::AddUsbMsDeviceL(const TUSBMSDeviceDescription& aDevice)
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CMSMMENGINE_ADDUSBMSDEVICEL_ENTRY );
+
TUsbMsDevice* device = SearchDevice(aDevice.iDeviceId);
if (!device)
{
device = new (ELeave) TUsbMsDevice(aDevice);
iDataEntrys->AddChild(device);
}
+ OstTraceFunctionExit0( CMSMMENGINE_ADDUSBMSDEVICEL_EXIT );
}
TUsbMsInterface* CMsmmEngine::AddUsbMsInterfaceL(TInt aDeviceId, TUint8 aInterfaceNumber,
TInt32 aInterfaceToken)
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CMSMMENGINE_ADDUSBMSINTERFACEL_ENTRY );
+
TUsbMsDevice* device = SearchDevice(aDeviceId);
if (!device)
{
@@ -87,13 +97,15 @@
{
interface = AddUsbMsInterfaceNodeL(device, aInterfaceNumber, aInterfaceToken);
}
+ OstTraceFunctionExit0( CMSMMENGINE_ADDUSBMSINTERFACEL_EXIT );
return interface;
}
void CMsmmEngine::AddUsbMsLogicalUnitL(TInt aDeviceId,
TInt aInterfaceNumber, TInt aLogicalUnitNumber, TText aDrive)
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CMSMMENGINE_ADDUSBMSLOGICALUNITL_ENTRY );
+
TUsbMsDevice* device = SearchDevice(aDeviceId);
if (!device)
{
@@ -109,17 +121,21 @@
{
User::Leave(KErrArgument); // A proper interface node can't be found
}
+ OstTraceFunctionExit0( CMSMMENGINE_ADDUSBMSLOGICALUNITL_EXIT );
}
void CMsmmEngine::RemoveUsbMsNode(TMsmmNodeBase* aNodeToBeRemoved)
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CMSMMENGINE_REMOVEUSBMSNODE_ENTRY );
+
delete aNodeToBeRemoved;
+ OstTraceFunctionExit0( CMSMMENGINE_REMOVEUSBMSNODE_EXIT );
}
TUsbMsDevice* CMsmmEngine::SearchDevice(TInt aDeviceId) const
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CMSMMENGINE_SEARCHDEVICE_ENTRY );
+
return static_cast<TUsbMsDevice*>(
iDataEntrys->SearchInChildren(aDeviceId));
}
@@ -127,31 +143,37 @@
TUsbMsInterface* CMsmmEngine::SearchInterface(TMsmmNodeBase* aDevice,
TInt aInterfaceNumber) const
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CMSMMENGINE_SEARCHINTERFACE_ENTRY );
+
return static_cast<TUsbMsInterface*>(
aDevice->SearchInChildren(aInterfaceNumber));
}
CMsmmEngine::CMsmmEngine()
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CMSMMENGINE_CMSMMENGINE_CONS_ENTRY );
+
}
void CMsmmEngine::ConstructL()
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CMSMMENGINE_CONSTRUCTL_ENTRY );
+
// Create the root of the whole node tree
iDataEntrys = new (ELeave) TMsmmNodeBase(0x0);
+ OstTraceFunctionExit0( CMSMMENGINE_CONSTRUCTL_EXIT );
}
TUsbMsInterface* CMsmmEngine::AddUsbMsInterfaceNodeL(TUsbMsDevice* iParent,
TInt aInterfaceNumber, TInt aInterfaceToken)
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CMSMMENGINE_ADDUSBMSINTERFACENODEL_ENTRY );
+
TUsbMsInterface* interface = new (ELeave) TUsbMsInterface(
aInterfaceNumber, aInterfaceToken);
iParent->AddChild(interface);
+ OstTraceFunctionExit0( CMSMMENGINE_ADDUSBMSINTERFACENODEL_EXIT );
return interface;
}
@@ -159,11 +181,13 @@
TUsbMsInterface* iParent, TInt aLogicalUnitNumber,
TText aDrive)
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CMSMMENGINE_ADDUSBMSLOGICALUNITNODEL_ENTRY );
+
TUsbMsLogicalUnit* logicalUnit = new (ELeave) TUsbMsLogicalUnit(
aLogicalUnitNumber, aDrive);
iParent->AddChild(logicalUnit);
+ OstTraceFunctionExit0( CMSMMENGINE_ADDUSBMSLOGICALUNITNODEL_EXIT );
return logicalUnit;
}
--- a/usbmgmt/usbmgr/host/functiondrivers/ms/msmm/server/src/msmmnodebase.cpp Wed Jul 07 14:16:40 2010 +0800
+++ b/usbmgmt/usbmgr/host/functiondrivers/ms/msmm/server/src/msmmnodebase.cpp Wed Jul 07 15:08:54 2010 +0800
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2008-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"
@@ -23,10 +23,12 @@
#include "msmmnodebase.h"
#include <usb/usblogger.h>
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "msmmnodebaseTraces.h"
+#endif
-#ifdef __FLOG_ACTIVE
-_LIT8(KLogComponent, "UsbHostMsmmServer");
-#endif
+
TMsmmNodeBase::TMsmmNodeBase(TInt aIdentifier):
iIdentifier(aIdentifier),
@@ -35,19 +37,22 @@
iLastChild(NULL),
iParent(NULL)
{
- LOG_FUNC
+ OstTraceFunctionEntry0( TMSMMNODEBASE_TMSMMNODEBASE_CONS_ENTRY );
}
TMsmmNodeBase::~TMsmmNodeBase()
{
- LOG_FUNC
+ OstTraceFunctionEntry0( TMSMMNODEBASE_TMSMMNODEBASE_DES_ENTRY );
+
// Remove current node from the parent node and destroy it.
DestroyNode();
+ OstTraceFunctionExit0( TMSMMNODEBASE_TMSMMNODEBASE_DES_EXIT );
}
void TMsmmNodeBase::DestroyNode()
{
- LOG_FUNC
+ OstTraceFunctionEntry0( TMSMMNODEBASE_DESTROYNODE_ENTRY );
+
TMsmmNodeBase* parentNode = iParent;
TMsmmNodeBase* iterator(this);
TMsmmNodeBase* iteratorPrev(NULL);
@@ -91,6 +96,7 @@
else
{
// No matched node
+ OstTraceFunctionExit0( TMSMMNODEBASE_DESTROYNODE_EXIT );
return;
}
}
@@ -111,11 +117,13 @@
}
}
}
+ OstTraceFunctionExit0( TMSMMNODEBASE_DESTROYNODE_EXIT_DUP1 );
}
void TMsmmNodeBase::AddChild(TMsmmNodeBase* aChild)
{
- LOG_FUNC
+ OstTraceFunctionEntry0( TMSMMNODEBASE_ADDCHILD_ENTRY );
+
if (!iFirstChild)
{
iFirstChild = aChild;
@@ -126,11 +134,13 @@
}
iLastChild = aChild;
aChild->iParent = this;
+ OstTraceFunctionExit0( TMSMMNODEBASE_ADDCHILD_EXIT );
}
TMsmmNodeBase* TMsmmNodeBase::SearchInChildren(TInt aIdentifier)
{
- LOG_FUNC
+ OstTraceFunctionEntry0( TMSMMNODEBASE_SEARCHINCHILDREN_ENTRY );
+
TMsmmNodeBase* iterator(iFirstChild);
while (iterator)
@@ -142,6 +152,7 @@
iterator = iterator->iNextPeer;
}
+ OstTraceFunctionExit0( TMSMMNODEBASE_SEARCHINCHILDREN_EXIT );
return iterator;
}
@@ -151,7 +162,7 @@
TMsmmNodeBase(aDevice.iDeviceId),
iDevice(aDevice)
{
- LOG_FUNC
+ OstTraceFunctionEntry0( TUSBMSDEVICE_TUSBMSDEVICE_CONS_ENTRY );
}
// TUsbMsInterface
@@ -162,13 +173,15 @@
iInterfaceNumber(aInterfaceNumber),
iInterfaceToken(aInterfaceToken)
{
- LOG_FUNC
+ OstTraceFunctionEntry0( TUSBMSINTERFACE_TUSBMSINTERFACE_CONS_ENTRY );
}
TUsbMsInterface::~TUsbMsInterface()
{
- LOG_FUNC
+ OstTraceFunctionEntry0( TUSBMSINTERFACE_TUSBMSINTERFACE_DES_ENTRY );
+
iUsbMsDevice.Close();
+ OstTraceFunctionExit0( TUSBMSINTERFACE_TUSBMSINTERFACE_DES_EXIT );
}
// TUsbMsLogicalUnit
@@ -178,7 +191,7 @@
iLogicalUnitNumber(aLogicalUnitNumber),
iDrive(aDrive)
{
- LOG_FUNC
+ OstTraceFunctionEntry0( TUSBMSLOGICALUNIT_TUSBMSLOGICALUNIT_CONS_ENTRY );
}
// End of file
--- a/usbmgmt/usbmgr/host/functiondrivers/ms/msmm/server/src/msmmserver.cpp Wed Jul 07 14:16:40 2010 +0800
+++ b/usbmgmt/usbmgr/host/functiondrivers/ms/msmm/server/src/msmmserver.cpp Wed Jul 07 15:08:54 2010 +0800
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2008-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"
@@ -30,10 +30,11 @@
#include <usb/hostms/msmmpolicypluginbase.h>
#include <usb/usblogger.h>
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "msmmserverTraces.h"
+#endif
-#ifdef __FLOG_ACTIVE
-_LIT8(KLogComponent, "UsbHostMsmmServer");
-#endif
// Static public functions
TInt CMsmmServer::ThreadFunction()
@@ -45,15 +46,7 @@
CTrapCleanup* cleanupStack = CTrapCleanup::New();
if (cleanupStack)
{
-#ifdef __FLOG_ACTIVE
- (void)CUsbLog::Connect();
-#endif
-
TRAP(ret, ThreadFunctionL());
-
-#ifdef __FLOG_ACTIVE
- CUsbLog::Close();
-#endif
delete cleanupStack;
}
@@ -68,7 +61,7 @@
void CMsmmServer::ThreadFunctionL()
{
- LOG_STATIC_FUNC_ENTRY
+ OstTraceFunctionEntry0( CMSMMSERVER_THREADFUNCTIONL_ENTRY );
TSecureId creatorSID = User::CreatorSecureId();
if (KFDFWSecureId != creatorSID)
@@ -96,6 +89,7 @@
// Free the server and active scheduler.
CleanupStack::PopAndDestroy(2, scheduler);
+ OstTraceFunctionExit0( CMSMMSERVER_THREADFUNCTIONL_EXIT );
}
CPolicyServer::TCustomResult CMsmmServer::CustomSecurityCheckL(
@@ -122,7 +116,8 @@
// Construction and destruction
CMsmmServer* CMsmmServer::NewLC()
{
- LOG_STATIC_FUNC_ENTRY
+ OstTraceFunctionEntry0( CMSMMSERVER_NEWLC_ENTRY );
+
CMsmmServer* self = new (ELeave) CMsmmServer(EPriorityHigh);
CleanupStack::PushL(self);
@@ -130,12 +125,14 @@
self->StartL(KMsmmServerName);
self->ConstructL();
+ OstTraceFunctionExit0( CMSMMSERVER_NEWLC_EXIT );
return self;
}
CMsmmServer::~CMsmmServer()
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CMSMMSERVER_CMSMMSERVER_DES_ENTRY );
+
delete iPolicyPlugin;
delete iEventQueue;
delete iEngine;
@@ -148,18 +145,19 @@
iFs.RemoveProxyDrive(KPROXYDRIVENAME);
iFs.Close();
#endif
+ OstTraceFunctionExit0( CMSMMSERVER_CMSMMSERVER_DES_EXIT );
}
// CMsmmServer APIs
CSession2* CMsmmServer::NewSessionL(const TVersion& aVersion,
const RMessage2& aMessage) const
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CMSMMSERVER_NEWSESSIONL_ENTRY );
if (KMaxClientCount <= SessionNumber())
{
// There is a connection to MSMM server already.
- // Currently design of MSMM can have two clients, one FDF and the other Indicator UI
+ // Currently design of MSMM can have two clients, one FDF and the other Indicator UI
// at any time.
User::Leave(KErrInUse);
}
@@ -182,22 +180,22 @@
TInt CMsmmServer::SessionNumber() const
{
- LOG_FUNC
-
+ OstTraceFunctionEntry0( CMSMMSERVER_SESSIONNUMBER_ENTRY );
return iNumSessions;
}
void CMsmmServer::AddSession()
{
- LOG_FUNC
-
+ OstTraceFunctionEntry0( CMSMMSERVER_ADDSESSION_ENTRY );
+
++iNumSessions;
iTerminator->Cancel();
+ OstTraceFunctionExit0( CMSMMSERVER_ADDSESSION_EXIT );
}
void CMsmmServer::RemoveSession()
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CMSMMSERVER_REMOVESESSION_ENTRY );
--iNumSessions;
if (iNumSessions == 0)
@@ -209,11 +207,13 @@
iTerminator->Cancel();
iTerminator->Start();
}
+
+ OstTraceFunctionExit0( CMSMMSERVER_REMOVESESSION_EXIT );
}
-
-void CMsmmServer::DismountUsbDrivesL(TUSBMSDeviceDescription& aDevice)
+
+ void CMsmmServer::DismountUsbDrivesL(TUSBMSDeviceDescription& aDevice)
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CMSMMSERVER_DISMOUNTUSBDRIVERSL_ENTRY );
delete iDismountManager;
iDismountManager = NULL;
iDismountManager= CMsmmDismountUsbDrives::NewL();
@@ -229,20 +229,21 @@
// Start dismounting
iDismountManager->DismountUsbDrives(*iPolicyPlugin, aDevice);
+ OstTraceFunctionExit0( CMSMMSERVER_DISMOUNTUSBDRIVERSL_EXIT );
}
+
// Private functions
// CMsmmServer Construction
CMsmmServer::CMsmmServer(TInt aPriority)
:CPolicyServer(aPriority, KMsmmServerSecurityPolicy, EUnsharableSessions)
{
- LOG_FUNC
- //
+ OstTraceFunctionEntry0( CMSMMSERVER_CMSMMSERVER_CONS_ENTRY );
}
void CMsmmServer::ConstructL()
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CMSMMSERVER_CONSTRUCTL_ENTRY );
iEngine = CMsmmEngine::NewL();
iEventQueue = CDeviceEventQueue::NewL(*this);
@@ -269,6 +270,7 @@
// Start automatic shutdown timer
iTerminator->Start();
+ OstTraceFunctionExit0( CMSMMSERVER_CONSTRUCTL_EXIT );
}
// End of file
--- a/usbmgmt/usbmgr/host/functiondrivers/ms/msmm/server/src/msmmsession.cpp Wed Jul 07 14:16:40 2010 +0800
+++ b/usbmgmt/usbmgr/host/functiondrivers/ms/msmm/server/src/msmmsession.cpp Wed Jul 07 15:08:54 2010 +0800
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2008-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"
@@ -27,33 +27,41 @@
#include "msmmnodebase.h"
#include <usb/hostms/srverr.h>
#include <usb/hostms/msmmpolicypluginbase.h>
-#include <usb/usblogger.h>
-#ifdef __FLOG_ACTIVE
-_LIT8(KLogComponent, "UsbHostMsmmServer");
+#include <usb/usblogger.h>
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "msmmsessionTraces.h"
#endif
+
+
CMsmmSession::~CMsmmSession()
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CMSMMSESSION_CMSMMSESSION_DES_ENTRY );
+
delete iErrData;
iServer.RemoveSession();
+ OstTraceFunctionExit0( CMSMMSESSION_CMSMMSESSION_DES_EXIT );
}
CMsmmSession* CMsmmSession::NewL(CMsmmServer& aServer,
CDeviceEventQueue& anEventQueue)
{
- LOG_STATIC_FUNC_ENTRY
+ OstTraceFunctionEntry0( CMSMMSESSION_NEWL_ENTRY );
+
CMsmmSession* self = new(ELeave) CMsmmSession(aServer, anEventQueue);
CleanupStack::PushL(self);
self->ConstructL();
CleanupStack::Pop(self);
+ OstTraceFunctionExit0( CMSMMSESSION_NEWL_EXIT );
return self;
}
void CMsmmSession::ServiceL(const RMessage2& aMessage)
{
- LOG_STATIC_FUNC_ENTRY
+ OstTraceFunctionEntry0( CMSMMSESSION_SERVICEL_ENTRY );
+
TInt ret(KErrNone);
#ifdef _DEBUG
@@ -103,11 +111,13 @@
// Complete the request
aMessage.Complete(ret);
+ OstTraceFunctionExit0( CMSMMSESSION_SERVICEL_EXIT );
}
void CMsmmSession::ServiceError(const RMessage2 &aMessage, TInt aError)
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CMSMMSESSION_SERVICEERROR_ENTRY );
+
CMsmmPolicyPluginBase* plugin = iServer.PolicyPlugin();
TUSBMSDeviceDescription& device = iDevicePkg();
@@ -131,9 +141,15 @@
iErrData->iProductString = device.iProductString;
iErrData->iDriveName = 0x0;
+ OstTrace1( TRACE_DUMP, CMSMMSESSION_SERVICEERROR, "iErrData->iE32Error = %d", aError );
+ OstTraceExt1( TRACE_DUMP, CMSMMSESSION_SERVICEERROR_DUP1, "iErrData->iManufacturerString=\"%S\"", device.iManufacturerString );
+ OstTraceExt1( TRACE_DUMP, CMSMMSESSION_SERVICEERROR_DUP2, "iErrData->iProductString=\"%S\"", device.iProductString );
+
+
TInt err(KErrNone);
TRAP(err, plugin->SendErrorNotificationL(*iErrData));
aMessage.Complete(aError);
+ OstTraceFunctionExit0( CMSMMSESSION_SERVICEERROR_EXIT );
}
CMsmmSession::CMsmmSession(CMsmmServer& aServer,
@@ -142,19 +158,24 @@
iEngine(aServer.Engine()),
iEventQueue(anEventQueue)
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CMSMMSESSION_CMSMMSESSION_CONS_ENTRY );
+
aServer.AddSession();
+ OstTraceFunctionExit0( CMSMMSESSION_CMSMMSESSION_CONS_EXIT );
}
void CMsmmSession::ConstructL()
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CMSMMSESSION_CONSTRUCTL_ENTRY );
+
iErrData = new (ELeave) THostMsErrData;
+ OstTraceFunctionExit0( CMSMMSESSION_CONSTRUCTL_EXIT );
}
void CMsmmSession::AddUsbMsInterfaceL(const RMessage2& aMessage)
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CMSMMSESSION_ADDUSBMSINTERFACEL_ENTRY );
+
aMessage.Read(0, iDevicePkg);
iInterfaceNumber = aMessage.Int1();
iInterfaceToken = static_cast<TInt32>(aMessage.Int2());
@@ -168,16 +189,19 @@
TDeviceEvent event(EDeviceEventAddFunction,
device.iDeviceId, iInterfaceNumber, iInterfaceToken);
iEventQueue.PushL(event);
+ OstTraceFunctionExit0( CMSMMSESSION_ADDUSBMSINTERFACEL_EXIT );
}
void CMsmmSession::RemoveUsbMsDeviceL(const RMessage2& aMessage)
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CMSMMSESSION_REMOVEUSBMSDEVICEL_ENTRY );
+
iDeviceID = aMessage.Int0();
// Put device event into queue
TDeviceEvent event(EDeviceEventRemoveDevice, iDeviceID, 0, 0);
iEventQueue.PushL(event);
+ OstTraceFunctionExit0( CMSMMSESSION_REMOVEUSBMSDEVICEL_EXIT );
}
// End of file
--- a/usbmgmt/usbmgr/host/functiondrivers/ms/msmm/server/src/msmmterminator.cpp Wed Jul 07 14:16:40 2010 +0800
+++ b/usbmgmt/usbmgr/host/functiondrivers/ms/msmm/server/src/msmmterminator.cpp Wed Jul 07 15:08:54 2010 +0800
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2008-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,33 +24,39 @@
#include "eventqueue.h"
#include <usb/usblogger.h>
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "msmmterminatorTraces.h"
+#endif
-#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)
{
- LOG_STATIC_FUNC_ENTRY
+ OstTraceFunctionEntry0( CMSMMTERMINATOR_NEWL_ENTRY );
+
CMsmmTerminator* self = new (ELeave) CMsmmTerminator(anEventQueue);
CleanupStack::PushL(self);
self->ConstructL();
CleanupStack::Pop(self);
+ OstTraceFunctionExit0( CMSMMTERMINATOR_NEWL_EXIT );
return self;
}
void CMsmmTerminator::Start()
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CMSMMTERMINATOR_START_ENTRY );
+
After(KShutdownDelay);
+ OstTraceFunctionExit0( CMSMMTERMINATOR_START_EXIT );
}
void CMsmmTerminator::RunL()
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CMSMMTERMINATOR_RUNL_ENTRY );
+
if (iEventQueue.Count())
{
// There are some events still in the event queue to
@@ -61,20 +67,25 @@
{
CActiveScheduler::Stop();
}
+ OstTraceFunctionExit0( CMSMMTERMINATOR_RUNL_EXIT );
}
CMsmmTerminator::CMsmmTerminator(const CDeviceEventQueue& anEventQueue):
CTimer(KMsmmTerminatorPriority),
iEventQueue(anEventQueue)
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CMSMMTERMINATOR_CMSMMTERMINATOR_CONS_ENTRY );
+
CActiveScheduler::Add(this);
+ OstTraceFunctionExit0( CMSMMTERMINATOR_CMSMMTERMINATOR_CONS_EXIT );
}
void CMsmmTerminator::ConstructL()
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CMSMMTERMINATOR_CONSTRUCTL_ENTRY );
+
CTimer::ConstructL();
+ OstTraceFunctionExit0( CMSMMTERMINATOR_CONSTRUCTL_EXIT );
}
// End of file
--- a/usbmgmt/usbmgr/host/functiondrivers/ms/msmm/server/src/subcommandbase.cpp Wed Jul 07 14:16:40 2010 +0800
+++ b/usbmgmt/usbmgr/host/functiondrivers/ms/msmm/server/src/subcommandbase.cpp Wed Jul 07 15:08:54 2010 +0800
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2008-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"
@@ -26,10 +26,12 @@
#include "eventhandler.h"
#include <usb/usblogger.h>
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "subcommandbaseTraces.h"
+#endif
-#ifdef __FLOG_ACTIVE
-_LIT8(KLogComponent, "UsbHostMsmmServer");
-#endif
+
THostMsSubCommandParam::THostMsSubCommandParam(MMsmmSrvProxy& aServer,
MUsbMsEventHandler& aHandler,
@@ -40,7 +42,7 @@
iCreator(aCreator),
iEvent(aEvent)
{
- LOG_FUNC
+ OstTraceFunctionEntry0( THOSTMSSUBCOMMANDPARAM_THOSTMSSUBCOMMANDPARAM_CONS_ENTRY );
}
TSubCommandBase::TSubCommandBase(THostMsSubCommandParam& aParameter):
@@ -51,7 +53,7 @@
iIsExecuted(EFalse),
iIsKeyCommand(ETrue)
{
- LOG_FUNC
+ OstTraceFunctionEntry0( TSUBCOMMANDBASE_TSUBCOMMANDBASE_CONS_ENTRY );
}
void TSubCommandBase::ExecuteL()
@@ -62,26 +64,34 @@
void TSubCommandBase::AsyncCmdCompleteL()
{
- LOG_FUNC
+ OstTraceFunctionEntry0( TSUBCOMMANDBASE_ASYNCCMDCOMPLETEL_ENTRY );
+
DoAsyncCmdCompleteL();
+ OstTraceFunctionExit0( TSUBCOMMANDBASE_ASYNCCMDCOMPLETEL_EXIT );
}
void TSubCommandBase::CancelAsyncCmd()
{
- LOG_FUNC
+ OstTraceFunctionEntry0( TSUBCOMMANDBASE_CANCELASYNCCMD_ENTRY );
+
DoCancelAsyncCmd();
+ OstTraceFunctionExit0( TSUBCOMMANDBASE_CANCELASYNCCMD_EXIT );
}
void TSubCommandBase::DoAsyncCmdCompleteL()
{
- LOG_FUNC
+ OstTraceFunctionEntry0( TSUBCOMMANDBASE_DOASYNCCMDCOMPLETEL_ENTRY );
+
// Empty implementation
+ OstTraceFunctionExit0( TSUBCOMMANDBASE_DOASYNCCMDCOMPLETEL_EXIT );
}
void TSubCommandBase::DoCancelAsyncCmd()
{
- LOG_FUNC
+ OstTraceFunctionEntry0( TSUBCOMMANDBASE_DOCANCELASYNCCMD_ENTRY );
+
// Empty implementation
+ OstTraceFunctionExit0( TSUBCOMMANDBASE_DOCANCELASYNCCMD_EXIT );
}
// End of file
--- a/usbmgmt/usbmgr/host/functiondrivers/ms/msmm/server/src/subcommands.cpp Wed Jul 07 14:16:40 2010 +0800
+++ b/usbmgmt/usbmgr/host/functiondrivers/ms/msmm/server/src/subcommands.cpp Wed Jul 07 15:08:54 2010 +0800
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2008-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"
@@ -30,10 +30,11 @@
#include <usb/hostms/srverr.h>
#include <usb/usblogger.h>
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "subcommandsTraces.h"
+#endif
-#ifdef __FLOG_ACTIVE
-_LIT8(KLogComponent, "UsbHostMsmmServer");
-#endif
/**
* TRegisterInterface member functions
@@ -43,12 +44,12 @@
iDeviceNode(NULL),
iInterfaceNode(NULL)
{
- LOG_FUNC
+ OstTraceFunctionEntry0( TREGISTERINTERFACE_TREGISTERINTERFACE_CONS_ENTRY );
}
void TRegisterInterface::DoExecuteL()
{
- LOG_FUNC
+ OstTraceFunctionEntry0( TREGISTERINTERFACE_DOEXECUTEL_ENTRY );
// Add new interface node into data engine
iInterfaceNode = iServer.Engine().AddUsbMsInterfaceL(iEvent.iDeviceId,
@@ -74,26 +75,32 @@
iMsConfig.iRemoteWakeup = device.iRemoteWakeup;
iMsConfig.iIsOtgClient = device.iIsOtgClient;
- LOGTEXT2(_L8("\t iMsConfig.iProtocolId %d"), iMsConfig.iProtocolId);
- LOGTEXT2(_L8("\t iMsConfig.iTransportId %d"), iMsConfig.iTransportId);
- LOGTEXT2(_L8("\t iMsConfig.iRemoteWakeup %d"), iMsConfig.iRemoteWakeup);
- LOGTEXT2(_L8("\t iMsConfig.iIsOtgClient %d"), iMsConfig.iIsOtgClient);
-
+ OstTrace1( TRACE_NORMAL, TREGISTERINTERFACE_DOEXECUTEL,
+ "iMsConfig.iProtocolId %d", iMsConfig.iProtocolId );
+ OstTrace1( TRACE_NORMAL, TREGISTERINTERFACE_DOEXECUTEL_DUP1,
+ "iMsConfig.iTransportId %d", iMsConfig.iTransportId );
+ OstTrace1( TRACE_NORMAL, TREGISTERINTERFACE_DOEXECUTEL_DUP2,
+ "iMsConfig.iRemoteWakeup %d", iMsConfig.iRemoteWakeup );
+ OstTrace1( TRACE_NORMAL, TREGISTERINTERFACE_DOEXECUTEL_DUP3,
+ "iMsConfig.iIsOtgClient %d", iMsConfig.iIsOtgClient );
+
TSuspensionPolicy suspensionPolicy;
iServer.PolicyPlugin()->GetSuspensionPolicy(suspensionPolicy);
iMsConfig.iOtgSuspendTime = suspensionPolicy.iOtgSuspendTime;
iMsConfig.iStatusPollingInterval = suspensionPolicy.iStatusPollingInterval;
-
- LOGTEXT2(_L8("\t iMsConfig.iStatusPollingInterval %d"), iMsConfig.iStatusPollingInterval);
- LOGTEXT2(_L8("\t iMsConfig.iOtgSuspendTime %d"), iMsConfig.iOtgSuspendTime);
-
+ OstTrace1( TRACE_NORMAL, TREGISTERINTERFACE_DOEXECUTEL_DUP4,
+ "iMsConfig.iStatusPollingInterval %d", iMsConfig.iStatusPollingInterval );
+ OstTrace1( TRACE_NORMAL, TREGISTERINTERFACE_DOEXECUTEL_DUP5,
+ "iMsConfig.iOtgSuspendTime %d", iMsConfig.iOtgSuspendTime );
+
iHandler.Start();
iInterfaceNode->iUsbMsDevice.Add(iMsConfig, iHandler.Status());
+ OstTraceFunctionExit0( TREGISTERINTERFACE_DOEXECUTEL_EXIT );
}
void TRegisterInterface::HandleError(THostMsErrData& aData, TInt aError)
{
- LOG_FUNC
+ OstTraceFunctionEntry0( TREGISTERINTERFACE_HANDLEERROR_ENTRY );
switch (aError)
{
@@ -120,11 +127,12 @@
iServer.Engine().RemoveUsbMsNode(iInterfaceNode);
iInterfaceNode = NULL;
}
+ OstTraceFunctionExit0( TREGISTERINTERFACE_HANDLEERROR_EXIT );
}
void TRegisterInterface::DoAsyncCmdCompleteL()
{
- LOG_FUNC
+ OstTraceFunctionEntry0( TREGISTERINTERFACE_DOASYNCCMDCOMPLETEL_ENTRY );
User::LeaveIfError(iHandler.Status().Int());
if(iInterfaceNode)
@@ -133,14 +141,16 @@
iInterfaceNode->iUsbMsDevice.GetNumLun(iMaxLogicalUnit));
}
- LOGTEXT2(_L8("\tGetNumLun %d"), iMaxLogicalUnit);
+ OstTrace1( TRACE_NORMAL, TREGISTERINTERFACE_DOASYNCCMDCOMPLETEL,
+ "GetNumLun %d", iMaxLogicalUnit );
iCreator.CreateSubCmdForRetrieveDriveLetterL(iMaxLogicalUnit);
+ OstTraceFunctionExit0( TREGISTERINTERFACE_DOASYNCCMDCOMPLETEL_EXIT );
}
void TRegisterInterface::DoCancelAsyncCmd()
{
- LOG_FUNC
+ OstTraceFunctionEntry0( TREGISTERINTERFACE_DOCANCELASYNCCMD_ENTRY );
if(iInterfaceNode)
{
@@ -148,6 +158,7 @@
iServer.Engine().RemoveUsbMsNode(iInterfaceNode);
iInterfaceNode = NULL;
}
+ OstTraceFunctionExit0( TREGISTERINTERFACE_DOCANCELASYNCCMD_EXIT );
}
/**
@@ -160,12 +171,12 @@
iLuNumber(aLuNumber),
iDrive(0)
{
- LOG_FUNC
+ OstTraceFunctionEntry0( TRETRIEVEDRIVELETTER_TRETRIEVEDRIVELETTER_CONS_ENTRY );
}
void TRetrieveDriveLetter::DoExecuteL()
{
- LOG_FUNC
+ OstTraceFunctionEntry0( TRETRIEVEDRIVELETTER_DOEXECUTEL_ENTRY );
TUsbMsDevice* deviceEntry(NULL);
deviceEntry = iServer.Engine().SearchDevice(iEvent.iDeviceId);
@@ -194,11 +205,12 @@
iServer.PolicyPlugin()->RetrieveDriveLetterL(
iDrive, iRequestData, status);
}
+ OstTraceFunctionExit0( TRETRIEVEDRIVELETTER_DOEXECUTEL_EXIT );
}
void TRetrieveDriveLetter::HandleError(THostMsErrData& aData, TInt aError)
{
- LOG_FUNC
+ OstTraceFunctionEntry0( TRETRIEVEDRIVELETTER_HANDLEERROR_ENTRY );
switch (aError)
{
@@ -218,22 +230,25 @@
aData.iManufacturerString = iRequestData.iManufacturerString;
aData.iProductString = iRequestData.iProductString;
aData.iDriveName = iDrive;
+ OstTraceFunctionExit0( TRETRIEVEDRIVELETTER_HANDLEERROR_EXIT );
}
void TRetrieveDriveLetter::DoAsyncCmdCompleteL()
{
- LOG_FUNC
+ OstTraceFunctionEntry0( TRETRIEVEDRIVELETTER_DOASYNCCMDCOMPLETEL_ENTRY );
User::LeaveIfError(iHandler.Status().Int());
iCreator.CreateSubCmdForMountingLogicalUnitL(iDrive, iLuNumber);
+ OstTraceFunctionExit0( TRETRIEVEDRIVELETTER_DOASYNCCMDCOMPLETEL_EXIT );
}
void TRetrieveDriveLetter::DoCancelAsyncCmd()
{
- LOG_FUNC
+ OstTraceFunctionEntry0( TRETRIEVEDRIVELETTER_DOCANCELASYNCCMD_ENTRY );
iServer.PolicyPlugin()->CancelRetrieveDriveLetter();
+ OstTraceFunctionExit0( TRETRIEVEDRIVELETTER_DOCANCELASYNCCMD_EXIT );
}
/**
@@ -246,14 +261,16 @@
iDrive(aDrive),
iLuNumber(aLuNumber)
{
- LOG_FUNC
+ OstTraceFunctionEntry0( TMOUNTLOGICALUNIT_TMOUNTLOGICALUNIT_CONS_ENTRY );
iIsKeyCommand = EFalse;
+ OstTraceFunctionExit0( TMOUNTLOGICALUNIT_TMOUNTLOGICALUNIT_CONS_EXIT );
}
void TMountLogicalUnit::DoExecuteL()
{
- LOG_FUNC
+ OstTraceFunctionEntry0( TMOUNTLOGICALUNIT_DOEXECUTEL_ENTRY );
+
TInt ret(KErrNone);
RFs& fs = iServer.FileServerSession();
@@ -277,16 +294,18 @@
if ((KErrNone != ret) && (KErrAlreadyExists != ret)
&& (KErrNotReady != ret))
{
- User::Leave (ret);
+ if (KErrAbort != ret)
+ User::Leave (ret);
}
iHandler.Start();
iHandler.Complete();
+ OstTraceFunctionExit0( TMOUNTLOGICALUNIT_DOEXECUTEL_EXIT );
}
void TMountLogicalUnit::HandleError(THostMsErrData& aData, TInt aError)
{
- LOG_FUNC
+ OstTraceFunctionEntry0( TMOUNTLOGICALUNIT_HANDLEERROR_ENTRY );
switch (aError)
{
@@ -336,16 +355,18 @@
aData.iProductString.Copy(deviceNode->iDevice.iProductString);
}
aData.iDriveName = iDrive;
+ OstTraceFunctionExit0( TMOUNTLOGICALUNIT_HANDLEERROR_EXIT );
}
void TMountLogicalUnit::DoAsyncCmdCompleteL()
{
- LOG_FUNC
-
+ OstTraceFunctionEntry0( TMOUNTLOGICALUNIT_DOASYNCCMDCOMPLETEL_ENTRY );
+
iServer.Engine().AddUsbMsLogicalUnitL(
iEvent.iDeviceId, iEvent.iInterfaceNumber,
iLuNumber, iDrive);
iCreator.CreateSubCmdForSaveLatestMountInfoL(iDrive, iLuNumber);
+ OstTraceFunctionExit0( TMOUNTLOGICALUNIT_DOASYNCCMDCOMPLETEL_EXIT );
}
/**
@@ -359,15 +380,16 @@
iDrive(aDrive),
iLuNumber(aLuNumber)
{
- LOG_FUNC
+ OstTraceFunctionEntry0( TSAVELATESTMOUNTINFO_TSAVELATESTMOUNTINFO_CONS_ENTRY );
iIsKeyCommand = EFalse;
+ OstTraceFunctionExit0( TSAVELATESTMOUNTINFO_TSAVELATESTMOUNTINFO_CONS_EXIT );
}
void TSaveLatestMountInfo::DoExecuteL()
{
- LOG_FUNC
-
+ OstTraceFunctionEntry0( TSAVELATESTMOUNTINFO_DOEXECUTEL_ENTRY );
+
TUsbMsDevice* deviceEntry(NULL);
deviceEntry = iServer.Engine().SearchDevice(iEvent.iDeviceId);
if (!deviceEntry)
@@ -398,18 +420,21 @@
iServer.PolicyPlugin()->SaveLatestMountInfoL(iRecord, status);
}
+ OstTraceFunctionExit0( TSAVELATESTMOUNTINFO_DOEXECUTEL_EXIT );
}
void TSaveLatestMountInfo::DoAsyncCmdCompleteL()
{
- LOG_FUNC
+ OstTraceFunctionEntry0( TSAVELATESTMOUNTINFO_DOASYNCCMDCOMPLETEL_ENTRY );
+
User::LeaveIfError(iHandler.Status().Int());
+ OstTraceFunctionExit0( TSAVELATESTMOUNTINFO_DOASYNCCMDCOMPLETEL_EXIT );
}
void TSaveLatestMountInfo::HandleError(THostMsErrData& aData, TInt aError)
{
- LOG_FUNC
-
+ OstTraceFunctionEntry0( TSAVELATESTMOUNTINFO_HANDLEERROR_ENTRY );
+
switch (aError)
{
case KErrNoMemory:
@@ -425,13 +450,15 @@
aData.iManufacturerString = iRecord.iLogicUnit.iManufacturerString;
aData.iProductString = iRecord.iLogicUnit.iProductString;
aData.iDriveName = iDrive;
+ OstTraceFunctionExit0( TSAVELATESTMOUNTINFO_HANDLEERROR_EXIT );
}
void TSaveLatestMountInfo::DoCancelAsyncCmd()
{
- LOG_FUNC
+ OstTraceFunctionEntry0( TSAVELATESTMOUNTINFO_DOCANCELASYNCCMD_ENTRY );
iServer.PolicyPlugin()->CancelSaveLatestMountInfo();
+ OstTraceFunctionExit0( TSAVELATESTMOUNTINFO_DOCANCELASYNCCMD_EXIT );
}
@@ -448,13 +475,13 @@
iDeviceNode(NULL),
iInterfaceNode(NULL)
{
- LOG_FUNC
+ OstTraceFunctionEntry0( TDEREGISTERINTERFACE_TDEREGISTERINTERFACE_CONS_ENTRY );
}
void TDeregisterInterface::DoExecuteL()
{
- LOG_FUNC
-
+ OstTraceFunctionEntry0( TDEREGISTERINTERFACE_DOEXECUTEL_ENTRY );
+
iDeviceNode = iServer.Engine().SearchDevice(iEvent.iDeviceId);
if (!iDeviceNode)
{
@@ -483,12 +510,13 @@
iHandler.Start();
// Simulate a async request be completed.
iHandler.Complete();
+ OstTraceFunctionExit0( TDEREGISTERINTERFACE_DOEXECUTEL_EXIT );
}
void TDeregisterInterface::HandleError(THostMsErrData& aData, TInt aError)
{
- LOG_FUNC
-
+ OstTraceFunctionEntry0( TDEREGISTERINTERFACE_HANDLEERROR_ENTRY );
+
switch (aError)
{
case KErrNoMemory:
@@ -507,6 +535,7 @@
aData.iProductString.Copy(iDeviceNode->iDevice.iProductString);
}
aData.iDriveName = 0;
+ OstTraceFunctionExit0( TDEREGISTERINTERFACE_HANDLEERROR_EXIT );
}
/**
@@ -519,12 +548,13 @@
TSubCommandBase(aParameter),
iLogicalUnit(aLogicalUnit)
{
- LOG_FUNC
+ OstTraceFunctionEntry0( TDISMOUNTLOGICALUNIT_TDISMOUNTLOGICALUNIT_CONS_ENTRY );
}
void TDismountLogicalUnit::DoExecuteL()
{
- LOG_FUNC
+ OstTraceFunctionEntry0( TDISMOUNTLOGICALUNIT_DOEXECUTEL_ENTRY );
+
RFs& fs = iServer.FileServerSession();
TInt driveNum;
fs.CharToDrive(iLogicalUnit.iDrive, driveNum);
@@ -541,11 +571,12 @@
iHandler.Start();
// Simulate a async request be completed.
iHandler.Complete();
+ OstTraceFunctionExit0( TDISMOUNTLOGICALUNIT_DOEXECUTEL_EXIT );
}
void TDismountLogicalUnit::HandleError(THostMsErrData& aData, TInt aError)
{
- LOG_FUNC
+ OstTraceFunctionEntry0( TDISMOUNTLOGICALUNIT_HANDLEERROR_ENTRY );
switch (aError)
{
@@ -566,6 +597,7 @@
aData.iProductString.Copy(deviceNode->iDevice.iProductString);
}
aData.iDriveName = iLogicalUnit.iDrive;
+ OstTraceFunctionExit0( TDISMOUNTLOGICALUNIT_HANDLEERROR_EXIT );
}
/**
@@ -578,12 +610,13 @@
TSubCommandBase(aParameter),
iNodeToBeRemoved(aNodeToBeRemoved)
{
- LOG_FUNC
+ OstTraceFunctionEntry0( TREMOVEUSBMSDEVICENODE_TREMOVEUSBMSDEVICENODE_CONS_ENTRY );
}
void TRemoveUsbMsDeviceNode::DoExecuteL()
{
- LOG_FUNC
+ OstTraceFunctionEntry0( TREMOVEUSBMSDEVICENODE_DOEXECUTEL_ENTRY );
+
if(iNodeToBeRemoved)
{
iServer.Engine().RemoveUsbMsNode(iNodeToBeRemoved);
@@ -598,11 +631,13 @@
iHandler.Start();
// Simulate a async request be completed.
iHandler.Complete();
+ OstTraceFunctionExit0( TREMOVEUSBMSDEVICENODE_DOEXECUTEL_EXIT );
}
void TRemoveUsbMsDeviceNode::HandleError(THostMsErrData& aData, TInt aError)
{
- LOG_FUNC
+ OstTraceFunctionEntry0( TREMOVEUSBMSDEVICENODE_HANDLEERROR_ENTRY );
+
switch (aError)
{
case KErrArgument:
@@ -619,6 +654,7 @@
aData.iProductString.Copy(deviceNode->iDevice.iProductString);
}
aData.iDriveName = 0;
+ OstTraceFunctionExit0( TREMOVEUSBMSDEVICENODE_HANDLEERROR_EXIT );
}
// End of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usbmgmt/usbmgr/host/functiondrivers/ms/msmm/server/traces/OstTraceDefinitions.h Wed Jul 07 15:08:54 2010 +0800
@@ -0,0 +1,7 @@
+#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
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usbmgmt/usbmgr/host/functiondrivers/ms/msmm/server/traces/fixed_id.definitions Wed Jul 07 15:08:54 2010 +0800
@@ -0,0 +1,280 @@
+#Fixed group and trace id definitions. If this file is removed, the identifiers are rebuilt.
+[GROUP]TRACE_DUMP=0x89
+[GROUP]TRACE_FLOW=0x8a
+[GROUP]TRACE_NORMAL=0x86
+[TRACE]TRACE_DUMP[0x89]_CMSMMSESSION_SERVICEERROR=0x1
+[TRACE]TRACE_DUMP[0x89]_CMSMMSESSION_SERVICEERROR_DUP1=0x2
+[TRACE]TRACE_DUMP[0x89]_CMSMMSESSION_SERVICEERROR_DUP2=0x3
+[TRACE]TRACE_FLOW[0x8A]_CDEVICEEVENTHANDLER_CDEVICEEVENTHANDLER_DES_ENTRY=0xd
+[TRACE]TRACE_FLOW[0x8A]_CDEVICEEVENTHANDLER_CDEVICEEVENTHANDLER_DES_EXIT=0xe
+[TRACE]TRACE_FLOW[0x8A]_CDEVICEEVENTHANDLER_CDEVICEEVENTHANDLER_ENTRY=0x28
+[TRACE]TRACE_FLOW[0x8A]_CDEVICEEVENTHANDLER_CDEVICEEVENTHANDLER_EXIT=0x29
+[TRACE]TRACE_FLOW[0x8A]_CDEVICEEVENTHANDLER_COMPLETECLIENT_ENTRY=0x38
+[TRACE]TRACE_FLOW[0x8A]_CDEVICEEVENTHANDLER_COMPLETECLIENT_EXIT=0x39
+[TRACE]TRACE_FLOW[0x8A]_CDEVICEEVENTHANDLER_COMPLETE_ENTRY=0x1c
+[TRACE]TRACE_FLOW[0x8A]_CDEVICEEVENTHANDLER_COMPLETE_EXIT=0x1d
+[TRACE]TRACE_FLOW[0x8A]_CDEVICEEVENTHANDLER_CONSTRUCTL_ENTRY=0x2a
+[TRACE]TRACE_FLOW[0x8A]_CDEVICEEVENTHANDLER_CONSTRUCTL_EXIT=0x2b
+[TRACE]TRACE_FLOW[0x8A]_CDEVICEEVENTHANDLER_CREATESUBCMDFORADDINGUSBMSFUNCTIONL_ENTRY=0x2e
+[TRACE]TRACE_FLOW[0x8A]_CDEVICEEVENTHANDLER_CREATESUBCMDFORADDINGUSBMSFUNCTIONL_EXIT=0x2f
+[TRACE]TRACE_FLOW[0x8A]_CDEVICEEVENTHANDLER_CREATESUBCMDFORDEVICEEVENTL_ENTRY=0x2c
+[TRACE]TRACE_FLOW[0x8A]_CDEVICEEVENTHANDLER_CREATESUBCMDFORDEVICEEVENTL_EXIT=0x2d
+[TRACE]TRACE_FLOW[0x8A]_CDEVICEEVENTHANDLER_CREATESUBCMDFORMOUNTINGLOGICALUNITL_ENTRY=0x15
+[TRACE]TRACE_FLOW[0x8A]_CDEVICEEVENTHANDLER_CREATESUBCMDFORMOUNTINGLOGICALUNITL_EXIT=0x16
+[TRACE]TRACE_FLOW[0x8A]_CDEVICEEVENTHANDLER_CREATESUBCMDFORREMOVINGUSBMSDEVICEL_ENTRY=0x30
+[TRACE]TRACE_FLOW[0x8A]_CDEVICEEVENTHANDLER_CREATESUBCMDFORREMOVINGUSBMSDEVICEL_EXIT=0x31
+[TRACE]TRACE_FLOW[0x8A]_CDEVICEEVENTHANDLER_CREATESUBCMDFORRETRIEVEDRIVELETTERL_ENTRY=0x13
+[TRACE]TRACE_FLOW[0x8A]_CDEVICEEVENTHANDLER_CREATESUBCMDFORRETRIEVEDRIVELETTERL_EXIT=0x14
+[TRACE]TRACE_FLOW[0x8A]_CDEVICEEVENTHANDLER_CREATESUBCMDFORSAVELATESTMOUNTINFOL_ENTRY=0x17
+[TRACE]TRACE_FLOW[0x8A]_CDEVICEEVENTHANDLER_CREATESUBCMDFORSAVELATESTMOUNTINFOL_EXIT=0x18
+[TRACE]TRACE_FLOW[0x8A]_CDEVICEEVENTHANDLER_DOCANCEL_ENTRY=0x21
+[TRACE]TRACE_FLOW[0x8A]_CDEVICEEVENTHANDLER_DOCANCEL_EXIT=0x22
+[TRACE]TRACE_FLOW[0x8A]_CDEVICEEVENTHANDLER_HANDLEEVENTL_ENTRY=0x1f
+[TRACE]TRACE_FLOW[0x8A]_CDEVICEEVENTHANDLER_HANDLEEVENTL_EXIT=0x20
+[TRACE]TRACE_FLOW[0x8A]_CDEVICEEVENTHANDLER_NEWLC_ENTRY=0x11
+[TRACE]TRACE_FLOW[0x8A]_CDEVICEEVENTHANDLER_NEWLC_EXIT=0x12
+[TRACE]TRACE_FLOW[0x8A]_CDEVICEEVENTHANDLER_NEWL_ENTRY=0xf
+[TRACE]TRACE_FLOW[0x8A]_CDEVICEEVENTHANDLER_NEWL_EXIT=0x10
+[TRACE]TRACE_FLOW[0x8A]_CDEVICEEVENTHANDLER_RESETHANDLERDATA_ENTRY=0x34
+[TRACE]TRACE_FLOW[0x8A]_CDEVICEEVENTHANDLER_RESETHANDLERDATA_EXIT=0x35
+[TRACE]TRACE_FLOW[0x8A]_CDEVICEEVENTHANDLER_RESETHANDLERERROR_ENTRY=0x36
+[TRACE]TRACE_FLOW[0x8A]_CDEVICEEVENTHANDLER_RESETHANDLERERROR_EXIT=0x37
+[TRACE]TRACE_FLOW[0x8A]_CDEVICEEVENTHANDLER_RESETHANDLER_ENTRY=0x32
+[TRACE]TRACE_FLOW[0x8A]_CDEVICEEVENTHANDLER_RESETHANDLER_EXIT=0x33
+[TRACE]TRACE_FLOW[0x8A]_CDEVICEEVENTHANDLER_RUNERROR_ENTRY=0x26
+[TRACE]TRACE_FLOW[0x8A]_CDEVICEEVENTHANDLER_RUNERROR_EXIT=0x27
+[TRACE]TRACE_FLOW[0x8A]_CDEVICEEVENTHANDLER_RUNL_ENTRY=0x23
+[TRACE]TRACE_FLOW[0x8A]_CDEVICEEVENTHANDLER_RUNL_EXIT=0x24
+[TRACE]TRACE_FLOW[0x8A]_CDEVICEEVENTHANDLER_RUNL_EXIT_DUP1=0x25
+[TRACE]TRACE_FLOW[0x8A]_CDEVICEEVENTHANDLER_START_ENTRY=0x19
+[TRACE]TRACE_FLOW[0x8A]_CDEVICEEVENTHANDLER_START_EXIT=0x1a
+[TRACE]TRACE_FLOW[0x8A]_CDEVICEEVENTHANDLER_START_EXIT_DUP1=0x1b
+[TRACE]TRACE_FLOW[0x8A]_CDEVICEEVENTHANDLER_STATUS_ENTRY=0x1e
+[TRACE]TRACE_FLOW[0x8A]_CDEVICEEVENTQUEUE_APPENDANDOPTIMIZEL_ENTRY=0x4c
+[TRACE]TRACE_FLOW[0x8A]_CDEVICEEVENTQUEUE_APPENDANDOPTIMIZEL_EXIT=0x4d
+[TRACE]TRACE_FLOW[0x8A]_CDEVICEEVENTQUEUE_APPENDANDOPTIMIZEL_EXIT_DUP1=0x4e
+[TRACE]TRACE_FLOW[0x8A]_CDEVICEEVENTQUEUE_CDEVICEEVENTQUEUE_CONS_ENTRY=0x48
+[TRACE]TRACE_FLOW[0x8A]_CDEVICEEVENTQUEUE_CDEVICEEVENTQUEUE_CONS_EXIT=0x49
+[TRACE]TRACE_FLOW[0x8A]_CDEVICEEVENTQUEUE_CDEVICEEVENTQUEUE_DES_ENTRY=0x3a
+[TRACE]TRACE_FLOW[0x8A]_CDEVICEEVENTQUEUE_CDEVICEEVENTQUEUE_DES_EXIT=0x3b
+[TRACE]TRACE_FLOW[0x8A]_CDEVICEEVENTQUEUE_CONSTRUCTL_ENTRY=0x4a
+[TRACE]TRACE_FLOW[0x8A]_CDEVICEEVENTQUEUE_CONSTRUCTL_EXIT=0x4b
+[TRACE]TRACE_FLOW[0x8A]_CDEVICEEVENTQUEUE_DOCANCEL_ENTRY=0x42
+[TRACE]TRACE_FLOW[0x8A]_CDEVICEEVENTQUEUE_DOCANCEL_EXIT=0x43
+[TRACE]TRACE_FLOW[0x8A]_CDEVICEEVENTQUEUE_NEWLC_ENTRY=0x3e
+[TRACE]TRACE_FLOW[0x8A]_CDEVICEEVENTQUEUE_NEWLC_EXIT=0x3f
+[TRACE]TRACE_FLOW[0x8A]_CDEVICEEVENTQUEUE_NEWL_ENTRY=0x3c
+[TRACE]TRACE_FLOW[0x8A]_CDEVICEEVENTQUEUE_NEWL_EXIT=0x3d
+[TRACE]TRACE_FLOW[0x8A]_CDEVICEEVENTQUEUE_POP_ENTRY=0x54
+[TRACE]TRACE_FLOW[0x8A]_CDEVICEEVENTQUEUE_POP_EXIT=0x55
+[TRACE]TRACE_FLOW[0x8A]_CDEVICEEVENTQUEUE_PUSHL_ENTRY=0x40
+[TRACE]TRACE_FLOW[0x8A]_CDEVICEEVENTQUEUE_PUSHL_EXIT=0x41
+[TRACE]TRACE_FLOW[0x8A]_CDEVICEEVENTQUEUE_RUNERROR_ENTRY=0x46
+[TRACE]TRACE_FLOW[0x8A]_CDEVICEEVENTQUEUE_RUNERROR_EXIT=0x47
+[TRACE]TRACE_FLOW[0x8A]_CDEVICEEVENTQUEUE_RUNL_ENTRY=0x44
+[TRACE]TRACE_FLOW[0x8A]_CDEVICEEVENTQUEUE_RUNL_EXIT=0x45
+[TRACE]TRACE_FLOW[0x8A]_CDEVICEEVENTQUEUE_SENDEVENTL_ENTRY=0x52
+[TRACE]TRACE_FLOW[0x8A]_CDEVICEEVENTQUEUE_SENDEVENTL_EXIT=0x53
+[TRACE]TRACE_FLOW[0x8A]_CDEVICEEVENTQUEUE_STARTL_ENTRY=0x4f
+[TRACE]TRACE_FLOW[0x8A]_CDEVICEEVENTQUEUE_STARTL_EXIT=0x50
+[TRACE]TRACE_FLOW[0x8A]_CDEVICEEVENTQUEUE_STARTL_EXIT_DUP1=0x51
+[TRACE]TRACE_FLOW[0x8A]_CDISMOUNTTIMER_CANCELTIMER_ENTRY=0x104
+[TRACE]TRACE_FLOW[0x8A]_CDISMOUNTTIMER_CANCELTIMER_EXIT=0x105
+[TRACE]TRACE_FLOW[0x8A]_CDISMOUNTTIMER_CDISMOUNTTIMER_CONS_ENTRY=0xfd
+[TRACE]TRACE_FLOW[0x8A]_CDISMOUNTTIMER_CDISMOUNTTIMER_DES_ENTRY=0xfe
+[TRACE]TRACE_FLOW[0x8A]_CDISMOUNTTIMER_CDISMOUNTTIMER_DES_EXIT=0xff
+[TRACE]TRACE_FLOW[0x8A]_CDISMOUNTTIMER_CONSTRUCTL_ENTRY=0x100
+[TRACE]TRACE_FLOW[0x8A]_CDISMOUNTTIMER_CONSTRUCTL_EXIT=0x101
+[TRACE]TRACE_FLOW[0x8A]_CDISMOUNTTIMER_NEWLC_ENTRY=0xfb
+[TRACE]TRACE_FLOW[0x8A]_CDISMOUNTTIMER_NEWLC_EXIT=0xfc
+[TRACE]TRACE_FLOW[0x8A]_CDISMOUNTTIMER_NEWL_ENTRY=0xf9
+[TRACE]TRACE_FLOW[0x8A]_CDISMOUNTTIMER_NEWL_EXIT=0xfa
+[TRACE]TRACE_FLOW[0x8A]_CDISMOUNTTIMER_RUNL_ENTRY=0x102
+[TRACE]TRACE_FLOW[0x8A]_CDISMOUNTTIMER_RUNL_EXIT=0x103
+[TRACE]TRACE_FLOW[0x8A]_CDISMOUNTTIMER_STARTTIMER_ENTRY=0x106
+[TRACE]TRACE_FLOW[0x8A]_CDISMOUNTTIMER_STARTTIMER_EXIT=0x107
+[TRACE]TRACE_FLOW[0x8A]_CMSMMDISMOUNTUSBDRIVES_CMSMMDISMOUNTUSBDRIVES_DES_ENTRY=0xe4
+[TRACE]TRACE_FLOW[0x8A]_CMSMMDISMOUNTUSBDRIVES_CMSMMDISMOUNTUSBDRIVES_DES_EXIT=0xe5
+[TRACE]TRACE_FLOW[0x8A]_CMSMMDISMOUNTUSBDRIVES_CMSMMDISMOUNTUSBDRIVES_ENTRY=0xee
+[TRACE]TRACE_FLOW[0x8A]_CMSMMDISMOUNTUSBDRIVES_CMSMMDISMOUNTUSBDRIVES_EXIT=0xef
+[TRACE]TRACE_FLOW[0x8A]_CMSMMDISMOUNTUSBDRIVES_CONSTRUCTL_ENTRY=0xf0
+[TRACE]TRACE_FLOW[0x8A]_CMSMMDISMOUNTUSBDRIVES_CONSTRUCTL_EXIT=0xf1
+[TRACE]TRACE_FLOW[0x8A]_CMSMMDISMOUNTUSBDRIVES_DISMOUNTUSBDRIVES_ENTRY=0xf2
+[TRACE]TRACE_FLOW[0x8A]_CMSMMDISMOUNTUSBDRIVES_DISMOUNTUSBDRIVES_EXIT=0xf3
+[TRACE]TRACE_FLOW[0x8A]_CMSMMDISMOUNTUSBDRIVES_DOCANCEL_ENTRY=0xec
+[TRACE]TRACE_FLOW[0x8A]_CMSMMDISMOUNTUSBDRIVES_DOCANCEL_EXIT=0xed
+[TRACE]TRACE_FLOW[0x8A]_CMSMMDISMOUNTUSBDRIVES_DODISMOUNT_ENTRY=0xf4
+[TRACE]TRACE_FLOW[0x8A]_CMSMMDISMOUNTUSBDRIVES_DODISMOUNT_EXIT=0xf5
+[TRACE]TRACE_FLOW[0x8A]_CMSMMDISMOUNTUSBDRIVES_DODISMOUNT_EXIT_DUP1=0xf6
+[TRACE]TRACE_FLOW[0x8A]_CMSMMDISMOUNTUSBDRIVES_NEWLC_ENTRY=0xe8
+[TRACE]TRACE_FLOW[0x8A]_CMSMMDISMOUNTUSBDRIVES_NEWLC_EXIT=0xe9
+[TRACE]TRACE_FLOW[0x8A]_CMSMMDISMOUNTUSBDRIVES_NEWL_ENTRY=0xe6
+[TRACE]TRACE_FLOW[0x8A]_CMSMMDISMOUNTUSBDRIVES_NEWL_EXIT=0xe7
+[TRACE]TRACE_FLOW[0x8A]_CMSMMDISMOUNTUSBDRIVES_RUNL_ENTRY=0xea
+[TRACE]TRACE_FLOW[0x8A]_CMSMMDISMOUNTUSBDRIVES_RUNL_EXIT=0xeb
+[TRACE]TRACE_FLOW[0x8A]_CMSMMDISMOUNTUSBDRIVES_TIMEREXPIRED_ENTRY=0xf7
+[TRACE]TRACE_FLOW[0x8A]_CMSMMDISMOUNTUSBDRIVES_TIMEREXPIRED_EXIT=0xf8
+[TRACE]TRACE_FLOW[0x8A]_CMSMMENGINE_ADDUSBMSDEVICEL_ENTRY=0x5c
+[TRACE]TRACE_FLOW[0x8A]_CMSMMENGINE_ADDUSBMSDEVICEL_EXIT=0x5d
+[TRACE]TRACE_FLOW[0x8A]_CMSMMENGINE_ADDUSBMSINTERFACEL_ENTRY=0x5e
+[TRACE]TRACE_FLOW[0x8A]_CMSMMENGINE_ADDUSBMSINTERFACEL_EXIT=0x5f
+[TRACE]TRACE_FLOW[0x8A]_CMSMMENGINE_ADDUSBMSINTERFACENODEL_ENTRY=0x69
+[TRACE]TRACE_FLOW[0x8A]_CMSMMENGINE_ADDUSBMSINTERFACENODEL_EXIT=0x6a
+[TRACE]TRACE_FLOW[0x8A]_CMSMMENGINE_ADDUSBMSLOGICALUNITL_ENTRY=0x60
+[TRACE]TRACE_FLOW[0x8A]_CMSMMENGINE_ADDUSBMSLOGICALUNITL_EXIT=0x61
+[TRACE]TRACE_FLOW[0x8A]_CMSMMENGINE_ADDUSBMSLOGICALUNITNODEL_ENTRY=0x6b
+[TRACE]TRACE_FLOW[0x8A]_CMSMMENGINE_ADDUSBMSLOGICALUNITNODEL_EXIT=0x6c
+[TRACE]TRACE_FLOW[0x8A]_CMSMMENGINE_CMSMMENGINE_CONS_ENTRY=0x66
+[TRACE]TRACE_FLOW[0x8A]_CMSMMENGINE_CMSMMENGINE_DES_ENTRY=0x56
+[TRACE]TRACE_FLOW[0x8A]_CMSMMENGINE_CMSMMENGINE_DES_EXIT=0x57
+[TRACE]TRACE_FLOW[0x8A]_CMSMMENGINE_CONSTRUCTL_ENTRY=0x67
+[TRACE]TRACE_FLOW[0x8A]_CMSMMENGINE_CONSTRUCTL_EXIT=0x68
+[TRACE]TRACE_FLOW[0x8A]_CMSMMENGINE_NEWLC_ENTRY=0x5a
+[TRACE]TRACE_FLOW[0x8A]_CMSMMENGINE_NEWLC_EXIT=0x5b
+[TRACE]TRACE_FLOW[0x8A]_CMSMMENGINE_NEWL_ENTRY=0x58
+[TRACE]TRACE_FLOW[0x8A]_CMSMMENGINE_NEWL_EXIT=0x59
+[TRACE]TRACE_FLOW[0x8A]_CMSMMENGINE_REMOVEUSBMSNODE_ENTRY=0x62
+[TRACE]TRACE_FLOW[0x8A]_CMSMMENGINE_REMOVEUSBMSNODE_EXIT=0x63
+[TRACE]TRACE_FLOW[0x8A]_CMSMMENGINE_SEARCHDEVICE_ENTRY=0x64
+[TRACE]TRACE_FLOW[0x8A]_CMSMMENGINE_SEARCHINTERFACE_ENTRY=0x65
+[TRACE]TRACE_FLOW[0x8A]_CMSMMSERVER_ADDSESSION_ENTRY=0x84
+[TRACE]TRACE_FLOW[0x8A]_CMSMMSERVER_ADDSESSION_EXIT=0x85
+[TRACE]TRACE_FLOW[0x8A]_CMSMMSERVER_CMSMMSERVER_CONS_ENTRY=0x8a
+[TRACE]TRACE_FLOW[0x8A]_CMSMMSERVER_CMSMMSERVER_DES_ENTRY=0x80
+[TRACE]TRACE_FLOW[0x8A]_CMSMMSERVER_CMSMMSERVER_DES_EXIT=0x81
+[TRACE]TRACE_FLOW[0x8A]_CMSMMSERVER_CONSTRUCTL_ENTRY=0x8b
+[TRACE]TRACE_FLOW[0x8A]_CMSMMSERVER_CONSTRUCTL_EXIT=0x8c
+[TRACE]TRACE_FLOW[0x8A]_CMSMMSERVER_DISMOUNTUSBDRIVERSL_ENTRY=0x88
+[TRACE]TRACE_FLOW[0x8A]_CMSMMSERVER_DISMOUNTUSBDRIVERSL_EXIT=0x89
+[TRACE]TRACE_FLOW[0x8A]_CMSMMSERVER_NEWLC_ENTRY=0x7e
+[TRACE]TRACE_FLOW[0x8A]_CMSMMSERVER_NEWLC_EXIT=0x7f
+[TRACE]TRACE_FLOW[0x8A]_CMSMMSERVER_NEWSESSIONL_ENTRY=0x82
+[TRACE]TRACE_FLOW[0x8A]_CMSMMSERVER_REMOVESESSION_ENTRY=0x86
+[TRACE]TRACE_FLOW[0x8A]_CMSMMSERVER_REMOVESESSION_EXIT=0x87
+[TRACE]TRACE_FLOW[0x8A]_CMSMMSERVER_SESSIONNUMBER_ENTRY=0x83
+[TRACE]TRACE_FLOW[0x8A]_CMSMMSERVER_THREADFUNCTIONL_ENTRY=0x7c
+[TRACE]TRACE_FLOW[0x8A]_CMSMMSERVER_THREADFUNCTIONL_EXIT=0x7d
+[TRACE]TRACE_FLOW[0x8A]_CMSMMSESSION_ADDUSBMSINTERFACEL_ENTRY=0x99
+[TRACE]TRACE_FLOW[0x8A]_CMSMMSESSION_ADDUSBMSINTERFACEL_EXIT=0x9a
+[TRACE]TRACE_FLOW[0x8A]_CMSMMSESSION_CMSMMSESSION_CONS_ENTRY=0x108
+[TRACE]TRACE_FLOW[0x8A]_CMSMMSESSION_CMSMMSESSION_CONS_EXIT=0x109
+[TRACE]TRACE_FLOW[0x8A]_CMSMMSESSION_CMSMMSESSION_DES_ENTRY=0x8d
+[TRACE]TRACE_FLOW[0x8A]_CMSMMSESSION_CMSMMSESSION_DES_EXIT=0x8e
+[TRACE]TRACE_FLOW[0x8A]_CMSMMSESSION_CONSTRUCTL_ENTRY=0x97
+[TRACE]TRACE_FLOW[0x8A]_CMSMMSESSION_CONSTRUCTL_EXIT=0x98
+[TRACE]TRACE_FLOW[0x8A]_CMSMMSESSION_NEWL_ENTRY=0x8f
+[TRACE]TRACE_FLOW[0x8A]_CMSMMSESSION_NEWL_EXIT=0x90
+[TRACE]TRACE_FLOW[0x8A]_CMSMMSESSION_REMOVEUSBMSDEVICEL_ENTRY=0x9b
+[TRACE]TRACE_FLOW[0x8A]_CMSMMSESSION_REMOVEUSBMSDEVICEL_EXIT=0x9c
+[TRACE]TRACE_FLOW[0x8A]_CMSMMSESSION_SERVICEERROR_ENTRY=0x93
+[TRACE]TRACE_FLOW[0x8A]_CMSMMSESSION_SERVICEERROR_EXIT=0x94
+[TRACE]TRACE_FLOW[0x8A]_CMSMMSESSION_SERVICEL_ENTRY=0x91
+[TRACE]TRACE_FLOW[0x8A]_CMSMMSESSION_SERVICEL_EXIT=0x92
+[TRACE]TRACE_FLOW[0x8A]_CMSMMTERMINATOR_CMSMMTERMINATOR_CONS_ENTRY=0xa3
+[TRACE]TRACE_FLOW[0x8A]_CMSMMTERMINATOR_CMSMMTERMINATOR_CONS_EXIT=0xa4
+[TRACE]TRACE_FLOW[0x8A]_CMSMMTERMINATOR_CONSTRUCTL_ENTRY=0xa5
+[TRACE]TRACE_FLOW[0x8A]_CMSMMTERMINATOR_CONSTRUCTL_EXIT=0xa6
+[TRACE]TRACE_FLOW[0x8A]_CMSMMTERMINATOR_NEWL_ENTRY=0x9d
+[TRACE]TRACE_FLOW[0x8A]_CMSMMTERMINATOR_NEWL_EXIT=0x9e
+[TRACE]TRACE_FLOW[0x8A]_CMSMMTERMINATOR_RUNL_ENTRY=0xa1
+[TRACE]TRACE_FLOW[0x8A]_CMSMMTERMINATOR_RUNL_EXIT=0xa2
+[TRACE]TRACE_FLOW[0x8A]_CMSMMTERMINATOR_START_ENTRY=0x9f
+[TRACE]TRACE_FLOW[0x8A]_CMSMMTERMINATOR_START_EXIT=0xa0
+[TRACE]TRACE_FLOW[0x8A]_RSUBCOMMANDQUEUE_EXECUTEHEADL_ENTRY=0x8
+[TRACE]TRACE_FLOW[0x8A]_RSUBCOMMANDQUEUE_EXECUTEHEADL_EXIT=0x9
+[TRACE]TRACE_FLOW[0x8A]_RSUBCOMMANDQUEUE_HEAD_ENTRY=0xa
+[TRACE]TRACE_FLOW[0x8A]_RSUBCOMMANDQUEUE_INSERTAFTERHEADL_ENTRY=0x6
+[TRACE]TRACE_FLOW[0x8A]_RSUBCOMMANDQUEUE_INSERTAFTERHEADL_EXIT=0x7
+[TRACE]TRACE_FLOW[0x8A]_RSUBCOMMANDQUEUE_POP_ENTRY=0x3
+[TRACE]TRACE_FLOW[0x8A]_RSUBCOMMANDQUEUE_POP_EXIT=0x4
+[TRACE]TRACE_FLOW[0x8A]_RSUBCOMMANDQUEUE_POP_EXIT_DUP1=0x5
+[TRACE]TRACE_FLOW[0x8A]_RSUBCOMMANDQUEUE_PUSHL_ENTRY=0x1
+[TRACE]TRACE_FLOW[0x8A]_RSUBCOMMANDQUEUE_PUSHL_EXIT=0x2
+[TRACE]TRACE_FLOW[0x8A]_RSUBCOMMANDQUEUE_RELEASE_ENTRY=0xb
+[TRACE]TRACE_FLOW[0x8A]_RSUBCOMMANDQUEUE_RELEASE_EXIT=0xc
+[TRACE]TRACE_FLOW[0x8A]_TDEREGISTERINTERFACE_DOEXECUTEL_ENTRY=0xd6
+[TRACE]TRACE_FLOW[0x8A]_TDEREGISTERINTERFACE_DOEXECUTEL_EXIT=0xd7
+[TRACE]TRACE_FLOW[0x8A]_TDEREGISTERINTERFACE_HANDLEERROR_ENTRY=0xd8
+[TRACE]TRACE_FLOW[0x8A]_TDEREGISTERINTERFACE_HANDLEERROR_EXIT=0xd9
+[TRACE]TRACE_FLOW[0x8A]_TDEREGISTERINTERFACE_TDEREGISTERINTERFACE_CONS_ENTRY=0xd5
+[TRACE]TRACE_FLOW[0x8A]_TDISMOUNTLOGICALUNIT_DOEXECUTEL_ENTRY=0xdb
+[TRACE]TRACE_FLOW[0x8A]_TDISMOUNTLOGICALUNIT_DOEXECUTEL_EXIT=0xdc
+[TRACE]TRACE_FLOW[0x8A]_TDISMOUNTLOGICALUNIT_HANDLEERROR_ENTRY=0xdd
+[TRACE]TRACE_FLOW[0x8A]_TDISMOUNTLOGICALUNIT_HANDLEERROR_EXIT=0xde
+[TRACE]TRACE_FLOW[0x8A]_TDISMOUNTLOGICALUNIT_TDISMOUNTLOGICALUNIT_CONS_ENTRY=0xda
+[TRACE]TRACE_FLOW[0x8A]_THOSTMSSUBCOMMANDPARAM_THOSTMSSUBCOMMANDPARAM_CONS_ENTRY=0xa7
+[TRACE]TRACE_FLOW[0x8A]_TMOUNTLOGICALUNIT_DOASYNCCMDCOMPLETEL_ENTRY=0xc9
+[TRACE]TRACE_FLOW[0x8A]_TMOUNTLOGICALUNIT_DOASYNCCMDCOMPLETEL_EXIT=0xca
+[TRACE]TRACE_FLOW[0x8A]_TMOUNTLOGICALUNIT_DOEXECUTEL_ENTRY=0xc5
+[TRACE]TRACE_FLOW[0x8A]_TMOUNTLOGICALUNIT_DOEXECUTEL_EXIT=0xc6
+[TRACE]TRACE_FLOW[0x8A]_TMOUNTLOGICALUNIT_HANDLEERROR_ENTRY=0xc7
+[TRACE]TRACE_FLOW[0x8A]_TMOUNTLOGICALUNIT_HANDLEERROR_EXIT=0xc8
+[TRACE]TRACE_FLOW[0x8A]_TMOUNTLOGICALUNIT_TMOUNTLOGICALUNIT_CONS_ENTRY=0xc3
+[TRACE]TRACE_FLOW[0x8A]_TMOUNTLOGICALUNIT_TMOUNTLOGICALUNIT_CONS_EXIT=0xc4
+[TRACE]TRACE_FLOW[0x8A]_TMSMMNODEBASE_ADDCHILD_ENTRY=0x73
+[TRACE]TRACE_FLOW[0x8A]_TMSMMNODEBASE_ADDCHILD_EXIT=0x74
+[TRACE]TRACE_FLOW[0x8A]_TMSMMNODEBASE_DESTROYNODE_ENTRY=0x70
+[TRACE]TRACE_FLOW[0x8A]_TMSMMNODEBASE_DESTROYNODE_EXIT=0x71
+[TRACE]TRACE_FLOW[0x8A]_TMSMMNODEBASE_DESTROYNODE_EXIT_DUP1=0x72
+[TRACE]TRACE_FLOW[0x8A]_TMSMMNODEBASE_SEARCHINCHILDREN_ENTRY=0x75
+[TRACE]TRACE_FLOW[0x8A]_TMSMMNODEBASE_SEARCHINCHILDREN_EXIT=0x76
+[TRACE]TRACE_FLOW[0x8A]_TMSMMNODEBASE_TMSMMNODEBASE_CONS_ENTRY=0x6d
+[TRACE]TRACE_FLOW[0x8A]_TMSMMNODEBASE_TMSMMNODEBASE_DES_ENTRY=0x6e
+[TRACE]TRACE_FLOW[0x8A]_TMSMMNODEBASE_TMSMMNODEBASE_DES_EXIT=0x6f
+[TRACE]TRACE_FLOW[0x8A]_TREGISTERINTERFACE_DOASYNCCMDCOMPLETEL_ENTRY=0xb6
+[TRACE]TRACE_FLOW[0x8A]_TREGISTERINTERFACE_DOASYNCCMDCOMPLETEL_EXIT=0xb7
+[TRACE]TRACE_FLOW[0x8A]_TREGISTERINTERFACE_DOCANCELASYNCCMD_ENTRY=0xb8
+[TRACE]TRACE_FLOW[0x8A]_TREGISTERINTERFACE_DOCANCELASYNCCMD_EXIT=0xb9
+[TRACE]TRACE_FLOW[0x8A]_TREGISTERINTERFACE_DOEXECUTEL_ENTRY=0xb2
+[TRACE]TRACE_FLOW[0x8A]_TREGISTERINTERFACE_DOEXECUTEL_EXIT=0xb3
+[TRACE]TRACE_FLOW[0x8A]_TREGISTERINTERFACE_HANDLEERROR_ENTRY=0xb4
+[TRACE]TRACE_FLOW[0x8A]_TREGISTERINTERFACE_HANDLEERROR_EXIT=0xb5
+[TRACE]TRACE_FLOW[0x8A]_TREGISTERINTERFACE_TREGISTERINTERFACE_CONS_ENTRY=0xb1
+[TRACE]TRACE_FLOW[0x8A]_TREMOVEUSBMSDEVICENODE_DOEXECUTEL_ENTRY=0xe0
+[TRACE]TRACE_FLOW[0x8A]_TREMOVEUSBMSDEVICENODE_DOEXECUTEL_EXIT=0xe1
+[TRACE]TRACE_FLOW[0x8A]_TREMOVEUSBMSDEVICENODE_HANDLEERROR_ENTRY=0xe2
+[TRACE]TRACE_FLOW[0x8A]_TREMOVEUSBMSDEVICENODE_HANDLEERROR_EXIT=0xe3
+[TRACE]TRACE_FLOW[0x8A]_TREMOVEUSBMSDEVICENODE_TREMOVEUSBMSDEVICENODE_CONS_ENTRY=0xdf
+[TRACE]TRACE_FLOW[0x8A]_TRETRIEVEDRIVELETTER_DOASYNCCMDCOMPLETEL_ENTRY=0xbf
+[TRACE]TRACE_FLOW[0x8A]_TRETRIEVEDRIVELETTER_DOASYNCCMDCOMPLETEL_EXIT=0xc0
+[TRACE]TRACE_FLOW[0x8A]_TRETRIEVEDRIVELETTER_DOCANCELASYNCCMD_ENTRY=0xc1
+[TRACE]TRACE_FLOW[0x8A]_TRETRIEVEDRIVELETTER_DOCANCELASYNCCMD_EXIT=0xc2
+[TRACE]TRACE_FLOW[0x8A]_TRETRIEVEDRIVELETTER_DOEXECUTEL_ENTRY=0xbb
+[TRACE]TRACE_FLOW[0x8A]_TRETRIEVEDRIVELETTER_DOEXECUTEL_EXIT=0xbc
+[TRACE]TRACE_FLOW[0x8A]_TRETRIEVEDRIVELETTER_HANDLEERROR_ENTRY=0xbd
+[TRACE]TRACE_FLOW[0x8A]_TRETRIEVEDRIVELETTER_HANDLEERROR_EXIT=0xbe
+[TRACE]TRACE_FLOW[0x8A]_TRETRIEVEDRIVELETTER_TRETRIEVEDRIVELETTER_CONS_ENTRY=0xba
+[TRACE]TRACE_FLOW[0x8A]_TSAVELATESTMOUNTINFO_DOASYNCCMDCOMPLETEL_ENTRY=0xcf
+[TRACE]TRACE_FLOW[0x8A]_TSAVELATESTMOUNTINFO_DOASYNCCMDCOMPLETEL_EXIT=0xd0
+[TRACE]TRACE_FLOW[0x8A]_TSAVELATESTMOUNTINFO_DOCANCELASYNCCMD_ENTRY=0xd3
+[TRACE]TRACE_FLOW[0x8A]_TSAVELATESTMOUNTINFO_DOCANCELASYNCCMD_EXIT=0xd4
+[TRACE]TRACE_FLOW[0x8A]_TSAVELATESTMOUNTINFO_DOEXECUTEL_ENTRY=0xcd
+[TRACE]TRACE_FLOW[0x8A]_TSAVELATESTMOUNTINFO_DOEXECUTEL_EXIT=0xce
+[TRACE]TRACE_FLOW[0x8A]_TSAVELATESTMOUNTINFO_HANDLEERROR_ENTRY=0xd1
+[TRACE]TRACE_FLOW[0x8A]_TSAVELATESTMOUNTINFO_HANDLEERROR_EXIT=0xd2
+[TRACE]TRACE_FLOW[0x8A]_TSAVELATESTMOUNTINFO_TSAVELATESTMOUNTINFO_CONS_ENTRY=0xcb
+[TRACE]TRACE_FLOW[0x8A]_TSAVELATESTMOUNTINFO_TSAVELATESTMOUNTINFO_CONS_EXIT=0xcc
+[TRACE]TRACE_FLOW[0x8A]_TSUBCOMMANDBASE_ASYNCCMDCOMPLETEL_ENTRY=0xa9
+[TRACE]TRACE_FLOW[0x8A]_TSUBCOMMANDBASE_ASYNCCMDCOMPLETEL_EXIT=0xaa
+[TRACE]TRACE_FLOW[0x8A]_TSUBCOMMANDBASE_CANCELASYNCCMD_ENTRY=0xab
+[TRACE]TRACE_FLOW[0x8A]_TSUBCOMMANDBASE_CANCELASYNCCMD_EXIT=0xac
+[TRACE]TRACE_FLOW[0x8A]_TSUBCOMMANDBASE_DOASYNCCMDCOMPLETEL_ENTRY=0xad
+[TRACE]TRACE_FLOW[0x8A]_TSUBCOMMANDBASE_DOASYNCCMDCOMPLETEL_EXIT=0xae
+[TRACE]TRACE_FLOW[0x8A]_TSUBCOMMANDBASE_DOCANCELASYNCCMD_ENTRY=0xaf
+[TRACE]TRACE_FLOW[0x8A]_TSUBCOMMANDBASE_DOCANCELASYNCCMD_EXIT=0xb0
+[TRACE]TRACE_FLOW[0x8A]_TSUBCOMMANDBASE_TSUBCOMMANDBASE_CONS_ENTRY=0xa8
+[TRACE]TRACE_FLOW[0x8A]_TUSBMSDEVICE_TUSBMSDEVICE_CONS_ENTRY=0x77
+[TRACE]TRACE_FLOW[0x8A]_TUSBMSINTERFACE_TUSBMSINTERFACE_CONS_ENTRY=0x78
+[TRACE]TRACE_FLOW[0x8A]_TUSBMSINTERFACE_TUSBMSINTERFACE_DES_ENTRY=0x79
+[TRACE]TRACE_FLOW[0x8A]_TUSBMSINTERFACE_TUSBMSINTERFACE_DES_EXIT=0x7a
+[TRACE]TRACE_FLOW[0x8A]_TUSBMSLOGICALUNIT_TUSBMSLOGICALUNIT_CONS_ENTRY=0x7b
+[TRACE]TRACE_NORMAL[0x86]_CMSMMDISMOUNTUSBDRIVES_DODISMOUNT=0x8
+[TRACE]TRACE_NORMAL[0x86]_TREGISTERINTERFACE_DOASYNCCMDCOMPLETEL=0x7
+[TRACE]TRACE_NORMAL[0x86]_TREGISTERINTERFACE_DOEXECUTEL=0x1
+[TRACE]TRACE_NORMAL[0x86]_TREGISTERINTERFACE_DOEXECUTEL_DUP1=0x2
+[TRACE]TRACE_NORMAL[0x86]_TREGISTERINTERFACE_DOEXECUTEL_DUP2=0x3
+[TRACE]TRACE_NORMAL[0x86]_TREGISTERINTERFACE_DOEXECUTEL_DUP3=0x4
+[TRACE]TRACE_NORMAL[0x86]_TREGISTERINTERFACE_DOEXECUTEL_DUP4=0x5
+[TRACE]TRACE_NORMAL[0x86]_TREGISTERINTERFACE_DOEXECUTEL_DUP5=0x6
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CMSMMSESSION_CMSMMSESSION_ENTRY=0x95
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CMSMMSESSION_CMSMMSESSION_EXIT=0x96
--- a/usbmgmt/usbmgr/inifile/src/inifile.cpp Wed Jul 07 14:16:40 2010 +0800
+++ b/usbmgmt/usbmgr/inifile/src/inifile.cpp Wed Jul 07 15:08:54 2010 +0800
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2002-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"
@@ -21,11 +21,11 @@
*/
#include <f32file.h>
+#include <usb/usblogger.h>
#include "inifile.h"
-#include <usb/usblogger.h>
-
-#ifdef __FLOG_ACTIVE
-_LIT8(KLogComponent, "IniFile");
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "inifileTraces.h"
#endif
@@ -34,14 +34,15 @@
void CIniFile::Panic(TIniPanic aPanic)
{
- _LIT(KIniData,"CIniFile");
- _USB_PANIC(KIniData,aPanic);
+ _LIT(KIniData,"CIniFile");
+ OstTrace1( TRACE_NORMAL, CINIFILE_PANIC, "CIniFile::Panic;aPanic=%d", aPanic );
+ User::Panic(KIniData,aPanic );
}
CIniFile::CIniFile()
: iPtr(NULL,0)
{
- LOG_FUNC
+ OstTraceFunctionEntry1( CINIFILE_CINIFILE_CONS_ENTRY, this );
}
CIniFile::~CIniFile()
@@ -58,12 +59,13 @@
* @param aName The name of the ini file to be used, e.g. "GPRSBTT.INI".
*/
{
- LOG_STATIC_FUNC_ENTRY
+ OstTraceFunctionEntry0( CINIFILE_NEWL_TDESC_ENTRY );
CIniFile* self = new(ELeave) CIniFile;
CleanupStack::PushL(self);
self->ConstructL(aName, KDefaultIniFileDir);
CleanupStack::Pop(self);
+ OstTraceFunctionExit0( CINIFILE_NEWL_TDESC_EXIT );
return self;
}
@@ -76,12 +78,13 @@
* @param aPath The location of the file e.g. "\\system\\data\\".
*/
{
- LOG_STATIC_FUNC_ENTRY
+ OstTraceFunctionEntry0( CINIFILE_NEWL_TDESC_TDESC_ENTRY );
CIniFile* self = new(ELeave) CIniFile;
CleanupStack::PushL(self);
self->ConstructL(aName, aPath);
CleanupStack::Pop(self);
+ OstTraceFunctionExit0( CINIFILE_NEWL_TDESC_TDESC_EXIT );
return self;
}
@@ -95,27 +98,53 @@
iToken = HBufC::NewL(KTokenSize+2); // 2 extra chars for []
RFs fs;
- LEAVEIFERRORL(fs.Connect());
+ TInt err;
+ err = fs.Connect();
+ if(err < 0)
+ {
+ OstTrace1( TRACE_NORMAL, CINIFILE_CONSTRUCTL, "CIniFile::ConstructL;fs.Connect() with error=%d", err );
+ User::Leave(err);
+ }
CleanupClosePushL(fs);
TFindFile ff(fs);
- LEAVEIFERRORL(ff.FindByDir(aName, aPath));
+ err = ff.FindByDir(aName, aPath);
+ if(err < 0)
+ {
+ OstTrace1( TRACE_NORMAL, CINIFILE_CONSTRUCTL_DUP1, "CIniFile::ConstructL;ff.FindByDir(aName, aPath) with error=%d", err );
+ User::Leave(err);
+ }
iName = ff.File().AllocL();
RFile file;
TInt size;
- LEAVEIFERRORL(file.Open(fs,*iName,EFileStreamText|EFileRead|EFileShareReadersOnly));
+ err = file.Open(fs,*iName,EFileStreamText|EFileRead|EFileShareReadersOnly);
+ if(err < 0)
+ {
+ OstTrace1( TRACE_NORMAL, CINIFILE_CONSTRUCTL_DUP2, "CIniFile::ConstructL;file.Open(fs,*iName,EFileStreamText|EFileRead|EFileShareReadersOnly) with error=%d", err );
+ User::Leave(err);
+ }
CleanupClosePushL(file);
- LEAVEIFERRORL(file.Size(size));
+ err = file.Size(size);
+ if(err < 0)
+ {
+ OstTrace1( TRACE_NORMAL, CINIFILE_CONSTRUCTL_DUP3, "CIniFile::ConstructL;file.Size(size) with error=%d", err );
+ User::Leave(err);
+ }
TText* data = REINTERPRET_CAST(TText*, User::AllocL(size));
iPtr.Set(data, size/sizeof(TText), size/sizeof(TText));
TPtr8 dest(REINTERPRET_CAST(TUint8*,data), 0, size);
- LEAVEIFERRORL(file.Read(dest));
+ err = file.Read(dest);
+ if(err < 0)
+ {
+ OstTrace1( TRACE_NORMAL, CINIFILE_CONSTRUCTL_DUP4, "CIniFile::ConstructL;file.Read(dest) with error=%d", err );
+ User::Leave(err);
+ }
TUint8* ptr = REINTERPRET_CAST(TUint8*,data);
--- a/usbmgmt/usbmgr/logger/BWINS/usbloggerU.DEF Wed Jul 07 14:16:40 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-EXPORTS
- ??0TFunctionLogger@@QAE@ABVTDesC8@@0PAX@Z @ 1 NONAME ; TFunctionLogger::TFunctionLogger(class TDesC8 const &, class TDesC8 const &, void *)
- ??1TFunctionLogger@@QAE@XZ @ 2 NONAME ; TFunctionLogger::~TFunctionLogger(void)
- ?Close@CUsbLog@@SAXXZ @ 3 NONAME ; void CUsbLog::Close(void)
- ?Connect@CUsbLog@@SAHXZ @ 4 NONAME ; int CUsbLog::Connect(void)
- ?HexDump@CUsbLog@@SAXABVTDesC8@@PBG1PBEH@Z @ 5 NONAME ; void CUsbLog::HexDump(class TDesC8 const &, unsigned short const *, unsigned short const *, unsigned char const *, int)
- ?VerboseLeaveIfErrorL@@YAXABVTDesC8@@PADHH@Z @ 6 NONAME ; void VerboseLeaveIfErrorL(class TDesC8 const &, char *, int, int)
- ?VerbosePanic@@YAXABVTDesC8@@PADHHPAEABVTDesC16@@@Z @ 7 NONAME ; void VerbosePanic(class TDesC8 const &, char *, int, int, unsigned char *, class TDesC16 const &)
- ?Write@CUsbLog@@SAXABVTDesC8@@0@Z @ 8 NONAME ; void CUsbLog::Write(class TDesC8 const &, class TDesC8 const &)
- ?Write@CUsbLog@@SAXABVTDesC8@@ABVTDesC16@@@Z @ 9 NONAME ; void CUsbLog::Write(class TDesC8 const &, class TDesC16 const &)
- ?WriteFormat@CUsbLog@@SAXABVTDesC8@@V?$TRefByValue@$$CBVTDesC16@@@@AAY00PAC@Z @ 10 NONAME ; void CUsbLog::WriteFormat(class TDesC8 const &, class TRefByValue<class TDesC16 const >, signed char * [1] &)
- ?WriteFormat@CUsbLog@@SAXABVTDesC8@@V?$TRefByValue@$$CBVTDesC16@@@@ZZ @ 11 NONAME ; void CUsbLog::WriteFormat(class TDesC8 const &, class TRefByValue<class TDesC16 const >, ...)
- ?WriteFormat@CUsbLog@@SAXABVTDesC8@@V?$TRefByValue@$$CBVTDesC8@@@@AAY00PAC@Z @ 12 NONAME ; void CUsbLog::WriteFormat(class TDesC8 const &, class TRefByValue<class TDesC8 const >, signed char * [1] &)
- ?WriteFormat@CUsbLog@@SAXABVTDesC8@@V?$TRefByValue@$$CBVTDesC8@@@@ZZ @ 13 NONAME ; void CUsbLog::WriteFormat(class TDesC8 const &, class TRefByValue<class TDesC8 const >, ...)
- ?VerboseLeaveL@@YAXABVTDesC8@@PADHH@Z @ 14 NONAME ; void VerboseLeaveL(class TDesC8 const &, char *, int, int)
- ?VerboseMsgPanic@@YAXABVTDesC8@@PADHABVRMessage2@@ABVTDesC16@@H@Z @ 15 NONAME ; void VerboseMsgPanic(class TDesC8 const &, char *, int, class RMessage2 const &, class TDesC16 const &, int)
-
--- a/usbmgmt/usbmgr/logger/EABI/usbloggerU.DEF Wed Jul 07 14:16:40 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-EXPORTS
- _Z12VerbosePanicRK6TDesC8PciiPhRK7TDesC16 @ 1 NONAME
- _Z20VerboseLeaveIfErrorLRK6TDesC8Pcii @ 2 NONAME
- _ZN15TFunctionLoggerC1ERK6TDesC8S2_Pv @ 3 NONAME
- _ZN15TFunctionLoggerC2ERK6TDesC8S2_Pv @ 4 NONAME
- _ZN15TFunctionLoggerD1Ev @ 5 NONAME
- _ZN15TFunctionLoggerD2Ev @ 6 NONAME
- _ZN7CUsbLog11WriteFormatERK6TDesC811TRefByValueIK7TDesC16ERSt9__va_list @ 7 NONAME
- _ZN7CUsbLog11WriteFormatERK6TDesC811TRefByValueIK7TDesC16Ez @ 8 NONAME
- _ZN7CUsbLog11WriteFormatERK6TDesC811TRefByValueIS1_ERSt9__va_list @ 9 NONAME
- _ZN7CUsbLog11WriteFormatERK6TDesC811TRefByValueIS1_Ez @ 10 NONAME
- _ZN7CUsbLog5CloseEv @ 11 NONAME
- _ZN7CUsbLog5WriteERK6TDesC8RK7TDesC16 @ 12 NONAME
- _ZN7CUsbLog5WriteERK6TDesC8S2_ @ 13 NONAME
- _ZN7CUsbLog7ConnectEv @ 14 NONAME
- _ZN7CUsbLog7HexDumpERK6TDesC8PKtS4_PKhi @ 15 NONAME
- _Z13VerboseLeaveLRK6TDesC8Pcii @ 16 NONAME
- _Z15VerboseMsgPanicRK6TDesC8PciRK9RMessage2RK7TDesC16i @ 17 NONAME
-
--- a/usbmgmt/usbmgr/logger/group/bld.inf Wed Jul 07 14:16:40 2010 +0800
+++ b/usbmgmt/usbmgr/logger/group/bld.inf Wed Jul 07 15:08:54 2010 +0800
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2005-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"
@@ -21,7 +21,5 @@
PRJ_EXPORTS
../public/usblogger.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(usb/usblogger.h)
-usblogger.mmh /epoc32/include/usb/usblogger.mmh
-PRJ_MMPFILES
-usblogger.MMP
+
--- a/usbmgmt/usbmgr/logger/group/usblogger.MMP Wed Jul 07 14:16:40 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-/*
-* Copyright (c) 2005-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:
-* Logging engine for USB.
-*
-*/
-
-/**
- @file
-*/
-
-target usblogger.dll
-
-CAPABILITY All -Tcb
-TARGETTYPE dll
-
-uid 0x1000008d 0x10281A7D
-
-// MACRO __USB_DEBUG_RDEBUG__
-// Define this macro to get output through the serial port (COM0)
-
-SOURCEPATH ../src
-SOURCE usblogger.cpp
-
-OS_LAYER_SYSTEMINCLUDE_SYMBIAN
-
-library euser.lib
-
-VENDORID 0x70000001
-
-#include <comms-infras/commsdebugutility.mmh>
-
-UNPAGED
--- a/usbmgmt/usbmgr/logger/group/usblogger.mmh Wed Jul 07 14:16:40 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,67 +0,0 @@
-/*
-* Copyright (c) 2005-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:
-* When checking this file into perforce, ensure that
-* LOGGING IS DISABLED FOR RELEASE BUILDS.
-* This file is not to be used outside Symbian.
-* It is largely a copy of commsdebugutility.mmh.
-* When the new logger comes in that provides the functionality we want
-* (specifically, 'connected' logging using TLS), we can remove our own logger
-* dll entirely, including this file. [We'll still possibly need a header with
-* our nice function entry/exit, leave and panic macros though.]
-*
-*/
-
-// Uncomment next line to temporarily engage logging for release builds.
-//#define __FLOGGER_UREL
-// Comment next line to temporarily disengage logging for debug builds
-#define __FLOGGER_UDEB
-
-// Determine whether, and how, flogger is to be included
-#ifdef __FLOGGER_UREL
- #ifdef __FLOGGER_UDEB
- #define __FLOGGER_INCLUDED
- MACRO __FLOG_UREL
- #endif
-#endif
-#ifdef __FLOGGER_UREL
- #ifndef __FLOGGER_UDEB
- #define __FLOGGER_INCLUDED
- MACRO __FLOG_UREL
- MACRO __FLOG_NO_UDEB
- #endif
-#endif
-#ifndef __FLOGGER_UREL
- #ifndef __FLOGGER_UDEB
- MACRO __FLOG_NO_UDEB
- #endif
-#endif
-#ifndef __FLOGGER_UREL
- #ifdef __FLOGGER_UDEB
- #define __FLOGGER_INCLUDED
- #define __FLOGGER_DEBUGGERLIBRARY
- #endif
-#endif
-
-
-#ifdef __FLOGGER_INCLUDED
- #ifndef __FLOGGER_SUPPRESS_LIBRARY
- #ifdef __FLOGGER_DEBUGGERLIBRARY
- DEBUGLIBRARY usblogger.lib
- #else
- LIBRARY usblogger.lib
- #endif
- #endif
-#endif
-
--- a/usbmgmt/usbmgr/logger/public/usblogger.h Wed Jul 07 14:16:40 2010 +0800
+++ b/usbmgmt/usbmgr/logger/public/usblogger.h Wed Jul 07 15:08:54 2010 +0800
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2005-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"
@@ -21,163 +21,20 @@
*/
-#ifndef LOGGER_H
-#define LOGGER_H
+#ifndef USBLOGGER_H
+#define USBLOGGER_H
#include <e32base.h>
-// Control function entry and exit logging using a compile-time switch.
-#define __LOG_FUNCTIONS__
-
-class TFunctionLogger;
-
-#ifndef __COMMSDEBUGUTILITY_H__ // comms-infras/commsdebugutility.h not included
-#ifdef _DEBUG // If this is a debug build...
-// Set flogging active.
-#define __FLOG_ACTIVE
-#endif
-#endif
-
-#ifdef __FLOG_ACTIVE
-#define IF_FLOGGING(a) a
-#else
-#define IF_FLOGGING(a)
-#endif
-
-_LIT8(KDefaultLogFile, "USB");
-
-#ifdef __FLOG_ACTIVE
-#define LEAVEIFERRORL(a) VerboseLeaveIfErrorL(KLogComponent, __FILE__, __LINE__, a)
-#define LEAVEL(a) VerboseLeaveL(KLogComponent, __FILE__, __LINE__, a)
-#define _USB_PANIC(CAT, CODE) VerbosePanic(KLogComponent, __FILE__, __LINE__, CODE, (TText8*)#CODE, CAT)
-#define PANIC_MSG(msg, cat, code) VerboseMsgPanic(KLogComponent, __FILE__, __LINE__, msg, cat, code);
-#define FLOG(a) CUsbLog::Write(KDefaultLogFile, a);
-#define FTRACE(a) {a;}
-#define LOGTEXT(text) CUsbLog::Write(KLogComponent, text);
-#define LOGTEXT2(text, a) CUsbLog::WriteFormat(KLogComponent, text, a);
-#define LOGTEXT3(text, a, b) CUsbLog::WriteFormat(KLogComponent, text, a, b);
-#define LOGTEXT4(text, a, b, c) CUsbLog::WriteFormat(KLogComponent, text, a, b, c);
-#define LOGTEXT5(text, a, b, c, d) CUsbLog::WriteFormat(KLogComponent, text, a, b, c, d);
-#define LOGTEXT6(text, a, b, c, d, e) CUsbLog::WriteFormat(KLogComponent, text, a, b, c, d, e);
-#define LOGTEXT7(text, a, b, c, d, e, f) CUsbLog::WriteFormat(KLogComponent, text, a, b, c, d, e, f);
-#define LOGHEXDESC(desc) CUsbLog::HexDump(KLogComponent, 0, 0, desc.Ptr() , desc.Length());
-#define LOGHEXRAW(data, len) CUsbLog::HexDump(KLogComponent, 0, 0, data, len);
-#else
-#define LEAVEIFERRORL(a) static_cast<void>(User::LeaveIfError(a))
-#define LEAVEL(a) User::Leave(a)
-#define _USB_PANIC(CAT, CODE) User::Panic(CAT, CODE)
-#define PANIC_MSG(msg, cat, code) msg.Panic(cat, code);
-#define FLOG(a)
-#define FTRACE(a)
-#define LOGTEXT(text)
-#define LOGTEXT2(text, a)
-#define LOGTEXT3(text, a, b)
-#define LOGTEXT4(text, a, b, c)
-#define LOGTEXT5(text, a, b, c, d)
-#define LOGTEXT6(text, a, b, c, d, e)
-#define LOGTEXT7(text, a, b, c, d, e, f)
-#define LOGHEXDESC(desc)
-#define LOGHEXRAW(data, len)
-#endif // __FLOG_ACTIVE
-
-#define FORCED_LOG_FUNC TFunctionLogger __instrument(KLogComponent, TPtrC8((TUint8*)__PRETTY_FUNCTION__), (TAny*)this);
-#define FORCED_LOG_STATIC_FUNC_ENTRY TFunctionLogger __instrument(KLogComponent, TPtrC8((TUint8*)__PRETTY_FUNCTION__), (TAny*)NULL);
-
-#if ( defined __FLOG_ACTIVE && defined __LOG_FUNCTIONS__ )
-#define LOG_LINE CUsbLog::Write(KLogComponent, KNullDesC8());
-#define LOG_FUNC FORCED_LOG_FUNC
-#define LOG_STATIC_FUNC_ENTRY FORCED_LOG_STATIC_FUNC_ENTRY
-#else
-#define LOG_LINE
-#define LOG_FUNC
-#define LOG_STATIC_FUNC_ENTRY
-#endif
-
-
+#define LEAVEIFERRORL(err, trace) \
+{ \
+TInt munged_err=(err); \
+if (munged_err < 0) \
+{ \
+trace; \
+User::Leave(munged_err);\
+}\
+}
-NONSHARABLE_CLASS(CUsbLog) : public CBase
- {
-public:
- IMPORT_C static TInt Connect();
- IMPORT_C static void Close();
-
- IMPORT_C static void Write(const TDesC8& aCmpt, const TDesC8& aText);
- IMPORT_C static void WriteFormat(const TDesC8& aCmpt, TRefByValue<const TDesC8> aFmt, ...);
- IMPORT_C static void WriteFormat(const TDesC8& aCmpt, TRefByValue<const TDesC8> aFmt, VA_LIST& aList);
- IMPORT_C static void Write(const TDesC8& aCmpt, const TDesC16& aText);
- IMPORT_C static void WriteFormat(const TDesC8& aCmpt, TRefByValue<const TDesC16> aFmt, ...);
- IMPORT_C static void WriteFormat(const TDesC8& aCmpt, TRefByValue<const TDesC16> aFmt, VA_LIST& aList);
- IMPORT_C static void HexDump(const TDesC8& aCmpt, const TText* aHeader, const TText* aMargin, const TUint8* aPtr, TInt aLen);
- };
-
-
-#ifndef NO_FPRINT
-inline void FPrint(const TRefByValue<const TDesC> IF_FLOGGING(aFmt), ...)
- {
-#ifdef __FLOG_ACTIVE
- VA_LIST list;
- VA_START(list,aFmt);
- CUsbLog::WriteFormat(KDefaultLogFile, aFmt, list);
-#endif
- }
-#endif
-
-
-#ifndef NO_FHEX_PTR
-inline void FHex(const TUint8* IF_FLOGGING(aPtr), TInt IF_FLOGGING(aLen))
- {
-#ifdef __FLOG_ACTIVE
- CUsbLog::HexDump(KDefaultLogFile, 0, 0, aPtr, aLen);
-#endif
- }
-#endif
-
+#endif // USBLOGGER_H
-#ifndef NO_FHEX_DESC
-inline void FHex(const TDesC8& IF_FLOGGING(aDes))
- {
-#ifdef __FLOG_ACTIVE
- FHex(aDes.Ptr(), aDes.Length());
-#endif
- }
-#endif
-
-
-IMPORT_C void VerboseLeaveIfErrorL(const TDesC8& aCpt,
- char* aFile,
- TInt aLine,
- TInt aReason);
-
-IMPORT_C void VerboseLeaveL(const TDesC8& aCpt,
- char* aFile,
- TInt aLine,
- TInt aReason);
-
-IMPORT_C void VerbosePanic(const TDesC8& aCpt,
- char* aFile,
- TInt aLine,
- TInt aPanicCode,
- TText8* aPanicName,
- const TDesC& aPanicCategory);
-
-IMPORT_C void VerboseMsgPanic(const TDesC8& aCpt,
- char* aFile,
- TInt aLine,
- const RMessage2& aMsg,
- const TDesC& aCat,
- TInt aPanicCode);
-
-
-NONSHARABLE_CLASS(TFunctionLogger)
- {
-public:
- IMPORT_C TFunctionLogger(const TDesC8& aCpt, const TDesC8& aString, TAny* aThis);
- IMPORT_C ~TFunctionLogger();
-
-private:
- TPtrC8 iCpt;
- TPtrC8 iString;
- };
-
-#endif // LOGGER_H
-
--- a/usbmgmt/usbmgr/logger/src/usblogger.cpp Wed Jul 07 14:16:40 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,600 +0,0 @@
-/*
-* Copyright (c) 2005-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:
-*
-*/
-
-/**
- @file
- @internalTechnology
-*/
-
-
-#include <e32base.h>
-#include <comms-infras/commsdebugutility.h>
-#include <usb/usblogger.h>
-
-
-#ifdef __USB_DEBUG_RDEBUG__
-#include <e32debug.h>
-const TInt KUSBLogBufferSize=255;
-class TUSBFlogOverflow8 : public TDes8Overflow
- {
-public:
- void Overflow(TDes8& /*aDes*/) { }
- };
-
-class TUSBFlogOverflow16 : public TDes16Overflow
- {
-public:
- void Overflow(TDes16& /*aDes*/) { }
- };
-void __CUsbLog_DoHexDump(const TDesC8& aCmpt, const TDesC8& aData, const TDesC8& aHeader, const TDesC8& aMargin);
-#endif //__USB_DEBUG_RDEBUG__
-
-
-
-
-#ifdef __FLOG_ACTIVE
-_LIT8(KSubsystem, "USB");
-_LIT8(KLogCmpt, "logengine");
-#endif
-
-
-NONSHARABLE_CLASS(TLogData)
- {
- public:
-#ifdef __FLOG_ACTIVE
- TLogData();
-
- void SetLogTags(const TDesC8& aCmpt);
-
- TInt iAccessCount;
-
- RFileLogger iLogEngine;
- TBuf8<KMaxTagLength> iCurrentComponent;
-#endif
- };
-
-
-#ifdef __FLOG_ACTIVE
-TLogData::TLogData()
- : iAccessCount(0), iCurrentComponent(KNullDesC8)
- {}
-
-void TLogData::SetLogTags(const TDesC8& aCmpt)
- {
- if (aCmpt != iCurrentComponent)
- {
- iLogEngine.SetLogTags(KSubsystem, aCmpt.Left(KMaxTagLength));
- iCurrentComponent = aCmpt.Left(KMaxTagLength);
- }
- }
-#endif
-
-#define GETLOG TLogData* __logger = static_cast<TLogData*>(Dll::Tls());
-
-
-
-EXPORT_C /*static*/ TInt CUsbLog::Connect()
- {
-#ifdef __FLOG_ACTIVE
- GETLOG;
-
- if (!__logger)
- {
-
- CUsbLog::Write(KLogCmpt, _L8("Opening new logger connection"));
- __logger = new TLogData();
- if (!__logger)
- {
- CUsbLog::Write(KLogCmpt, _L8("Opening logger connection failed, no memory"));
- return KErrNoMemory;
- }
-
- __logger->iLogEngine.Connect();
- Dll::SetTls(__logger);
- }
-
- __logger->iAccessCount++;
- CUsbLog::WriteFormat(KLogCmpt, _L8("Opening -- %d instances now open"), __logger->iAccessCount);
-
- return KErrNone;
-#else
- return KErrNotSupported;
-#endif
- }
-
-
-EXPORT_C /*static*/ void CUsbLog::Close()
- {
-#ifdef __FLOG_ACTIVE
- GETLOG;
-
- if (__logger)
- {
- TInt& count = __logger->iAccessCount;
-
- if (count)
- {
- count--;
- CUsbLog::WriteFormat(KLogCmpt, _L8("Closing -- %d instance(s) left open"), count);
- if (!count)
- {
- __logger->iLogEngine.Close();
- delete __logger;
- Dll::SetTls(NULL);
- CUsbLog::Write(KLogCmpt, _L8("Fully closed and deleted, now flogging statically."));
- }
- }
- else
- {
- CUsbLog::Write(KLogCmpt, _L8("Not closing -- not opened"));
- }
- }
-#endif
- }
-
-
-EXPORT_C /*static*/ void CUsbLog::Write(const TDesC8& IF_FLOGGING(aCmpt), const TDesC8& IF_FLOGGING(aText))
- {
-#ifdef __FLOG_ACTIVE
- GETLOG;
-
-#ifdef __USB_DEBUG_RDEBUG__
- TBuf8<KUSBLogBufferSize> buf;
- RThread thread;
- buf.AppendFormat(_L8("%S\t%S\t%LX\t%S\r\n"), &KSubsystem(), &aCmpt, thread.Id().Id(), &aText);
- RDebug::RawPrint(buf);
-#endif // __USB_DEBUG_RDEBUG
-
- if (__logger)
- {
- __logger->SetLogTags(aCmpt);
- __logger->iLogEngine.Write(aText);
- }
- else
- {
- RFileLogger::Write(KSubsystem, aCmpt, aText);
- }
-#endif
- }
-
-
-EXPORT_C /*static*/ void CUsbLog::WriteFormat(const TDesC8& IF_FLOGGING(aCmpt), TRefByValue<const TDesC8> IF_FLOGGING(aFmt), ...)
- {
-#ifdef __FLOG_ACTIVE
- VA_LIST list;
- VA_START(list, aFmt);
-
- GETLOG;
-
-#ifdef __USB_DEBUG_RDEBUG__
- TUSBFlogOverflow8 objFlogBody8;
- TBuf8<KUSBLogBufferSize> buf;
- RThread thread;
- buf.AppendFormat(_L8("%S\t%S\t%LX\t"), &KSubsystem(), &aCmpt, thread.Id().Id());
- buf.AppendFormatList(aFmt, list, &objFlogBody8);
- buf.Append(_L8("\r\n"));
- RDebug::RawPrint(buf);
-#endif // __USB_DEBUG_RDEBUG
-
- if (__logger)
- {
- __logger->SetLogTags(aCmpt);
- __logger->iLogEngine.WriteFormat(aFmt, list);
- }
- else
- {
- RFileLogger::WriteFormat(KSubsystem, aCmpt, aFmt, list);
- }
-#endif
- }
-
-
-EXPORT_C /*static*/ void CUsbLog::WriteFormat(const TDesC8& IF_FLOGGING(aCmpt), TRefByValue<const TDesC8> IF_FLOGGING(aFmt), VA_LIST& IF_FLOGGING(aList))
- {
-#ifdef __FLOG_ACTIVE
- GETLOG;
-
-#ifdef __USB_DEBUG_RDEBUG__
- TUSBFlogOverflow8 objFlogBody8;
- TBuf8<KUSBLogBufferSize> buf;
- RThread thread;
- buf.AppendFormat(_L8("%S\t%S\t%LX\t"), &KSubsystem(), &aCmpt, thread.Id().Id());
- buf.AppendFormatList(aFmt, aList, &objFlogBody8);
- buf.Append(_L8("\r\n"));
- RDebug::RawPrint(buf);
-#endif // __USB_DEBUG_RDEBUG
-
- if (__logger)
- {
- __logger->SetLogTags(aCmpt);
- __logger->iLogEngine.WriteFormat(aFmt, aList);
- }
- else
- {
- RFileLogger::WriteFormat(KSubsystem, aCmpt, aFmt, aList);
- }
-#endif
- }
-
-
-EXPORT_C /*static*/ void CUsbLog::Write(const TDesC8& IF_FLOGGING(aCmpt), const TDesC16& IF_FLOGGING(aText))
- {
-#ifdef __FLOG_ACTIVE
- GETLOG;
-
-#ifdef __USB_DEBUG_RDEBUG__
- TBuf16<KUSBLogBufferSize> buf;
- buf.AppendFormat(_L16("(TDesC16): %S\r\n"), &aText);
- RDebug::RawPrint(buf);
-#endif // __USB_DEBUG_RDEBUG
-
- if (__logger)
- {
- __logger->SetLogTags(aCmpt);
- __logger->iLogEngine.Write(aText);
- }
- else
- {
- RFileLogger::WriteFormat(KSubsystem, aCmpt, aText);
- }
-#endif
- }
-
-
-EXPORT_C /*static*/ void CUsbLog::WriteFormat(const TDesC8& IF_FLOGGING(aCmpt), TRefByValue<const TDesC16> IF_FLOGGING(aFmt), ...)
- {
-#ifdef __FLOG_ACTIVE
- VA_LIST list;
- VA_START(list, aFmt);
-
- GETLOG;
-
-#ifdef __USB_DEBUG_RDEBUG__
- TUSBFlogOverflow16 objFlogBody16;
- TBuf16<KUSBLogBufferSize> wideBuf;
- wideBuf.Append(_L16("(TDesC16): "));
- wideBuf.AppendFormatList(aFmt, list, &objFlogBody16);
- wideBuf.Append(_L16("\r\n"));
- RDebug::RawPrint(wideBuf);
-#endif // __USB_DEBUG_RDEBUG
-
- if (__logger)
- {
- __logger->SetLogTags(aCmpt);
- __logger->iLogEngine.WriteFormat(aFmt, list);
- }
- else
- {
- RFileLogger::WriteFormat(KSubsystem, aCmpt, aFmt, list);
- }
-#endif
- }
-
-
-EXPORT_C /*static*/ void CUsbLog::WriteFormat(const TDesC8& IF_FLOGGING(aCmpt), TRefByValue<const TDesC16> IF_FLOGGING(aFmt), VA_LIST& IF_FLOGGING(aList))
- {
-#ifdef __FLOG_ACTIVE
- GETLOG;
-
-#ifdef __USB_DEBUG_RDEBUG__
- TUSBFlogOverflow16 objFlogBody16;
- TBuf16<KUSBLogBufferSize> wideBuf;
- wideBuf.Append(_L16("(TDesC16): "));
- wideBuf.AppendFormatList(aFmt, aList, &objFlogBody16);
- wideBuf.Append(_L16("\r\n"));
- RDebug::RawPrint(wideBuf);
-#endif // __USB_DEBUG_RDEBUG
-
- if (__logger)
- {
- __logger->SetLogTags(aCmpt);
- __logger->iLogEngine.WriteFormat(aFmt, aList);
- }
- else
- {
- RFileLogger::WriteFormat(KSubsystem, aCmpt, aFmt, aList);
- }
-#endif
- }
-
-
-EXPORT_C /*static*/ void CUsbLog::HexDump(const TDesC8& IF_FLOGGING(aCmpt), const TText* IF_FLOGGING(aHeader), const TText* IF_FLOGGING(aMargin), const TUint8* IF_FLOGGING(aPtr), TInt IF_FLOGGING(aLen))
- {
-#ifdef __FLOG_ACTIVE
- GETLOG;
-
-#ifdef __USB_DEBUG_RDEBUG__
- __CUsbLog_DoHexDump(aCmpt, TPtrC8(aPtr, aLen), TPtrC8(NULL,0), TPtrC8(NULL,0));
-#endif // __USB_DEBUG_RDEBUG
-
- if (__logger)
- {
- __logger->SetLogTags(aCmpt);
- __logger->iLogEngine.HexDump(aHeader, aMargin, aPtr, aLen);
- }
- else
- {
- RFileLogger::HexDump(KSubsystem, aCmpt, TPtrC8(aPtr, aLen), KNullDesC8);
- }
-#endif
- }
-
-
-#ifdef __USB_DEBUG_RDEBUG__
-
-#define BLANK _S("")
-const TInt KHexDumpWidth=16; ///< Number of bytes written per line when formatting as hex.
-const TInt KLowestPrintableCharacter = 32; ///< In Hex output, replace chars below space with a dot.
-const TInt KHighestPrintableCharacter = 126; ///< In Hex output, replace chars above 7-bits with a dot.
-
-_LIT8(KFirstFormatString8,"%04x : "); ///< Format string used in Hexdump to format first part: header and byte numbers.
-_LIT8(KSecondFormatString8,"%02x "); ///< Format string used in Hexdump to format mid part: each of the 16 bytes as hex
-_LIT8(KThirdFormatString8,"%c"); ///< Format string used in Hexdump to format the last part: each of the 16 bytes as characters
-_LIT8(KThreeSpaces8," "); ///< Format string used in Hexdump to define padding between first and mid parts
-_LIT8(KTwoSpaces8," "); ///< Format string used in Hexdump to define padding between hex and char bytes.
-const TText8 KFullStopChar8='.';
-
-void __CUsbLog_DoHexDump(const TDesC8& aCmpt, const TDesC8& aData, const TDesC8& aHeader, const TDesC8& aMargin)
- {
-#ifdef __FLOG_ACTIVE
- HBufC8* marginStr = NULL;
- TBuf8<KMaxHexDumpWidth> buf;
- TInt aRemainingLen = aData.Length();
- TInt aHeaderLen = aHeader.Length();
- TUSBFlogOverflow8 objFlogBody8;
-
- if (aData.Length()==0) // nothing to do
- {
- return;
- }
-
-
- if (aHeaderLen > 0)
- {
-
- if (aMargin.Length() == 0)
- {
- marginStr = HBufC8::New(aHeader.Length());
- if (marginStr == NULL)
- {
- return; // abort if No memory
- }
- TPtr8 marginStrPtr(marginStr->Des());
- marginStrPtr.AppendFill(' ',aHeader.Length());
- }
- else
- {
- marginStr = aMargin.Alloc();
- }
- }
-
-
-
- TUint blockStartPos = 0;
- while (aRemainingLen>0)
- {
- RThread thread;
- buf.AppendFormat(_L8("%S\t%S\t%LX\t"), &KSubsystem(), &aCmpt, thread.Id().Id());
- TInt blockLength = (aRemainingLen>KHexDumpWidth ? KHexDumpWidth : aRemainingLen);
-
- // write the header/margin and print in hex which bytes we are about to write
- if (blockStartPos == 0)
- {
- if (aHeaderLen > 0)
- {
- buf.Append(aHeader);
- }
- buf.AppendFormat(KFirstFormatString8,&objFlogBody8, blockStartPos);
- }
- else
- {
- if (marginStr)
- {
- buf.Append(*marginStr);
- }
- buf.AppendFormat(KFirstFormatString8,&objFlogBody8,blockStartPos);
- }
-
- TInt bytePos;
- // write the bytes as hex
- for (bytePos = 0; bytePos < blockLength; bytePos++)
- {
- buf.AppendFormat(KSecondFormatString8,aData[blockStartPos + bytePos]);
- }
- while (bytePos++ < KHexDumpWidth)
- {
- buf.Append(KThreeSpaces8);
- }
- buf.Append(KTwoSpaces8);
- // print the bytes as characters, or full stops if outside printable range
- for (bytePos = 0; bytePos < blockLength; bytePos++)
- {
- buf.AppendFormat(KThirdFormatString8,(aData[blockStartPos + bytePos] < KLowestPrintableCharacter || aData[blockStartPos + bytePos] > KHighestPrintableCharacter) ? KFullStopChar8 : aData[blockStartPos + bytePos]);
- }
-
- buf.Append(_L8("\r\n"));
- RDebug::RawPrint(buf);
-
- buf.SetLength(0);
- aRemainingLen -= blockLength;
- blockStartPos += blockLength;
- }
- delete marginStr;
-#endif // __FLOG_ACTIVE
- }
-
-
-
-#endif // __USB_DEBUG_RDEBUG
-
-
-/**
-Leave (if error) verbosely- log name of file and line number just before
-leaving.
-@param aFile The file we're leaving from.
-@param aLine The line number we're leaving from.
-@param aReason The leave code.
-*/
-EXPORT_C void VerboseLeaveIfErrorL(const TDesC8& IF_FLOGGING(aCpt),
- char* IF_FLOGGING(aFile),
- TInt IF_FLOGGING(aLine),
- TInt aReason)
- {
- // only leave negative value
- if ( aReason >= 0 )
- {
- return;
- }
-
-#ifdef __FLOG_ACTIVE
- _LIT8(KLeavePrefix, "LEAVE: ");
-
- TPtrC8 fullFileName((const TUint8*)aFile);
- TPtrC8 fileName(fullFileName.Ptr()+fullFileName.LocateReverse('\\')+1);
-
- TBuf8<256> buf;
- buf.Append(KLeavePrefix);
- buf.AppendFormat(_L8("aReason = %d [file %S, line %d]"), aReason, &fileName,
- aLine);
- CUsbLog::Write(aCpt, buf);
-#endif
-
- // finally
- User::Leave(aReason);
- }
-
-/**
-Leave verbosely- log name of file and line number just before
-leaving.
-@param aFile The file we're leaving from.
-@param aLine The line number we're leaving from.
-@param aReason The leave code.
-*/
-EXPORT_C void VerboseLeaveL(const TDesC8& IF_FLOGGING(aCpt),
- char* IF_FLOGGING(aFile),
- TInt IF_FLOGGING(aLine),
- TInt aReason)
- {
-#ifdef __FLOG_ACTIVE
- _LIT8(KLeavePrefix, "LEAVE: ");
-
- TPtrC8 fullFileName((const TUint8*)aFile);
- TPtrC8 fileName(fullFileName.Ptr()+fullFileName.LocateReverse('\\')+1);
-
- TBuf8<256> buf;
- buf.Append(KLeavePrefix);
- buf.AppendFormat(_L8("aReason = %d [file %S, line %d]"), aReason, &fileName,
- aLine);
- CUsbLog::Write(aCpt, buf);
-#endif
-
- // finally
- User::Leave(aReason);
- }
-
-/**
-Panic verbosely- log name of file and line number just before panicking.
-@param aFile The file that's panicking.
-@param aLine The line number that's panicking.
-@param aReason The panic code.
-@param aPanicName The text of the panic code.
-@param aPanicCategory The panic category.
-*/
-EXPORT_C void VerbosePanic(const TDesC8& IF_FLOGGING(aCpt),
- char* IF_FLOGGING(aFile),
- TInt IF_FLOGGING(aLine),
- TInt aPanicCode,
- TText8* IF_FLOGGING(aPanicName),
- const TDesC& aPanicCategory)
- {
-#ifdef __FLOG_ACTIVE
- _LIT8(KPanicPrefix, "PANIC: code ");
-
- TPtrC8 fullFileName((const TUint8*)aFile);
- TPtrC8 fileName(fullFileName.Ptr()+fullFileName.LocateReverse('\\')+1);
-
- TBuf8<256> buf;
- buf.Append(KPanicPrefix);
- buf.AppendFormat(_L8("%d = %s [file %S, line %d]"),
- aPanicCode,
- aPanicName,
- &fileName,
- aLine);
- CUsbLog::Write(aCpt, buf);
-#endif
-
- // finally
- User::Panic(aPanicCategory, aPanicCode);
- }
-
-
-/**
-Panic the given message verbosely- log name of file and line number just
-before panicking.
-@param aMsg Message to panic.
-@param aFile The file that's panicking.
-@param aLine The line number that's panicking.
-@param aReason The panic code.
-@param aPanicName The text of the panic code.
-@param aPanicCategory The panic category.
-*/
-EXPORT_C void VerboseMsgPanic(const TDesC8& IF_FLOGGING(aCpt),
- char* IF_FLOGGING(aFile),
- TInt IF_FLOGGING(aLine),
- const RMessage2& aMsg,
- const TDesC& aCat,
- TInt aPanicCode)
- {
-#ifdef __FLOG_ACTIVE
- _LIT8(KPanicPrefix, "PANICKING CLIENT: code ");
-
- TPtrC8 fullFileName((const TUint8*)aFile);
- TPtrC8 fileName(fullFileName.Ptr()+fullFileName.LocateReverse('\\')+1);
-
- TBuf8<256> buf;
- buf.Append(KPanicPrefix);
- buf.AppendFormat(_L8("%d [file %S, line %d]"),
- aPanicCode,
- &fileName,
- aLine);
- CUsbLog::Write(aCpt, buf);
-#endif
- // finally
- aMsg.Panic(aCat, aPanicCode);
- }
-
-#ifdef __FLOG_ACTIVE
-_LIT8(KInstrumentIn, ">>%S this = [0x%08x]");
-_LIT8(KInstrumentOut, "<<%S");
-#endif
-
-EXPORT_C TFunctionLogger::TFunctionLogger(const TDesC8& IF_FLOGGING(aCpt), const TDesC8& IF_FLOGGING(aString), TAny* IF_FLOGGING(aThis))
- {
-#ifdef __FLOG_ACTIVE
- iCpt.Set(aCpt);
- iString.Set(aString);
- CUsbLog::WriteFormat(iCpt, KInstrumentIn, &iString, aThis);
-#endif
- }
-
-EXPORT_C TFunctionLogger::~TFunctionLogger()
- {
-#ifdef __FLOG_ACTIVE
- CUsbLog::WriteFormat(iCpt, KInstrumentOut, &iString);
-#endif
- }
-
--- a/usbmgmt/usbmgr/test/cit/ROMConfig/group/bld.inf Wed Jul 07 14:16:40 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,37 +0,0 @@
-/*
-* Copyright (c) 2005-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:
-*
-*/
-
-PRJ_TESTEXPORTS
-
-// TEF ini file.
-..\testdata\UsbRomConfig.ini \epoc32\winscw\c\testdata\usbromconfig\UsbRomConfig.ini
-
-// TEF scripts files.
-..\scripts\USB_ROMCONFIG_001.script \epoc32\winscw\c\scripts\usbromconfig\USB_ROMCONFIG_001.script
-..\scripts\USB_ROMCONFIG_002.script \epoc32\winscw\c\scripts\usbromconfig\USB_ROMCONFIG_002.script
-..\scripts\USB_ROMCONFIG_003.script \epoc32\winscw\c\scripts\usbromconfig\USB_ROMCONFIG_003.script
-..\scripts\USB_ROMCONFIG_004.script \epoc32\winscw\c\scripts\usbromconfig\USB_ROMCONFIG_004.script
-..\scripts\USB_INC_ROMCONFIG_001.script \epoc32\winscw\c\scripts\usbromconfig\USB_INC_ROMCONFIG_001.script
-..\scripts\USB_INC_ROMCONFIG_002.script \epoc32\winscw\c\scripts\usbromconfig\USB_INC_ROMCONFIG_002.script
-..\scripts\USB_INC_ROMCONFIG_003.script \epoc32\winscw\c\scripts\usbromconfig\USB_INC_ROMCONFIG_003.script
-..\scripts\USB_INC_ROMCONFIG_004.script \epoc32\winscw\c\scripts\usbromconfig\USB_INC_ROMCONFIG_004.script
-
-// Rom iby files.
-
-PRJ_TESTMMPFILES
-testserversymbianexcludeusb.mmp
-
--- a/usbmgmt/usbmgr/test/cit/ROMConfig/group/testserversymbianexcludeusb.mmp Wed Jul 07 14:16:40 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,43 +0,0 @@
-/*
-* Copyright (c) 2005-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:
-* ObexTITest.mmp
-*
-*/
-
-TARGET testserversymbianexcludeusb.exe
-TARGETTYPE exe
-UID 0x1000008d 0x0F1F777D
-
-VENDORID 0x70000001
-CAPABILITY All -TCB
-
-SOURCEPATH ../src
-SOURCE testserversymbianexcludeusb.cpp
-SOURCE cteststepusbromconfigbase.cpp
-SOURCE cteststepusbromconfig001.cpp
-SOURCE cteststepusbromconfig002.cpp
-SOURCE cteststepusbromconfig003.cpp
-SOURCE cteststepusbromconfig004.cpp
-
-USERINCLUDE ../inc
-
-OS_LAYER_SYSTEMINCLUDE_SYMBIAN
-
-LIBRARY euser.lib
-LIBRARY c32.lib
-LIBRARY testexecuteutils.lib
-LIBRARY testexecutelogclient.lib
-LIBRARY esock.lib
-LIBRARY usbman.lib
--- a/usbmgmt/usbmgr/test/cit/ROMConfig/inc/cteststepusbromconfig001.h Wed Jul 07 14:16:40 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,37 +0,0 @@
-/*
-* Copyright (c) 2005-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:
-*
-*/
-
-#ifndef CTESTSTEPUSBROMCONFIG001_H
-#define CTESTSTEPUSBROMCONFIG001_H
-
-#include "cteststepusbromconfigbase.h"
-
-class CTestStepUsbRomConfig001 : public CTestStepUsbRomConfigBase
- {
-public:
- static CTestStepUsbRomConfig001* New(CTestServer& aParent);
- ~CTestStepUsbRomConfig001();
- TVerdict doTestStepL();
-
-private:
- CTestStepUsbRomConfig001(CTestServer& aParent);
- };
-
-_LIT(KTestName001, "USB_ROMCONFIG_001");
-#endif // CTESTSTEPUSBROMCONFIG001_H
-
-// EOF
--- a/usbmgmt/usbmgr/test/cit/ROMConfig/inc/cteststepusbromconfig002.h Wed Jul 07 14:16:40 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,37 +0,0 @@
-/*
-* Copyright (c) 2005-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:
-*
-*/
-
-#ifndef CTESTSTEPUSBROMCONFIG002_H
-#define CTESTSTEPUSBROMCONFIG002_H
-
-#include "cteststepusbromconfigbase.h"
-
-class CTestStepUsbRomConfig002 : public CTestStepUsbRomConfigBase
- {
-public:
- static CTestStepUsbRomConfig002* New(CTestServer& aParent);
- ~CTestStepUsbRomConfig002();
- TVerdict doTestStepL();
-
-private:
- CTestStepUsbRomConfig002(CTestServer& aParent);
- };
-
-_LIT(KTestName002, "USB_ROMCONFIG_002");
-#endif // CTESTSTEPUSBROMCONFIG002_H
-
-// EOF
--- a/usbmgmt/usbmgr/test/cit/ROMConfig/inc/cteststepusbromconfig003.h Wed Jul 07 14:16:40 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,37 +0,0 @@
-/*
-* Copyright (c) 2005-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:
-*
-*/
-
-#ifndef CTESTSTEPUSBROMCONFIG003_H
-#define CTESTSTEPUSBROMCONFIG003_H
-
-#include "cteststepusbromconfigbase.h"
-
-class CTestStepUsbRomConfig003 : public CTestStepUsbRomConfigBase
- {
-public:
- static CTestStepUsbRomConfig003* New(CTestServer& aParent);
- ~CTestStepUsbRomConfig003();
- TVerdict doTestStepL();
-
-private:
- CTestStepUsbRomConfig003(CTestServer& aParent);
- };
-
-_LIT(KTestName003, "USB_ROMCONFIG_003");
-#endif // CTESTSTEPUSBROMCONFIG003_H
-
-// EOF
--- a/usbmgmt/usbmgr/test/cit/ROMConfig/inc/cteststepusbromconfig004.h Wed Jul 07 14:16:40 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,37 +0,0 @@
-/*
-* Copyright (c) 2005-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:
-*
-*/
-
-#ifndef CTESTSTEPUSBROMCONFIG004_H
-#define CTESTSTEPUSBROMCONFIG004_H
-
-#include "cteststepusbromconfigbase.h"
-
-class CTestStepUsbRomConfig004 : public CTestStepUsbRomConfigBase
- {
-public:
- static CTestStepUsbRomConfig004* New(CTestServer& aParent);
- ~CTestStepUsbRomConfig004();
- TVerdict doTestStepL();
-
-private:
- CTestStepUsbRomConfig004(CTestServer& aParent);
- };
-
-_LIT(KTestName004, "USB_ROMCONFIG_004");
-#endif // CTESTSTEPUSBROMCONFIG004_H
-
-// EOF
--- a/usbmgmt/usbmgr/test/cit/ROMConfig/inc/cteststepusbromconfigbase.h Wed Jul 07 14:16:40 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,48 +0,0 @@
-/*
-* Copyright (c) 2005-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:
-*
-*/
-
-#ifndef CTESTSTEPUSBROMCONFIGBASE_H
-#define CTESTSTEPUSBROMCONFIGBASE_H
-
-#include <test/testexecutestepbase.h>
-#include <test/testexecuteserverbase.h>
-
-// constants used for logging
-_LIT(KErrNotFoundLit, "KErrNotFound");
-_LIT(KErrNoneLit, "KErrNone");
-_LIT(KErrBadNameLit, "KErrBadName");
-_LIT(KErrNotSupportedLit, "KErrNotSupported");
-
-class CTestStepUsbRomConfigBase : public CTestStep
- {
-public:
- ~CTestStepUsbRomConfigBase();
- TVerdict doTestStepL()=0;
- TVerdict doTestStepPreambleL();
-
-protected:
- CTestStepUsbRomConfigBase(CTestServer& aParent);
- void CheckAndSetTestResult();
- // ideally this should be const, but we need to get the value out of an ini file
- // and there's no easy way to do this inside the initialization list
- TBool iUsbExcluded;
- const CTestServer& iParent;
- };
-
-#endif // CTESTSTEPUSBROMCONFIGBASE_H
-
-// EOF
--- a/usbmgmt/usbmgr/test/cit/ROMConfig/inc/testserversymbianexcludeusb.h Wed Jul 07 14:16:40 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +0,0 @@
-/*
-* Copyright (c) 2005-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:
-*
-*/
-
-#ifndef TESTSERVERSYMBIANEXCLUDEUSB_H
-#define TESTSERVERSYMBIANEXCLUDEUSB_H
-
-#include <test/testexecuteserverbase.h>
-
-/**
-Test Server for the USB tests for PREQ 581: Enable features to be ommitted from a ROM
-
-Nothing more than a wrapper to load the TestExecute steps
-*/
-class CTestServerSymbianExcludeUsb : public CTestServer
- {
-public:
- static CTestServerSymbianExcludeUsb* NewL();
- virtual CTestStep* CreateTestStep(const TDesC& aStepName);
- };
-#endif // TESTSERVERSYMBIANEXCLUDEUSB_H
-// End of File
--- a/usbmgmt/usbmgr/test/cit/ROMConfig/scripts/USB_CIT_P581_UsbExcluded.script Wed Jul 07 14:16:40 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +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 "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:
-*
-*/
-
-// Run all the USB_ROMCONFIG_* tests
-// Expects a ROM to be built without USB i.e. __USB has NOT been specified
-
-RUN_SCRIPT c:\scripts\usbromconfig\USB_ROMCONFIG_001.script
-
-RUN_SCRIPT c:\scripts\usbromconfig\USB_ROMCONFIG_002.script
-
-RUN_SCRIPT c:\scripts\usbromconfig\USB_ROMCONFIG_003.script
-
-RUN_SCRIPT c:\scripts\usbromconfig\USB_ROMCONFIG_004.script
-
--- a/usbmgmt/usbmgr/test/cit/ROMConfig/scripts/USB_CIT_P581_UsbIncluded.script Wed Jul 07 14:16:40 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +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 "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:
-*
-*/
-
-// Run all the USB_INC_ROMCONFIG_* tests
-// Expects a standard ROM to be built i.e. __USB has been specified
-
-RUN_SCRIPT c:\scripts\usbromconfig\USB_INC_ROMCONFIG_001.script
-
-RUN_SCRIPT c:\scripts\usbromconfig\USB_INC_ROMCONFIG_002.script
-
-RUN_SCRIPT c:\scripts\usbromconfig\USB_INC_ROMCONFIG_003.script
-
-RUN_SCRIPT c:\scripts\usbromconfig\USB_INC_ROMCONFIG_004.script
--- a/usbmgmt/usbmgr/test/cit/ROMConfig/scripts/USB_INC_ROMCONFIG_001.script Wed Jul 07 14:16:40 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +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 "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:
-*
-*/
-
-LOAD_SERVER TestServerSymbianExcludeUsb
-
-START_TESTCASE USB-INC-ROMCONFIG-001
-//! @SYMTestCaseID USB-INC-ROMCONFIG-001
-//! @SYMTestCaseDesc RUsb::Connect should succeed on a standard Techview ROM
-//! @SYMREQ 5414
-//! @SYMTestType CIT
-//! @SYMTestPriority 3
-//! @SYMTestStatus Implemented
-//! @SYMTestActions Call RUsb::Connect
-//! @SYMTestExpectedResults Returns KErrNone
-RUN_TEST_STEP 10 TestServerSymbianExcludeUsb USB_ROMCONFIG_001 c:\testdata\usbromconfig\UsbRomConfig.ini UsbIncluded
-END_TESTCASE USB-INC-ROMCONFIG-001
--- a/usbmgmt/usbmgr/test/cit/ROMConfig/scripts/USB_INC_ROMCONFIG_002.script Wed Jul 07 14:16:40 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +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 "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:
-*
-*/
-
-LOAD_SERVER TestServerSymbianExcludeUsb
-
-START_TESTCASE USB-INC-ROMCONFIG-002
-//! @SYMTestCaseID USB-INC-ROMCONFIG-002
-//! @SYMTestCaseDesc User::LoadLogicalDevice("EUSBC") should succeed on a standard Techview ROM
-//! @SYMREQ 5414
-//! @SYMTestType CIT
-//! @SYMTestPriority 3
-//! @SYMTestStatus Implemented
-//! @SYMTestActions Call User::LoadLogicalDevice("EUSBC")
-//! @SYMTestExpectedResults Returns KErrNone (or KErrAlreadyExists)
-RUN_TEST_STEP 10 TestServerSymbianExcludeUsb USB_ROMCONFIG_002 c:\testdata\usbromconfig\UsbRomConfig.ini UsbIncluded
-END_TESTCASE USB-INC-ROMCONFIG-002
--- a/usbmgmt/usbmgr/test/cit/ROMConfig/scripts/USB_INC_ROMCONFIG_003.script Wed Jul 07 14:16:40 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +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 "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:
-*
-*/
-
-LOAD_SERVER TestServerSymbianExcludeUsb
-
-START_TESTCASE USB-INC-ROMCONFIG-003
-//! @SYMTestCaseID USB-INC-ROMCONFIG-003
-//! @SYMTestCaseDesc RCommServ::LoadCommModule should succeed for ACM csy on a standard Techview ROM
-//! @SYMREQ 5414
-//! @SYMTestType CIT
-//! @SYMTestPriority 3
-//! @SYMTestStatus Implemented
-//! @SYMTestActions Call RCommServ::LoadCommModule("ECACM")
-//! @SYMTestExpectedResults Returns KErrNone
-RUN_TEST_STEP 10 TestServerSymbianExcludeUsb USB_ROMCONFIG_003 c:\testdata\usbromconfig\UsbRomConfig.ini UsbIncluded
-END_TESTCASE USB-INC-ROMCONFIG-003
--- a/usbmgmt/usbmgr/test/cit/ROMConfig/scripts/USB_INC_ROMCONFIG_004.script Wed Jul 07 14:16:40 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +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 "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:
-*
-*/
-
-LOAD_SERVER TestServerSymbianExcludeUsb
-
-START_TESTCASE USB-INC-ROMCONFIG-004
-//! @SYMTestCaseID USB-INC-ROMCONFIG-004
-//! @SYMTestCaseDesc RDevUsbcClient::Open should succeed on a standard Techview ROM
-//! @SYMREQ 5414
-//! @SYMTestType CIT
-//! @SYMTestPriority 3
-//! @SYMTestStatus Implemented
-//! @SYMTestActions Call RDevUsbcClient::Open(0)
-//! @SYMTestExpectedResults Returns KErrNone
-RUN_TEST_STEP 10 TestServerSymbianExcludeUsb USB_ROMCONFIG_004 c:\testdata\usbromconfig\UsbRomConfig.ini UsbIncluded
-END_TESTCASE USB-INC-ROMCONFIG-004
--- a/usbmgmt/usbmgr/test/cit/ROMConfig/scripts/USB_ROMCONFIG_001.script Wed Jul 07 14:16:40 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +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 "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:
-*
-*/
-
-LOAD_SERVER TestServerSymbianExcludeUsb
-
-START_TESTCASE USB-ROMCONFIG-001
-//! @SYMTestCaseID USB-ROMCONFIG-001
-//! @SYMTestCaseDesc RUsb::Connect should fail on a ROM built without __USB specified
-//! @SYMREQ 5414
-//! @SYMTestType CIT
-//! @SYMTestPriority 1
-//! @SYMTestStatus Implemented
-//! @SYMTestActions Call RUsb::Connect
-//! @SYMTestExpectedResults Returns KErrNotFound, as USB support has been removed from ROM
-RUN_TEST_STEP 10 TestServerSymbianExcludeUsb USB_ROMCONFIG_001 c:\testdata\usbromconfig\UsbRomConfig.ini UsbExcluded
-END_TESTCASE USB-ROMCONFIG-001
--- a/usbmgmt/usbmgr/test/cit/ROMConfig/scripts/USB_ROMCONFIG_002.script Wed Jul 07 14:16:40 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +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 "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:
-*
-*/
-
-LOAD_SERVER TestServerSymbianExcludeUsb
-
-START_TESTCASE USB-ROMCONFIG-002
-//! @SYMTestCaseID USB-ROMCONFIG-002
-//! @SYMTestCaseDesc User::LoadLogicalDevice("EUSBC") should fail on a a ROM built without __USB specified
-//! @SYMREQ 5414
-//! @SYMTestType CIT
-//! @SYMTestPriority 1
-//! @SYMTestStatus Implemented
-//! @SYMTestActions Call User::LoadLogicalDevice("EUSBC")
-//! @SYMTestExpectedResults Returns KErrNotFound, as usb.ldd has been removed from ROM
-RUN_TEST_STEP 10 TestServerSymbianExcludeUsb USB_ROMCONFIG_002 c:\testdata\usbromconfig\UsbRomConfig.ini UsbExcluded
-END_TESTCASE USB-ROMCONFIG-002
--- a/usbmgmt/usbmgr/test/cit/ROMConfig/scripts/USB_ROMCONFIG_003.script Wed Jul 07 14:16:40 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +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 "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:
-*
-*/
-
-LOAD_SERVER TestServerSymbianExcludeUsb
-
-START_TESTCASE USB-ROMCONFIG-003
-//! @SYMTestCaseID USB-ROMCONFIG-003
-//! @SYMTestCaseDesc RCommServ::LoadCommModule should fail for ACM csy on a ROM built without __USB specified
-//! @SYMREQ 5414
-//! @SYMTestType CIT
-//! @SYMTestPriority 1
-//! @SYMTestStatus Implemented
-//! @SYMTestActions Call RCommServ::LoadCommModule("ECACM")
-//! @SYMTestExpectedResults Returns KErrNotFound, as ecacm.csy has been removed from ROM
-RUN_TEST_STEP 10 TestServerSymbianExcludeUsb USB_ROMCONFIG_003 c:\testdata\usbromconfig\UsbRomConfig.ini UsbExcluded
-END_TESTCASE USB-ROMCONFIG-003
--- a/usbmgmt/usbmgr/test/cit/ROMConfig/scripts/USB_ROMCONFIG_004.script Wed Jul 07 14:16:40 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +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 "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:
-*
-*/
-
-LOAD_SERVER TestServerSymbianExcludeUsb
-
-START_TESTCASE USB-ROMCONFIG-004
-//! @SYMTestCaseID USB-ROMCONFIG-004
-//! @SYMTestCaseDesc RDevUsbcClient::Open should fail on a a ROM built without __USB specified
-//! @SYMREQ 5414
-//! @SYMTestType CIT
-//! @SYMTestPriority 1
-//! @SYMTestStatus Implemented
-//! @SYMTestActions Call RDevUsbcClient::Open(0)
-//! @SYMTestExpectedResults Returns KErrNotFound, as USB not on ROM
-RUN_TEST_STEP 10 TestServerSymbianExcludeUsb USB_ROMCONFIG_004 c:\testdata\usbromconfig\UsbRomConfig.ini UsbExcluded
-END_TESTCASE USB-ROMCONFIG-004
--- a/usbmgmt/usbmgr/test/cit/ROMConfig/src/cteststepusbromconfig001.cpp Wed Jul 07 14:16:40 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,70 +0,0 @@
-/*
-* Copyright (c) 2005-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:
-*
-*/
-
-#include "cteststepusbromconfig001.h"
-#include <usbman.h>
-
-CTestStepUsbRomConfig001::~CTestStepUsbRomConfig001()
- {
- }
-
-CTestStepUsbRomConfig001::CTestStepUsbRomConfig001(CTestServer& aParent)
- : CTestStepUsbRomConfigBase(aParent)
- {
- SetTestStepName(KTestName001);
- }
-
-/**
-Static Constructor
-Note the lack of ELeave. This means that having insufficient memory will return NULL;
-*/
-CTestStepUsbRomConfig001* CTestStepUsbRomConfig001::New(CTestServer& aParent)
- {
- return new CTestStepUsbRomConfig001(aParent);
- }
-
-/**
-See USB_ROMCONFIG_001.script
-*/
-TVerdict CTestStepUsbRomConfig001::doTestStepL()
- {
- INFO_PRINTF1(\
- _L(">>CTestStepUsbRomConfig001::doTestStepL()"));
-
- const TInt expectedError = ( iUsbExcluded ? KErrNotFound : KErrNone );
- const TDesC* expectedErrorDesPtr = ( iUsbExcluded ? &KErrNotFoundLit : &KErrNoneLit );
- RUsb usb;
- TInt err = usb.Connect();
- if ( err!=expectedError )
- {
- INFO_PRINTF4(\
- _L("Failed: Expected %S(%d) and got %d when calling RUsb::Connect()"),\
- expectedErrorDesPtr, expectedError, err);
- SetTestStepResult(EFail);
- }
- if ( usb.Handle() )
- {
- usb.Close();
- }
-
- INFO_PRINTF1(\
- _L("<<CTestStepUsbRomConfig001::doTestStepL()"));
- CheckAndSetTestResult();
- return TestStepResult();
- }
-
-// EOF
--- a/usbmgmt/usbmgr/test/cit/ROMConfig/src/cteststepusbromconfig002.cpp Wed Jul 07 14:16:40 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,74 +0,0 @@
-/*
-* Copyright (c) 2005-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:
-*
-*/
-
-#include "cteststepusbromconfig002.h"
-
-#ifndef __WINS__
-_LIT(KUsbLddName, "EUSBC");
-#else
-_LIT(KUsbLddName, "TESTUSBC");
-#endif
-
-CTestStepUsbRomConfig002::~CTestStepUsbRomConfig002()
- {
- }
-
-CTestStepUsbRomConfig002::CTestStepUsbRomConfig002
- (CTestServer& aParent)
- : CTestStepUsbRomConfigBase(aParent)
- {
- SetTestStepName(KTestName002);
- }
-
-/**
-Static Constructor
-Note the lack of ELeave. This means that having insufficient memory will return NULL;
-*/
-CTestStepUsbRomConfig002* CTestStepUsbRomConfig002::New
- (CTestServer& aParent)
- {
- return new CTestStepUsbRomConfig002(aParent);
- }
-
-/**
-See USB_ROMCONFIG_002.script
-*/
-TVerdict CTestStepUsbRomConfig002::doTestStepL()
- {
- INFO_PRINTF1(\
- _L(">>CTestStepUsbRomConfig002::doTestStepL()"));
-
- const TInt expectedError = ( iUsbExcluded ? KErrNotFound : KErrNone );
- const TDesC* expectedErrorDesPtr = ( iUsbExcluded ? &KErrNotFoundLit : &KErrNoneLit );
-
- TInt err = User::LoadLogicalDevice(KUsbLddName);
- if ( (expectedError==KErrNone && err!=KErrNone && err!=KErrAlreadyExists) ||
- (expectedError!=KErrNone && err!=expectedError) )
- {
- INFO_PRINTF5(\
- _L("Failed: Expected %S(%d) and got %d when calling LoadLogicalDevice(%S)"),\
- expectedErrorDesPtr, expectedError, err, &KUsbLddName);
- SetTestStepResult(EFail);
- }
-
- INFO_PRINTF1(\
- _L("<<CTestStepUsbRomConfig002::doTestStepL()"));
- CheckAndSetTestResult();
- return TestStepResult();
- }
-
-// EOF
--- a/usbmgmt/usbmgr/test/cit/ROMConfig/src/cteststepusbromconfig003.cpp Wed Jul 07 14:16:40 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,72 +0,0 @@
-/*
-* Copyright (c) 2005-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:
-*
-*/
-
-#include "cteststepusbromconfig003.h"
-#include <c32comm.h>
-#include <AcmInterface.h>
-
-CTestStepUsbRomConfig003::~CTestStepUsbRomConfig003()
- {
- }
-
-CTestStepUsbRomConfig003::CTestStepUsbRomConfig003
- (CTestServer& aParent)
- : CTestStepUsbRomConfigBase(aParent)
- {
- SetTestStepName(KTestName003);
- }
-
-/**
-Static Constructor
-Note the lack of ELeave. This means that having insufficient memory will return NULL;
-*/
-CTestStepUsbRomConfig003* CTestStepUsbRomConfig003::New
- (CTestServer& aParent)
- {
- return new CTestStepUsbRomConfig003(aParent);
- }
-
-/**
-See USB_ROMCONFIG_003.script
-*/
-TVerdict CTestStepUsbRomConfig003::doTestStepL()
- {
- INFO_PRINTF1(\
- _L(">>CTestStepUsbRomConfig003::doTestStepL()"));
-
- const TInt expectedError = ( iUsbExcluded ? KErrNotFound : KErrNone );
- const TDesC* expectedErrorDesPtr = ( iUsbExcluded ? &KErrNotFoundLit : &KErrNoneLit );
-
- RCommServ commServ;
- commServ.Connect();
- TInt err = commServ.LoadCommModule(KAcmCsyName);
- if ( err!=expectedError )
- {
- INFO_PRINTF5(\
- _L("Failed: Expected %S(%d) and got %d when calling LoadCommModule(%S)"),\
- expectedErrorDesPtr, expectedError, err, &KAcmCsyName);
- SetTestStepResult(EFail);
- }
- commServ.Close();
-
- INFO_PRINTF1(\
- _L("<<CTestStepUsbRomConfig003::doTestStepL()"));
- CheckAndSetTestResult();
- return TestStepResult();
- }
-
-// EOF
--- a/usbmgmt/usbmgr/test/cit/ROMConfig/src/cteststepusbromconfig004.cpp Wed Jul 07 14:16:40 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,73 +0,0 @@
-/*
-* Copyright (c) 2005-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:
-*
-*/
-
-#include "cteststepusbromconfig004.h"
-#include <d32usbc.h>
-
-CTestStepUsbRomConfig004::~CTestStepUsbRomConfig004()
- {
- }
-
-CTestStepUsbRomConfig004::CTestStepUsbRomConfig004
- (CTestServer& aParent)
- : CTestStepUsbRomConfigBase(aParent)
- {
- SetTestStepName(KTestName004);
- }
-
-/**
-Static Constructor
-Note the lack of ELeave. This means that having insufficient memory will return NULL;
-*/
-CTestStepUsbRomConfig004* CTestStepUsbRomConfig004::New
- (CTestServer& aParent)
- {
- return new CTestStepUsbRomConfig004(aParent);
- }
-
-/**
-See USB_ROMCONFIG_004.script
-*/
-TVerdict CTestStepUsbRomConfig004::doTestStepL()
- {
- INFO_PRINTF1(\
- _L(">>CTestStepUsbRomConfig004::doTestStepL()"));
-
- const TInt expectedError = ( iUsbExcluded ? KErrNotFound : KErrNone );
- const TDesC* expectedErrorDesPtr = ( iUsbExcluded ? &KErrNotFoundLit : &KErrNoneLit );
-
- RDevUsbcClient usbClient;
- TInt err = usbClient.Open(0);
- if ( err!=expectedError )
- {
- INFO_PRINTF4(\
- _L("Failed: Expected %S(%d) and got %d when calling RDevUsbcClient::Open(0)"),\
- expectedErrorDesPtr, expectedError, err);
- SetTestStepResult(EFail);
- }
- if ( usbClient.Handle() )
- {
- usbClient.Close();
- }
-
- INFO_PRINTF1(\
- _L("<<CTestStepUsbRomConfig004::doTestStepL()"));
- CheckAndSetTestResult();
- return TestStepResult();
- }
-
-// EOF
--- a/usbmgmt/usbmgr/test/cit/ROMConfig/src/cteststepusbromconfigbase.cpp Wed Jul 07 14:16:40 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,66 +0,0 @@
-/*
-* Copyright (c) 2005-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:
-*
-*/
-
-#include "cteststepusbromconfigbase.h"
-
-_LIT(KUsbExcludedKeyName, "UsbExcluded");
-
-CTestStepUsbRomConfigBase::~CTestStepUsbRomConfigBase()
- {
- }
-
-/**
-Constructor sets the default test result to inconclusive
-Up to the test to either explicitly fail the test or to
-explicitly pass
-*/
-CTestStepUsbRomConfigBase::CTestStepUsbRomConfigBase(CTestServer& aParent)
- : iParent(aParent)
- {
- SetTestStepResult(EInconclusive);
- }
-
-/**
-The ROMConfig tests run in two configurations:
-ROM with component included
-ROM with component excluded
-By specifying the appropriate ini section, the test behaviour can be altered
-*/
-TVerdict CTestStepUsbRomConfigBase::doTestStepPreambleL()
- {
- if ( GetBoolFromConfig(ConfigSection(),KUsbExcludedKeyName, iUsbExcluded) )
- {
- return EPass;
- }
- return EFail;
- }
-
-/**
-Should be called at the end of every test
-Checks if the default (EInconclusive) result is still set
-i.e. test has NOT set the result to EFail
-If still EInconclusive, then sets the result to EPass.
-*/
-void CTestStepUsbRomConfigBase::CheckAndSetTestResult()
- {
- if ( TestStepResult()==EInconclusive )
- {
- SetTestStepResult(EPass);
- }
- }
-
-// EOF
--- a/usbmgmt/usbmgr/test/cit/ROMConfig/src/testserversymbianexcludeusb.cpp Wed Jul 07 14:16:40 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,148 +0,0 @@
-/*
-* Copyright (c) 2005-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:
-*
-*/
-
-#include "testserversymbianexcludeusb.h"
-#include <e32std.h>
-#include <rsshared.h>
-
-// Put all of the test step header files here...
-#include "cteststepusbromconfig001.h"
-#include "cteststepusbromconfig002.h"
-#include "cteststepusbromconfig003.h"
-#include "cteststepusbromconfig004.h"
-
-_LIT(KServerName,"TestServerSymbianExcludeUsb");
-
-TInt LoadDrivers()
- {
-#ifdef __WINS__
- #define KPDDName _L("ECDRV")
- #define KLDDName _L("ECOMM")
-#else
- #define KPDDName _L("EUART1")
- #define KLDDName _L("ECOMM")
-#endif
- TInt rerr = KErrNone;
-
- rerr = StartC32();
- if ( rerr!=KErrNone && rerr!=KErrAlreadyExists )
- {
- return rerr;
- }
-
- rerr = User::LoadPhysicalDevice(KPDDName);
- if (rerr != KErrNone && rerr != KErrAlreadyExists)
- {
- return rerr;
- }
-
- rerr = User::LoadLogicalDevice(KLDDName);
- if (rerr != KErrNone && rerr != KErrAlreadyExists)
- {
- return rerr;
- }
- return KErrNone;
- }
-
-
-/**
-Called inside the MainL() function to create and start the test
-@return Instance of the test server
-*/
-CTestServerSymbianExcludeUsb* CTestServerSymbianExcludeUsb::NewL()
-
- {
- CTestServerSymbianExcludeUsb* server = new (ELeave) CTestServerSymbianExcludeUsb;
- CleanupStack::PushL(server);
- server->ConstructL(KServerName);
- CleanupStack::Pop(server);
- return server;
- }
-
-LOCAL_C void MainL()
- {
- CActiveScheduler* sched = new (ELeave) CActiveScheduler;
- CleanupStack::PushL(sched);
- CActiveScheduler::Install(sched);
-
- // this registers the server with the active scheduler and calls SetActive
- CTestServerSymbianExcludeUsb* server = CTestServerSymbianExcludeUsb::NewL();
-
- // signal to the client that we are ready by
- // rendevousing process
- RProcess::Rendezvous(KErrNone);
-
- // run the active scheduler
- sched->Start();
-
- // clean up
- delete server;
- CleanupStack::PopAndDestroy(sched);
- }
-
-/**
-@return Standard Epoc error code on exit
-*/
-GLDEF_C TInt E32Main()
- {
- TInt rerr = LoadDrivers();
- if (rerr!=KErrNone)
- {
- return rerr;
- }
-
- __UHEAP_MARK;
- CTrapCleanup* cleanup = CTrapCleanup::New();
-
- if (cleanup == NULL)
- {
- return KErrNoMemory;
- }
-
- TRAPD(err,MainL());
-
- delete cleanup;
- __UHEAP_MARKEND;
- return err;
- }
-
-/**
-Implementation of CTestServer pure virtual
-@return A CTestStep derived instance
-*/
-CTestStep* CTestServerSymbianExcludeUsb::CreateTestStep(const TDesC& aStepName)
- {
- if ( aStepName==KTestName001 )
- {
- return CTestStepUsbRomConfig001::New(*this);
- }
- if ( aStepName==KTestName002 )
- {
- return CTestStepUsbRomConfig002::New(*this);
- }
- if ( aStepName==KTestName003 )
- {
- return CTestStepUsbRomConfig003::New(*this);
- }
- if ( aStepName==KTestName004 )
- {
- return CTestStepUsbRomConfig004::New(*this);
- }
- return NULL;
- }
-
-// EOF
--- a/usbmgmt/usbmgr/test/cit/ROMConfig/testdata/UsbRomConfig.ini Wed Jul 07 14:16:40 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +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 "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:
-;
-;
-[UsbIncluded]
-UsbExcluded = False
-
-[UsbExcluded]
-UsbExcluded = True
-
--- a/usbmgmt/usbmgr/test/cit/ROMConfig/xml/UsbRomConfigSuite.xml Wed Jul 07 14:16:40 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE testSuite SYSTEM "file:///c:/program files/common files/symbian/testSuite.dtd" [ ]>
-
-<testSuite>
-
- <name>UsbRomConfigSuite</name>
-
- <testItems>
- <suite>UsbExcSuite</suite>
- <suite>UsbIncSuite</suite>
- </testItems>
-
- <testExecuteServers>
- <server>TestServerSymbianExcludeUsb</server>
- </testExecuteServers>
-
-</testSuite>
--- a/usbmgmt/usbmgr/test/cit/ROMConfig/xml/UsbRomConfigSuite/TestExecuteServers/TestServerSymbianExcludeUsb.xml Wed Jul 07 14:16:40 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE testExecuteServer SYSTEM "c:\program files\common files\symbian\testExecuteServer.dtd" [ ]>
-
-<testExecuteServer>
-
- <name>TestServerSymbianExcludeUsb</name>
-
- <mmpFile>testserversymbianexcludeusb.mmp</mmpFile>
-
- <bldInfPath>group\bld.inf</bldInfPath>
-
-</testExecuteServer>
--- a/usbmgmt/usbmgr/test/cit/ROMConfig/xml/UsbRomConfigSuite/UsbExcSuite.xml Wed Jul 07 14:16:40 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE testSuite SYSTEM "file:///c:/program files/common files/symbian/testSuite.dtd" [ ]>
-
-<testSuite>
-
- <name>UsbExcSuite</name>
-
- <testItems>
- <test>UsbRomConfig001</test>
- <test>UsbRomConfig002</test>
- <test>UsbRomConfig003</test>
- <test>UsbRomConfig004</test>
- </testItems>
-
-</testSuite>
--- a/usbmgmt/usbmgr/test/cit/ROMConfig/xml/UsbRomConfigSuite/UsbExcSuite/UsbRomConfig001.xml Wed Jul 07 14:16:40 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE testExecuteTest SYSTEM "c:\program files\common files\symbian\testExecuteTest.dtd" [ ]>
-
-<testExecuteTest>
-
- <name>UsbRomConfig001</name>
-
- <timeout>30</timeout>
-
- <testScripts>
- <script>
- <hostPath>scripts\USB_ROMCONFIG_001.script</hostPath>
- <devicePath>c:\scripts\usbromconfig\USB_ROMCONFIG_001.script</devicePath>
- </script>
- </testScripts>
-
- <testServers>
- <server>TestServerSymbianExcludeUsb</server>
- </testServers>
-
- <dependencies>
- <data>
- <hostPath>testdata\UsbRomConfig.ini</hostPath>
- <devicePath>c:\testdata\usbromconfig\UsbRomConfig.ini</devicePath>
- </data>
- </dependencies>
-
-</testExecuteTest>
--- a/usbmgmt/usbmgr/test/cit/ROMConfig/xml/UsbRomConfigSuite/UsbExcSuite/UsbRomConfig002.xml Wed Jul 07 14:16:40 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE testExecuteTest SYSTEM "c:\program files\common files\symbian\testExecuteTest.dtd" [ ]>
-
-<testExecuteTest>
-
- <name>UsbRomConfig002</name>
-
- <timeout>30</timeout>
-
- <testScripts>
- <script>
- <hostPath>scripts\USB_ROMCONFIG_002.script</hostPath>
- <devicePath>c:\scripts\usbromconfig\USB_ROMCONFIG_002.script</devicePath>
- </script>
- </testScripts>
-
- <testServers>
- <server>TestServerSymbianExcludeUsb</server>
- </testServers>
-
- <dependencies>
- <data>
- <hostPath>testdata\UsbRomConfig.ini</hostPath>
- <devicePath>c:\testdata\usbromconfig\UsbRomConfig.ini</devicePath>
- </data>
- </dependencies>
-
-</testExecuteTest>
--- a/usbmgmt/usbmgr/test/cit/ROMConfig/xml/UsbRomConfigSuite/UsbExcSuite/UsbRomConfig003.xml Wed Jul 07 14:16:40 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE testExecuteTest SYSTEM "c:\program files\common files\symbian\testExecuteTest.dtd" [ ]>
-
-<testExecuteTest>
-
- <name>UsbRomConfig003</name>
-
- <timeout>30</timeout>
-
- <testScripts>
- <script>
- <hostPath>scripts\USB_ROMCONFIG_003.script</hostPath>
- <devicePath>c:\scripts\usbromconfig\USB_ROMCONFIG_003.script</devicePath>
- </script>
- </testScripts>
-
- <testServers>
- <server>TestServerSymbianExcludeUsb</server>
- </testServers>
-
- <dependencies>
- <data>
- <hostPath>testdata\UsbRomConfig.ini</hostPath>
- <devicePath>c:\testdata\usbromconfig\UsbRomConfig.ini</devicePath>
- </data>
- </dependencies>
-
-</testExecuteTest>
--- a/usbmgmt/usbmgr/test/cit/ROMConfig/xml/UsbRomConfigSuite/UsbExcSuite/UsbRomConfig004.xml Wed Jul 07 14:16:40 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE testExecuteTest SYSTEM "c:\program files\common files\symbian\testExecuteTest.dtd" [ ]>
-
-<testExecuteTest>
-
- <name>UsbRomConfig004</name>
-
- <timeout>30</timeout>
-
- <testScripts>
- <script>
- <hostPath>scripts\USB_ROMCONFIG_004.script</hostPath>
- <devicePath>c:\scripts\usbromconfig\USB_ROMCONFIG_004.script</devicePath>
- </script>
- </testScripts>
-
- <testServers>
- <server>TestServerSymbianExcludeUsb</server>
- </testServers>
-
- <dependencies>
- <data>
- <hostPath>testdata\UsbRomConfig.ini</hostPath>
- <devicePath>c:\testdata\usbromconfig\UsbRomConfig.ini</devicePath>
- </data>
- </dependencies>
-
-</testExecuteTest>
--- a/usbmgmt/usbmgr/test/cit/ROMConfig/xml/UsbRomConfigSuite/UsbIncSuite.xml Wed Jul 07 14:16:40 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE testSuite SYSTEM "file:///c:/program files/common files/symbian/testSuite.dtd" [ ]>
-
-<testSuite>
-
- <name>UsbIncSuite</name>
-
- <testItems>
- <test>UsbIncRomConfig001</test>
- <test>UsbIncRomConfig002</test>
- <test>UsbIncRomConfig003</test>
- <test>UsbIncRomConfig004</test>
- </testItems>
-
-</testSuite>
--- a/usbmgmt/usbmgr/test/cit/ROMConfig/xml/UsbRomConfigSuite/UsbIncSuite/UsbIncRomConfig001.xml Wed Jul 07 14:16:40 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE testExecuteTest SYSTEM "c:\program files\common files\symbian\testExecuteTest.dtd" [ ]>
-
-<testExecuteTest>
-
- <name>UsbIncRomConfig001</name>
-
- <timeout>30</timeout>
-
- <testScripts>
- <script>
- <hostPath>scripts\USB_INC_ROMCONFIG_001.script</hostPath>
- <devicePath>c:\scripts\usbromconfig\USB_INC_ROMCONFIG_001.script</devicePath>
- </script>
- </testScripts>
-
- <testServers>
- <server>TestServerSymbianExcludeUsb</server>
- </testServers>
-
- <dependencies>
- <data>
- <hostPath>testdata\UsbRomConfig.ini</hostPath>
- <devicePath>c:\testdata\usbromconfig\UsbRomConfig.ini</devicePath>
- </data>
- </dependencies>
-
-</testExecuteTest>
--- a/usbmgmt/usbmgr/test/cit/ROMConfig/xml/UsbRomConfigSuite/UsbIncSuite/UsbIncRomConfig002.xml Wed Jul 07 14:16:40 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE testExecuteTest SYSTEM "c:\program files\common files\symbian\testExecuteTest.dtd" [ ]>
-
-<testExecuteTest>
-
- <name>UsbIncRomConfig002</name>
-
- <timeout>30</timeout>
-
- <testScripts>
- <script>
- <hostPath>scripts\USB_INC_ROMCONFIG_002.script</hostPath>
- <devicePath>c:\scripts\usbromconfig\USB_INC_ROMCONFIG_002.script</devicePath>
- </script>
- </testScripts>
-
- <testServers>
- <server>TestServerSymbianExcludeUsb</server>
- </testServers>
-
- <dependencies>
- <data>
- <hostPath>testdata\UsbRomConfig.ini</hostPath>
- <devicePath>c:\testdata\usbromconfig\UsbRomConfig.ini</devicePath>
- </data>
- </dependencies>
-
-</testExecuteTest>
--- a/usbmgmt/usbmgr/test/cit/ROMConfig/xml/UsbRomConfigSuite/UsbIncSuite/UsbIncRomConfig003.xml Wed Jul 07 14:16:40 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE testExecuteTest SYSTEM "c:\program files\common files\symbian\testExecuteTest.dtd" [ ]>
-
-<testExecuteTest>
-
- <name>UsbIncRomConfig003</name>
-
- <timeout>30</timeout>
-
- <testScripts>
- <script>
- <hostPath>scripts\USB_INC_ROMCONFIG_003.script</hostPath>
- <devicePath>c:\scripts\usbromconfig\USB_INC_ROMCONFIG_003.script</devicePath>
- </script>
- </testScripts>
-
- <testServers>
- <server>TestServerSymbianExcludeUsb</server>
- </testServers>
-
- <dependencies>
- <data>
- <hostPath>testdata\UsbRomConfig.ini</hostPath>
- <devicePath>c:\testdata\usbromconfig\UsbRomConfig.ini</devicePath>
- </data>
- </dependencies>
-
-</testExecuteTest>
--- a/usbmgmt/usbmgr/test/cit/ROMConfig/xml/UsbRomConfigSuite/UsbIncSuite/UsbIncRomConfig004.xml Wed Jul 07 14:16:40 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE testExecuteTest SYSTEM "c:\program files\common files\symbian\testExecuteTest.dtd" [ ]>
-
-<testExecuteTest>
-
- <name>UsbIncRomConfig004</name>
-
- <timeout>30</timeout>
-
- <testScripts>
- <script>
- <hostPath>scripts\USB_INC_ROMCONFIG_004.script</hostPath>
- <devicePath>c:\scripts\usbromconfig\USB_INC_ROMCONFIG_004.script</devicePath>
- </script>
- </testScripts>
-
- <testServers>
- <server>TestServerSymbianExcludeUsb</server>
- </testServers>
-
- <dependencies>
- <data>
- <hostPath>testdata\UsbRomConfig.ini</hostPath>
- <devicePath>c:\testdata\usbromconfig\UsbRomConfig.ini</devicePath>
- </data>
- </dependencies>
-
-</testExecuteTest>
--- a/usbmgmt/usbmgr/usbman/chargingplugin/group/UsbBatteryChargingPluginBase.mmp Wed Jul 07 14:16:40 2010 +0800
+++ b/usbmgmt/usbmgr/usbman/chargingplugin/group/UsbBatteryChargingPluginBase.mmp Wed Jul 07 15:08:54 2010 +0800
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2005-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"
@@ -44,15 +44,12 @@
OS_LAYER_SYSTEMINCLUDE_SYMBIAN
// use this line for default implementation
-USERINCLUDE ../inc/default
+USERINCLUDE ../inc/default
+USERINCLUDE ../traces
LIBRARY euser.lib
LIBRARY usbmanextensionplugin.lib
LIBRARY centralrepository.lib
-#include <usb/usblogger.mmh>
-
-
-//library flogger.lib
NOEXPORTLIBRARY
--- a/usbmgmt/usbmgr/usbman/chargingplugin/src/CUsbBatteryChargingPlugin.cpp Wed Jul 07 14:16:40 2010 +0800
+++ b/usbmgmt/usbmgr/usbman/chargingplugin/src/CUsbBatteryChargingPlugin.cpp Wed Jul 07 15:08:54 2010 +0800
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2005-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"
@@ -18,16 +18,19 @@
/** @file
@internalComponent
*/
-
#include "CUsbBatteryChargingPlugin.h"
-#include "chargingstates.h"
-#include <musbmanextensionpluginobserver.h>
-#include "cusbbatterycharginglicenseehooks.h"
-#include "reenumerator.h"
+#include <e32debug.h>
+#include <e32def.h>
#include <usb/usblogger.h>
#include <e32property.h>
#include <centralrepository.h>
#include <usbotgdefs.h>
+#include <musbmanextensionpluginobserver.h>
+
+
+#include "chargingstates.h"
+#include "cusbbatterycharginglicenseehooks.h"
+#include "reenumerator.h"
#ifdef SYMBIAN_ENABLE_USB_OTG_HOST_PRIV // For host OTG enabled charging plug-in
#include "idpinwatcher.h"
@@ -35,15 +38,15 @@
#endif
#include "vbuswatcher.h"
-#include <e32debug.h>
-#include <e32def.h>
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "CUsbBatteryChargingPluginTraces.h"
+#endif
+
static const TInt KUsbBatteryChargingConfigurationDescriptorCurrentOffset = 8; // see bMaxPower in section 9.6.3 of USB Spec 2.0
static const TInt KUsbBatteryChargingCurrentRequestTimeout = 3000000; // 3 seconds
-#ifdef __FLOG_ACTIVE
-_LIT8(KLogComponent, "USBCHARGE");
-#endif
/**
Factory function.
@@ -63,8 +66,7 @@
*/
CUsbBatteryChargingPlugin::~CUsbBatteryChargingPlugin()
{
- LOGTEXT(KNullDesC8);
- LOGTEXT2(_L8(">>CUsbBatteryChargingPlugin::~CUsbBatteryChargingPlugin this = [0x%08x]"), this);
+ OstTraceFunctionEntry1( REF_CUSBBATTERYCHARGINGPLUGIN_CUSBBATTERYCHARGINGPLUGIN_DES_ENTRY, this );
iCurrentValues.Close();
delete iDeviceReEnumerator;
@@ -99,7 +101,7 @@
*/
void CUsbBatteryChargingPlugin::ConstructL()
{
- LOGTEXT(_L8(">>CUsbBatteryChargingPlugin::ConstructL"));
+ OstTraceFunctionEntry0( REF_CUSBBATTERYCHARGINGPLUGIN_CONSTRUCTL_ENTRY );
// Create state objects
iPluginStates[EPluginStateIdle] =
@@ -137,7 +139,8 @@
}
else
{
- LEAVEL(err);
+ OstTrace1( TRACE_NORMAL, REF_CUSBBATTERYCHARGINGPLUGIN_CONSTRUCTL, "CUsbBatteryChargingPlugin::ConstructL;leave with error=%d", err );
+ User::Leave(err );
}
if(err == KErrNone || err == KErrAlreadyExists)
@@ -151,7 +154,8 @@
static_cast<void> (RProperty::Delete (
KPropertyUidUsbBatteryChargingCategory,
KPropertyUidUsbBatteryChargingAvailableCurrent ));
- LEAVEL(err);
+ OstTrace1( TRACE_NORMAL, REF_CUSBBATTERYCHARGINGPLUGIN_CONSTRUCTL_DUP1, "CUsbBatteryChargingPlugin::ConstructL;leave with error=%d", err );
+ User::Leave(err);
}
err = RProperty::Set(KPropertyUidUsbBatteryChargingCategory,
@@ -166,7 +170,8 @@
static_cast<void> (RProperty::Delete (
KPropertyUidUsbBatteryChargingCategory,
KPropertyUidUsbBatteryChargingChargingCurrent ));
- LEAVEL(err);
+ OstTrace1( TRACE_NORMAL, REF_CUSBBATTERYCHARGINGPLUGIN_CONSTRUCTL_DUP2, "CUsbBatteryChargingPlugin::ConstructL;leave with error=%d", err );
+ User::Leave(err );
}
iRepositoryNotifier = CUsbChargingRepositoryNotifier::NewL (*this,
@@ -201,18 +206,18 @@
else
{
iPluginState = EPluginStateBEndedCableNotPresent;
- LOGTEXT2(_L8("PluginState => EPluginStateADevice(%d)"), iPluginState);
+ OstTrace1( TRACE_NORMAL, REF_CUSBBATTERYCHARGINGPLUGIN_CONSTRUCTL_DUP3, "CUsbBatteryChargingPlugin::ConstructL;PluginState => EPluginStateADevice(%d)", iPluginState );
}
Observer().RegisterStateObserverL(*this);
iLicenseeHooks = CUsbBatteryChargingLicenseeHooks::NewL();
- LOGTEXT(_L8("Created licensee specific hooks"));
+ OstTrace0( TRACE_NORMAL, REF_CUSBBATTERYCHARGINGPLUGIN_CONSTRUCTL_DUP4, "CUsbBatteryChargingPlugin::ConstructL;Created licensee specific hooks" );
// Set initial recovery state to idle
PushRecoverState(EPluginStateIdle);
- LOGTEXT(_L8("<<CUsbBatteryChargingPlugin::ConstructL"));
+ OstTraceFunctionExit0( REF_CUSBBATTERYCHARGINGPLUGIN_CONSTRUCTL_EXIT );
}
// For host OTG enabled charging plug-in
@@ -247,21 +252,32 @@
*/
void CUsbBatteryChargingPlugin::SetInitialConfigurationL()
{
- LOGTEXT(_L8("Setting Initial Configuration"));
+ OstTrace0( TRACE_NORMAL, REF_CUSBBATTERYCHARGINGPLUGIN_SETINITIALCONFIGURATIONL, "CUsbBatteryChargingPlugin::SetInitialConfigurationL;Setting Initial Configuration" );
if (iCurrentValues.Count() > 0)
{
+ TInt err;
TInt configDescriptorSize = 0;
- LEAVEIFERRORL(iLdd.GetConfigurationDescriptorSize(configDescriptorSize));
+ err = iLdd.GetConfigurationDescriptorSize(configDescriptorSize);
+ if(err < 0)
+ {
+ OstTrace1( TRACE_NORMAL, REF_CUSBBATTERYCHARGINGPLUGIN_SETINITIALCONFIGURATIONL_DUP1, "CUsbBatteryChargingPlugin::SetInitialConfigurationL;iLdd.GetConfigurationDescriptorSize(configDescriptorSize) with error=%d", err );
+ User::Leave(err);
+ }
HBufC8* configDescriptor = HBufC8::NewLC(configDescriptorSize);
TPtr8 ptr(configDescriptor->Des());
- LOGTEXT2(_L8("Getting Configuration Descriptor (size = %d)"),configDescriptorSize);
- LEAVEIFERRORL(iLdd.GetConfigurationDescriptor(ptr));
+ OstTrace1( TRACE_NORMAL, REF_CUSBBATTERYCHARGINGPLUGIN_SETINITIALCONFIGURATIONL_DUP2, "CUsbBatteryChargingPlugin::SetInitialConfigurationL;Getting Configuration Descriptor (size = %d)", configDescriptorSize );
+ err = iLdd.GetConfigurationDescriptor(ptr);
+ if(err < 0)
+ {
+ OstTrace1( TRACE_NORMAL, REF_CUSBBATTERYCHARGINGPLUGIN_SETINITIALCONFIGURATIONL_DUP3, "CUsbBatteryChargingPlugin::SetInitialConfigurationL;iLdd.GetConfigurationDescriptor(ptr) with error=%d", err );
+ User::Leave(err);
+ }
// For host OTG enabled charging plug-in
#ifdef SYMBIAN_ENABLE_USB_OTG_HOST_PRIV
// Get first power to put in configurator
- LOGTEXT(_L8("Checking IdPin state:"));
+ OstTrace0( TRACE_NORMAL, REF_CUSBBATTERYCHARGINGPLUGIN_SETINITIALCONFIGURATIONL_DUP4, "CUsbBatteryChargingPlugin::SetInitialConfigurationL;Checking IdPin state:" );
if(iIdPinState == EUsbBatteryChargingIdPinBRole)
#else
if (ETrue)
@@ -271,24 +287,29 @@
{
iCurrentIndexRequested = 0;
iRequestedCurrentValue = iCurrentValues[iCurrentIndexRequested];
- LOGTEXT2(_L8("IdPin state is 0, current set to: %d"), iRequestedCurrentValue);
+ OstTrace1( TRACE_NORMAL, REF_CUSBBATTERYCHARGINGPLUGIN_SETINITIALCONFIGURATIONL_DUP5, "CUsbBatteryChargingPlugin::SetInitialConfigurationL;IdPin state is 0, current set to: %d", iRequestedCurrentValue );
}
else
{
- LOGTEXT(_L8("No vailable current found !"));
+ OstTrace0( TRACE_NORMAL, REF_CUSBBATTERYCHARGINGPLUGIN_SETINITIALCONFIGURATIONL_DUP6, "CUsbBatteryChargingPlugin::SetInitialConfigurationL;No vailable current found !" );
}
}
else
{
iRequestedCurrentValue = 0;
- LOGTEXT(_L8("IdPin state is 1, current set to 0"));
+ OstTrace0( TRACE_NORMAL, REF_CUSBBATTERYCHARGINGPLUGIN_SETINITIALCONFIGURATIONL_DUP7, "CUsbBatteryChargingPlugin::SetInitialConfigurationL;IdPin state is 1, current set to 0" );
}
TUint oldCurrentValue = ptr[KUsbBatteryChargingConfigurationDescriptorCurrentOffset] << 1;
ptr[KUsbBatteryChargingConfigurationDescriptorCurrentOffset] = (iRequestedCurrentValue >> 1);
- LOGTEXT(_L8("Setting Updated Configuration Descriptor"));
- LEAVEIFERRORL(iLdd.SetConfigurationDescriptor(ptr));
+ OstTrace0( TRACE_NORMAL, REF_CUSBBATTERYCHARGINGPLUGIN_SETINITIALCONFIGURATIONL_DUP8, "CUsbBatteryChargingPlugin::SetInitialConfigurationL;Setting Updated Configuration Descriptor" );
+ err = iLdd.SetConfigurationDescriptor(ptr);
+ if(err < 0)
+ {
+ OstTrace1( TRACE_NORMAL, REF_CUSBBATTERYCHARGINGPLUGIN_SETINITIALCONFIGURATIONL_DUP9, "CUsbBatteryChargingPlugin::SetInitialConfigurationL;iLdd.SetConfigurationDescriptor(ptr) with error=%d", err );
+ User::Leave(err);
+ }
CleanupStack::PopAndDestroy(configDescriptor);
}
@@ -297,19 +318,19 @@
TAny* CUsbBatteryChargingPlugin::GetInterface(TUid aUid)
{
- LOGTEXT(KNullDesC8);
- LOGTEXT3(_L8(">>CUsbBatteryChargingPlugin::GetInterface this = [0x%08x], aUid = 0x%08x"), this, aUid);
+ OstTrace1( TRACE_FLOW, REF_CUSBBATTERYCHARGINGPLUGIN_GETINTERFACE, "CUsbBatteryChargingPlugin::GetInterface;this = [0x%08x]", this );
+ OstTrace1( TRACE_NORMAL, REF_CUSBBATTERYCHARGINGPLUGIN_GETINTERFACE_DUP1, "CUsbBatteryChargingPlugin::GetInterface;aUid = 0x%08x", aUid.iUid );
(void)aUid;
TAny* ret = NULL;
- LOGTEXT2(_L8("<<CUsbBatteryChargingPlugin::GetInterface ret = [0x%08x]"), ret);
+ OstTrace1( TRACE_NORMAL, REF_CUSBBATTERYCHARGINGPLUGIN_GETINTERFACE_DUP2, "CUsbBatteryChargingPlugin::GetInterface;ret = [0x%08x]", ret );
return ret;
}
void CUsbBatteryChargingPlugin::Panic(TUsbBatteryChargingPanic aPanic)
{
- LOGTEXT2(_L8("*** CUsbBatteryChargingPlugin::Panic(%d) ***"),aPanic);
+ OstTrace1( TRACE_FATAL, REF_CUSBBATTERYCHARGINGPLUGIN_PANIC, "CUsbBatteryChargingPlugin::Panic;*** CUsbBatteryChargingPlugin::Panic(%d) ***", aPanic );
_LIT(KUsbChargingPanic,"USB Charging");
User::Panic(KUsbChargingPanic, aPanic);
}
@@ -321,7 +342,7 @@
void CUsbBatteryChargingPlugin::PushRecoverState(TUsbChargingPluginState aRecoverState)
{
- LOG_FUNC
+ OstTraceFunctionEntry0( REF_CUSBBATTERYCHARGINGPLUGIN_PUSHRECOVERSTATE_ENTRY );
if((aRecoverState == EPluginStateIdle)||
(aRecoverState == EPluginStateIdleNegotiated) ||
@@ -330,22 +351,24 @@
{
iPluginStateToRecovery = aRecoverState;
}
+ OstTraceFunctionExit0( REF_CUSBBATTERYCHARGINGPLUGIN_PUSHRECOVERSTATE_EXIT );
}
TUsbChargingPluginState CUsbBatteryChargingPlugin::PopRecoverState()
{
- LOG_FUNC
+ OstTraceFunctionEntry0( REF_CUSBBATTERYCHARGINGPLUGIN_POPRECOVERSTATE_ENTRY );
SetState(iPluginStateToRecovery);
iPluginStateToRecovery = EPluginStateIdle;
+ OstTraceFunctionExit0( REF_CUSBBATTERYCHARGINGPLUGIN_POPRECOVERSTATE_EXIT );
return iPluginStateToRecovery;
}
TUsbChargingPluginState CUsbBatteryChargingPlugin::SetState(TUsbChargingPluginState aState)
{
- LOG_FUNC
+ OstTraceFunctionEntry0( REF_CUSBBATTERYCHARGINGPLUGIN_SETSTATE_ENTRY );
switch (aState)
{
@@ -371,22 +394,23 @@
iPluginState = EPluginStateIdle;
iCurrentState = iPluginStates[EPluginStateIdle];
- LOGTEXT2(_L8(">>CUsbBatteryChargingPlugin::SetState: Invalid new state: aState = %d"), aState);
+ OstTrace1( TRACE_NORMAL, REF_CUSBBATTERYCHARGINGPLUGIN_SETSTATE, "CUsbBatteryChargingPlugin::SetState;Invalid new state: aState = %d", aState );
Panic(EUsbBatteryChargingPanicUnexpectedPluginState);
}
iPluginState = aState;
- LOGTEXT2(_L8(">>CUsbBatteryChargingPlugin::SetState, New state: aState = %d"), aState);
+ OstTrace1( TRACE_NORMAL, REF_CUSBBATTERYCHARGINGPLUGIN_SETSTATE_DUP1, "CUsbBatteryChargingPlugin::SetState;New state: aState=%d", aState );
+ OstTraceFunctionExit0( REF_CUSBBATTERYCHARGINGPLUGIN_SETSTATE_EXIT );
return iPluginState;
}
void CUsbBatteryChargingPlugin::NegotiateChargingCurrent()
{
- LOG_FUNC
+ OstTraceFunctionEntry0( REF_CUSBBATTERYCHARGINGPLUGIN_NEGOTIATECHARGINGCURRENT_ENTRY );
- LOGTEXT2(_L8(">>CUsbBatteryChargingPlugin::StartNegotiation, iDeviceState = %d"), iDeviceState);
+ OstTrace1( TRACE_NORMAL, REF_CUSBBATTERYCHARGINGPLUGIN_NEGOTIATECHARGINGCURRENT, "CUsbBatteryChargingPlugin::NegotiateChargingCurrent;iDeviceState=%d", iDeviceState );
TRAPD(result, NegotiateNextCurrentValueL());
if(result == KErrNone)
{
@@ -394,35 +418,39 @@
}
else
{
- LOGTEXT2(_L8("Negotiation call failed, iVBusState = 1: result = %d"), result);
+ OstTrace1( TRACE_NORMAL, REF_CUSBBATTERYCHARGINGPLUGIN_NEGOTIATECHARGINGCURRENT_DUP1, "CUsbBatteryChargingPlugin::NegotiateChargingCurrent;Negotiation call failed, iVBusState = 1: result = %d", result );
}
+ OstTraceFunctionExit0( REF_CUSBBATTERYCHARGINGPLUGIN_NEGOTIATECHARGINGCURRENT_EXIT );
}
void CUsbBatteryChargingPlugin::UsbDeviceStateChange(TInt aLastError,
TUsbDeviceState aOldState, TUsbDeviceState aNewState)
{
- LOG_FUNC
+ OstTraceFunctionEntry0( REF_CUSBBATTERYCHARGINGPLUGIN_USBDEVICESTATECHANGE_ENTRY );
iCurrentState->UsbDeviceStateChange(aLastError, aOldState, aNewState);
+ OstTraceFunctionExit0( REF_CUSBBATTERYCHARGINGPLUGIN_USBDEVICESTATECHANGE_EXIT );
}
void CUsbBatteryChargingPlugin::HandleRepositoryValueChangedL(const TUid& aRepository, TUint aId, TInt aVal)
{
- LOG_FUNC
+ OstTraceFunctionEntry0( REF_CUSBBATTERYCHARGINGPLUGIN_HANDLEREPOSITORYVALUECHANGEDL_ENTRY );
iCurrentState->HandleRepositoryValueChangedL(aRepository, aId, aVal);
+ OstTraceFunctionExit0( REF_CUSBBATTERYCHARGINGPLUGIN_HANDLEREPOSITORYVALUECHANGEDL_EXIT );
}
void CUsbBatteryChargingPlugin::DeviceStateTimeout()
{
- LOG_FUNC
+ OstTraceFunctionEntry0( REF_CUSBBATTERYCHARGINGPLUGIN_DEVICESTATETIMEOUT_ENTRY );
iCurrentState->DeviceStateTimeout();
+ OstTraceFunctionExit0( REF_CUSBBATTERYCHARGINGPLUGIN_DEVICESTATETIMEOUT_EXIT );
}
void CUsbBatteryChargingPlugin::NegotiateNextCurrentValueL()
{
- LOG_FUNC
+ OstTraceFunctionEntry0( REF_CUSBBATTERYCHARGINGPLUGIN_NEGOTIATENEXTCURRENTVALUEL_ENTRY );
iDeviceStateTimer->Cancel();
TUint newCurrent = 0;
@@ -454,18 +482,19 @@
RequestCurrentL(newCurrent);
iRequestedCurrentValue = newCurrent;
iPluginState = EPluginStateCurrentNegotiating;
+ OstTraceFunctionExit0( REF_CUSBBATTERYCHARGINGPLUGIN_NEGOTIATENEXTCURRENTVALUEL_EXIT );
}
void CUsbBatteryChargingPlugin::ResetPlugin()
{
- LOG_FUNC
+ OstTraceFunctionEntry0( REF_CUSBBATTERYCHARGINGPLUGIN_RESETPLUGIN_ENTRY );
if((iPluginState != EPluginStateIdle))
{
iDeviceStateTimer->Cancel(); // doesn't matter if not running
iPluginState = EPluginStateIdle;
iPluginStateToRecovery = EPluginStateIdle;
- LOGTEXT2(_L8("PluginState => EPluginStateIdle(%d)"),iPluginState);
+ OstTrace1( TRACE_NORMAL, REF_CUSBBATTERYCHARGINGPLUGIN_RESETPLUGIN, "CUsbBatteryChargingPlugin::ResetPlugin;PluginState => EPluginStateIdle(%d)", iPluginState );
iRequestedCurrentValue = 0;
iCurrentIndexRequested = 0;
@@ -473,52 +502,70 @@
SetNegotiatedCurrent(0);
TRAP_IGNORE(SetInitialConfigurationL());
}
+ OstTraceFunctionExit0( REF_CUSBBATTERYCHARGINGPLUGIN_RESETPLUGIN_EXIT );
}
void CUsbBatteryChargingPlugin::RequestCurrentL(TUint aMilliAmps)
{
- LOG_FUNC
+ OstTraceFunctionEntry0( REF_CUSBBATTERYCHARGINGPLUGIN_REQUESTCURRENTL_ENTRY );
- LOGTEXT2(_L8(">>CUsbBatteryChargingPlugin::RequestCurrent aMilliAmps = %d"), aMilliAmps);
+ OstTrace1( TRACE_NORMAL, REF_CUSBBATTERYCHARGINGPLUGIN_REQUESTCURRENTL, "CUsbBatteryChargingPlugin::RequestCurrentL;aMilliAmps=%u", aMilliAmps );
if((EPluginStateCurrentNegotiating == iPluginState) && (iRequestedCurrentValue != aMilliAmps))
{
+ TInt err;
TInt configDescriptorSize = 0;
- LEAVEIFERRORL(iLdd.GetConfigurationDescriptorSize(configDescriptorSize));
+ err = iLdd.GetConfigurationDescriptorSize(configDescriptorSize);
+ if(err < 0)
+ {
+ OstTrace1( TRACE_NORMAL, REF_CUSBBATTERYCHARGINGPLUGIN_REQUESTCURRENTL_DUP1, "CUsbBatteryChargingPlugin::RequestCurrentL;iLdd.GetConfigurationDescriptorSize(configDescriptorSize) with error=%d", err );
+ User::Leave(err);
+ }
HBufC8* configDescriptor = HBufC8::NewLC(configDescriptorSize);
TPtr8 ptr(configDescriptor->Des());
- LOGTEXT2(_L8("Getting Configuration Descriptor (size = %d)"),configDescriptorSize);
- LEAVEIFERRORL(iLdd.GetConfigurationDescriptor(ptr));
+ OstTrace1( TRACE_NORMAL, REF_CUSBBATTERYCHARGINGPLUGIN_REQUESTCURRENTL_DUP2, "CUsbBatteryChargingPlugin::RequestCurrentL;Getting Configuration Descriptor (size = %d)", configDescriptorSize );
+ err = iLdd.GetConfigurationDescriptor(ptr);
+ if(err < 0)
+ {
+ OstTrace1( TRACE_NORMAL, REF_CUSBBATTERYCHARGINGPLUGIN_REQUESTCURRENTL_DUP3, "CUsbBatteryChargingPlugin::RequestCurrentL;iLdd.GetConfigurationDescriptor(ptr) with error=%d", err );
+ User::Leave(err);
+ }
// set bMaxPower field. One unit = 2mA, so need to halve aMilliAmps.
- LOGTEXT3(_L8("Setting bMaxPower to %d mA ( = %d x 2mA units)"),aMilliAmps, (aMilliAmps >> 1));
+ OstTraceExt2( TRACE_NORMAL, REF_CUSBBATTERYCHARGINGPLUGIN_REQUESTCURRENTL_DUP4, "CUsbBatteryChargingPlugin::RequestCurrentL;Setting bMaxPower to %u mA ( = %u x 2mA units)", aMilliAmps, aMilliAmps >> 1 );
TUint oldCurrentValue = ptr[KUsbBatteryChargingConfigurationDescriptorCurrentOffset] << 1;
- LOGTEXT2(_L8("(old value was %d mA)"), oldCurrentValue);
+ OstTrace1( TRACE_NORMAL, REF_CUSBBATTERYCHARGINGPLUGIN_REQUESTCURRENTL_DUP5, "CUsbBatteryChargingPlugin::RequestCurrentL;(old value was %u mA)", oldCurrentValue );
//since the device will force reEnumeration if the value is odd
aMilliAmps = aMilliAmps & 0xFFFE;
// to negotiate a new current value, ReEnumerate is needed
- LOGTEXT(_L8("Forcing ReEnumeration"));
+ OstTrace0( TRACE_NORMAL, REF_CUSBBATTERYCHARGINGPLUGIN_REQUESTCURRENTL_DUP6, "CUsbBatteryChargingPlugin::RequestCurrentL;Forcing ReEnumeration" );
ptr[KUsbBatteryChargingConfigurationDescriptorCurrentOffset] = (aMilliAmps >> 1);
- LOGTEXT(_L8("Setting Updated Configuration Descriptor"));
- LEAVEIFERRORL(iLdd.SetConfigurationDescriptor(ptr));
- LOGTEXT(_L8("Triggering Re-enumeration"));
+ OstTrace0( TRACE_NORMAL, REF_CUSBBATTERYCHARGINGPLUGIN_REQUESTCURRENTL_DUP7, "CUsbBatteryChargingPlugin::RequestCurrentL;Setting Updated Configuration Descriptor" );
+ err = iLdd.SetConfigurationDescriptor(ptr);
+ if(err < 0)
+ {
+ OstTrace1( TRACE_NORMAL, REF_CUSBBATTERYCHARGINGPLUGIN_REQUESTCURRENTL_DUP8, "CUsbBatteryChargingPlugin::RequestCurrentL;iLdd.SetConfigurationDescriptor(ptr) with err=%d", err );
+ User::Leave(err);
+ }
+ OstTrace0( TRACE_NORMAL, REF_CUSBBATTERYCHARGINGPLUGIN_REQUESTCURRENTL_DUP9, "CUsbBatteryChargingPlugin::RequestCurrentL;Triggering Re-enumeration" );
iDeviceReEnumerator->ReEnumerate();
CleanupStack::PopAndDestroy(configDescriptor); // configDescriptor
}
// Always issue a timer as a watchdog to monitor the request progress
- LOGTEXT2(_L8("Starting timer: %d"), User::NTickCount());
+ OstTrace1( TRACE_NORMAL, REF_CUSBBATTERYCHARGINGPLUGIN_REQUESTCURRENTL_DUP10, "CUsbBatteryChargingPlugin::RequestCurrentL;Starting timer: %d", User::NTickCount() );
iDeviceStateTimer->Cancel();
iDeviceStateTimer->Start(TTimeIntervalMicroSeconds32(KUsbBatteryChargingCurrentRequestTimeout));
+ OstTraceFunctionExit0( REF_CUSBBATTERYCHARGINGPLUGIN_REQUESTCURRENTL_EXIT );
}
void CUsbBatteryChargingPlugin::ReadCurrentRequestValuesL()
{
- LOG_FUNC
+ OstTraceFunctionEntry0( REF_CUSBBATTERYCHARGINGPLUGIN_READCURRENTREQUESTVALUESL_ENTRY );
CRepository* repository = CRepository::NewLC(KUsbBatteryChargingCentralRepositoryUid);
@@ -531,26 +578,27 @@
TInt value;
repository->Get(KUsbBatteryChargingCurrentValuesOffset + i, value);
iCurrentValues.Append(static_cast<TUint>(value));
- LOGTEXT3(_L8("CurrentValue %d = %dmA"),i,value);
+ OstTraceExt2( TRACE_FLOW, REF_CUSBBATTERYCHARGINGPLUGIN_READCURRENTREQUESTVALUESL, "CUsbBatteryChargingPlugin::ReadCurrentRequestValuesL;CurrentValue %d = %dmA", i, value );
}
CleanupStack::PopAndDestroy(repository);
+ OstTraceFunctionExit0( REF_CUSBBATTERYCHARGINGPLUGIN_READCURRENTREQUESTVALUESL_EXIT );
}
void CUsbBatteryChargingPlugin::StartCharging(TUint aMilliAmps)
{
- LOG_FUNC
+ OstTraceFunctionEntry0( REF_CUSBBATTERYCHARGINGPLUGIN_STARTCHARGING_ENTRY );
- LOGTEXT2(_L8(">>CUsbBatteryChargingPlugin::StartCharging aMilliAmps = %d"), aMilliAmps);
+ OstTrace1( TRACE_NORMAL, REF_CUSBBATTERYCHARGINGPLUGIN_STARTCHARGING, "CUsbBatteryChargingPlugin::StartCharging;aMilliAmps=%u", aMilliAmps );
// do licensee specific functionality (if any)
iLicenseeHooks->StartCharging(aMilliAmps);
-#ifdef __FLOG_ACTIVE
+#ifdef _DEBUG
TInt err = RProperty::Set(KPropertyUidUsbBatteryChargingCategory,
KPropertyUidUsbBatteryChargingChargingCurrent,
aMilliAmps);
- LOGTEXT3(_L8("Set P&S current = %dmA - err = %d"),aMilliAmps,err);
+ OstTraceExt2( TRACE_NORMAL, REF_CUSBBATTERYCHARGINGPLUGIN_STARTCHARGING_DUP1, "CUsbBatteryChargingPlugin::StartCharging;Set P&S current = %umA - err = %d", aMilliAmps, err );
#else
(void)RProperty::Set(KPropertyUidUsbBatteryChargingCategory,
KPropertyUidUsbBatteryChargingChargingCurrent,
@@ -558,91 +606,95 @@
#endif
SetState(EPluginStateCharging);
+ OstTraceFunctionExit0( REF_CUSBBATTERYCHARGINGPLUGIN_STARTCHARGING_EXIT );
}
void CUsbBatteryChargingPlugin::StopCharging()
{
- LOG_FUNC
+ OstTraceFunctionEntry0( REF_CUSBBATTERYCHARGINGPLUGIN_STOPCHARGING_ENTRY );
// do licensee specific functionality (if any)
iLicenseeHooks->StopCharging();
-#ifdef __FLOG_ACTIVE
+#ifdef _DEBUG
TInt err = RProperty::Set(KPropertyUidUsbBatteryChargingCategory,
KPropertyUidUsbBatteryChargingChargingCurrent,
0);
- LOGTEXT2(_L8("Set P&S current = 0mA - err = %d"),err);
+ OstTrace1( TRACE_NORMAL, REF_CUSBBATTERYCHARGINGPLUGIN_STOPCHARGING, "CUsbBatteryChargingPlugin::StopCharging;Set P&S current = 0mA - err = %d", err );
#else
(void)RProperty::Set(KPropertyUidUsbBatteryChargingCategory,
KPropertyUidUsbBatteryChargingChargingCurrent,
0);
#endif
+ OstTraceFunctionExit0( REF_CUSBBATTERYCHARGINGPLUGIN_STOPCHARGING_EXIT );
}
void CUsbBatteryChargingPlugin::SetNegotiatedCurrent(TUint aMilliAmps)
{
- LOG_FUNC
+ OstTraceFunctionEntry0( REF_CUSBBATTERYCHARGINGPLUGIN_SETNEGOTIATEDCURRENT_ENTRY );
- LOGTEXT2(_L8(">>CUsbBatteryChargingPlugin::SetNegotiatedCurrent aMilliAmps = %d"), aMilliAmps);
+ OstTrace1( TRACE_NORMAL, REF_CUSBBATTERYCHARGINGPLUGIN_SETNEGOTIATEDCURRENT, "CUsbBatteryChargingPlugin::SetNegotiatedCurrent;aMilliAmps=%u", aMilliAmps );
// Ignore errors - not much we can do if it fails
-#ifdef __FLOG_ACTIVE
+#ifdef _DEBUG
TInt err = RProperty::Set(KPropertyUidUsbBatteryChargingCategory,
KPropertyUidUsbBatteryChargingAvailableCurrent,
aMilliAmps);
- LOGTEXT3(_L8("Set P&S current = %dmA - err = %d"),aMilliAmps,err);
+ OstTraceExt2( TRACE_NORMAL, REF_CUSBBATTERYCHARGINGPLUGIN_SETNEGOTIATEDCURRENT_DUP1, "CUsbBatteryChargingPlugin::SetNegotiatedCurrent;Set P&S current = %umA - err = %d", aMilliAmps, err );
#else
(void)RProperty::Set(KPropertyUidUsbBatteryChargingCategory,
KPropertyUidUsbBatteryChargingAvailableCurrent,
aMilliAmps);
#endif
+ OstTraceFunctionExit0( REF_CUSBBATTERYCHARGINGPLUGIN_SETNEGOTIATEDCURRENT_EXIT );
}
-#ifndef __FLOG_ACTIVE
+#ifndef _DEBUG
void CUsbBatteryChargingPlugin::LogStateText(TUsbDeviceState /*aState*/)
{
- LOG_FUNC
}
#else
void CUsbBatteryChargingPlugin::LogStateText(TUsbDeviceState aState)
{
- LOG_FUNC
+ OstTraceFunctionEntry0( REF_CUSBBATTERYCHARGINGPLUGIN_LOGSTATETEXT_ENTRY );
switch (aState)
{
case EUsbDeviceStateUndefined:
- LOGTEXT(_L8(" ***** UNDEFINED *****"));
+ OstTrace0( TRACE_NORMAL, REF_CUSBBATTERYCHARGINGPLUGIN_LOGSTATETEXT, "CUsbBatteryChargingPlugin::LogStateText; ***** UNDEFINED *****" );
break;
case EUsbDeviceStateDefault:
- LOGTEXT(_L8(" ***** DEFAULT *****"));
+ OstTrace0( TRACE_NORMAL, REF_CUSBBATTERYCHARGINGPLUGIN_LOGSTATETEXT_DUP1, "CUsbBatteryChargingPlugin::LogStateText; ***** DEFAULT *****" );
break;
case EUsbDeviceStateAttached:
- LOGTEXT(_L8(" ***** ATTACHED *****"));
+ OstTrace0( TRACE_NORMAL, REF_CUSBBATTERYCHARGINGPLUGIN_LOGSTATETEXT_DUP2, "CUsbBatteryChargingPlugin::LogStateText; ***** ATTACHED *****" );
break;
case EUsbDeviceStatePowered:
- LOGTEXT(_L8(" ***** POWERED *****"));
+ OstTrace0( TRACE_NORMAL, REF_CUSBBATTERYCHARGINGPLUGIN_LOGSTATETEXT_DUP3, "CUsbBatteryChargingPlugin::LogStateText; ***** POWERED *****" );
break;
case EUsbDeviceStateConfigured:
- LOGTEXT(_L8(" ***** CONFIGURED *****"));
+ OstTrace0( TRACE_NORMAL, REF_CUSBBATTERYCHARGINGPLUGIN_LOGSTATETEXT_DUP4, "CUsbBatteryChargingPlugin::LogStateText; ***** CONFIGURED *****" );
break;
case EUsbDeviceStateAddress:
- LOGTEXT(_L8(" ***** ADDRESS *****"));
+ OstTrace0( TRACE_NORMAL, REF_CUSBBATTERYCHARGINGPLUGIN_LOGSTATETEXT_DUP5, "CUsbBatteryChargingPlugin::LogStateText; ***** ADDRESS *****" );
break;
case EUsbDeviceStateSuspended:
- LOGTEXT(_L8(" ***** SUSPENDED *****"));
+ OstTrace0( TRACE_NORMAL, REF_CUSBBATTERYCHARGINGPLUGIN_LOGSTATETEXT_DUP6, "CUsbBatteryChargingPlugin::LogStateText; ***** SUSPENDED *****" );
break;
default:
break;
}
+ OstTraceFunctionExit0( REF_CUSBBATTERYCHARGINGPLUGIN_LOGSTATETEXT_EXIT );
}
#endif
void CUsbBatteryChargingPlugin::MpsoVBusStateChanged(TInt aNewState)
{
- LOG_FUNC
+ OstTraceFunctionEntry0( REF_CUSBBATTERYCHARGINGPLUGIN_MPSOVBUSSTATECHANGED_ENTRY );
iCurrentState->MpsoVBusStateChanged(aNewState);
+ OstTraceFunctionExit0( REF_CUSBBATTERYCHARGINGPLUGIN_MPSOVBUSSTATECHANGED_EXIT );
}
@@ -650,15 +702,17 @@
#ifdef SYMBIAN_ENABLE_USB_OTG_HOST_PRIV
void CUsbBatteryChargingPlugin::MpsoIdPinStateChanged(TInt aValue)
{
- LOG_FUNC
+ OstTraceFunctionEntry0( REF_CUSBBATTERYCHARGINGPLUGIN_MPSOIDPINSTATECHANGED_ENTRY );
iCurrentState->MpsoIdPinStateChanged(aValue);
+ OstTraceFunctionExit0( REF_CUSBBATTERYCHARGINGPLUGIN_MPSOIDPINSTATECHANGED_EXIT );
}
void CUsbBatteryChargingPlugin::MpsoOtgStateChangedL(TUsbOtgState aNewState)
{
- LOG_FUNC
+ OstTraceFunctionEntry0( REF_CUSBBATTERYCHARGINGPLUGIN_MPSOOTGSTATECHANGEDL_ENTRY );
iCurrentState->MpsoOtgStateChangedL(aNewState);
+ OstTraceFunctionExit0( REF_CUSBBATTERYCHARGINGPLUGIN_MPSOOTGSTATECHANGEDL_EXIT );
}
#endif
--- a/usbmgmt/usbmgr/usbman/chargingplugin/src/chargingstates.cpp Wed Jul 07 14:16:40 2010 +0800
+++ b/usbmgmt/usbmgr/usbman/chargingplugin/src/chargingstates.cpp Wed Jul 07 15:08:54 2010 +0800
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2009-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"
@@ -20,13 +20,15 @@
@internalComponent
*/
+#include <usb/usblogger.h>
#include "chargingstates.h"
-#include <usb/usblogger.h>
#include "reenumerator.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "chargingstatesTraces.h"
+#endif
-#ifdef __FLOG_ACTIVE
-_LIT8(KLogComponent, "USBCHARGEStates");
-#endif
+
// Charging plugin base state
@@ -35,32 +37,38 @@
void TUsbBatteryChargingPluginStateBase::UsbServiceStateChange(TInt aLastError,
TUsbServiceState aOldState, TUsbServiceState aNewState)
{
- LOG_FUNC
+ OstTraceFunctionEntry0( REF_TUSBBATTERYCHARGINGPLUGINSTATEBASE_USBSERVICESTATECHANGE_ENTRY );
(void)aLastError;
(void)aOldState;
(void)aNewState;
// Not use
+ OstTraceFunctionExit0( REF_TUSBBATTERYCHARGINGPLUGINSTATEBASE_USBSERVICESTATECHANGE_EXIT );
}
void TUsbBatteryChargingPluginStateBase::UsbDeviceStateChange(TInt aLastError,
TUsbDeviceState aOldState, TUsbDeviceState aNewState)
{
- LOG_FUNC
+ OstTraceFunctionEntry0( REF_TUSBBATTERYCHARGINGPLUGINSTATEBASE_USBDEVICESTATECHANGE_ENTRY );
(void)aLastError;
(void)aOldState;
(void)aNewState;
+ OstTraceFunctionExit0( REF_TUSBBATTERYCHARGINGPLUGINSTATEBASE_USBDEVICESTATECHANGE_EXIT );
}
void TUsbBatteryChargingPluginStateBase::HandleRepositoryValueChangedL(
const TUid& aRepository, TUint aId, TInt aVal)
{
- LOG_FUNC
+ OstTraceFunctionEntry0( REF_TUSBBATTERYCHARGINGPLUGINSTATEBASE_HANDLEREPOSITORYVALUECHANGEDL_ENTRY );
- LOGTEXT4(_L8(">>TUsbBatteryChargingPluginStateBase::HandleRepositoryValueChangedL aRepository = 0x%08x, aId = %d, aVal = %d"), aRepository, aId, aVal);
- LOGTEXT3(_L8("Plugin State = %d, Device State = %d"), iParent.iPluginState, iParent.iDeviceState);
+ OstTraceExt3( TRACE_NORMAL, REF_TUSBBATTERYCHARGINGPLUGINSTATEBASE_HANDLEREPOSITORYVALUECHANGEDL,
+ "TUsbBatteryChargingPluginStateBase::HandleRepositoryValueChangedL;aRepository = 0x%08x;aId=%d;aVal=%d",
+ aRepository.iUid, aId, (TInt32)aVal );
+ OstTraceExt2( TRACE_NORMAL, REF_TUSBBATTERYCHARGINGPLUGINSTATEBASE_HANDLEREPOSITORYVALUECHANGEDL_DUP1,
+ "TUsbBatteryChargingPluginStateBase::HandleRepositoryValueChangedL;Plugin State = %d, Device State = %d",
+ iParent.iPluginState, iParent.iDeviceState );
if ((aRepository == KUsbBatteryChargingCentralRepositoryUid) &&
(aId == KUsbBatteryChargingKeyEnabledUserSetting))
@@ -85,12 +93,13 @@
iParent.SetState(EPluginStateUserDisabled);
}
}
+ OstTraceFunctionExit0( REF_TUSBBATTERYCHARGINGPLUGINSTATEBASE_HANDLEREPOSITORYVALUECHANGEDL_EXIT );
}
void TUsbBatteryChargingPluginStateBase::DeviceStateTimeout()
{
- LOG_FUNC
- LOGTEXT4(_L8("Time: %d Plugin State = %d, Device State = %d"), User::NTickCount(), iParent.iPluginState, iParent.iDeviceState);
+ OstTraceFunctionEntry0( REF_TUSBBATTERYCHARGINGPLUGINSTATEBASE_DEVICESTATETIMEOUT_ENTRY );
+ OstTraceExt3( TRACE_NORMAL, REF_TUSBBATTERYCHARGINGPLUGINSTATEBASE_DEVICESTATETIMEOUT, "TUsbBatteryChargingPluginStateBase::DeviceStateTimeout;Time: %u Plugin State = %d, Device State = %d", User::NTickCount(), (TInt32)iParent.iPluginState, (TInt32)iParent.iDeviceState );
iParent.iDeviceReEnumerator->Cancel(); // cancel re-enumeration AO
@@ -99,15 +108,16 @@
// Should not happen !!! Otherwise, something wrong!!!
iParent.SetState(EPluginStateIdle);
}
+ OstTraceFunctionExit0( REF_TUSBBATTERYCHARGINGPLUGINSTATEBASE_DEVICESTATETIMEOUT_EXIT );
}
// For host OTG enabled charging plug-in
#ifdef SYMBIAN_ENABLE_USB_OTG_HOST_PRIV
void TUsbBatteryChargingPluginStateBase::MpsoIdPinStateChanged(TInt aValue)
{
- LOG_FUNC
-
- LOGTEXT2(_L8("IdPinState changed => %d"), aValue);
+ OstTraceFunctionEntry0( REF_TUSBBATTERYCHARGINGPLUGINSTATEBASE_MPSOIDPINSTATECHANGED_ENTRY );
+
+ OstTrace1( TRACE_NORMAL, REF_TUSBBATTERYCHARGINGPLUGINSTATEBASE_MPSOIDPINSTATECHANGED, "TUsbBatteryChargingPluginStateBase::MpsoIdPinStateChanged;IdPinState changed => %d", aValue );
// Disable charging here when IdPin is present
// When IdPin disappears (i.e. the phone becomes B-Device), all necessary step are performed
@@ -127,6 +137,7 @@
TRAP_IGNORE(iParent.SetInitialConfigurationL());
iParent.SetState(EPluginStateBEndedCableNotPresent);
+ OstTraceFunctionExit0( REF_TUSBBATTERYCHARGINGPLUGINSTATEBASE_MPSOIDPINSTATECHANGED_EXIT );
return;
case EUsbBatteryChargingIdPinBRole:
@@ -141,29 +152,32 @@
iParent.SetState(EPluginStateIdle);
break;
}
+ OstTraceFunctionExit0( REF_TUSBBATTERYCHARGINGPLUGINSTATEBASE_MPSOIDPINSTATECHANGED_EXIT_DUP1 );
}
void TUsbBatteryChargingPluginStateBase::MpsoOtgStateChangedL(TUsbOtgState aNewState)
{
- LOG_FUNC
+ OstTraceFunctionEntry0( REF_TUSBBATTERYCHARGINGPLUGINSTATEBASE_MPSOOTGSTATECHANGEDL_ENTRY );
iParent.iOtgState = aNewState;
// Not use currently
+ OstTraceFunctionExit0( REF_TUSBBATTERYCHARGINGPLUGINSTATEBASE_MPSOOTGSTATECHANGEDL_EXIT );
}
#endif
void TUsbBatteryChargingPluginStateBase::MpsoVBusStateChanged(TInt aNewState)
{
- LOG_FUNC
+ OstTraceFunctionEntry0( REF_TUSBBATTERYCHARGINGPLUGINSTATEBASE_MPSOVBUSSTATECHANGED_ENTRY );
if (aNewState == iParent.iVBusState)
{
- LOGTEXT2(_L8("Receive VBus State Change notification without any state change: aNewState = %d"), aNewState);
+ OstTrace1( TRACE_NORMAL, REF_TUSBBATTERYCHARGINGPLUGINSTATEBASE_MPSOVBUSSTATECHANGED, "TUsbBatteryChargingPluginStateBase::MpsoVBusStateChanged;Receive VBus State Change notification without any state change: aNewState = %d", aNewState );
+ OstTraceFunctionExit0( REF_TUSBBATTERYCHARGINGPLUGINSTATEBASE_MPSOVBUSSTATECHANGED_EXIT );
return;//should not happen??
}
- LOGTEXT3(_L8("VBusState changed from %d to %d"), iParent.iVBusState, aNewState);
+ OstTraceExt2( TRACE_NORMAL, REF_TUSBBATTERYCHARGINGPLUGINSTATEBASE_MPSOVBUSSTATECHANGED_DUP1, "TUsbBatteryChargingPluginStateBase::MpsoVBusStateChanged;VBusState changed from %d to %d", iParent.iVBusState, aNewState );
iParent.iVBusState = aNewState;
if (aNewState == 0) // VBus drop down - we have disconnected from host
@@ -176,6 +190,7 @@
}
// The handling of VBus on will be down in DeviceStateChanged implicitly
+ OstTraceFunctionExit0( REF_TUSBBATTERYCHARGINGPLUGINSTATEBASE_MPSOVBUSSTATECHANGED_EXIT_DUP1 );
}
@@ -183,7 +198,8 @@
CUsbBatteryChargingPlugin& aParentStateMachine ):
iParent(aParentStateMachine)
{
- LOG_FUNC
+ OstTraceFunctionEntry0( REF_TUSBBATTERYCHARGINGPLUGINSTATEBASE_TUSBBATTERYCHARGINGPLUGINSTATEBASE_CONS_ENTRY );
+ OstTraceFunctionExit0( REF_TUSBBATTERYCHARGINGPLUGINSTATEBASE_TUSBBATTERYCHARGINGPLUGINSTATEBASE_CONS_EXIT );
}
@@ -193,15 +209,16 @@
CUsbBatteryChargingPlugin& aParentStateMachine ) :
TUsbBatteryChargingPluginStateBase(aParentStateMachine)
{
- LOG_FUNC
+ OstTraceFunctionEntry0( REF_TUSBBATTERYCHARGINGPLUGINSTATEIDLE_TUSBBATTERYCHARGINGPLUGINSTATEIDLE_CONS_ENTRY );
+ OstTraceFunctionExit0( REF_TUSBBATTERYCHARGINGPLUGINSTATEIDLE_TUSBBATTERYCHARGINGPLUGINSTATEIDLE_CONS_EXIT );
};
void TUsbBatteryChargingPluginStateIdle::UsbDeviceStateChange(
TInt aLastError, TUsbDeviceState aOldState, TUsbDeviceState aNewState)
{
- LOG_FUNC
+ OstTraceFunctionEntry0( REF_TUSBBATTERYCHARGINGPLUGINSTATEIDLE_USBDEVICESTATECHANGE_ENTRY );
- LOGTEXT4(_L8(">>TUsbBatteryChargingPluginStateIdle::UsbDeviceStateChange LastError = %d, aOldState = %d, aNewState = %d"), aLastError, aOldState, aNewState);
+ OstTraceExt3( TRACE_NORMAL, REF_TUSBBATTERYCHARGINGPLUGINSTATEIDLE_USBDEVICESTATECHANGE, "TUsbBatteryChargingPluginStateIdle::UsbDeviceStateChange;aLastError=%d;aOldState=%d;aNewState=%d", aLastError, aOldState, aNewState );
(void)aLastError;
(void)aOldState;
iParent.iDeviceState = aNewState;
@@ -225,6 +242,7 @@
}
break;
}
+ OstTraceFunctionExit0( REF_TUSBBATTERYCHARGINGPLUGINSTATEIDLE_USBDEVICESTATECHANGE_EXIT );
}
@@ -234,15 +252,16 @@
CUsbBatteryChargingPlugin& aParentStateMachine ) :
TUsbBatteryChargingPluginStateBase(aParentStateMachine)
{
- LOG_FUNC
+ OstTraceFunctionEntry0( REF_TUSBBATTERYCHARGINGPLUGINSTATECURRENTNEGOTIATING_TUSBBATTERYCHARGINGPLUGINSTATECURRENTNEGOTIATING_CONS_ENTRY );
+ OstTraceFunctionExit0( REF_TUSBBATTERYCHARGINGPLUGINSTATECURRENTNEGOTIATING_TUSBBATTERYCHARGINGPLUGINSTATECURRENTNEGOTIATING_CONS_EXIT );
};
void TUsbBatteryChargingPluginStateCurrentNegotiating::UsbDeviceStateChange(
TInt aLastError, TUsbDeviceState aOldState, TUsbDeviceState aNewState)
{
- LOG_FUNC
+ OstTraceFunctionEntry0( REF_TUSBBATTERYCHARGINGPLUGINSTATECURRENTNEGOTIATING_USBDEVICESTATECHANGE_ENTRY );
- LOGTEXT4(_L8(">>TUsbBatteryChargingPluginStateCurrentNegotiating::UsbDeviceStateChange LastError = %d, aOldState = %d, aNewState = %d"), aLastError, aOldState, aNewState);
+ OstTraceExt3( TRACE_NORMAL, REF_TUSBBATTERYCHARGINGPLUGINSTATECURRENTNEGOTIATING_USBDEVICESTATECHANGE, "TUsbBatteryChargingPluginStateCurrentNegotiating::UsbDeviceStateChange;aLastError=%d;aOldState=%d;aNewState=%d", aLastError, aOldState, aNewState );
(void)aLastError;
(void)aOldState;
iParent.iDeviceState = aNewState;
@@ -255,7 +274,7 @@
{
iParent.iDeviceStateTimer->Cancel();
- LOGTEXT2(_L8("iParent.iAvailableMilliAmps = %d"),iParent.iAvailableMilliAmps);
+ OstTrace1( TRACE_NORMAL, REF_TUSBBATTERYCHARGINGPLUGINSTATECURRENTNEGOTIATING_USBDEVICESTATECHANGE_DUP1, "TUsbBatteryChargingPluginStateCurrentNegotiating::UsbDeviceStateChange;iParent.iAvailableMilliAmps=%d", iParent.iAvailableMilliAmps );
iParent.iAvailableMilliAmps = iParent.iRequestedCurrentValue;
if(0 != iParent.iRequestedCurrentValue)
@@ -263,7 +282,7 @@
// A non-zero value was accepted by host, charging
// can be performed now.
iParent.StartCharging(iParent.iAvailableMilliAmps);
- LOGTEXT2(_L8("PluginState => EPluginStateCharging(%d)"),iParent.iPluginState);
+ OstTrace1( TRACE_NORMAL, REF_TUSBBATTERYCHARGINGPLUGINSTATECURRENTNEGOTIATING_USBDEVICESTATECHANGE_DUP2, "TUsbBatteryChargingPluginStateCurrentNegotiating::UsbDeviceStateChange;PluginState => EPluginStateCharging(%d)", iParent.iPluginState );
iParent.SetNegotiatedCurrent(iParent.iAvailableMilliAmps);
}
else
@@ -271,7 +290,7 @@
// Host can only accept 0 charging current
// No way to do charging
iParent.SetState(EPluginStateNoValidCurrent);
- LOGTEXT2(_L8("No more current value to try, iPluginState turned to %d"), iParent.iPluginState);
+ OstTrace1( TRACE_NORMAL, REF_TUSBBATTERYCHARGINGPLUGINSTATECURRENTNEGOTIATING_USBDEVICESTATECHANGE_DUP3, "TUsbBatteryChargingPluginStateCurrentNegotiating::UsbDeviceStateChange;No more current value to try, iPluginState turned to %d", iParent.iPluginState );
}
}
@@ -285,12 +304,13 @@
default:
break;
}
+ OstTraceFunctionExit0( REF_TUSBBATTERYCHARGINGPLUGINSTATECURRENTNEGOTIATING_USBDEVICESTATECHANGE_EXIT );
}
void TUsbBatteryChargingPluginStateCurrentNegotiating::DeviceStateTimeout()
{
- LOG_FUNC
- LOGTEXT4(_L8("Time: %d Plugin State = %d, Device State = %d"), User::NTickCount(), iParent.iPluginState, iParent.iDeviceState);
+ OstTraceFunctionEntry0( REF_TUSBBATTERYCHARGINGPLUGINSTATECURRENTNEGOTIATING_DEVICESTATETIMEOUT_ENTRY );
+ OstTraceExt3( TRACE_NORMAL, REF_TUSBBATTERYCHARGINGPLUGINSTATECURRENTNEGOTIATING_DEVICESTATETIMEOUT, "TUsbBatteryChargingPluginStateCurrentNegotiating::DeviceStateTimeout;Time: %d Plugin State = %d, Device State = %d", User::NTickCount(), (TInt32)iParent.iPluginState, (TInt32)iParent.iDeviceState );
iParent.iDeviceReEnumerator->Cancel(); // cancel re-enumeration AO
@@ -305,6 +325,7 @@
// Assume it will never happens.
iParent.SetState(EPluginStateNoValidCurrent);
}
+ OstTraceFunctionExit0( REF_TUSBBATTERYCHARGINGPLUGINSTATECURRENTNEGOTIATING_DEVICESTATETIMEOUT_EXIT );
}
@@ -315,15 +336,16 @@
CUsbBatteryChargingPlugin& aParentStateMachine ) :
TUsbBatteryChargingPluginStateBase(aParentStateMachine)
{
- LOG_FUNC
+ OstTraceFunctionEntry0( REF_TUSBBATTERYCHARGINGPLUGINSTATECHARGING_TUSBBATTERYCHARGINGPLUGINSTATECHARGING_CONS_ENTRY );
+ OstTraceFunctionExit0( REF_TUSBBATTERYCHARGINGPLUGINSTATECHARGING_TUSBBATTERYCHARGINGPLUGINSTATECHARGING_CONS_EXIT );
}
void TUsbBatteryChargingPluginStateCharging::UsbDeviceStateChange(
TInt aLastError, TUsbDeviceState aOldState, TUsbDeviceState aNewState)
{
- LOG_FUNC
+ OstTraceFunctionEntry0( REF_TUSBBATTERYCHARGINGPLUGINSTATECHARGING_USBDEVICESTATECHANGE_ENTRY );
- LOGTEXT4(_L8(">>TUsbBatteryChargingPluginStateCharging::UsbDeviceStateChange LastError = %d, aOldState = %d, aNewState = %d"), aLastError, aOldState, aNewState);
+ OstTraceExt3( TRACE_NORMAL, REF_TUSBBATTERYCHARGINGPLUGINSTATECHARGING_USBDEVICESTATECHANGE, "TUsbBatteryChargingPluginStateCharging::UsbDeviceStateChange;aLastError=%d;aOldState=%d;aNewState=%d", aLastError, aOldState, aNewState );
(void)aLastError;
(void)aOldState;
iParent.iDeviceState = aNewState;
@@ -349,6 +371,7 @@
default:
break;
}
+ OstTraceFunctionExit0( REF_TUSBBATTERYCHARGINGPLUGINSTATECHARGING_USBDEVICESTATECHANGE_EXIT );
}
// Charging plugin negotiated fail state
@@ -358,7 +381,8 @@
CUsbBatteryChargingPlugin& aParentStateMachine ) :
TUsbBatteryChargingPluginStateBase(aParentStateMachine)
{
- LOG_FUNC
+ OstTraceFunctionEntry0( REF_TUSBBATTERYCHARGINGPLUGINSTATENOVALIDCURRENT_TUSBBATTERYCHARGINGPLUGINSTATENOVALIDCURRENT_CONS_ENTRY );
+ OstTraceFunctionExit0( REF_TUSBBATTERYCHARGINGPLUGINSTATENOVALIDCURRENT_TUSBBATTERYCHARGINGPLUGINSTATENOVALIDCURRENT_CONS_EXIT );
};
@@ -368,15 +392,16 @@
CUsbBatteryChargingPlugin& aParentStateMachine ) :
TUsbBatteryChargingPluginStateBase(aParentStateMachine)
{
- LOG_FUNC
+ OstTraceFunctionEntry0( REF_TUSBBATTERYCHARGINGPLUGINSTATEIDLENEGOTIATED_TUSBBATTERYCHARGINGPLUGINSTATEIDLENEGOTIATED_CONS_ENTRY );
+ OstTraceFunctionExit0( REF_TUSBBATTERYCHARGINGPLUGINSTATEIDLENEGOTIATED_TUSBBATTERYCHARGINGPLUGINSTATEIDLENEGOTIATED_CONS_EXIT );
};
void TUsbBatteryChargingPluginStateIdleNegotiated::UsbDeviceStateChange(
TInt aLastError, TUsbDeviceState aOldState, TUsbDeviceState aNewState)
{
- LOG_FUNC
+ OstTraceFunctionEntry0( REF_TUSBBATTERYCHARGINGPLUGINSTATEIDLENEGOTIATED_USBDEVICESTATECHANGE_ENTRY );
- LOGTEXT4(_L8(">>TUsbBatteryChargingPluginStateIdleNegotiated::UsbDeviceStateChange LastError = %d, aOldState = %d, aNewState = %d"), aLastError, aOldState, aNewState);
+ OstTraceExt3( TRACE_NORMAL, REF_TUSBBATTERYCHARGINGPLUGINSTATEIDLENEGOTIATED_USBDEVICESTATECHANGE, "TUsbBatteryChargingPluginStateIdleNegotiated::UsbDeviceStateChange;aLastError=%d;aOldState=%d;aNewState=%d", aLastError, aOldState, aNewState );
(void)aLastError;
(void)aOldState;
iParent.iDeviceState = aNewState;
@@ -397,6 +422,7 @@
default:
break;
}
+ OstTraceFunctionExit0( REF_TUSBBATTERYCHARGINGPLUGINSTATEIDLENEGOTIATED_USBDEVICESTATECHANGE_EXIT );
}
// Charging plugin user disabled state
@@ -405,29 +431,32 @@
CUsbBatteryChargingPlugin& aParentStateMachine ) :
TUsbBatteryChargingPluginStateBase(aParentStateMachine)
{
- LOG_FUNC
+ OstTraceFunctionEntry0( REF_TUSBBATTERYCHARGINGPLUGINSTATEUSERDISABLED_TUSBBATTERYCHARGINGPLUGINSTATEUSERDISABLED_CONS_ENTRY );
+ OstTraceFunctionExit0( REF_TUSBBATTERYCHARGINGPLUGINSTATEUSERDISABLED_TUSBBATTERYCHARGINGPLUGINSTATEUSERDISABLED_CONS_EXIT );
};
void TUsbBatteryChargingPluginStateUserDisabled::UsbDeviceStateChange(
TInt aLastError, TUsbDeviceState aOldState, TUsbDeviceState aNewState)
{
- LOG_FUNC
+ OstTraceFunctionEntry0( REF_TUSBBATTERYCHARGINGPLUGINSTATEUSERDISABLED_USBDEVICESTATECHANGE_ENTRY );
- LOGTEXT4(_L8(">>TUsbBatteryChargingPluginStateUserDisabled::UsbDeviceStateChange LastError = %d, aOldState = %d, aNewState = %d"), aLastError, aOldState, aNewState);
+ OstTraceExt3( TRACE_NORMAL, REF_TUSBBATTERYCHARGINGPLUGINSTATEUSERDISABLED_USBDEVICESTATECHANGE, "TUsbBatteryChargingPluginStateUserDisabled::UsbDeviceStateChange;aLastError=%d;aOldState=%d;aNewState=%d", aLastError, aOldState, aNewState );
(void)aLastError;
(void)aOldState;
iParent.iDeviceState = aNewState;
iParent.LogStateText(aNewState);
+ OstTraceFunctionExit0( REF_TUSBBATTERYCHARGINGPLUGINSTATEUSERDISABLED_USBDEVICESTATECHANGE_EXIT );
}
void TUsbBatteryChargingPluginStateUserDisabled::HandleRepositoryValueChangedL(
const TUid& aRepository, TUint aId, TInt aVal)
{
- LOG_FUNC
+ OstTraceFunctionEntry0( REF_TUSBBATTERYCHARGINGPLUGINSTATEUSERDISABLED_HANDLEREPOSITORYVALUECHANGEDL_ENTRY );
- LOGTEXT4(_L8(">>TUsbBatteryChargingPluginStateUserDisabled::HandleRepositoryValueChangedL aRepository = 0x%08x, aId = %d, aVal = %d"), aRepository, aId, aVal);
- LOGTEXT3(_L8("Plugin State = %d, Device State = %d"), iParent.iPluginState, iParent.iDeviceState);
+ OstTrace1( TRACE_NORMAL, REF_TUSBBATTERYCHARGINGPLUGINSTATEUSERDISABLED_HANDLEREPOSITORYVALUECHANGEDL, "TUsbBatteryChargingPluginStateUserDisabled::HandleRepositoryValueChangedL;aRepository = 0x%08x", aRepository.iUid );
+ OstTraceExt2( TRACE_NORMAL, REF_TUSBBATTERYCHARGINGPLUGINSTATEUSERDISABLED_HANDLEREPOSITORYVALUECHANGEDL_DUP1, "TUsbBatteryChargingPluginStateUserDisabled::HandleRepositoryValueChangedL;aId=%d;aVal=%d", aId, aVal );
+ OstTraceExt2( TRACE_NORMAL, REF_TUSBBATTERYCHARGINGPLUGINSTATEUSERDISABLED_HANDLEREPOSITORYVALUECHANGEDL_DUP2, "TUsbBatteryChargingPluginStateUserDisabled::HandleRepositoryValueChangedL;iParent.iPluginState=%d;iParent.iDeviceState=%d", iParent.iPluginState, iParent.iDeviceState );
if ((aRepository == KUsbBatteryChargingCentralRepositoryUid) &&
(aId == KUsbBatteryChargingKeyEnabledUserSetting))
@@ -443,18 +472,19 @@
{
iParent.StartCharging(iParent.iAvailableMilliAmps); // Go to charing state implicitly
}
- LOGTEXT2(_L8("PluginState => %d"), iParent.iPluginState);
+ OstTrace1( TRACE_NORMAL, REF_TUSBBATTERYCHARGINGPLUGINSTATEUSERDISABLED_HANDLEREPOSITORYVALUECHANGEDL_DUP3, "TUsbBatteryChargingPluginStateUserDisabled::HandleRepositoryValueChangedL;PluginState => %d", iParent.iPluginState );
}
}
+ OstTraceFunctionExit0( REF_TUSBBATTERYCHARGINGPLUGINSTATEUSERDISABLED_HANDLEREPOSITORYVALUECHANGEDL_EXIT );
}
// For host OTG enabled charging plug-in
#ifdef SYMBIAN_ENABLE_USB_OTG_HOST_PRIV
void TUsbBatteryChargingPluginStateUserDisabled::MpsoIdPinStateChanged(TInt aValue)
{
- LOG_FUNC
+ OstTraceFunctionEntry0( REF_TUSBBATTERYCHARGINGPLUGINSTATEUSERDISABLED_MPSOIDPINSTATECHANGED_ENTRY );
- LOGTEXT2(_L8("IdPinState changed => %d"), aValue);
+ OstTrace1( TRACE_NORMAL, REF_TUSBBATTERYCHARGINGPLUGINSTATEUSERDISABLED_MPSOIDPINSTATECHANGED, "TUsbBatteryChargingPluginStateUserDisabled::MpsoIdPinStateChanged;IdPinState changed => %d", aValue );
// Disable charging here when IdPin is present
// When IdPin disappears (i.e. the phone becomes B-Device), all necessary step are performed
@@ -468,6 +498,7 @@
TRAP_IGNORE(iParent.SetInitialConfigurationL());
iParent.PushRecoverState(EPluginStateBEndedCableNotPresent);
+ OstTraceFunctionExit0( REF_TUSBBATTERYCHARGINGPLUGINSTATEUSERDISABLED_MPSOIDPINSTATECHANGED_EXIT );
return;
case EUsbBatteryChargingIdPinBRole:
@@ -478,21 +509,23 @@
iParent.SetState(EPluginStateIdle);
break;
}
+ OstTraceFunctionExit0( REF_TUSBBATTERYCHARGINGPLUGINSTATEUSERDISABLED_MPSOIDPINSTATECHANGED_EXIT_DUP1 );
}
#endif
void TUsbBatteryChargingPluginStateUserDisabled::MpsoVBusStateChanged(TInt aNewState)
{
- LOG_FUNC
+ OstTraceFunctionEntry0( REF_TUSBBATTERYCHARGINGPLUGINSTATEUSERDISABLED_MPSOVBUSSTATECHANGED_ENTRY );
if (aNewState == iParent.iVBusState)
{
- LOGTEXT2(_L8("Receive VBus State Change notification without any state change: aNewState = %d"), aNewState);
+ OstTrace1( TRACE_NORMAL, REF_TUSBBATTERYCHARGINGPLUGINSTATEUSERDISABLED_MPSOVBUSSTATECHANGED, "TUsbBatteryChargingPluginStateUserDisabled::MpsoVBusStateChanged;Receive VBus State Change notification without any state change: aNewState = %d", aNewState );
+ OstTraceFunctionExit0( REF_TUSBBATTERYCHARGINGPLUGINSTATEUSERDISABLED_MPSOVBUSSTATECHANGED_EXIT );
return;
}
- LOGTEXT3(_L8("VBusState changed from %d to %d"), iParent.iVBusState, aNewState);
+ OstTraceExt2( TRACE_NORMAL, REF_TUSBBATTERYCHARGINGPLUGINSTATEUSERDISABLED_MPSOVBUSSTATECHANGED_DUP1, "TUsbBatteryChargingPluginStateUserDisabled::MpsoVBusStateChanged;VBusState changed from %d to %d", iParent.iVBusState, aNewState );
iParent.iVBusState = aNewState;
if (aNewState == 0) // VBus drop down - we have disconnected from host
@@ -505,6 +538,7 @@
}
// The handling of VBus on will be down in DeviceStateChanged implicitly
+ OstTraceFunctionExit0( REF_TUSBBATTERYCHARGINGPLUGINSTATEUSERDISABLED_MPSOVBUSSTATECHANGED_EXIT_DUP1 );
}
@@ -514,7 +548,8 @@
CUsbBatteryChargingPlugin& aParentStateMachine ) :
TUsbBatteryChargingPluginStateBase(aParentStateMachine)
{
- LOG_FUNC
+ OstTraceFunctionEntry0( RES_TUSBBATTERYCHARGINGPLUGINSTATEBENDEDCABLENOTPRESENT_TUSBBATTERYCHARGINGPLUGINSTATEBENDEDCABLENOTPRESENT_CONS_ENTRY );
+ OstTraceFunctionExit0( RES_TUSBBATTERYCHARGINGPLUGINSTATEBENDEDCABLENOTPRESENT_TUSBBATTERYCHARGINGPLUGINSTATEBENDEDCABLENOTPRESENT_CONS_EXIT );
};
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usbmgmt/usbmgr/usbman/chargingplugin/traces/OstTraceDefinitions.h Wed Jul 07 15:08:54 2010 +0800
@@ -0,0 +1,7 @@
+#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
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usbmgmt/usbmgr/usbman/chargingplugin/traces/fixed_id.definitions Wed Jul 07 15:08:54 2010 +0800
@@ -0,0 +1,192 @@
+#Fixed group and trace id definitions. If this file is removed, the identifiers are rebuilt.
+[GROUP]TRACE_FATAL=0x81
+[GROUP]TRACE_FLOW=0x8a
+[GROUP]TRACE_NORMAL=0x86
+[TRACE]TRACE_FATAL[0x81]_REF_CUSBBATTERYCHARGINGPLUGIN_PANIC=0x1
+[TRACE]TRACE_FLOW[0x8A]_REF_CUSBBATTERYCHARGINGPLUGIN_CONSTRUCTL_ENTRY=0x6a
+[TRACE]TRACE_FLOW[0x8A]_REF_CUSBBATTERYCHARGINGPLUGIN_CONSTRUCTL_EXIT=0x6b
+[TRACE]TRACE_FLOW[0x8A]_REF_CUSBBATTERYCHARGINGPLUGIN_CUSBBATTERYCHARGINGPLUGIN_DES_ENTRY=0x69
+[TRACE]TRACE_FLOW[0x8A]_REF_CUSBBATTERYCHARGINGPLUGIN_DEVICESTATETIMEOUT_ENTRY=0x41
+[TRACE]TRACE_FLOW[0x8A]_REF_CUSBBATTERYCHARGINGPLUGIN_DEVICESTATETIMEOUT_EXIT=0x42
+[TRACE]TRACE_FLOW[0x8A]_REF_CUSBBATTERYCHARGINGPLUGIN_GETINTERFACE=0x72
+[TRACE]TRACE_FLOW[0x8A]_REF_CUSBBATTERYCHARGINGPLUGIN_HANDLEREPOSITORYVALUECHANGEDL_ENTRY=0x3f
+[TRACE]TRACE_FLOW[0x8A]_REF_CUSBBATTERYCHARGINGPLUGIN_HANDLEREPOSITORYVALUECHANGEDL_EXIT=0x40
+[TRACE]TRACE_FLOW[0x8A]_REF_CUSBBATTERYCHARGINGPLUGIN_LOGSTATETEXT_ENTRY=0x51
+[TRACE]TRACE_FLOW[0x8A]_REF_CUSBBATTERYCHARGINGPLUGIN_LOGSTATETEXT_EXIT=0x52
+[TRACE]TRACE_FLOW[0x8A]_REF_CUSBBATTERYCHARGINGPLUGIN_MPSOIDPINSTATECHANGED_ENTRY=0x55
+[TRACE]TRACE_FLOW[0x8A]_REF_CUSBBATTERYCHARGINGPLUGIN_MPSOIDPINSTATECHANGED_EXIT=0x56
+[TRACE]TRACE_FLOW[0x8A]_REF_CUSBBATTERYCHARGINGPLUGIN_MPSOOTGSTATECHANGEDL_ENTRY=0x57
+[TRACE]TRACE_FLOW[0x8A]_REF_CUSBBATTERYCHARGINGPLUGIN_MPSOOTGSTATECHANGEDL_EXIT=0x58
+[TRACE]TRACE_FLOW[0x8A]_REF_CUSBBATTERYCHARGINGPLUGIN_MPSOVBUSSTATECHANGED_ENTRY=0x53
+[TRACE]TRACE_FLOW[0x8A]_REF_CUSBBATTERYCHARGINGPLUGIN_MPSOVBUSSTATECHANGED_EXIT=0x54
+[TRACE]TRACE_FLOW[0x8A]_REF_CUSBBATTERYCHARGINGPLUGIN_NEGOTIATECHARGINGCURRENT_ENTRY=0x3b
+[TRACE]TRACE_FLOW[0x8A]_REF_CUSBBATTERYCHARGINGPLUGIN_NEGOTIATECHARGINGCURRENT_EXIT=0x3c
+[TRACE]TRACE_FLOW[0x8A]_REF_CUSBBATTERYCHARGINGPLUGIN_NEGOTIATENEXTCURRENTVALUEL_ENTRY=0x43
+[TRACE]TRACE_FLOW[0x8A]_REF_CUSBBATTERYCHARGINGPLUGIN_NEGOTIATENEXTCURRENTVALUEL_EXIT=0x44
+[TRACE]TRACE_FLOW[0x8A]_REF_CUSBBATTERYCHARGINGPLUGIN_POPRECOVERSTATE_ENTRY=0x37
+[TRACE]TRACE_FLOW[0x8A]_REF_CUSBBATTERYCHARGINGPLUGIN_POPRECOVERSTATE_EXIT=0x38
+[TRACE]TRACE_FLOW[0x8A]_REF_CUSBBATTERYCHARGINGPLUGIN_PUSHRECOVERSTATE_ENTRY=0x35
+[TRACE]TRACE_FLOW[0x8A]_REF_CUSBBATTERYCHARGINGPLUGIN_PUSHRECOVERSTATE_EXIT=0x36
+[TRACE]TRACE_FLOW[0x8A]_REF_CUSBBATTERYCHARGINGPLUGIN_READCURRENTREQUESTVALUESL=0x6c
+[TRACE]TRACE_FLOW[0x8A]_REF_CUSBBATTERYCHARGINGPLUGIN_READCURRENTREQUESTVALUESL_ENTRY=0x49
+[TRACE]TRACE_FLOW[0x8A]_REF_CUSBBATTERYCHARGINGPLUGIN_READCURRENTREQUESTVALUESL_EXIT=0x4a
+[TRACE]TRACE_FLOW[0x8A]_REF_CUSBBATTERYCHARGINGPLUGIN_REQUESTCURRENTL_ENTRY=0x47
+[TRACE]TRACE_FLOW[0x8A]_REF_CUSBBATTERYCHARGINGPLUGIN_REQUESTCURRENTL_EXIT=0x48
+[TRACE]TRACE_FLOW[0x8A]_REF_CUSBBATTERYCHARGINGPLUGIN_RESETPLUGIN_ENTRY=0x45
+[TRACE]TRACE_FLOW[0x8A]_REF_CUSBBATTERYCHARGINGPLUGIN_RESETPLUGIN_EXIT=0x46
+[TRACE]TRACE_FLOW[0x8A]_REF_CUSBBATTERYCHARGINGPLUGIN_SETNEGOTIATEDCURRENT_ENTRY=0x4f
+[TRACE]TRACE_FLOW[0x8A]_REF_CUSBBATTERYCHARGINGPLUGIN_SETNEGOTIATEDCURRENT_EXIT=0x50
+[TRACE]TRACE_FLOW[0x8A]_REF_CUSBBATTERYCHARGINGPLUGIN_SETSTATE_ENTRY=0x39
+[TRACE]TRACE_FLOW[0x8A]_REF_CUSBBATTERYCHARGINGPLUGIN_SETSTATE_EXIT=0x3a
+[TRACE]TRACE_FLOW[0x8A]_REF_CUSBBATTERYCHARGINGPLUGIN_STARTCHARGING_ENTRY=0x4b
+[TRACE]TRACE_FLOW[0x8A]_REF_CUSBBATTERYCHARGINGPLUGIN_STARTCHARGING_EXIT=0x4c
+[TRACE]TRACE_FLOW[0x8A]_REF_CUSBBATTERYCHARGINGPLUGIN_STOPCHARGING_ENTRY=0x4d
+[TRACE]TRACE_FLOW[0x8A]_REF_CUSBBATTERYCHARGINGPLUGIN_STOPCHARGING_EXIT=0x4e
+[TRACE]TRACE_FLOW[0x8A]_REF_CUSBBATTERYCHARGINGPLUGIN_USBDEVICESTATECHANGE_ENTRY=0x3d
+[TRACE]TRACE_FLOW[0x8A]_REF_CUSBBATTERYCHARGINGPLUGIN_USBDEVICESTATECHANGE_EXIT=0x3e
+[TRACE]TRACE_FLOW[0x8A]_REF_TUSBBATTERYCHARGINGPLUGINSTATEBASE_DEVICESTATETIMEOUT_ENTRY=0x7
+[TRACE]TRACE_FLOW[0x8A]_REF_TUSBBATTERYCHARGINGPLUGINSTATEBASE_DEVICESTATETIMEOUT_EXIT=0x8
+[TRACE]TRACE_FLOW[0x8A]_REF_TUSBBATTERYCHARGINGPLUGINSTATEBASE_HANDLEREPOSITORYVALUECHANGEDL_ENTRY=0x5
+[TRACE]TRACE_FLOW[0x8A]_REF_TUSBBATTERYCHARGINGPLUGINSTATEBASE_HANDLEREPOSITORYVALUECHANGEDL_EXIT=0x6
+[TRACE]TRACE_FLOW[0x8A]_REF_TUSBBATTERYCHARGINGPLUGINSTATEBASE_MPSOIDPINSTATECHANGED_ENTRY=0x9
+[TRACE]TRACE_FLOW[0x8A]_REF_TUSBBATTERYCHARGINGPLUGINSTATEBASE_MPSOIDPINSTATECHANGED_EXIT=0xa
+[TRACE]TRACE_FLOW[0x8A]_REF_TUSBBATTERYCHARGINGPLUGINSTATEBASE_MPSOIDPINSTATECHANGED_EXIT_DUP1=0xb
+[TRACE]TRACE_FLOW[0x8A]_REF_TUSBBATTERYCHARGINGPLUGINSTATEBASE_MPSOOTGSTATECHANGEDL_ENTRY=0xc
+[TRACE]TRACE_FLOW[0x8A]_REF_TUSBBATTERYCHARGINGPLUGINSTATEBASE_MPSOOTGSTATECHANGEDL_EXIT=0xd
+[TRACE]TRACE_FLOW[0x8A]_REF_TUSBBATTERYCHARGINGPLUGINSTATEBASE_MPSOVBUSSTATECHANGED_ENTRY=0xe
+[TRACE]TRACE_FLOW[0x8A]_REF_TUSBBATTERYCHARGINGPLUGINSTATEBASE_MPSOVBUSSTATECHANGED_EXIT=0xf
+[TRACE]TRACE_FLOW[0x8A]_REF_TUSBBATTERYCHARGINGPLUGINSTATEBASE_MPSOVBUSSTATECHANGED_EXIT_DUP1=0x10
+[TRACE]TRACE_FLOW[0x8A]_REF_TUSBBATTERYCHARGINGPLUGINSTATEBASE_TUSBBATTERYCHARGINGPLUGINSTATEBASE_CONS_ENTRY=0x59
+[TRACE]TRACE_FLOW[0x8A]_REF_TUSBBATTERYCHARGINGPLUGINSTATEBASE_TUSBBATTERYCHARGINGPLUGINSTATEBASE_CONS_EXIT=0x5a
+[TRACE]TRACE_FLOW[0x8A]_REF_TUSBBATTERYCHARGINGPLUGINSTATEBASE_USBDEVICESTATECHANGE_ENTRY=0x3
+[TRACE]TRACE_FLOW[0x8A]_REF_TUSBBATTERYCHARGINGPLUGINSTATEBASE_USBDEVICESTATECHANGE_EXIT=0x4
+[TRACE]TRACE_FLOW[0x8A]_REF_TUSBBATTERYCHARGINGPLUGINSTATEBASE_USBSERVICESTATECHANGE_ENTRY=0x1
+[TRACE]TRACE_FLOW[0x8A]_REF_TUSBBATTERYCHARGINGPLUGINSTATEBASE_USBSERVICESTATECHANGE_EXIT=0x2
+[TRACE]TRACE_FLOW[0x8A]_REF_TUSBBATTERYCHARGINGPLUGINSTATECHARGING_TUSBBATTERYCHARGINGPLUGINSTATECHARGING_CONS_ENTRY=0x5f
+[TRACE]TRACE_FLOW[0x8A]_REF_TUSBBATTERYCHARGINGPLUGINSTATECHARGING_TUSBBATTERYCHARGINGPLUGINSTATECHARGING_CONS_EXIT=0x60
+[TRACE]TRACE_FLOW[0x8A]_REF_TUSBBATTERYCHARGINGPLUGINSTATECHARGING_USBDEVICESTATECHANGE_ENTRY=0x1f
+[TRACE]TRACE_FLOW[0x8A]_REF_TUSBBATTERYCHARGINGPLUGINSTATECHARGING_USBDEVICESTATECHANGE_EXIT=0x20
+[TRACE]TRACE_FLOW[0x8A]_REF_TUSBBATTERYCHARGINGPLUGINSTATECURRENTNEGOTIATING_DEVICESTATETIMEOUT_ENTRY=0x1b
+[TRACE]TRACE_FLOW[0x8A]_REF_TUSBBATTERYCHARGINGPLUGINSTATECURRENTNEGOTIATING_DEVICESTATETIMEOUT_EXIT=0x1c
+[TRACE]TRACE_FLOW[0x8A]_REF_TUSBBATTERYCHARGINGPLUGINSTATECURRENTNEGOTIATING_TUSBBATTERYCHARGINGPLUGINSTATECURRENTNEGOTIATING_CONS_ENTRY=0x5d
+[TRACE]TRACE_FLOW[0x8A]_REF_TUSBBATTERYCHARGINGPLUGINSTATECURRENTNEGOTIATING_TUSBBATTERYCHARGINGPLUGINSTATECURRENTNEGOTIATING_CONS_EXIT=0x5e
+[TRACE]TRACE_FLOW[0x8A]_REF_TUSBBATTERYCHARGINGPLUGINSTATECURRENTNEGOTIATING_USBDEVICESTATECHANGE_ENTRY=0x19
+[TRACE]TRACE_FLOW[0x8A]_REF_TUSBBATTERYCHARGINGPLUGINSTATECURRENTNEGOTIATING_USBDEVICESTATECHANGE_EXIT=0x1a
+[TRACE]TRACE_FLOW[0x8A]_REF_TUSBBATTERYCHARGINGPLUGINSTATEIDLENEGOTIATED_TUSBBATTERYCHARGINGPLUGINSTATEIDLENEGOTIATED_CONS_ENTRY=0x63
+[TRACE]TRACE_FLOW[0x8A]_REF_TUSBBATTERYCHARGINGPLUGINSTATEIDLENEGOTIATED_TUSBBATTERYCHARGINGPLUGINSTATEIDLENEGOTIATED_CONS_EXIT=0x64
+[TRACE]TRACE_FLOW[0x8A]_REF_TUSBBATTERYCHARGINGPLUGINSTATEIDLENEGOTIATED_USBDEVICESTATECHANGE_ENTRY=0x25
+[TRACE]TRACE_FLOW[0x8A]_REF_TUSBBATTERYCHARGINGPLUGINSTATEIDLENEGOTIATED_USBDEVICESTATECHANGE_EXIT=0x26
+[TRACE]TRACE_FLOW[0x8A]_REF_TUSBBATTERYCHARGINGPLUGINSTATEIDLE_TUSBBATTERYCHARGINGPLUGINSTATEIDLE_CONS_ENTRY=0x5b
+[TRACE]TRACE_FLOW[0x8A]_REF_TUSBBATTERYCHARGINGPLUGINSTATEIDLE_TUSBBATTERYCHARGINGPLUGINSTATEIDLE_CONS_EXIT=0x5c
+[TRACE]TRACE_FLOW[0x8A]_REF_TUSBBATTERYCHARGINGPLUGINSTATEIDLE_USBDEVICESTATECHANGE_ENTRY=0x15
+[TRACE]TRACE_FLOW[0x8A]_REF_TUSBBATTERYCHARGINGPLUGINSTATEIDLE_USBDEVICESTATECHANGE_EXIT=0x16
+[TRACE]TRACE_FLOW[0x8A]_REF_TUSBBATTERYCHARGINGPLUGINSTATENOVALIDCURRENT_TUSBBATTERYCHARGINGPLUGINSTATENOVALIDCURRENT_CONS_ENTRY=0x61
+[TRACE]TRACE_FLOW[0x8A]_REF_TUSBBATTERYCHARGINGPLUGINSTATENOVALIDCURRENT_TUSBBATTERYCHARGINGPLUGINSTATENOVALIDCURRENT_CONS_EXIT=0x62
+[TRACE]TRACE_FLOW[0x8A]_REF_TUSBBATTERYCHARGINGPLUGINSTATEUSERDISABLED_HANDLEREPOSITORYVALUECHANGEDL_ENTRY=0x2b
+[TRACE]TRACE_FLOW[0x8A]_REF_TUSBBATTERYCHARGINGPLUGINSTATEUSERDISABLED_HANDLEREPOSITORYVALUECHANGEDL_EXIT=0x2c
+[TRACE]TRACE_FLOW[0x8A]_REF_TUSBBATTERYCHARGINGPLUGINSTATEUSERDISABLED_MPSOIDPINSTATECHANGED_ENTRY=0x2d
+[TRACE]TRACE_FLOW[0x8A]_REF_TUSBBATTERYCHARGINGPLUGINSTATEUSERDISABLED_MPSOIDPINSTATECHANGED_EXIT=0x2e
+[TRACE]TRACE_FLOW[0x8A]_REF_TUSBBATTERYCHARGINGPLUGINSTATEUSERDISABLED_MPSOIDPINSTATECHANGED_EXIT_DUP1=0x2f
+[TRACE]TRACE_FLOW[0x8A]_REF_TUSBBATTERYCHARGINGPLUGINSTATEUSERDISABLED_MPSOVBUSSTATECHANGED_ENTRY=0x30
+[TRACE]TRACE_FLOW[0x8A]_REF_TUSBBATTERYCHARGINGPLUGINSTATEUSERDISABLED_MPSOVBUSSTATECHANGED_EXIT=0x31
+[TRACE]TRACE_FLOW[0x8A]_REF_TUSBBATTERYCHARGINGPLUGINSTATEUSERDISABLED_MPSOVBUSSTATECHANGED_EXIT_DUP1=0x32
+[TRACE]TRACE_FLOW[0x8A]_REF_TUSBBATTERYCHARGINGPLUGINSTATEUSERDISABLED_TUSBBATTERYCHARGINGPLUGINSTATEUSERDISABLED_CONS_ENTRY=0x65
+[TRACE]TRACE_FLOW[0x8A]_REF_TUSBBATTERYCHARGINGPLUGINSTATEUSERDISABLED_TUSBBATTERYCHARGINGPLUGINSTATEUSERDISABLED_CONS_EXIT=0x66
+[TRACE]TRACE_FLOW[0x8A]_REF_TUSBBATTERYCHARGINGPLUGINSTATEUSERDISABLED_USBDEVICESTATECHANGE_ENTRY=0x29
+[TRACE]TRACE_FLOW[0x8A]_REF_TUSBBATTERYCHARGINGPLUGINSTATEUSERDISABLED_USBDEVICESTATECHANGE_EXIT=0x2a
+[TRACE]TRACE_FLOW[0x8A]_RES_TUSBBATTERYCHARGINGPLUGINSTATEBENDEDCABLENOTPRESENT_TUSBBATTERYCHARGINGPLUGINSTATEBENDEDCABLENOTPRESENT_CONS_ENTRY=0x67
+[TRACE]TRACE_FLOW[0x8A]_RES_TUSBBATTERYCHARGINGPLUGINSTATEBENDEDCABLENOTPRESENT_TUSBBATTERYCHARGINGPLUGINSTATEBENDEDCABLENOTPRESENT_CONS_EXIT=0x68
+[TRACE]TRACE_NORMAL[0x86]_REF_CUSBBATTERYCHARGINGPLUGIN_CONSTRUCTL=0x18
+[TRACE]TRACE_NORMAL[0x86]_REF_CUSBBATTERYCHARGINGPLUGIN_CONSTRUCTL_DUP1=0x19
+[TRACE]TRACE_NORMAL[0x86]_REF_CUSBBATTERYCHARGINGPLUGIN_CONSTRUCTL_DUP2=0x1a
+[TRACE]TRACE_NORMAL[0x86]_REF_CUSBBATTERYCHARGINGPLUGIN_CONSTRUCTL_DUP3=0x1d
+[TRACE]TRACE_NORMAL[0x86]_REF_CUSBBATTERYCHARGINGPLUGIN_CONSTRUCTL_DUP4=0x1e
+[TRACE]TRACE_NORMAL[0x86]_REF_CUSBBATTERYCHARGINGPLUGIN_GETINTERFACE_DUP1=0x41
+[TRACE]TRACE_NORMAL[0x86]_REF_CUSBBATTERYCHARGINGPLUGIN_GETINTERFACE_DUP2=0x42
+[TRACE]TRACE_NORMAL[0x86]_REF_CUSBBATTERYCHARGINGPLUGIN_LOGSTATETEXT=0x29
+[TRACE]TRACE_NORMAL[0x86]_REF_CUSBBATTERYCHARGINGPLUGIN_LOGSTATETEXT_DUP1=0x2a
+[TRACE]TRACE_NORMAL[0x86]_REF_CUSBBATTERYCHARGINGPLUGIN_LOGSTATETEXT_DUP2=0x2b
+[TRACE]TRACE_NORMAL[0x86]_REF_CUSBBATTERYCHARGINGPLUGIN_LOGSTATETEXT_DUP3=0x2c
+[TRACE]TRACE_NORMAL[0x86]_REF_CUSBBATTERYCHARGINGPLUGIN_LOGSTATETEXT_DUP4=0x2d
+[TRACE]TRACE_NORMAL[0x86]_REF_CUSBBATTERYCHARGINGPLUGIN_LOGSTATETEXT_DUP5=0x2e
+[TRACE]TRACE_NORMAL[0x86]_REF_CUSBBATTERYCHARGINGPLUGIN_LOGSTATETEXT_DUP6=0x2f
+[TRACE]TRACE_NORMAL[0x86]_REF_CUSBBATTERYCHARGINGPLUGIN_NEGOTIATECHARGINGCURRENT=0x33
+[TRACE]TRACE_NORMAL[0x86]_REF_CUSBBATTERYCHARGINGPLUGIN_NEGOTIATECHARGINGCURRENT_DUP1=0x34
+[TRACE]TRACE_NORMAL[0x86]_REF_CUSBBATTERYCHARGINGPLUGIN_REQUESTCURRENTL=0x36
+[TRACE]TRACE_NORMAL[0x86]_REF_CUSBBATTERYCHARGINGPLUGIN_REQUESTCURRENTL_DUP1=0x37
+[TRACE]TRACE_NORMAL[0x86]_REF_CUSBBATTERYCHARGINGPLUGIN_REQUESTCURRENTL_DUP10=0x40
+[TRACE]TRACE_NORMAL[0x86]_REF_CUSBBATTERYCHARGINGPLUGIN_REQUESTCURRENTL_DUP2=0x38
+[TRACE]TRACE_NORMAL[0x86]_REF_CUSBBATTERYCHARGINGPLUGIN_REQUESTCURRENTL_DUP3=0x39
+[TRACE]TRACE_NORMAL[0x86]_REF_CUSBBATTERYCHARGINGPLUGIN_REQUESTCURRENTL_DUP4=0x3a
+[TRACE]TRACE_NORMAL[0x86]_REF_CUSBBATTERYCHARGINGPLUGIN_REQUESTCURRENTL_DUP5=0x3b
+[TRACE]TRACE_NORMAL[0x86]_REF_CUSBBATTERYCHARGINGPLUGIN_REQUESTCURRENTL_DUP6=0x3c
+[TRACE]TRACE_NORMAL[0x86]_REF_CUSBBATTERYCHARGINGPLUGIN_REQUESTCURRENTL_DUP7=0x3d
+[TRACE]TRACE_NORMAL[0x86]_REF_CUSBBATTERYCHARGINGPLUGIN_REQUESTCURRENTL_DUP8=0x3e
+[TRACE]TRACE_NORMAL[0x86]_REF_CUSBBATTERYCHARGINGPLUGIN_REQUESTCURRENTL_DUP9=0x3f
+[TRACE]TRACE_NORMAL[0x86]_REF_CUSBBATTERYCHARGINGPLUGIN_RESETPLUGIN=0x35
+[TRACE]TRACE_NORMAL[0x86]_REF_CUSBBATTERYCHARGINGPLUGIN_SETINITIALCONFIGURATIONL=0x1f
+[TRACE]TRACE_NORMAL[0x86]_REF_CUSBBATTERYCHARGINGPLUGIN_SETINITIALCONFIGURATIONL_DUP1=0x20
+[TRACE]TRACE_NORMAL[0x86]_REF_CUSBBATTERYCHARGINGPLUGIN_SETINITIALCONFIGURATIONL_DUP2=0x21
+[TRACE]TRACE_NORMAL[0x86]_REF_CUSBBATTERYCHARGINGPLUGIN_SETINITIALCONFIGURATIONL_DUP3=0x22
+[TRACE]TRACE_NORMAL[0x86]_REF_CUSBBATTERYCHARGINGPLUGIN_SETINITIALCONFIGURATIONL_DUP4=0x23
+[TRACE]TRACE_NORMAL[0x86]_REF_CUSBBATTERYCHARGINGPLUGIN_SETINITIALCONFIGURATIONL_DUP5=0x24
+[TRACE]TRACE_NORMAL[0x86]_REF_CUSBBATTERYCHARGINGPLUGIN_SETINITIALCONFIGURATIONL_DUP6=0x25
+[TRACE]TRACE_NORMAL[0x86]_REF_CUSBBATTERYCHARGINGPLUGIN_SETINITIALCONFIGURATIONL_DUP7=0x26
+[TRACE]TRACE_NORMAL[0x86]_REF_CUSBBATTERYCHARGINGPLUGIN_SETINITIALCONFIGURATIONL_DUP8=0x27
+[TRACE]TRACE_NORMAL[0x86]_REF_CUSBBATTERYCHARGINGPLUGIN_SETINITIALCONFIGURATIONL_DUP9=0x28
+[TRACE]TRACE_NORMAL[0x86]_REF_CUSBBATTERYCHARGINGPLUGIN_SETNEGOTIATEDCURRENT=0x43
+[TRACE]TRACE_NORMAL[0x86]_REF_CUSBBATTERYCHARGINGPLUGIN_SETNEGOTIATEDCURRENT_DUP1=0x44
+[TRACE]TRACE_NORMAL[0x86]_REF_CUSBBATTERYCHARGINGPLUGIN_SETSTATE=0x31
+[TRACE]TRACE_NORMAL[0x86]_REF_CUSBBATTERYCHARGINGPLUGIN_SETSTATE_DUP1=0x32
+[TRACE]TRACE_NORMAL[0x86]_REF_CUSBBATTERYCHARGINGPLUGIN_STARTCHARGING=0x45
+[TRACE]TRACE_NORMAL[0x86]_REF_CUSBBATTERYCHARGINGPLUGIN_STARTCHARGING_DUP1=0x46
+[TRACE]TRACE_NORMAL[0x86]_REF_CUSBBATTERYCHARGINGPLUGIN_STOPCHARGING=0x47
+[TRACE]TRACE_NORMAL[0x86]_REF_TUSBBATTERYCHARGINGPLUGINSTATEBASE_DEVICESTATETIMEOUT=0x3
+[TRACE]TRACE_NORMAL[0x86]_REF_TUSBBATTERYCHARGINGPLUGINSTATEBASE_HANDLEREPOSITORYVALUECHANGEDL=0x1
+[TRACE]TRACE_NORMAL[0x86]_REF_TUSBBATTERYCHARGINGPLUGINSTATEBASE_HANDLEREPOSITORYVALUECHANGEDL_DUP1=0x2
+[TRACE]TRACE_NORMAL[0x86]_REF_TUSBBATTERYCHARGINGPLUGINSTATEBASE_MPSOIDPINSTATECHANGED=0x4
+[TRACE]TRACE_NORMAL[0x86]_REF_TUSBBATTERYCHARGINGPLUGINSTATEBASE_MPSOVBUSSTATECHANGED=0x5
+[TRACE]TRACE_NORMAL[0x86]_REF_TUSBBATTERYCHARGINGPLUGINSTATEBASE_MPSOVBUSSTATECHANGED_DUP1=0x6
+[TRACE]TRACE_NORMAL[0x86]_REF_TUSBBATTERYCHARGINGPLUGINSTATECHARGING_USBDEVICESTATECHANGE=0xe
+[TRACE]TRACE_NORMAL[0x86]_REF_TUSBBATTERYCHARGINGPLUGINSTATECURRENTNEGOTIATING_DEVICESTATETIMEOUT=0xd
+[TRACE]TRACE_NORMAL[0x86]_REF_TUSBBATTERYCHARGINGPLUGINSTATECURRENTNEGOTIATING_USBDEVICESTATECHANGE=0x8
+[TRACE]TRACE_NORMAL[0x86]_REF_TUSBBATTERYCHARGINGPLUGINSTATECURRENTNEGOTIATING_USBDEVICESTATECHANGE_DUP1=0x9
+[TRACE]TRACE_NORMAL[0x86]_REF_TUSBBATTERYCHARGINGPLUGINSTATECURRENTNEGOTIATING_USBDEVICESTATECHANGE_DUP2=0xa
+[TRACE]TRACE_NORMAL[0x86]_REF_TUSBBATTERYCHARGINGPLUGINSTATECURRENTNEGOTIATING_USBDEVICESTATECHANGE_DUP3=0xb
+[TRACE]TRACE_NORMAL[0x86]_REF_TUSBBATTERYCHARGINGPLUGINSTATEIDLENEGOTIATED_USBDEVICESTATECHANGE=0xf
+[TRACE]TRACE_NORMAL[0x86]_REF_TUSBBATTERYCHARGINGPLUGINSTATEIDLE_USBDEVICESTATECHANGE=0x7
+[TRACE]TRACE_NORMAL[0x86]_REF_TUSBBATTERYCHARGINGPLUGINSTATEUSERDISABLED_HANDLEREPOSITORYVALUECHANGEDL=0x11
+[TRACE]TRACE_NORMAL[0x86]_REF_TUSBBATTERYCHARGINGPLUGINSTATEUSERDISABLED_HANDLEREPOSITORYVALUECHANGEDL_DUP1=0x12
+[TRACE]TRACE_NORMAL[0x86]_REF_TUSBBATTERYCHARGINGPLUGINSTATEUSERDISABLED_HANDLEREPOSITORYVALUECHANGEDL_DUP2=0x13
+[TRACE]TRACE_NORMAL[0x86]_REF_TUSBBATTERYCHARGINGPLUGINSTATEUSERDISABLED_HANDLEREPOSITORYVALUECHANGEDL_DUP3=0x14
+[TRACE]TRACE_NORMAL[0x86]_REF_TUSBBATTERYCHARGINGPLUGINSTATEUSERDISABLED_MPSOIDPINSTATECHANGED=0x15
+[TRACE]TRACE_NORMAL[0x86]_REF_TUSBBATTERYCHARGINGPLUGINSTATEUSERDISABLED_MPSOVBUSSTATECHANGED=0x16
+[TRACE]TRACE_NORMAL[0x86]_REF_TUSBBATTERYCHARGINGPLUGINSTATEUSERDISABLED_MPSOVBUSSTATECHANGED_DUP1=0x17
+[TRACE]TRACE_NORMAL[0x86]_REF_TUSBBATTERYCHARGINGPLUGINSTATEUSERDISABLED_USBDEVICESTATECHANGE=0x10
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_REF_CUSBBATTERYCHARGINGPLUGIN_GETINTERFACE_DUP1=0x73
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_REF_CUSBBATTERYCHARGINGPLUGIN_GETINTERFACE_DUP2=0x74
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_REF_CUSBBATTERYCHARGINGPLUGIN_SETNEGOTIATEDCURRENT=0x70
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_REF_CUSBBATTERYCHARGINGPLUGIN_SETNEGOTIATEDCURRENT_DUP1=0x71
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_REF_CUSBBATTERYCHARGINGPLUGIN_STARTCHARGING=0x6d
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_REF_CUSBBATTERYCHARGINGPLUGIN_STARTCHARGING_DUP1=0x6e
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_REF_CUSBBATTERYCHARGINGPLUGIN_STOPCHARGING=0x6f
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_REF_TUSBBATTERYCHARGINGPLUGINSTATEBASE_TUSBBATTERYCHARGINGPLUGINSTATEBASE_ENTRY=0x11
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_REF_TUSBBATTERYCHARGINGPLUGINSTATEBASE_TUSBBATTERYCHARGINGPLUGINSTATEBASE_EXIT=0x12
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_REF_TUSBBATTERYCHARGINGPLUGINSTATECHARGING_TUSBBATTERYCHARGINGPLUGINSTATECHARGING_ENTRY=0x1d
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_REF_TUSBBATTERYCHARGINGPLUGINSTATECHARGING_TUSBBATTERYCHARGINGPLUGINSTATECHARGING_EXIT=0x1e
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_REF_TUSBBATTERYCHARGINGPLUGINSTATECURRENTNEGOTIATING_TUSBBATTERYCHARGINGPLUGINSTATECURRENTNEGOTIATING_ENTRY=0x17
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_REF_TUSBBATTERYCHARGINGPLUGINSTATECURRENTNEGOTIATING_TUSBBATTERYCHARGINGPLUGINSTATECURRENTNEGOTIATING_EXIT=0x18
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_REF_TUSBBATTERYCHARGINGPLUGINSTATEIDLENEGOTIATED_TUSBBATTERYCHARGINGPLUGINSTATEIDLENEGOTIATED_ENTRY=0x23
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_REF_TUSBBATTERYCHARGINGPLUGINSTATEIDLENEGOTIATED_TUSBBATTERYCHARGINGPLUGINSTATEIDLENEGOTIATED_EXIT=0x24
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_REF_TUSBBATTERYCHARGINGPLUGINSTATEIDLE_TUSBBATTERYCHARGINGPLUGINSTATEIDLE_ENTRY=0x13
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_REF_TUSBBATTERYCHARGINGPLUGINSTATEIDLE_TUSBBATTERYCHARGINGPLUGINSTATEIDLE_EXIT=0x14
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_REF_TUSBBATTERYCHARGINGPLUGINSTATENOVALIDCURRENT_TUSBBATTERYCHARGINGPLUGINSTATENOVALIDCURRENT_ENTRY=0x21
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_REF_TUSBBATTERYCHARGINGPLUGINSTATENOVALIDCURRENT_TUSBBATTERYCHARGINGPLUGINSTATENOVALIDCURRENT_EXIT=0x22
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_REF_TUSBBATTERYCHARGINGPLUGINSTATEUSERDISABLED_TUSBBATTERYCHARGINGPLUGINSTATEUSERDISABLED_ENTRY=0x27
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_REF_TUSBBATTERYCHARGINGPLUGINSTATEUSERDISABLED_TUSBBATTERYCHARGINGPLUGINSTATEUSERDISABLED_EXIT=0x28
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_RES_TUSBBATTERYCHARGINGPLUGINSTATEBENDEDCABLENOTPRESENT_TUSBBATTERYCHARGINGPLUGINSTATEBENDEDCABLENOTPRESENT_ENTRY=0x33
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_RES_TUSBBATTERYCHARGINGPLUGINSTATEBENDEDCABLENOTPRESENT_TUSBBATTERYCHARGINGPLUGINSTATEBENDEDCABLENOTPRESENT_EXIT=0x34
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_REF_CUSBBATTERYCHARGINGPLUGIN_PANIC=0x30
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_REF_TUSBBATTERYCHARGINGPLUGINSTATEBASE_HANDLEREPOSITORYVALUECHANGEDL_DUP2=0xc
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]__REF_CUSBBATTERYCHARGINGPLUGIN_CONSTRUCTL_DUP3=0x1b
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]__REF_CUSBBATTERYCHARGINGPLUGIN_CONSTRUCTL_DUP4=0x1c
--- a/usbmgmt/usbmgr/usbman/client/SRC/RUsb.cpp Wed Jul 07 14:16:40 2010 +0800
+++ b/usbmgmt/usbmgr/usbman/client/SRC/RUsb.cpp Wed Jul 07 15:08:54 2010 +0800
@@ -19,17 +19,20 @@
#include <usbman.h>
#include <usb.h>
#include <e32base.h>
-#include "rusb.h"
-#include <usb/usblogger.h>
-
-#ifdef __FLOG_ACTIVE
-_LIT8(KLogComponent, "USBMAN");
-#endif
#ifdef __USBMAN_NO_PROCESSES__
#include <e32math.h>
#endif
+#include <usb/usblogger.h>
+
+#include "rusb.h"
+
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "RUsbTraces.h"
+#endif
+
static TInt StartServer()
//
@@ -109,7 +112,8 @@
server.Close();
- LOGTEXT2(_L8("USB server started successfully: err = %d\n"),err);
+ OstTrace1( TRACE_NORMAL, RUSB_STARTSERVER, "::StartServer;USB server started successfully: err=%d", err );
+
return err;
}
@@ -121,14 +125,14 @@
: iDeviceStatePkg(0), iServiceStatePkg(0), iMessagePkg(0),
iHostPkg(TDeviceEventInformation())
{
- LOG_LINE
- LOG_FUNC
+ OstTraceFunctionEntry0( RUSB_RUSB_CONS_ENTRY );
+ OstTraceFunctionExit0( RUSB_RUSB_CONS_EXIT );
}
EXPORT_C RUsb::~RUsb()
{
- LOG_LINE
- LOG_FUNC
+ OstTraceFunctionEntry0( RUSB_RUSB_DES_ENTRY );
+ OstTraceFunctionExit0( RUSB_RUSB_DES_EXIT );
}
EXPORT_C TVersion RUsb::Version() const
@@ -138,9 +142,7 @@
EXPORT_C TInt RUsb::Connect()
{
- LOG_LINE
- LOG_FUNC
-
+ OstTraceFunctionEntry0( RUSB_CONNECT_ENTRY );
TInt retry = 2;
FOREVER
@@ -150,11 +152,13 @@
if ((err != KErrNotFound) && (err != KErrServerTerminated))
{
+ OstTraceFunctionExit0( RUSB_CONNECT_EXIT );
return err;
}
if (--retry == 0)
{
+ OstTraceFunctionExit0( RUSB_CONNECT_EXIT_DUP1 );
return err;
}
@@ -162,6 +166,7 @@
if ((err != KErrNone) && (err != KErrAlreadyExists))
{
+ OstTraceFunctionExit0( RUSB_CONNECT_EXIT_DUP2 );
return err;
}
}
@@ -169,149 +174,134 @@
EXPORT_C void RUsb::Start(TRequestStatus& aStatus)
{
- LOG_LINE
- LOG_FUNC
-
+ OstTraceFunctionEntry0( RUSB_START_ENTRY );
+
SendReceive(EUsbStart, aStatus);
+ OstTraceFunctionExit0( RUSB_START_EXIT );
}
EXPORT_C void RUsb::StartCancel()
{
- LOG_LINE
- LOG_FUNC
-
+ OstTraceFunctionEntry0( RUSB_STARTCANCEL_ENTRY );
SendReceive(EUsbStartCancel);
+ OstTraceFunctionExit0( RUSB_STARTCANCEL_EXIT );
}
EXPORT_C void RUsb::Stop()
{
- LOG_LINE
- LOG_FUNC
-
+ OstTraceFunctionEntry0( RUSB_STOP_ENTRY );
SendReceive(EUsbStop);
+ OstTraceFunctionExit0( RUSB_STOP_EXIT );
}
EXPORT_C void RUsb::Stop(TRequestStatus& aStatus)
{
- LOG_LINE
- LOG_FUNC
-
+ OstTraceFunctionEntry0( RUSB_STOP_TREQUESTSTATUS_ENTRY );
SendReceive(EUsbStop, aStatus);
+ OstTraceFunctionExit0( RUSB_STOP_TREQUESTSTATUS_EXIT );
}
EXPORT_C void RUsb::StopCancel()
{
- LOG_LINE
- LOG_FUNC
-
+ OstTraceFunctionEntry0( RUSB_STOPCANCEL_ENTRY );
SendReceive(EUsbStopCancel);
+ OstTraceFunctionExit0( RUSB_STOPCANCEL_EXIT );
}
EXPORT_C TInt RUsb::GetServiceState(TUsbServiceState& aState)
{
- LOG_LINE
- LOG_FUNC
-
+ OstTraceFunctionEntry0( RUSB_GETSERVICESTATE_ENTRY );
TPckg<TUint32> pkg(aState);
TInt ret=SendReceive(EUsbGetCurrentState, TIpcArgs(&pkg));
aState=(TUsbServiceState)pkg();
+ OstTraceFunctionExit0( RUSB_GETSERVICESTATE_EXIT );
return ret;
}
EXPORT_C TInt RUsb::GetCurrentState(TUsbServiceState& aState)
{
- LOG_LINE
- LOG_FUNC
-
+ OstTraceFunctionEntry0( RUSB_GETCURRENTSTATE_ENTRY );
return GetServiceState(aState);
}
EXPORT_C void RUsb::ServiceStateNotification(TUsbServiceState& aState,
TRequestStatus& aStatus)
{
- LOG_LINE
- LOG_FUNC
+ OstTraceFunctionEntry0( RUSB_SERVICESTATENOTIFICATION_ENTRY );
iServiceStatePkg.Set((TUint8*)&aState, sizeof(TUint32), sizeof(TUint32));
SendReceive(EUsbRegisterServiceObserver, TIpcArgs(&iServiceStatePkg), aStatus);
+ OstTraceFunctionExit0( RUSB_SERVICESTATENOTIFICATION_EXIT );
}
EXPORT_C void RUsb::ServiceStateNotificationCancel()
{
- LOG_LINE
- LOG_FUNC
-
+ OstTraceFunctionEntry0( RUSB_SERVICESTATENOTIFICATIONCANCEL_ENTRY );
SendReceive(EUsbCancelServiceObserver);
+ OstTraceFunctionExit0( RUSB_SERVICESTATENOTIFICATIONCANCEL_EXIT );
}
EXPORT_C TInt RUsb::GetDeviceState(TUsbDeviceState& aState)
{
- LOG_LINE
- LOG_FUNC
-
+ OstTraceFunctionEntry0( RUSB_GETDEVICESTATE_ENTRY );
TPckg<TUint32> pkg(aState);
TInt ret=SendReceive(EUsbGetCurrentDeviceState, TIpcArgs(&pkg));
aState=(TUsbDeviceState)pkg();
+ OstTraceFunctionExit0( RUSB_GETDEVICESTATE_EXIT );
return ret;
}
EXPORT_C void RUsb::DeviceStateNotification(TUint aEventMask, TUsbDeviceState& aState,
TRequestStatus& aStatus)
{
- LOG_LINE
- LOG_FUNC
-
+ OstTraceFunctionEntry0( RUSB_DEVICESTATENOTIFICATION_ENTRY );
iDeviceStatePkg.Set((TUint8*)&aState, sizeof(TUint32), sizeof(TUint32));
SendReceive(EUsbRegisterObserver, TIpcArgs(aEventMask, &iDeviceStatePkg), aStatus);
+ OstTraceFunctionExit0( RUSB_DEVICESTATENOTIFICATION_EXIT );
}
EXPORT_C void RUsb::DeviceStateNotificationCancel()
{
- LOG_LINE
- LOG_FUNC
-
+ OstTraceFunctionEntry0( RUSB_DEVICESTATENOTIFICATIONCANCEL_ENTRY );
SendReceive(EUsbCancelObserver);
+ OstTraceFunctionExit0( RUSB_DEVICESTATENOTIFICATIONCANCEL_EXIT );
}
EXPORT_C void RUsb::StateNotification(TUint aEventMask, TUsbDeviceState& aState, TRequestStatus& aStatus)
{
- LOG_LINE
- LOG_FUNC
-
+ OstTraceFunctionEntry0( RUSB_STATENOTIFICATION_ENTRY );
DeviceStateNotification(aEventMask, aState, aStatus);
+ OstTraceFunctionExit0( RUSB_STATENOTIFICATION_EXIT );
}
EXPORT_C void RUsb::StateNotificationCancel()
{
- LOG_LINE
- LOG_FUNC
-
+ OstTraceFunctionEntry0( RUSB_STATENOTIFICATIONCANCEL_ENTRY );
DeviceStateNotificationCancel();
+ OstTraceFunctionExit0( RUSB_STATENOTIFICATIONCANCEL_EXIT );
}
EXPORT_C void RUsb::TryStart(TInt aPersonalityId, TRequestStatus& aStatus)
{
- LOG_LINE
- LOG_FUNC
+ OstTraceFunctionEntry0( RUSB_TRYSTART_ENTRY );
TIpcArgs ipcArgs(aPersonalityId);
SendReceive(EUsbTryStart, ipcArgs, aStatus);
+ OstTraceFunctionExit0( RUSB_TRYSTART_EXIT );
}
EXPORT_C void RUsb::TryStop(TRequestStatus& aStatus)
{
- LOG_LINE
- LOG_FUNC
-
+ OstTraceFunctionEntry0( RUSB_TRYSTOP_ENTRY );
SendReceive(EUsbTryStop, aStatus);
+ OstTraceFunctionExit0( RUSB_TRYSTOP_EXIT );
}
EXPORT_C TInt RUsb::CancelInterest(TUsbReqType aMessageId)
{
- LOG_LINE
- LOG_FUNC
+ OstTraceFunctionEntry0( RUSB_CANCELINTEREST_ENTRY );
TInt messageId;
switch (aMessageId)
@@ -338,9 +328,7 @@
EXPORT_C TInt RUsb::GetDescription(TInt aPersonalityId, HBufC*& aLocalizedPersonalityDescriptor)
{
- LOG_LINE
- LOG_FUNC
-
+ OstTraceFunctionEntry0( RUSB_GETDESCRIPTION_ENTRY );
TInt ret = KErrNone;
// caller is responsible for freeing up memory allocatd for aLocalizedPersonalityDescriptor
TRAP(ret, aLocalizedPersonalityDescriptor = HBufC::NewL(KUsbStringDescStringMaxSize));
@@ -357,31 +345,31 @@
aLocalizedPersonalityDescriptor = NULL;
}
+ OstTraceFunctionExit0( RUSB_GETDESCRIPTION_EXIT );
return ret;
}
EXPORT_C TInt RUsb::GetCurrentPersonalityId(TInt& aPersonalityId)
{
- LOG_LINE
- LOG_FUNC
+ OstTraceFunctionEntry0( RUSB_GETCURRENTPERSONALITYID_ENTRY );
TPckg<TInt> pkg0(aPersonalityId);
TInt ret = SendReceive(EUsbGetCurrentPersonalityId, TIpcArgs(&pkg0));
aPersonalityId = static_cast<TInt>(pkg0());
+ OstTraceFunctionExit0( RUSB_GETCURRENTPERSONALITYID_EXIT );
return ret;
}
EXPORT_C TInt RUsb::GetSupportedClasses(TInt aPersonalityId, RArray<TUid>& aClassUids)
{
- LOG_LINE
- LOG_FUNC
-
+ OstTraceFunctionEntry0( RUSB_GETSUPPORTEDCLASSES_ENTRY );
TInt ret = KErrNone;
HBufC8* buf = NULL;
// +1 for the actual count of personality ids
TRAP(ret, buf = HBufC8::NewL((KUsbMaxSupportedClasses + 1)*sizeof (TInt32)));
if (ret != KErrNone)
{
+ OstTraceFunctionExit0( RUSB_GETSUPPORTEDCLASSES_EXIT );
return ret;
}
@@ -394,6 +382,7 @@
if (!recvedIds)
{
delete buf;
+ OstTraceFunctionExit0( RUSB_GETSUPPORTEDCLASSES_EXIT_DUP1 );
return KErrCorrupt;
}
@@ -432,13 +421,13 @@
}
delete buf;
+ OstTraceFunctionExit0( RUSB_GETSUPPORTEDCLASSES_EXIT_DUP2 );
return ret;
}
EXPORT_C TInt RUsb::ClassSupported(TInt aPersonalityId, TUid aClassUid, TBool& aSupported)
{
- LOG_LINE
- LOG_FUNC
+ OstTraceFunctionEntry0( RUSB_CLASSSUPPORTED_ENTRY );
TPckg<TInt32> pkg2(aSupported);
TIpcArgs ipcArgs(aPersonalityId, aClassUid.iUid, &pkg2);
@@ -450,20 +439,20 @@
aSupported = static_cast<TBool>(pkg2());
}
+ OstTraceFunctionExit0( RUSB_CLASSSUPPORTED_EXIT );
return ret;
}
EXPORT_C TInt RUsb::GetPersonalityIds(RArray<TInt>& aPersonalityIds)
{
- LOG_LINE
- LOG_FUNC
-
+ OstTraceFunctionEntry0( RUSB_GETPERSONALITYIDS_ENTRY );
TInt ret = KErrNone;
HBufC8* buf = NULL;
// +1 for the actual count of personality ids
TRAP(ret, buf = HBufC8::NewL((KUsbMaxSupportedPersonalities + 1)*sizeof (TInt)));
if (ret != KErrNone)
{
+ OstTraceFunctionExit0( RUSB_GETPERSONALITYIDS_EXIT );
return ret;
}
@@ -476,6 +465,7 @@
if (!recvedIds)
{
delete buf;
+ OstTraceFunctionExit0( RUSB_GETPERSONALITYIDS_EXIT_DUP1 );
return KErrCorrupt;
}
@@ -515,6 +505,7 @@
}
delete buf;
+ OstTraceFunctionExit0( RUSB_GETPERSONALITYIDS_EXIT_DUP2 );
return ret;
}
@@ -567,14 +558,14 @@
}
EXPORT_C void panic()
- {
- _USB_PANIC(KUsbCliPncCat, EUsbPanicRemovedExport);
+ {
+ OstTrace1( TRACE_FATAL, RUSB_PANIC, "::panic;Panic reason=%d", EUsbPanicRemovedExport );
+ User::Panic(KUsbCliPncCat, EUsbPanicRemovedExport);
}
EXPORT_C TInt RUsb::SetCtlSessionMode(TBool aValue)
{
- LOG_LINE
- LOG_FUNC
+ OstTraceFunctionEntry0( RUSB_SETCTLSESSIONMODE_ENTRY );
TPckg<TBool> pkg(aValue);
return SendReceive(EUsbSetCtlSessionMode, TIpcArgs(&pkg));
@@ -582,94 +573,82 @@
EXPORT_C TInt RUsb::BusRequest()
{
- LOG_LINE
- LOG_FUNC
+ OstTraceFunctionEntry0( RUSB_BUSREQUEST_ENTRY );
return SendReceive(EUsbBusRequest);
}
EXPORT_C TInt RUsb::BusRespondSrp()
{
- LOG_LINE
- LOG_FUNC
+ OstTraceFunctionEntry0( RUSB_BUSRESPONDSRP_ENTRY );
return SendReceive(EUsbBusRespondSrp);
}
EXPORT_C TInt RUsb::BusClearError()
{
- LOG_LINE
- LOG_FUNC
-
+ OstTraceFunctionEntry0( RUSB_BUSCLEARERROR_ENTRY );
return SendReceive(EUsbBusClearError);
}
EXPORT_C TInt RUsb::BusDrop()
{
- LOG_LINE
- LOG_FUNC
-
+ OstTraceFunctionEntry0( RUSB_BUSDROP_ENTRY );
return SendReceive(EUsbBusDrop);
}
EXPORT_C void RUsb::MessageNotification(TRequestStatus& aStatus, TInt& aMessage)
{
- LOG_LINE
- LOG_FUNC
-
+ OstTraceFunctionEntry0( RUSB_MESSAGENOTIFICATION_ENTRY );
iMessagePkg.Set((TUint8*)&aMessage, sizeof(TInt), sizeof(TInt));
SendReceive(EUsbRegisterMessageObserver, TIpcArgs(&iMessagePkg), aStatus);
+ OstTraceFunctionExit0( RUSB_MESSAGENOTIFICATION_EXIT );
}
EXPORT_C void RUsb::MessageNotificationCancel()
{
- LOG_LINE
- LOG_FUNC
-
+ OstTraceFunctionEntry0( RUSB_MESSAGENOTIFICATIONCANCEL_ENTRY );
SendReceive(EUsbCancelMessageObserver);
+ OstTraceFunctionExit0( RUSB_MESSAGENOTIFICATIONCANCEL_EXIT );
}
EXPORT_C void RUsb::HostEventNotification(TRequestStatus& aStatus,
TDeviceEventInformation& aDeviceInformation)
{
- LOG_LINE
- LOG_FUNC
+ OstTraceFunctionEntry0( RUSB_HOSTEVENTNOTIFICATION_ENTRY );
iHostPkg.Set((TUint8*)&aDeviceInformation, sizeof(TDeviceEventInformation), sizeof(TDeviceEventInformation));
SendReceive(EUsbRegisterHostObserver, TIpcArgs(&iHostPkg), aStatus);
+ OstTraceFunctionExit0( RUSB_HOSTEVENTNOTIFICATION_EXIT );
}
EXPORT_C void RUsb::HostEventNotificationCancel()
{
- LOG_LINE
- LOG_FUNC
-
+ OstTraceFunctionEntry0( RUSB_HOSTEVENTNOTIFICATIONCANCEL_ENTRY );
SendReceive(EUsbCancelHostObserver);
+ OstTraceFunctionExit0( RUSB_HOSTEVENTNOTIFICATIONCANCEL_EXIT );
}
EXPORT_C TInt RUsb::EnableFunctionDriverLoading()
{
- LOG_LINE
- LOG_FUNC
+ OstTraceFunctionEntry0( RUSB_ENABLEFUNCTIONDRIVERLOADING_ENTRY );
return SendReceive(EUsbEnableFunctionDriverLoading);
}
EXPORT_C void RUsb::DisableFunctionDriverLoading()
{
- LOG_LINE
- LOG_FUNC
-
+ OstTraceFunctionEntry0( RUSB_DISABLEFUNCTIONDRIVERLOADING_ENTRY );
SendReceive(EUsbDisableFunctionDriverLoading);
+ OstTraceFunctionExit0( RUSB_DISABLEFUNCTIONDRIVERLOADING_EXIT );
}
EXPORT_C TInt RUsb::GetSupportedLanguages(TUint aDeviceId, RArray<TUint>& aLangIds)
{
- LOG_LINE
- LOG_FUNC
+ OstTraceFunctionEntry0( RUSB_GETSUPPORTEDLANGUAGES_ENTRY );
aLangIds.Reset();
@@ -679,6 +658,7 @@
TRAP(ret, buf = HBufC8::NewL((KUsbMaxSupportedLanguageIds + 1)*sizeof (TUint)));
if (ret != KErrNone)
{
+ OstTraceFunctionExit0( RUSB_GETSUPPORTEDLANGUAGES_EXIT );
return ret;
}
@@ -691,6 +671,7 @@
if (!recvedIds)
{
delete buf;
+ OstTraceFunctionExit0( RUSB_GETSUPPORTEDLANGUAGES_EXIT_DUP1 );
return KErrCorrupt;
}
@@ -708,30 +689,26 @@
}
delete buf;
+ OstTraceFunctionExit0( RUSB_GETSUPPORTEDLANGUAGES_EXIT_DUP2 );
return ret;
}
EXPORT_C TInt RUsb::GetManufacturerStringDescriptor(TUint aDeviceId, TUint aLangId, TName& aString)
{
- LOG_LINE
- LOG_FUNC
+ OstTraceFunctionEntry0( RUSB_GETMANUFACTURERSTRINGDESCRIPTOR_ENTRY );
return SendReceive(EUsbGetManufacturerStringDescriptor, TIpcArgs(aDeviceId, aLangId, &aString));
}
EXPORT_C TInt RUsb::GetProductStringDescriptor(TUint aDeviceId, TUint aLangId, TName& aString)
{
- LOG_LINE
- LOG_FUNC
-
+ OstTraceFunctionEntry0( RUSB_GETPRODUCTSTRINGDESCRIPTOR_ENTRY );
return SendReceive(EUsbGetProductStringDescriptor, TIpcArgs(aDeviceId, aLangId, &aString));
}
EXPORT_C TInt RUsb::GetOtgDescriptor(TUint aDeviceId, TOtgDescriptor& aDescriptor)
{
- LOG_LINE
- LOG_FUNC
-
+ OstTraceFunctionEntry0( RUSB_GETOTGDESCRIPTOR_ENTRY );
TPckg<TOtgDescriptor> otgDescPkg(aDescriptor);
TIpcArgs args;
@@ -744,24 +721,22 @@
EXPORT_C TInt RUsb::RequestSession()
{
- LOG_LINE
- LOG_FUNC
+ OstTraceFunctionEntry0( RUSB_REQUESTSESSION_ENTRY );
return SendReceive(EUsbRequestSession);
}
EXPORT_C TInt RUsb::GetDetailedDescription(TInt /*aPersonalityId*/, HBufC*& /*aLocalizedPersonalityDescriptor*/)
{
- LOG_LINE
- LOG_FUNC
+ OstTraceFunctionEntry0( RUSB_GETDETAILEDDESCRIPTION_ENTRY );
//This API has been deprecated
+ OstTraceFunctionExit0( RUSB_GETDETAILEDDESCRIPTION_EXIT );
return KErrNotSupported;
}
EXPORT_C TInt RUsb::GetPersonalityProperty(TInt aPersonalityId, TUint32& aProperty)
{
- LOG_LINE
- LOG_FUNC
+ OstTraceFunctionEntry0( RUSB_GETPERSONALITYPROPERTY_ENTRY );
TPckg<TUint32> pkg(aProperty);
TInt ret = SendReceive(EUsbGetPersonalityProperty, TIpcArgs(aPersonalityId, &pkg));
@@ -769,6 +744,7 @@
{
aProperty = static_cast<TUint32>(pkg());
}
+ OstTraceFunctionExit0( RUSB_GETPERSONALITYPROPERTY_EXIT );
return ret;
}
--- a/usbmgmt/usbmgr/usbman/client/group/Usbman.mmp Wed Jul 07 14:16:40 2010 +0800
+++ b/usbmgmt/usbmgr/usbman/client/group/Usbman.mmp 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"
@@ -34,14 +34,14 @@
sourcepath ../SRC
source RUsb.cpp
-userinclude ../../server/public
+userinclude ../../server/public
+userinclude ../traces
+
OS_LAYER_SYSTEMINCLUDE_SYMBIAN
library euser.lib
-#include <usb/usblogger.mmh>
-
VENDORID 0x70000001
UNPAGED
--- a/usbmgmt/usbmgr/usbman/client/group/Usbman_over_dummyusbdi.mmp Wed Jul 07 14:16:40 2010 +0800
+++ b/usbmgmt/usbmgr/usbman/client/group/Usbman_over_dummyusbdi.mmp 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"
@@ -38,12 +38,11 @@
source RUsb.cpp
OS_LAYER_SYSTEMINCLUDE_SYMBIAN
-userinclude ../../server/public
+userinclude ../../server/public
+userinclude ../traces
library euser.lib
-#include <usb/usblogger.mmh>
-
VENDORID 0x70000001
UNPAGED
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usbmgmt/usbmgr/usbman/client/traces/OstTraceDefinitions.h Wed Jul 07 15:08:54 2010 +0800
@@ -0,0 +1,7 @@
+#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
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usbmgmt/usbmgr/usbman/client/traces/fixed_id.definitions Wed Jul 07 15:08:54 2010 +0800
@@ -0,0 +1,107 @@
+#Fixed group and trace id definitions. If this file is removed, the identifiers are rebuilt.
+[GROUP]TRACE_FATAL=0x81
+[GROUP]TRACE_FLOW=0x8a
+[GROUP]TRACE_NORMAL=0x86
+[TRACE]TRACE_FATAL[0x81]_RUSB_PANIC=0x1
+[TRACE]TRACE_FLOW[0x8A]_RUSB_BUSCLEARERROR_ENTRY=0x3a
+[TRACE]TRACE_FLOW[0x8A]_RUSB_BUSDROP_ENTRY=0x3b
+[TRACE]TRACE_FLOW[0x8A]_RUSB_BUSREQUEST_ENTRY=0x38
+[TRACE]TRACE_FLOW[0x8A]_RUSB_BUSRESPONDSRP_ENTRY=0x39
+[TRACE]TRACE_FLOW[0x8A]_RUSB_CANCELINTEREST_ENTRY=0x28
+[TRACE]TRACE_FLOW[0x8A]_RUSB_CLASSSUPPORTED_ENTRY=0x31
+[TRACE]TRACE_FLOW[0x8A]_RUSB_CLASSSUPPORTED_EXIT=0x32
+[TRACE]TRACE_FLOW[0x8A]_RUSB_CONNECT_ENTRY=0x5
+[TRACE]TRACE_FLOW[0x8A]_RUSB_CONNECT_EXIT=0x6
+[TRACE]TRACE_FLOW[0x8A]_RUSB_CONNECT_EXIT_DUP1=0x7
+[TRACE]TRACE_FLOW[0x8A]_RUSB_CONNECT_EXIT_DUP2=0x8
+[TRACE]TRACE_FLOW[0x8A]_RUSB_DEVICESTATENOTIFICATIONCANCEL_ENTRY=0x1e
+[TRACE]TRACE_FLOW[0x8A]_RUSB_DEVICESTATENOTIFICATIONCANCEL_EXIT=0x1f
+[TRACE]TRACE_FLOW[0x8A]_RUSB_DEVICESTATENOTIFICATION_ENTRY=0x1c
+[TRACE]TRACE_FLOW[0x8A]_RUSB_DEVICESTATENOTIFICATION_EXIT=0x1d
+[TRACE]TRACE_FLOW[0x8A]_RUSB_DISABLEFUNCTIONDRIVERLOADING_ENTRY=0x45
+[TRACE]TRACE_FLOW[0x8A]_RUSB_DISABLEFUNCTIONDRIVERLOADING_EXIT=0x46
+[TRACE]TRACE_FLOW[0x8A]_RUSB_ENABLEFUNCTIONDRIVERLOADING_ENTRY=0x44
+[TRACE]TRACE_FLOW[0x8A]_RUSB_GETCURRENTPERSONALITYID_ENTRY=0x2b
+[TRACE]TRACE_FLOW[0x8A]_RUSB_GETCURRENTPERSONALITYID_EXIT=0x2c
+[TRACE]TRACE_FLOW[0x8A]_RUSB_GETCURRENTSTATE_ENTRY=0x15
+[TRACE]TRACE_FLOW[0x8A]_RUSB_GETDESCRIPTION_ENTRY=0x29
+[TRACE]TRACE_FLOW[0x8A]_RUSB_GETDESCRIPTION_EXIT=0x2a
+[TRACE]TRACE_FLOW[0x8A]_RUSB_GETDETAILEDDESCRIPTION_ENTRY=0x4f
+[TRACE]TRACE_FLOW[0x8A]_RUSB_GETDETAILEDDESCRIPTION_EXIT=0x50
+[TRACE]TRACE_FLOW[0x8A]_RUSB_GETDEVICESTATE_ENTRY=0x1a
+[TRACE]TRACE_FLOW[0x8A]_RUSB_GETDEVICESTATE_EXIT=0x1b
+[TRACE]TRACE_FLOW[0x8A]_RUSB_GETMANUFACTURERSTRINGDESCRIPTOR_ENTRY=0x4b
+[TRACE]TRACE_FLOW[0x8A]_RUSB_GETOTGDESCRIPTOR_ENTRY=0x4d
+[TRACE]TRACE_FLOW[0x8A]_RUSB_GETPERSONALITYIDS_ENTRY=0x33
+[TRACE]TRACE_FLOW[0x8A]_RUSB_GETPERSONALITYIDS_EXIT=0x34
+[TRACE]TRACE_FLOW[0x8A]_RUSB_GETPERSONALITYIDS_EXIT_DUP1=0x35
+[TRACE]TRACE_FLOW[0x8A]_RUSB_GETPERSONALITYIDS_EXIT_DUP2=0x36
+[TRACE]TRACE_FLOW[0x8A]_RUSB_GETPERSONALITYPROPERTY_ENTRY=0x51
+[TRACE]TRACE_FLOW[0x8A]_RUSB_GETPERSONALITYPROPERTY_EXIT=0x52
+[TRACE]TRACE_FLOW[0x8A]_RUSB_GETPRODUCTSTRINGDESCRIPTOR_ENTRY=0x4c
+[TRACE]TRACE_FLOW[0x8A]_RUSB_GETSERVICESTATE_ENTRY=0x13
+[TRACE]TRACE_FLOW[0x8A]_RUSB_GETSERVICESTATE_EXIT=0x14
+[TRACE]TRACE_FLOW[0x8A]_RUSB_GETSUPPORTEDCLASSES_ENTRY=0x2d
+[TRACE]TRACE_FLOW[0x8A]_RUSB_GETSUPPORTEDCLASSES_EXIT=0x2e
+[TRACE]TRACE_FLOW[0x8A]_RUSB_GETSUPPORTEDCLASSES_EXIT_DUP1=0x2f
+[TRACE]TRACE_FLOW[0x8A]_RUSB_GETSUPPORTEDCLASSES_EXIT_DUP2=0x30
+[TRACE]TRACE_FLOW[0x8A]_RUSB_GETSUPPORTEDLANGUAGES_ENTRY=0x47
+[TRACE]TRACE_FLOW[0x8A]_RUSB_GETSUPPORTEDLANGUAGES_EXIT=0x48
+[TRACE]TRACE_FLOW[0x8A]_RUSB_GETSUPPORTEDLANGUAGES_EXIT_DUP1=0x49
+[TRACE]TRACE_FLOW[0x8A]_RUSB_GETSUPPORTEDLANGUAGES_EXIT_DUP2=0x4a
+[TRACE]TRACE_FLOW[0x8A]_RUSB_HOSTEVENTNOTIFICATIONCANCEL_ENTRY=0x42
+[TRACE]TRACE_FLOW[0x8A]_RUSB_HOSTEVENTNOTIFICATIONCANCEL_EXIT=0x43
+[TRACE]TRACE_FLOW[0x8A]_RUSB_HOSTEVENTNOTIFICATION_ENTRY=0x40
+[TRACE]TRACE_FLOW[0x8A]_RUSB_HOSTEVENTNOTIFICATION_EXIT=0x41
+[TRACE]TRACE_FLOW[0x8A]_RUSB_MESSAGENOTIFICATIONCANCEL_ENTRY=0x3e
+[TRACE]TRACE_FLOW[0x8A]_RUSB_MESSAGENOTIFICATIONCANCEL_EXIT=0x3f
+[TRACE]TRACE_FLOW[0x8A]_RUSB_MESSAGENOTIFICATION_ENTRY=0x3c
+[TRACE]TRACE_FLOW[0x8A]_RUSB_MESSAGENOTIFICATION_EXIT=0x3d
+[TRACE]TRACE_FLOW[0x8A]_RUSB_REQUESTSESSION_ENTRY=0x4e
+[TRACE]TRACE_FLOW[0x8A]_RUSB_RUSB_CONS_ENTRY=0x53
+[TRACE]TRACE_FLOW[0x8A]_RUSB_RUSB_CONS_EXIT=0x54
+[TRACE]TRACE_FLOW[0x8A]_RUSB_RUSB_DES_ENTRY=0x55
+[TRACE]TRACE_FLOW[0x8A]_RUSB_RUSB_DES_EXIT=0x56
+[TRACE]TRACE_FLOW[0x8A]_RUSB_SERVICESTATENOTIFICATIONCANCEL_ENTRY=0x18
+[TRACE]TRACE_FLOW[0x8A]_RUSB_SERVICESTATENOTIFICATIONCANCEL_EXIT=0x19
+[TRACE]TRACE_FLOW[0x8A]_RUSB_SERVICESTATENOTIFICATION_ENTRY=0x16
+[TRACE]TRACE_FLOW[0x8A]_RUSB_SERVICESTATENOTIFICATION_EXIT=0x17
+[TRACE]TRACE_FLOW[0x8A]_RUSB_SETCTLSESSIONMODE_ENTRY=0x37
+[TRACE]TRACE_FLOW[0x8A]_RUSB_STARTCANCEL_ENTRY=0xb
+[TRACE]TRACE_FLOW[0x8A]_RUSB_STARTCANCEL_EXIT=0xc
+[TRACE]TRACE_FLOW[0x8A]_RUSB_START_ENTRY=0x9
+[TRACE]TRACE_FLOW[0x8A]_RUSB_START_EXIT=0xa
+[TRACE]TRACE_FLOW[0x8A]_RUSB_STATENOTIFICATIONCANCEL_ENTRY=0x22
+[TRACE]TRACE_FLOW[0x8A]_RUSB_STATENOTIFICATIONCANCEL_EXIT=0x23
+[TRACE]TRACE_FLOW[0x8A]_RUSB_STATENOTIFICATION_ENTRY=0x20
+[TRACE]TRACE_FLOW[0x8A]_RUSB_STATENOTIFICATION_EXIT=0x21
+[TRACE]TRACE_FLOW[0x8A]_RUSB_STOPCANCEL_ENTRY=0x11
+[TRACE]TRACE_FLOW[0x8A]_RUSB_STOPCANCEL_EXIT=0x12
+[TRACE]TRACE_FLOW[0x8A]_RUSB_STOP_ENTRY=0xd
+[TRACE]TRACE_FLOW[0x8A]_RUSB_STOP_EXIT=0xe
+[TRACE]TRACE_FLOW[0x8A]_RUSB_STOP_TREQUESTSTATUS_ENTRY=0x57
+[TRACE]TRACE_FLOW[0x8A]_RUSB_STOP_TREQUESTSTATUS_EXIT=0x58
+[TRACE]TRACE_FLOW[0x8A]_RUSB_TRYSTART_ENTRY=0x24
+[TRACE]TRACE_FLOW[0x8A]_RUSB_TRYSTART_EXIT=0x25
+[TRACE]TRACE_FLOW[0x8A]_RUSB_TRYSTOP_ENTRY=0x26
+[TRACE]TRACE_FLOW[0x8A]_RUSB_TRYSTOP_EXIT=0x27
+[TRACE]TRACE_NORMAL[0x86]_RUSB_STARTSERVER=0xd
+[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_RUSB_MESSAGENOTIFICATION_DUP6=0x1
+[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_RUSB_MESSAGENOTIFICATION_DUP9=0x2
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_RUSB_RUSB_ENTRY=0x1
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_RUSB_RUSB_ENTRY_DUP1=0x3
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_RUSB_RUSB_EXIT=0x2
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_RUSB_RUSB_EXIT_DUP1=0x4
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_RUSB_STOP_ENTRY_DUP1=0xf
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_RUSB_STOP_EXIT_DUP1=0x10
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_RUSB_MESSAGENOTIFICATION=0x2
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_RUSB_MESSAGENOTIFICATION_DUP1=0x9
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_RUSB_MESSAGENOTIFICATION_DUP11=0xb
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_RUSB_MESSAGENOTIFICATION_DUP2=0x3
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_RUSB_MESSAGENOTIFICATION_DUP3=0x5
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_RUSB_MESSAGENOTIFICATION_DUP4=0x7
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_RUSB_MESSAGENOTIFICATION_DUP5=0x8
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_RUSB_MESSAGENOTIFICATION_DUP7=0xa
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_RUSB_MESSAGENOTIFICATION_DUP8=0x6
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]__PANIC=0xc
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]__STARTSERVER=0x1
--- a/usbmgmt/usbmgr/usbman/server/INC/CUsbDevice.h Wed Jul 07 14:16:40 2010 +0800
+++ b/usbmgmt/usbmgr/usbman/server/INC/CUsbDevice.h Wed Jul 07 15:08:54 2010 +0800
@@ -159,13 +159,13 @@
void ResourceFileNameL(TFileName& aFileName);
void CreateClassControllersL(const RArray<TUid>& aClassUids);
TInt PowerUpAndConnect();
-#ifdef __FLOG_ACTIVE
+#ifdef _DEBUG
void PrintDescriptor(CUsbDevice::TUsbDeviceDescriptor& aDeviceDescriptor);
#endif
void InstantiateExtensionPluginsL();
private:
RPointerArray<CUsbClassControllerBase> iSupportedClasses;
- RPointerArray<MUsbDeviceNotify> iObservers;
+ RPointerArray<MUsbDeviceNotify> iObservers;
RPointerArray<CUsbmanExtensionPlugin> iExtensionPlugins;
TUsbDeviceState iDeviceState;
TUsbServiceState iServiceState;
--- a/usbmgmt/usbmgr/usbman/server/SRC/CPersonality.cpp Wed Jul 07 14:16:40 2010 +0800
+++ b/usbmgmt/usbmgr/usbman/server/SRC/CPersonality.cpp Wed Jul 07 15:08:54 2010 +0800
@@ -21,11 +21,11 @@
@internalAll
*/
-#include <usb/usblogger.h>
#include "CPersonality.h"
-#ifdef __FLOG_ACTIVE
-_LIT8(KLogComponent, "USBSVR");
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "CPersonalityTraces.h"
#endif
// Panic category only used in debug builds
@@ -48,12 +48,13 @@
*/
CPersonality* CPersonality::NewL()
{
- LOG_STATIC_FUNC_ENTRY
+ OstTraceFunctionEntry0( CPERSONALITY_NEWL_ENTRY );
CPersonality* self = new(ELeave) CPersonality;
CleanupStack::PushL(self);
self->ConstructL();
CleanupStack::Pop(self);
+ OstTraceFunctionExit0( CPERSONALITY_NEWL_EXIT );
return self;
}
@@ -62,8 +63,9 @@
*/
void CPersonality::ConstructL()
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CPERSONALITY_CONSTRUCTL_ENTRY );
iDescription = HBufC::NewL(KUsbStringDescStringMaxSize);
+ OstTraceFunctionExit0( CPERSONALITY_CONSTRUCTL_EXIT );
}
/**
@@ -78,9 +80,11 @@
*/
CPersonality::~CPersonality()
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CPERSONALITY_CPERSONALITY_DES_ENTRY );
+
iPersonalityConfigs.ResetAndDestroy();
delete iDescription;
+ OstTraceFunctionExit0( CPERSONALITY_CPERSONALITY_DES_EXIT );
}
/**
@@ -89,7 +93,11 @@
const RArray<CPersonalityConfigurations::TUsbClasses>& CPersonality::SupportedClasses() const
{
//we only support configuration 0 now
- __ASSERT_DEBUG( iPersonalityConfigs.Count() != 0, _USB_PANIC(KUsbPersonalityPanicCategory, EPersonalityConfigsArrayEmpty) );
+ if(iPersonalityConfigs.Count() == 0)
+ {
+ OstTrace1( TRACE_FATAL, CPERSONALITY_SUPPORTEDCLASSES, "CPersonality::SupportedClasses;Panic error=%d", EPersonalityConfigsArrayEmpty );
+ __ASSERT_DEBUG( EFalse, User::Panic(KUsbPersonalityPanicCategory, EPersonalityConfigsArrayEmpty) );
+ }
return iPersonalityConfigs[0]->Classes();
}
@@ -100,7 +108,11 @@
TBool CPersonality::ClassSupported(TUid aClassUid) const
{
//we only support configuration 0 now
- __ASSERT_DEBUG( iPersonalityConfigs.Count() != 0, _USB_PANIC(KUsbPersonalityPanicCategory, EPersonalityConfigsArrayEmpty) );
+ if(iPersonalityConfigs.Count() == 0)
+ {
+ OstTrace1( TRACE_FATAL, CPERSONALITY_CLASSSUPPORTED, "CPersonality::ClassSupported;Panic error=%d", EPersonalityConfigsArrayEmpty );
+ __ASSERT_DEBUG( EFalse, User::Panic(KUsbPersonalityPanicCategory, EPersonalityConfigsArrayEmpty) );
+ }
const RArray<CPersonalityConfigurations::TUsbClasses> &classes = iPersonalityConfigs[0]->Classes();
TInt classesCount = classes.Count();
for(TInt classesIndex = 0; classesIndex < classesCount; ++classesIndex)
@@ -249,6 +261,7 @@
*/
CPersonalityConfigurations::~CPersonalityConfigurations()
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CPERSONALITYCONFIGURATIONS_CPERSONALITYCONFIGURATIONS_DES_ENTRY );
iClasses.Close();
+ OstTraceFunctionExit0( CPERSONALITYCONFIGURATIONS_CPERSONALITYCONFIGURATIONS_DES_EXIT );
}
--- a/usbmgmt/usbmgr/usbman/server/SRC/CUsbDevice.cpp Wed Jul 07 14:16:40 2010 +0800
+++ b/usbmgmt/usbmgr/usbman/server/SRC/CUsbDevice.cpp Wed Jul 07 15:08:54 2010 +0800
@@ -20,7 +20,6 @@
/**
@file
*/
-
#include <cusbclasscontrolleriterator.h>
#include <cusbclasscontrollerbase.h>
#include <cusbclasscontrollerplugin.h>
@@ -48,12 +47,15 @@
#include "usbmancenrepmanager.h"
#include "usbmanprivatecrkeys.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "CUsbDeviceTraces.h"
+#endif
+
+
_LIT(KUsbLDDName, "eusbc"); //Name used in call to User::LoadLogicalDevice
_LIT(KUsbLDDFreeName, "Usbc"); //Name used in call to User::FreeLogicalDevice
-#ifdef __FLOG_ACTIVE
-_LIT8(KLogComponent, "USBSVR");
-#endif
// Panic category only used in debug builds
#ifdef _DEBUG
@@ -81,12 +83,13 @@
* @return A new CUsbDevice object
*/
{
- LOG_STATIC_FUNC_ENTRY
+ OstTraceFunctionEntry0( CUSBDEVICE_NEWL_ENTRY );
CUsbDevice* r = new (ELeave) CUsbDevice(aUsbServer);
CleanupStack::PushL(r);
r->ConstructL();
CleanupStack::Pop(r);
+ OstTraceFunctionExit0( CUSBDEVICE_NEWL_EXIT );
return r;
}
@@ -96,7 +99,7 @@
* Destructor.
*/
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CUSBDEVICE_CUSBDEVICE_DES_ENTRY );
// Cancel any outstanding asynchronous operation.
Cancel();
@@ -124,24 +127,27 @@
#ifndef __OVER_DUMMYUSBDI__
#ifndef __WINS__
- LOGTEXT2(_L8("about to delete device state watcher @ %08x"), (TUint32) iDeviceStateWatcher);
+ OstTrace1( TRACE_NORMAL, CUSBDEVICE_CUSBDEVICE, "CUsbDevice::~CUsbDevice;about to delete device state watcher @ %08x", (TUint32)iDeviceStateWatcher );
+
delete iDeviceStateWatcher;
- LOGTEXT(_L8("deleted device state watcher"));
+ OstTrace0( TRACE_NORMAL, CUSBDEVICE_CUSBDEVICE_DUP1, "CUsbDevice::~CUsbDevice;deleted device state watcher" );
iLdd.Close();
- LOGTEXT(_L8("Freeing logical device"));
+ OstTrace0( TRACE_NORMAL, CUSBDEVICE_CUSBDEVICE_DUP2, "CUsbDevice::~CUsbDevice;Freeing logical device" );
+
TInt err = User::FreeLogicalDevice(KUsbLDDFreeName);
//Putting the LOGTEXT2 inside the if statement prevents a compiler
//warning about err being unused in UREL builds.
if(err)
{
- LOGTEXT2(_L8(" User::FreeLogicalDevice returned %d"),err);
+ OstTrace1( TRACE_NORMAL, CUSBDEVICE_CUSBDEVICE_DUP3, "CUsbDevice::~CUsbDevice; User::FreeLogicalDevice returned err=%d", err );
}
#endif
#endif
delete iDefaultSerialNumber;
+ OstTraceFunctionExit0( CUSBDEVICE_CUSBDEVICE_DES_EXIT );
}
@@ -164,7 +170,7 @@
* Performs 2nd phase construction of the USB device.
*/
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CUSBDEVICE_CONSTRUCTL_ENTRY );
iEcom = &(REComSession::OpenL());
@@ -175,17 +181,25 @@
iDeviceConfiguration.iProductName = HBufC::NewL(KUsbStringDescStringMaxSize);
#ifndef __OVER_DUMMYUSBDI__
#ifndef __WINS__
- LOGTEXT(_L8("About to load LDD"));
+ OstTrace0( TRACE_NORMAL, CUSBDEVICE_CONSTRUCTL, "CUsbDevice::ConstructL; About to load LDD" );
+
TInt err = User::LoadLogicalDevice(KUsbLDDName);
if (err != KErrNone && err != KErrAlreadyExists)
{
- LEAVEL(err);
+ OstTrace1( TRACE_NORMAL, CUSBDEVICE_CONSTRUCTL_DUP10, "CUsbDevice::ConstructL;err=%d", err );
+ User::Leave(err);
}
- LOGTEXT(_L8("About to open LDD"));
- LEAVEIFERRORL(iLdd.Open(0));
- LOGTEXT(_L8("LDD opened"));
+ OstTrace0( TRACE_NORMAL, CUSBDEVICE_CONSTRUCTL_DUP1, "CUsbDevice::ConstructL; About to open LDD" );
+ err = iLdd.Open(0);
+ if(err < 0)
+ {
+ OstTrace1( TRACE_NORMAL, CUSBDEVICE_CONSTRUCTL_DUP9, "CUsbDevice::ConstructL;iLdd.Open(0) with error=%d", err );
+ User::Leave(err);
+ }
+ OstTrace0( TRACE_NORMAL, CUSBDEVICE_CONSTRUCTL_DUP2, "CUsbDevice::ConstructL; LDD opened" );
+
// hide bus from host while interfaces are being set up
iLdd.DeviceDisconnectFromHost();
@@ -196,21 +210,33 @@
// the device state is not undefined. This is to save power in the UDC
// when there's no point it being powered.
TUsbDeviceCaps devCapsBuf;
- LEAVEIFERRORL(iLdd.DeviceCaps(devCapsBuf));
+ err = iLdd.DeviceCaps(devCapsBuf);
+ if(err < 0)
+ {
+ OstTrace1( TRACE_NORMAL, CUSBDEVICE_CONSTRUCTL_DUP11, "CUsbDevice::ConstructL;iLdd.DeviceCaps(devCapsBuf) with error=%d", err );
+ User::Leave(err);
+ }
+
if ( devCapsBuf().iFeatureWord1 & KUsbDevCapsFeatureWord1_CableDetectWithoutPower )
{
- LOGTEXT(_L8("\tUDC supports cable detect when unpowered"));
+ OstTrace0( TRACE_NORMAL, CUSBDEVICE_CONSTRUCTL_DUP3, "CUsbDevice::ConstructL: UDC supports cable detect when unpowered" );
iUdcSupportsCableDetectWhenUnpowered = ETrue;
}
else
{
- LOGTEXT(_L8("\tUDC does not support cable detect when unpowered"));
+ OstTrace0( TRACE_NORMAL, CUSBDEVICE_CONSTRUCTL_DUP4, "CUsbDevice::ConstructL; UDC does not support cable detect when unpowered" );
}
TUsbcDeviceState deviceState;
- LEAVEIFERRORL(iLdd.DeviceStatus(deviceState));
+ err = iLdd.DeviceStatus(deviceState);
+ if(err < 0)
+ {
+ OstTrace1( TRACE_NORMAL, CUSBDEVICE_CONSTRUCTL_DUP13, "CUsbDevice::ConstructL;iLdd.DeviceStatus(deviceState) with error=%d", err );
+ User::Leave(err);
+ }
SetDeviceState(deviceState);
- LOGTEXT(_L8("Got device state"));
+ OstTrace0( TRACE_NORMAL, CUSBDEVICE_CONSTRUCTL_DUP5, "CUsbDevice::ConstructL; Got device state" );
+
iDeviceStateWatcher = CUsbDeviceStateWatcher::NewL(*this, iLdd);
iDeviceStateWatcher->Start();
@@ -225,36 +251,43 @@
{
delete iDefaultSerialNumber;
iDefaultSerialNumber = NULL;
- LOGTEXT(_L8("No default serial number"));
+ OstTrace0( TRACE_NORMAL, CUSBDEVICE_CONSTRUCTL_DUP6, "CUsbDevice::ConstructL; No default serial number" );
+
}
else
{
- LEAVEIFERRORL(err);
-#ifdef __FLOG_ACTIVE
- TBuf8<KUsbStringDescStringMaxSize> narrowString;
- narrowString.Copy(serNum);
- LOGTEXT2(_L8("Got default serial number %S"), &narrowString);
-#endif //__FLOG_ACTIVE
+ if(err < 0)
+ {
+ OstTrace1( TRACE_NORMAL, CUSBDEVICE_CONSTRUCTL_DUP12, "CUsbDevice::ConstructL;error=%d", err );
+ User::Leave(err);
+ }
+#ifdef _DEBUG
+ OstTraceExt1( TRACE_NORMAL, CUSBDEVICE_CONSTRUCTL_DUP7, "CUsbDevice::ConstructL;serNum=%S", serNum );
+#endif //_DEBUG
}
- LOGTEXT(_L8("UsbDevice::ConstructL() finished"));
+ OstTrace0( TRACE_NORMAL, CUSBDEVICE_CONSTRUCTL_DUP8, "CUsbDevice::ConstructL; UsbDevice::ConstructL() finished" );
+
#endif
#endif
#ifndef __OVER_DUMMYUSBDI__
InstantiateExtensionPluginsL();
#endif
+ OstTraceFunctionExit0( CUSBDEVICE_CONSTRUCTL_EXIT );
}
void CUsbDevice::InstantiateExtensionPluginsL()
{
- LOGTEXT(_L8(">>CUsbDevice::InstantiateExtensionPluginsL"));
+ OstTraceFunctionEntry0( CUSBDEVICE_INSTANTIATEEXTENSIONPLUGINSL_ENTRY );
+
const TUid KUidExtensionPluginInterface = TUid::Uid(KUsbmanExtensionPluginInterfaceUid);
RImplInfoPtrArray implementations;
const TEComResolverParams noResolverParams;
REComSession::ListImplementationsL(KUidExtensionPluginInterface, noResolverParams, KRomOnlyResolverUid, implementations);
CleanupResetAndDestroyPushL(implementations);
- LOGTEXT2(_L8("Number of implementations of extension plugin interface: %d"), implementations.Count());
+ OstTrace1( TRACE_FLOW, CUSBDEVICE_INSTANTIATEEXTENSIONPLUGINSL, "CUsbDevice::InstantiateExtensionPluginsL;Number of implementations of extension plugin interface: %d", implementations.Count() );
+
for (TInt i=0; i<implementations.Count(); i++)
{
@@ -262,13 +295,14 @@
CleanupStack::PushL(plugin);
iExtensionPlugins.AppendL(plugin); // transfer ownership to iExtensionPlugins
CleanupStack::Pop(plugin);
- LOGTEXT2(_L8("Added extension plugin with UID 0x%08x"),
- implementations[i]->ImplementationUid());
+ OstTrace1( TRACE_NORMAL, CUSBDEVICE_INSTANTIATEEXTENSIONPLUGINSL_DUP1,
+ "CUsbDevice::InstantiateExtensionPluginsL;Added extension plugin with UID 0x%08x",
+ implementations[i]->ImplementationUid().iUid );
+
}
CleanupStack::PopAndDestroy(&implementations);
-
- LOGTEXT(_L8("<<CUsbDevice::InstantiateExtensionPluginsL"));
+ OstTraceFunctionExit0( CUSBDEVICE_INSTANTIATEEXTENSIONPLUGINSL_EXIT );
}
@@ -280,7 +314,7 @@
*
*/
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CUSBDEVICE_ENUMERATECLASSCONTROLLERSL_ENTRY );
#ifdef USE_DUMMY_CLASS_CONTROLLER
//create a TLinearOrder to supply the comparison function, Compare(), to be used
@@ -294,8 +328,12 @@
{
AddClassControllerL(CUsbDummyClassController::NewL(*this, ii), order);
}
-
- LEAVEIFERRORL(iUsbClassControllerIterator->First());
+ TInt err = iUsbClassControllerIterator->First();
+ if(err < 0)
+ {
+ OstTrace1( TRACE_NORMAL, CUSBDEVICE_ENUMERATECLASSCONTROLLERSL_DUP2, "CUsbDevice::EnumerateClassControllersL;iUsbClassControllerIterator->First() with error=%d", err );
+ User::Leave(err);
+ }
#else
@@ -313,19 +351,24 @@
REComSession::ListImplementationsL(KUidUsbPlugIns, noResolverParams, KRomOnlyResolverUid, implementations);
CleanupResetAndDestroyPushL(implementations);
- LOGTEXT2(_L8("Number of implementations to load %d"), implementations.Count());
+ OstTrace1( TRACE_NORMAL, CUSBDEVICE_ENUMERATECLASSCONTROLLERSL, "CUsbDevice::EnumerateClassControllersL;Number of implementations to load %d", implementations.Count() );
for (TInt i=0; i<implementations.Count(); i++)
{
- LOGTEXT2(_L8("Adding class controller with UID %x"),
- implementations[i]->ImplementationUid());
- const TUid uid = implementations[i]->ImplementationUid();
- LEAVEIFERRORL(iSupportedClassUids.Append(uid));
+ OstTrace1( TRACE_NORMAL, CUSBDEVICE_ENUMERATECLASSCONTROLLERSL_DUP1, "CUsbDevice::EnumerateClassControllersL;Adding class controller with UID %x", implementations[i]->ImplementationUid().iUid );
+ const TUid uid = implementations[i]->ImplementationUid();
+ TInt err = iSupportedClassUids.Append(uid);
+ if(err < 0)
+ {
+ OstTrace1( TRACE_NORMAL, CUSBDEVICE_ENUMERATECLASSCONTROLLERSL_DUP3, "CUsbDevice::EnumerateClassControllersL;iSupportedClassUids.Append(uid) with error=%d", err );
+ User::Leave(err);
+ }
}
CleanupStack::PopAndDestroy(&implementations);
#endif // USE_DUMMY_CLASS_CONTROLLER
+ OstTraceFunctionExit0( CUSBDEVICE_ENUMERATECLASSCONTROLLERSL_EXIT );
}
void CUsbDevice::AddClassControllerL(CUsbClassControllerBase* aClassController,
@@ -341,7 +384,7 @@
* added
*/
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CUSBDEVICE_ADDCLASSCONTROLLERL_ENTRY );
TInt rc = KErrNone;
@@ -360,8 +403,10 @@
{
// Avoid memory leak by deleting class controller if the append fails.
delete aClassController;
- LEAVEL(rc);
+ OstTrace1( TRACE_NORMAL, CUSBDEVICE_ADDCLASSCONTROLLERL, "CUsbDevice::AddClassControllerL;Leave rc=%d", rc );
+ User::Leave(rc);
}
+ OstTraceFunctionExit0( CUSBDEVICE_ADDCLASSCONTROLLERL_EXIT );
}
void CUsbDevice::RegisterObserverL(MUsbDeviceNotify& aObserver)
@@ -372,9 +417,14 @@
* @param aObserver New Observer of the device
*/
{
- LOG_FUNC
-
- LEAVEIFERRORL(iObservers.Append(&aObserver));
+ OstTraceFunctionEntry0( CUSBDEVICE_REGISTEROBSERVERL_ENTRY );
+ TInt err = iObservers.Append(&aObserver);
+ if(err < 0)
+ {
+ OstTrace1( TRACE_NORMAL, CUSBDEVICE_REGISTEROBSERVERL, "CUsbDevice::RegisterObserverL;iObservers.Append(&aObserver) with err=%d", err );
+ User::Leave(err);
+ }
+ OstTraceFunctionExit0( CUSBDEVICE_REGISTEROBSERVERL_EXIT );
}
@@ -385,12 +435,13 @@
* @param aObserver The existing device observer to be de-registered
*/
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CUSBDEVICE_DEREGISTEROBSERVER_ENTRY );
TInt index = iObservers.Find(&aObserver);
if (index >= 0)
iObservers.Remove(index);
+ OstTraceFunctionExit0( CUSBDEVICE_DEREGISTEROBSERVER_EXIT );
}
@@ -400,7 +451,7 @@
* Reports errors and state changes via observer interface.
*/
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CUSBDEVICE_STARTL_ENTRY );
Cancel();
SetServiceState(EUsbServiceStarting);
@@ -408,12 +459,14 @@
TRAPD(err, SetDeviceDescriptorL());
if ( err != KErrNone )
{
- SetServiceState(EUsbServiceIdle);
- LEAVEL(err);
+ SetServiceState(EUsbServiceIdle);
+ OstTrace1( TRACE_NORMAL, CUSBDEVICE_STARTL, "CUsbDevice::StartL;Leave with error=%d", err );
+ User::Leave(err);
}
iLastError = KErrNone;
StartCurrentClassController();
+ OstTraceFunctionExit0( CUSBDEVICE_STARTL_EXIT );
}
void CUsbDevice::Stop()
@@ -421,13 +474,14 @@
* Stop the USB device and all its associated USB classes.
*/
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CUSBDEVICE_STOP_ENTRY );
Cancel();
SetServiceState(EUsbServiceStopping);
iLastError = KErrNone;
StopCurrentClassController();
+ OstTraceFunctionExit0( CUSBDEVICE_STOP_EXIT );
}
void CUsbDevice::SetServiceState(TUsbServiceState aState)
@@ -437,8 +491,11 @@
* @param aState New state that the device is moving to
*/
{
- LOGTEXT3(_L8("Calling: CUsbDevice::SetServiceState [iServiceState=%d,aState=%d]"),
- iServiceState, aState);
+ OstTraceFunctionEntry0( CUSBDEVICE_SETSERVICESTATE_ENTRY );
+
+ OstTraceExt2( TRACE_NORMAL, CUSBDEVICE_SETSERVICESTATE,
+ "CUsbDevice::SetServiceState;iServiceState=%d;aState=%d", iServiceState, aState );
+
if (iServiceState != aState)
{
@@ -456,7 +513,7 @@
if (iServiceState == EUsbServiceIdle)
iUsbServer.LaunchShutdownTimerIfNoSessions();
}
- LOGTEXT(_L8("Exiting: CUsbDevice::SetServiceState"));
+ OstTraceFunctionExit0( CUSBDEVICE_SETSERVICESTATE_EXIT );
}
void CUsbDevice::SetDeviceState(TUsbcDeviceState aState)
@@ -469,8 +526,9 @@
* @param aState New state that the device is moving to
*/
{
- LOG_FUNC
- LOGTEXT3(_L8("\taState = %d, iDeviceState = %d"), aState, iDeviceState);
+ OstTraceFunctionEntry0( CUSBDEVICE_SETDEVICESTATE_ENTRY );
+ OstTraceExt2( TRACE_NORMAL, CUSBDEVICE_SETDEVICESTATE,
+ "CUsbDevice::SetDeviceState;aState=%d;iDeviceState=%d", aState, iDeviceState );
TUsbDeviceState state;
switch (aState)
@@ -526,6 +584,7 @@
iObservers[i]->UsbDeviceStateChange(LastError(), oldState, iDeviceState);
}
}
+ OstTraceFunctionExit0( CUSBDEVICE_SETDEVICESTATE_EXIT );
}
/**
@@ -534,7 +593,7 @@
*/
void CUsbDevice::BusEnumerationCompleted()
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CUSBDEVICE_BUSENUMERATIONCOMPLETED_ENTRY );
// Has the start been cancelled?
if (iServiceState == EUsbServiceStarting)
@@ -543,8 +602,10 @@
}
else
{
- LOGTEXT(_L8(" Start has been cancelled!"));
+ OstTrace0( TRACE_NORMAL, CUSBDEVICE_BUSENUMERATIONCOMPLETED,
+ "CUsbDevice::BusEnumerationCompleted; Start has been cancelled!" );
}
+ OstTraceFunctionExit0( CUSBDEVICE_BUSENUMERATIONCOMPLETED_EXIT );
}
void CUsbDevice::BusEnumerationFailed(TInt aError)
@@ -555,7 +616,8 @@
* @param aError Error that has occurred during Re-enumeration
*/
{
- LOGTEXT2(_L8("CUsbDevice::BusEnumerationFailed [aError=%d]"), aError);
+ OstTrace1( TRACE_NORMAL, CUSBDEVICE_BUSENUMERATIONFAILED, "CUsbDevice::BusEnumerationFailed;aError=%d", aError );
+
iLastError = aError;
if (iServiceState == EUsbServiceStarting)
@@ -565,7 +627,8 @@
}
else
{
- LOGTEXT(_L8(" Start has been cancelled!"));
+ OstTrace0( TRACE_NORMAL, CUSBDEVICE_BUSENUMERATIONFAILED_DUP1,
+ "CUsbDevice::BusEnumerationFailed; Start has been cancelled!" );
}
}
@@ -575,10 +638,11 @@
* Called numerous times to start all the USB classes.
*/
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CUSBDEVICE_STARTCURRENTCLASSCONTROLLER_ENTRY );
iUsbClassControllerIterator->Current()->Start(iStatus);
SetActive();
+ OstTraceFunctionExit0( CUSBDEVICE_STARTCURRENTCLASSCONTROLLER_EXIT );
}
void CUsbDevice::StopCurrentClassController()
@@ -586,10 +650,11 @@
* Called numerous times to stop all the USB classes.
*/
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CUSBDEVICE_STOPCURRENTCLASSCONTROLLER_ENTRY );
iUsbClassControllerIterator->Current()->Stop(iStatus);
SetActive();
+ OstTraceFunctionExit0( CUSBDEVICE_STOPCURRENTCLASSCONTROLLER_EXIT );
}
/**
@@ -598,12 +663,19 @@
*/
TInt CUsbDevice::PowerUpAndConnect()
{
- LOG_FUNC
- LOGTEXT(_L8("\tPowering up UDC..."));
+ OstTraceFunctionEntry0( CUSBDEVICE_POWERUPANDCONNECT_ENTRY );
+
+ OstTrace0( TRACE_NORMAL, CUSBDEVICE_POWERUPANDCONNECT, "CUsbDevice::PowerUpAndConnect;Powering up UDC..." );
+
TInt res = iLdd.PowerUpUdc();
- LOGTEXT2(_L8("\tPowerUpUdc res = %d"), res);
+ OstTrace1( TRACE_NORMAL, CUSBDEVICE_POWERUPANDCONNECT_DUP1,
+ "CUsbDevice::PowerUpAndConnect;PowerUpUdc res = %d", res );
+
res = iLdd.DeviceConnectToHost();
- LOGTEXT2(_L8("\tDeviceConnectToHost res = %d"), res);
+ OstTrace1( TRACE_NORMAL, CUSBDEVICE_POWERUPANDCONNECT_DUP2,
+ "CUsbDevice::PowerUpAndConnect;DeviceConnectToHost res = %d", res );
+
+ OstTraceFunctionExit0( CUSBDEVICE_POWERUPANDCONNECT_EXIT );
return res;
}
@@ -614,9 +686,15 @@
* classes have been completed.
*/
{
- LOGTEXT2(_L8(">>CUsbDevice::RunL [iStatus=%d]"), iStatus.Int());
+ OstTraceFunctionEntry0( CUSBDEVICE_RUNL_ENTRY );
+ OstTrace1( TRACE_NORMAL, CUSBDEVICE_RUNL, "CUsbDevice::RunL;iStatus.Int()=%d", iStatus.Int() );
- LEAVEIFERRORL(iStatus.Int());
+ TInt err = iStatus.Int();
+ if(err < 0)
+ {
+ OstTrace1( TRACE_NORMAL, CUSBDEVICE_RUNL_DUP4, "CUsbDevice::RunL;iStatus.Int() with error=%d", err );
+ User::Leave(err);
+ }
switch (iServiceState)
{
@@ -630,7 +708,8 @@
// We've finished starting the classes. We can just power up the UDC
// now: there's no need to re-enumerate, because we soft disconnected
// earlier. This will also do a soft connect.
- LOGTEXT(_L8("Finished starting classes: powering up UDC"));
+ OstTrace0( TRACE_NORMAL, CUSBDEVICE_RUNL_DUP1, "CUsbDevice::RunL;Finished starting classes: powering up UDC" );
+
// It isn't an error if this call fails. This will happen, for example,
// in the case where there are no USB classes defined.
@@ -659,12 +738,12 @@
if (iDefaultSerialNumber)
{
TInt res = iLdd.SetSerialNumberStringDescriptor(*iDefaultSerialNumber);
- LOGTEXT2(_L8("Restore default serial number res = %d"), res);
+ OstTrace1( TRACE_NORMAL, CUSBDEVICE_RUNL_DUP2, "CUsbDevice::RunL;Restore default serial number res = %d", res );
}
else
{
TInt res = iLdd.RemoveSerialNumberStringDescriptor();
- LOGTEXT2(_L8("Remove serial number res = %d"), res);
+ OstTrace1( TRACE_NORMAL, CUSBDEVICE_RUNL_DUP3, "CUsbDevice::RunL;Remove serial number res = %d", res );
}
#endif
@@ -678,10 +757,13 @@
break;
default:
- __ASSERT_DEBUG( EFalse, _USB_PANIC(KUsbDevicePanicCategory, EBadAsynchronousCall) );
+
+ OstTrace1( TRACE_FATAL, CUSBDEVICE_RUNL_DUP5, "CUsbDevice::RunL;Panic reason=%d", EBadAsynchronousCall );
+ __ASSERT_DEBUG( EFalse, User::Panic(KUsbDevicePanicCategory, EBadAsynchronousCall) );
+
break;
}
- LOGTEXT(_L8("<<CUsbDevice::RunL"));
+ OstTraceFunctionExit0( CUSBDEVICE_RUNL_EXIT );
}
void CUsbDevice::DoCancel()
@@ -691,7 +773,7 @@
* this function being called is a programming error.
*/
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CUSBDEVICE_DOCANCEL_ENTRY );
switch (iServiceState)
{
@@ -701,9 +783,12 @@
break;
default:
- __ASSERT_DEBUG( EFalse, _USB_PANIC(KUsbDevicePanicCategory, EBadAsynchronousCall) );
+
+ OstTrace1( TRACE_FATAL, CUSBDEVICE_DOCANCEL, "CUsbDevice::DoCancel;Panic reason=%d", EBadAsynchronousCall );
+ __ASSERT_DEBUG( EFalse, User::Panic(KUsbDevicePanicCategory, EBadAsynchronousCall ) );
break;
}
+ OstTraceFunctionExit0( CUSBDEVICE_DOCANCEL_EXIT );
}
TInt CUsbDevice::RunError(TInt aError)
@@ -715,7 +800,8 @@
* @return Always KErrNone, to avoid an active scheduler panic
*/
{
- LOGTEXT2(_L8("CUsbDevice::RunError [aError=%d]"), aError);
+ OstTrace1( TRACE_NORMAL, CUSBDEVICE_RUNERROR, "CUsbDevice::RunError;aError=%d", aError );
+
iLastError = aError;
@@ -747,7 +833,8 @@
break;
default:
- __ASSERT_DEBUG( EFalse, _USB_PANIC(KUsbDevicePanicCategory, EBadAsynchronousCall) );
+ OstTrace1( TRACE_FATAL, CUSBDEVICE_RUNERROR_DUP1, "CUsbDevice::RunError;Panic reason=%d", EBadAsynchronousCall );
+ __ASSERT_DEBUG( EFalse, User::Panic(KUsbDevicePanicCategory, EBadAsynchronousCall ) );
break;
}
@@ -763,7 +850,7 @@
* @return A new iterator
*/
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CUSBDEVICE_UCCNGETCLASSCONTROLLERITERATORL_ENTRY );
return new (ELeave) CUsbClassControllerIterator(iSupportedClasses);
}
@@ -776,30 +863,31 @@
* @param aError The error that's occurred
*/
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CUSBDEVICE_UCCNERROR_ENTRY );
RunError(aError);
+ OstTraceFunctionExit0( CUSBDEVICE_UCCNERROR_EXIT );
}
-#ifdef __FLOG_ACTIVE
+#ifdef _DEBUG
void CUsbDevice::PrintDescriptor(CUsbDevice::TUsbDeviceDescriptor& aDeviceDescriptor)
{
- LOGTEXT2(_L8("\tiLength is %d"), aDeviceDescriptor.iLength);
- LOGTEXT2(_L8("\tiDescriptorType is %d"), aDeviceDescriptor.iDescriptorType);
- LOGTEXT2(_L8("\tBcdUsb is: 0x%04x"), aDeviceDescriptor.iBcdUsb);
- LOGTEXT2(_L8("\tDeviceClass is: 0x%02x"), aDeviceDescriptor.iDeviceClass);
- LOGTEXT2(_L8("\tDeviceSubClass is: 0x%02x"), aDeviceDescriptor.iDeviceSubClass);
- LOGTEXT2(_L8("\tDeviceProtocol is: 0x%02x"), aDeviceDescriptor.iDeviceProtocol);
- LOGTEXT2(_L8("\tiMaxPacketSize is: 0x%02x"), aDeviceDescriptor.iMaxPacketSize);
+ OstTrace1( TRACE_DUMP, CUSBDEVICE_PRINTDESCRIPTOR, "CUsbDevice::PrintDescriptor;iLength=%d", aDeviceDescriptor.iLength );
+ OstTrace1( TRACE_DUMP, CUSBDEVICE_PRINTDESCRIPTOR_DUP1, "CUsbDevice::PrintDescriptor;iDescriptorType=%d", aDeviceDescriptor.iDescriptorType );
+ OstTrace1( TRACE_DUMP, CUSBDEVICE_PRINTDESCRIPTOR_DUP2, "CUsbDevice::PrintDescriptor;iBcdUsb=0x%04x", aDeviceDescriptor.iBcdUsb );
+ OstTrace1( TRACE_DUMP, CUSBDEVICE_PRINTDESCRIPTOR_DUP3, "CUsbDevice::PrintDescriptor;iDeviceClass=0x%02x", aDeviceDescriptor.iDeviceClass );
+ OstTrace1( TRACE_DUMP, CUSBDEVICE_PRINTDESCRIPTOR_DUP4, "CUsbDevice::PrintDescriptor;iDeviceSubClass=0x%02x", aDeviceDescriptor.iDeviceSubClass );
+ OstTrace1( TRACE_DUMP, CUSBDEVICE_PRINTDESCRIPTOR_DUP5, "CUsbDevice::PrintDescriptor;iDeviceProtocol=0x%02x", aDeviceDescriptor.iDeviceProtocol );
+ OstTrace1( TRACE_DUMP, CUSBDEVICE_PRINTDESCRIPTOR_DUP6, "CUsbDevice::PrintDescriptor;iMaxPacketSize=0x%02x", aDeviceDescriptor.iMaxPacketSize );
- LOGTEXT2(_L8("\tVendorId is: 0x%04x"), aDeviceDescriptor.iIdVendor);
- LOGTEXT2(_L8("\tProductId is: 0x%04x"), aDeviceDescriptor.iProductId);
- LOGTEXT2(_L8("\tBcdDevice is: 0x%04x"), aDeviceDescriptor.iBcdDevice);
-
- LOGTEXT2(_L8("\tiManufacturer is: 0x%04x"), aDeviceDescriptor.iManufacturer);
- LOGTEXT2(_L8("\tiSerialNumber is: 0x%04x"), aDeviceDescriptor.iSerialNumber);
- LOGTEXT2(_L8("\tiNumConfigurations is: 0x%04x"), aDeviceDescriptor.iNumConfigurations);
+ OstTrace1( TRACE_DUMP, CUSBDEVICE_PRINTDESCRIPTOR_DUP7, "CUsbDevice::PrintDescriptor;iIdVendor=0x%04x", aDeviceDescriptor.iIdVendor );
+ OstTrace1( TRACE_DUMP, CUSBDEVICE_PRINTDESCRIPTOR_DUP8, "CUsbDevice::PrintDescriptor;iProductId=0x%04x", aDeviceDescriptor.iProductId );
+ OstTrace1( TRACE_DUMP, CUSBDEVICE_PRINTDESCRIPTOR_DUP9, "CUsbDevice::PrintDescriptor;iBcdDevice=0x%04x", aDeviceDescriptor.iBcdDevice );
+
+ OstTrace1( TRACE_DUMP, CUSBDEVICE_PRINTDESCRIPTOR_DUP10, "CUsbDevice::PrintDescriptor;iManufacturer=0x%04x", aDeviceDescriptor.iManufacturer );
+ OstTrace1( TRACE_DUMP, CUSBDEVICE_PRINTDESCRIPTOR_DUP11, "CUsbDevice::PrintDescriptor;iSerialNumber=0x%04x", aDeviceDescriptor.iSerialNumber );
+ OstTrace1( TRACE_DUMP, CUSBDEVICE_PRINTDESCRIPTOR_DUP12, "CUsbDevice::PrintDescriptor;iNumConfigurations=0x%04x", aDeviceDescriptor.iNumConfigurations );
}
#endif
//
@@ -808,13 +896,13 @@
* Modifies the USB device descriptor.
*/
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CUSBDEVICE_SETDEVICEDESCRIPTORL_ENTRY );
#if !defined(__OVER_DUMMYUSBDI__) && !defined(__WINS__)
TInt desSize = 0;
iLdd.GetDeviceDescriptorSize(desSize);
- LOGTEXT2(_L8("UDeviceDescriptorSize = %d"), desSize);
+ OstTrace1( TRACE_NORMAL, CUSBDEVICE_SETDEVICEDESCRIPTORL, "CUsbDevice::SetDeviceDescriptorL;UDeviceDescriptorSize = %d", desSize );
HBufC8* deviceBuf = HBufC8::NewLC(desSize);
TPtr8 devicePtr = deviceBuf->Des();
devicePtr.SetLength(0);
@@ -823,8 +911,8 @@
if (ret != KErrNone)
{
- LOGTEXT2(_L8("Unable to fetch device descriptor. Error: %d"), ret);
- LEAVEL(ret);
+ OstTrace1( TRACE_NORMAL, CUSBDEVICE_SETDEVICEDESCRIPTORL_DUP1, "CUsbDevice::SetDeviceDescriptorL;Unable to fetch device descriptor. Error: %d", ret );
+ User::Leave(ret);
}
TUsbDeviceDescriptor* deviceDescriptor = reinterpret_cast<TUsbDeviceDescriptor*>(
@@ -846,8 +934,9 @@
}
else
{
- LOGTEXT(_L8("USB configuration is not read"));
- LEAVEL(KErrNotFound);
+ OstTrace0( TRACE_NORMAL, CUSBDEVICE_SETDEVICEDESCRIPTORL_DUP3,
+ "CUsbDevice::SetDeviceDescriptorL;USB configuration is not read" );
+ User::Leave(KErrNotFound);
}
#ifndef __OVER_DUMMYUSBDI__
@@ -856,14 +945,15 @@
if (ret != KErrNone)
{
- LOGTEXT2(_L8("Unable to set device descriptor. Error: %d"), ret);
- LEAVEL(ret);
+ OstTrace1( TRACE_NORMAL, CUSBDEVICE_SETDEVICEDESCRIPTORL_DUP2, "CUsbDevice::SetDeviceDescriptorL;Unable to set device descriptor. Error: %d", ret );
+ User::Leave(ret);
}
CleanupStack::PopAndDestroy(deviceBuf);
#endif
#endif // __OVER_DUMMYUSBDI__
+ OstTraceFunctionExit0( CUSBDEVICE_SETDEVICEDESCRIPTORL_EXIT );
}
void CUsbDevice::SetUsbDeviceSettingsDefaultsL(CUsbDevice::TUsbDeviceDescriptor& aDeviceDescriptor)
@@ -888,10 +978,10 @@
* @param aDeviceDescriptor The device descriptor for the USB device
*/
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CUSBDEVICE_SETUSBDEVICESETTINGSFROMPERSONALITYL_ENTRY );
// First, use the default values
- LOGTEXT(_L8("Setting default values for the configuration"));
+ OstTrace0( TRACE_NORMAL, CUSBDEVICE_SETUSBDEVICESETTINGSFROMPERSONALITYL, "CUsbDevice::SetUsbDeviceSettingsFromPersonalityL;Setting default values for the configuration" );
SetUsbDeviceSettingsDefaultsL(aDeviceDescriptor);
// Now try to get the configuration from the current personality
@@ -906,49 +996,65 @@
#ifndef __OVER_DUMMYUSBDI__
#ifndef __WINS__
- LEAVEIFERRORL(iLdd.SetManufacturerStringDescriptor(*(iDeviceConfiguration.iManufacturerName)));
- LEAVEIFERRORL(iLdd.SetProductStringDescriptor(*(iDeviceConfiguration.iProductName)));
+ TInt err = iLdd.SetManufacturerStringDescriptor(*(iDeviceConfiguration.iManufacturerName));
+ if(err < 0)
+ {
+ OstTrace1( TRACE_NORMAL, CUSBDEVICE_SETUSBDEVICESETTINGSFROMPERSONALITYL_DUP7, "CUsbDevice::SetUsbDeviceSettingsFromPersonalityL;iLdd.SetManufacturerStringDescriptor(*(iCurrentPersonality->Manufacturer())) with error=%d", err );
+ User::Leave(err);
+ }
+ err = iLdd.SetProductStringDescriptor(*(iDeviceConfiguration.iProductName));
+ if(err < 0)
+ {
+ OstTrace1( TRACE_NORMAL, CUSBDEVICE_SETUSBDEVICESETTINGSFROMPERSONALITYL_DUP6, "CUsbDevice::SetUsbDeviceSettingsFromPersonalityL;iLdd.SetProductStringDescriptor(*(iCurrentPersonality->Product())) with error=%d", err );
+ User::Leave(err);
+ }
+
//Read the published serial number. The key is the UID KUidUsbmanServer = 0x101FE1DB
TBuf16<KUsbStringDescStringMaxSize> serNum;
TInt r = RProperty::Get(KUidSystemCategory,0x101FE1DB,serNum);
if(r==KErrNone)
{
-#ifdef __FLOG_ACTIVE
- TBuf8<KUsbStringDescStringMaxSize> narrowString;
- narrowString.Copy(serNum);
- LOGTEXT2(_L8("Setting published SerialNumber: %S"), &narrowString);
-#endif // __FLOG_ACTIVE
+#ifdef _DEBUG
+ OstTraceExt1( TRACE_NORMAL, CUSBDEVICE_SETUSBDEVICESETTINGSFROMPERSONALITYL_DUP1, "CUsbDevice::SetUsbDeviceSettingsFromPersonalityL;Setting published SerialNumber: %S", serNum );
+#endif//_DEBUG
//USB spec doesn't give any constraints on what constitutes a valid serial number.
//As long as it is a string descriptor it is valid.
- LEAVEIFERRORL(iLdd.SetSerialNumberStringDescriptor(serNum));
+ err = iLdd.SetSerialNumberStringDescriptor(serNum);
+ if(err < 0)
+ {
+ OstTrace1( TRACE_NORMAL, CUSBDEVICE_SETUSBDEVICESETTINGSFROMPERSONALITYL_DUP3, "CUsbDevice::SetUsbDeviceSettingsFromPersonalityL;iLdd.SetSerialNumberStringDescriptor(serNum) with error=%d", err );
+ User::Leave(err);
+ }
}
-#ifdef __FLOG_ACTIVE
+#ifdef _DEBUG
else
{
- LOGTEXT(_L8("SerialNumber has not been published"));
+ OstTrace0( TRACE_NORMAL, CUSBDEVICE_SETUSBDEVICESETTINGSFROMPERSONALITYL_DUP2, "CUsbDevice::SetUsbDeviceSettingsFromPersonalityL;SerialNumber has not been published" );
}
-#endif // __FLOG_ACTIVE
+#endif // _DEBUG
#endif
#endif // __OVER_DUMMYUSBDI__
-#ifdef __FLOG_ACTIVE
+#ifdef _DEBUG
PrintDescriptor(aDeviceDescriptor);
#ifndef __OVER_DUMMYUSBDI__
#ifndef __WINS__
TBuf16<KUsbStringDescStringMaxSize> wideString;
- TBuf8<KUsbStringDescStringMaxSize> narrowString;
-
- LEAVEIFERRORL(iLdd.GetConfigurationStringDescriptor(wideString));
- narrowString.Copy(wideString);
- LOGTEXT2(_L8("Configuration is: '%S'"), &narrowString);
+ TInt tmp = iLdd.GetConfigurationStringDescriptor(wideString);
+ if(tmp < 0)
+ {
+ OstTrace1( TRACE_NORMAL, CUSBDEVICE_SETUSBDEVICESETTINGSFROMPERSONALITYL_DUP5, "CUsbDevice::SetUsbDeviceSettingsFromPersonalityL;iLdd.GetConfigurationStringDescriptor(wideString) with error=%d", tmp );
+ User::Leave(tmp);
+ }
+ OstTraceExt1( TRACE_NORMAL, CUSBDEVICE_SETUSBDEVICESETTINGSFROMPERSONALITYL_DUP4, "CUsbDevice::SetUsbDeviceSettingsFromPersonalityL;Configuration is:%S", wideString );
#endif
#endif // __OVER_DUMMYUSBDI__
-#endif // __FLOG_ACTIVE
+#endif // _DEBUG
}
void CUsbDevice::TryStartL(TInt aPersonalityId)
@@ -960,7 +1066,7 @@
* @param aPersonalityId a personality id
*/
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CUSBDEVICE_TRYSTARTL_ENTRY );
SetCurrentPersonalityL(aPersonalityId);
SelectClassControllersL();
@@ -969,12 +1075,14 @@
TRAPD(err, SetDeviceDescriptorL());
if ( err != KErrNone )
{
- SetServiceState(EUsbServiceIdle);
- LEAVEL(err);
+ SetServiceState(EUsbServiceIdle);
+ OstTrace1( TRACE_NORMAL, CUSBDEVICE_TRYSTARTL, "CUsbDevice::TryStartL;leave with error=%d", err );
+ User::Leave(err);
}
iLastError = KErrNone;
StartCurrentClassController();
+ OstTraceFunctionExit0( CUSBDEVICE_TRYSTARTL_EXIT );
}
TInt CUsbDevice::CurrentPersonalityId() const
@@ -982,7 +1090,7 @@
* @return the current personality id
*/
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CUSBDEVICE_CURRENTPERSONALITYID_ENTRY );
return iCurrentPersonality->PersonalityId();
}
@@ -991,7 +1099,7 @@
* @return a const reference to RPointerArray<CPersonality>
*/
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CUSBDEVICE_PERSONALITIES_ENTRY );
return iSupportedPersonalities;
}
@@ -1004,17 +1112,19 @@
* or 0 otherwise.
*/
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CUSBDEVICE_GETPERSONALITY_ENTRY );
TInt count = iSupportedPersonalities.Count();
for (TInt i = 0; i < count; i++)
{
if (iSupportedPersonalities[i]->PersonalityId() == aPersonalityId)
{
+ OstTraceFunctionExit0( CUSBDEVICE_GETPERSONALITY_EXIT );
return iSupportedPersonalities[i];
}
}
+ OstTraceFunctionExit0( CUSBDEVICE_GETPERSONALITY_EXIT_DUP1 );
return 0;
}
@@ -1023,15 +1133,16 @@
* Sets the current personality to the personality with id aPersonalityId
*/
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CUSBDEVICE_SETCURRENTPERSONALITYL_ENTRY );
const CPersonality* personality = GetPersonality(aPersonalityId);
if (!personality)
{
- LOGTEXT(_L8("Personality id not found"));
- LEAVEL(KErrNotFound);
+ OstTrace0( TRACE_NORMAL, CUSBDEVICE_SETCURRENTPERSONALITYL, "CUsbDevice::SetCurrentPersonalityL;Personality id not found" );
+ User::Leave(KErrNotFound);
}
iCurrentPersonality = personality;
+ OstTraceFunctionExit0( CUSBDEVICE_SETCURRENTPERSONALITYL_EXIT );
}
void CUsbDevice::ValidatePersonalitiesL()
@@ -1040,7 +1151,7 @@
* Leave if validation fails.
*/
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CUSBDEVICE_VALIDATEPERSONALITIESL_ENTRY );
TInt personalityCount = iSupportedPersonalities.Count();
for (TInt i = 0; i < personalityCount; i++)
@@ -1051,10 +1162,10 @@
{
TInt ccCount = iSupportedClassUids.Count();
TInt k;
- LOGTEXT2(_L8("iSupportedClassUids Count = %d"),ccCount);
+ OstTrace1( TRACE_NORMAL, CUSBDEVICE_VALIDATEPERSONALITIESL_DUP1, "CUsbDevice::ValidatePersonalitiesL;iSupportedClassUids Count = %d", ccCount );
for (k = 0; k < ccCount; k++)
{
- LOGTEXT5(_L8("iSupportedClassUids %d %x classes %d %x"), k, iSupportedClassUids[k].iUid, j, classes[j].iClassUid.iUid);
+ OstTraceExt4( TRACE_NORMAL, CUSBDEVICE_VALIDATEPERSONALITIESL_DUP2, "CUsbDevice::ValidatePersonalitiesL;iSupportedClassUids %d %x classes %d %x", k, iSupportedClassUids[k].iUid, j, classes[j].iClassUid.iUid );
if (iSupportedClassUids[k] == classes[j].iClassUid)
{
break;
@@ -1062,11 +1173,12 @@
}
if (k == ccCount)
{
- LOGTEXT(_L8("personality validation failed"));
- LEAVEL(KErrAbort);
+ OstTrace0( TRACE_NORMAL, CUSBDEVICE_VALIDATEPERSONALITIESL, "CUsbDevice::ValidatePersonalitiesL;personality validation failed" );
+ User::Leave(KErrAbort);
}
}
}
+ OstTraceFunctionExit0( CUSBDEVICE_VALIDATEPERSONALITIESL_EXIT );
}
/**
Converts text string with UIDs to array of Uint
@@ -1080,9 +1192,15 @@
*/
void CUsbDevice::ConvertUidsL(const TDesC& aStr, RArray<TUint>& aUidArray)
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CUSBDEVICE_CONVERTUIDSL_ENTRY );
// Function assumes that aUIDs is empty
- __ASSERT_DEBUG( aUidArray.Count() == 0, _USB_PANIC(KUsbDevicePanicCategory, EUidArrayNotEmpty) );
+#ifdef _DEBUG
+ if(aUidArray.Count() != 0)
+ {
+ OstTrace1( TRACE_FATAL, CUSBDEVICE_CONVERTUIDSL, "CUsbDevice::ConvertUidsL;Panic reason=%d", EUidArrayNotEmpty );
+ User::Panic(KUsbDevicePanicCategory, EUidArrayNotEmpty);
+ }
+#endif
TLex input(aStr);
@@ -1098,15 +1216,21 @@
// Convert and add to array
TUint val;
- LEAVEIFERRORL(input.Val(val,EHex));
+ TInt err = input.Val(val,EHex);
+ if(err < 0)
+ {
+ OstTrace1( TRACE_NORMAL, CUSBDEVICE_CONVERTUIDSL_DUP1, "CUsbDevice::ConvertUidsL;input.Val(val,EHex) with error=%d", err );
+ User::Leave(err);
+ }
aUidArray.AppendL(val);
}
while (!input.Eos());
+ OstTraceFunctionExit0( CUSBDEVICE_CONVERTUIDSL_EXIT );
}
void CUsbDevice::ReadPersonalitiesL()
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CUSBDEVICE_READPERSONALITIESL_ENTRY );
TPtrC16 sysUtilModelName;
TPtrC16 sysUtilManuName;
@@ -1134,6 +1258,7 @@
}
CleanupStack::PopAndDestroy(deviceInfo);
iPersonalityCfged = ETrue;
+ OstTraceFunctionExit0( CUSBDEVICE_READPERSONALITIESL_EXIT );
}
void CUsbDevice::SelectClassControllersL()
@@ -1141,7 +1266,7 @@
* Selects class controllers for the current personality
*/
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CUSBDEVICE_SELECTCLASSCONTROLLERSL_ENTRY );
const RArray<CPersonalityConfigurations::TUsbClasses>& classes = iCurrentPersonality->SupportedClasses();
RArray<TUid> classUids;
CleanupClosePushL( classUids );
@@ -1155,6 +1280,7 @@
CreateClassControllersL(classUids);
CleanupStack::PopAndDestroy( &classUids );
+ OstTraceFunctionExit0( CUSBDEVICE_SELECTCLASSCONTROLLERSL_EXIT );
}
#ifdef USE_DUMMY_CLASS_CONTROLLER
void CUsbDevice::CreateClassControllersL(const RArray<TUid>& /* aClassUids*/)
@@ -1167,7 +1293,7 @@
* @param aClassUids an array of class uids
*/
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CUSBDEVICE_CREATECLASSCONTROLLERSL_ENTRY );
#ifndef USE_DUMMY_CLASS_CONTROLLER
@@ -1179,15 +1305,19 @@
// destroy any class controller objects in iSupportedClasses and reset it for reuse
iSupportedClasses.ResetAndDestroy();
- LOGTEXT2(_L8("aClassUids.Count() = %d\n"), count);
+ OstTrace1( TRACE_NORMAL, CUSBDEVICE_CREATECLASSCONTROLLERSL, "CUsbDevice::CreateClassControllersL;aClassUids.Count() = %d", count );
for (TInt i = 0; i < count; i++)
{
CUsbClassControllerPlugIn* plugIn = CUsbClassControllerPlugIn::NewL(aClassUids[i], *this);
AddClassControllerL(reinterpret_cast<CUsbClassControllerBase*>(plugIn), order);
}
#endif // USE_DUMMY_CLASS_CONTROLLER
-
- LEAVEIFERRORL(iUsbClassControllerIterator->First());
+ TInt err = iUsbClassControllerIterator->First();
+ if(err < 0)
+ {
+ OstTrace1( TRACE_NORMAL, CUSBDEVICE_CREATECLASSCONTROLLERSL_DUP1, "CUsbDevice::CreateClassControllersL;iUsbClassControllerIterator->First() with error=%d", err );
+ User::Leave(err);
+ }
}
void CUsbDevice::SetDefaultPersonalityL()
@@ -1195,7 +1325,7 @@
* Sets default personality. Used for Start request.
*/
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CUSBDEVICE_SETDEFAULTPERSONALITYL_ENTRY );
TInt smallestId = iSupportedPersonalities[0]->PersonalityId();
TInt count = iSupportedPersonalities.Count();
@@ -1209,6 +1339,7 @@
SetCurrentPersonalityL(smallestId);
SelectClassControllersL();
+ OstTraceFunctionExit0( CUSBDEVICE_SETDEFAULTPERSONALITYL_EXIT );
}
void CUsbDevice::LoadFallbackClassControllersL()
@@ -1220,9 +1351,10 @@
* or stopped
*/
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CUSBDEVICE_LOADFALLBACKCLASSCONTROLLERSL_ENTRY );
SetDeviceDescriptorL();
CreateClassControllersL(iSupportedClassUids);
+ OstTraceFunctionExit0( CUSBDEVICE_LOADFALLBACKCLASSCONTROLLERSL_EXIT );
}
RDevUsbcClient& CUsbDevice::MuepoDoDevUsbcClient()
@@ -1244,6 +1376,6 @@
* @param aObserver New Observer of the device
*/
{
- LOGTEXT2(_L8("CUsbDevice::MuepoDoRegisterStateObserverL aObserver = 0x%08x"),&aObserver);
+ OstTrace1( TRACE_NORMAL, CUSBDEVICE_MUEPODOREGISTERSTATEOBSERVERL, "CUsbDevice::MuepoDoRegisterStateObserverL;aObserver = 0x%08x", &aObserver );
RegisterObserverL(aObserver);
}
--- a/usbmgmt/usbmgr/usbman/server/SRC/CUsbDeviceStateWatcher.cpp Wed Jul 07 14:16:40 2010 +0800
+++ b/usbmgmt/usbmgr/usbman/server/SRC/CUsbDeviceStateWatcher.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"
@@ -21,14 +21,15 @@
@file
*/
-#include <usb/usblogger.h>
#include "CUsbScheduler.h"
#include "CUsbDeviceStateWatcher.h"
#include "CUsbDevice.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "CUsbDeviceStateWatcherTraces.h"
+#endif
-#ifdef __FLOG_ACTIVE
-_LIT8(KLogComponent, "USBSVR");
-#endif
+
/**
* The CUsbDeviceStateWatcher::NewL method
@@ -43,9 +44,10 @@
*/
CUsbDeviceStateWatcher* CUsbDeviceStateWatcher::NewL(CUsbDevice& aOwner, RDevUsbcClient& aLdd)
{
- LOG_STATIC_FUNC_ENTRY
+ OstTraceFunctionEntry0( CUSBDEVICESTATEWATCHER_NEWL_ENTRY );
CUsbDeviceStateWatcher* r = new (ELeave) CUsbDeviceStateWatcher(aOwner, aLdd);
+ OstTraceFunctionExit0( CUSBDEVICESTATEWATCHER_NEWL_EXIT );
return r;
}
@@ -59,7 +61,8 @@
*/
CUsbDeviceStateWatcher::~CUsbDeviceStateWatcher()
{
- LOGTEXT2(_L8(">CUsbDeviceStateWatcher::~CUsbDeviceStateWatcher (0x%08x)"), (TUint32) this);
+ OstTrace1( TRACE_NORMAL, CUSBDEVICESTATEWATCHER_CUSBDEVICESTATEWATCHER,
+ "CUsbDeviceStateWatcher::~CUsbDeviceStateWatcher; this=(0x%08x)", (TUint32)this );
Cancel();
}
@@ -85,19 +88,21 @@
{
if (iStatus.Int() != KErrNone)
{
- LOGTEXT2(_L8("CUsbDeviceStateWatcher::RunL() - Error = %d"), iStatus.Int());
+ OstTrace1( TRACE_NORMAL, CUSBDEVICESTATEWATCHER_RUNL,
+ "CUsbDeviceStateWatcher::RunL;Error=%d", iStatus.Int() );
return;
}
- LOGTEXT2(_L8("CUsbDeviceStateWatcher::RunL() - State Changed to %d"), iState);
-
+ OstTrace1( TRACE_NORMAL, CUSBDEVICESTATEWATCHER_RUNL_DUP1, "CUsbDeviceStateWatcher::RunL; - State Changed to %u", iState );
+
if (!(iState & KUsbAlternateSetting))
iOwner.SetDeviceState((TUsbcDeviceState) iState);
- LOGTEXT(_L8("CUsbDeviceStateWatcher::RunL() - About to call DeviceStatusNotify"));
+ OstTrace0( TRACE_NORMAL, CUSBDEVICESTATEWATCHER_RUNL_DUP2,
+ "CUsbDeviceStateWatcher::RunL - About to call DeviceStatusNotify" );
iLdd.AlternateDeviceStatusNotify(iStatus, iState);
SetActive();
- LOGTEXT(_L8("CUsbDeviceStateWatcher::RunL() - Called DeviceStatusNotify"));
+ OstTrace0( TRACE_NORMAL, CUSBDEVICESTATEWATCHER_RUNL_DUP3, "CUsbDeviceStateWatcher::RunL - Called DeviceStatusNotify" );
}
@@ -106,8 +111,9 @@
*/
void CUsbDeviceStateWatcher::DoCancel()
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CUSBDEVICESTATEWATCHER_DOCANCEL_ENTRY );
iLdd.AlternateDeviceStatusNotifyCancel();
+ OstTraceFunctionExit0( CUSBDEVICESTATEWATCHER_DOCANCEL_EXIT );
}
@@ -116,7 +122,8 @@
*/
void CUsbDeviceStateWatcher::Start()
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CUSBDEVICESTATEWATCHER_START_ENTRY );
iLdd.AlternateDeviceStatusNotify(iStatus, iState);
SetActive();
+ OstTraceFunctionExit0( CUSBDEVICESTATEWATCHER_START_EXIT );
}
--- a/usbmgmt/usbmgr/usbman/server/SRC/CUsbDummyClassController.cpp Wed Jul 07 14:16:40 2010 +0800
+++ b/usbmgmt/usbmgr/usbman/server/SRC/CUsbDummyClassController.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"
@@ -20,14 +20,16 @@
@file
*/
-#include "CUsbDummyClassController.h"
#include <usb_std.h>
-#include "inifile.h"
#include <usb/usblogger.h>
+#include "CUsbDummyClassController.h"
+#include "inifile.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "CUsbDummyClassControllerTraces.h"
+#endif
-#ifdef __FLOG_ACTIVE
-_LIT8(KLogComponent, "USBSVR");
-#endif
+
_LIT(KDummyControllerPanic, "UsbDummyCC"); // must be <=16 chars
// Panic codes
@@ -81,12 +83,13 @@
* @return Ownership of a new CUsbDummyClassController object
*/
{
- LOG_STATIC_FUNC_ENTRY
+ OstTraceFunctionEntry0( CUSBDUMMYCLASSCONTROLLER_NEWL_MUSBCLASSCONTROLLERNOTIFY_TUINT_ENTRY );
CUsbDummyClassController* self = new(ELeave) CUsbDummyClassController(aOwner, aIndex);
CleanupStack::PushL(self);
self->ConstructL();
CleanupStack::Pop(self);
+ OstTraceFunctionExit0( CUSBDUMMYCLASSCONTROLLER_NEWL_MUSBCLASSCONTROLLERNOTIFY_TUINT_EXIT );
return self;
}
@@ -103,12 +106,13 @@
* @return Ownership of a new CUsbDummyClassController object
*/
{
- LOG_STATIC_FUNC_ENTRY
+ OstTraceFunctionEntry0( CUSBDUMMYCLASSCONTROLLER_NEWL_MUSBCLASSCONTROLLERNOTIFY_TUINT_TINT_ENTRY );
CUsbDummyClassController* self = new(ELeave) CUsbDummyClassController(aOwner, aIndex, aPriority);
CleanupStack::PushL(self);
self->ConstructL();
CleanupStack::Pop(self);
+ OstTraceFunctionExit0( CUSBDUMMYCLASSCONTROLLER_NEWL_MUSBCLASSCONTROLLERNOTIFY_TUINT_TINT_EXIT );
return self;
}
@@ -149,7 +153,12 @@
* Method to perform second phase construction.
*/
{
- LEAVEIFERRORL(iTimer.CreateLocal());
+ TInt err = iTimer.CreateLocal();
+ if(err < 0)
+ {
+ OstTrace1( TRACE_FATAL, CUSBDUMMYCLASSCONTROLLER_CONSTRUCTL, "CUsbDummyClassController::ConstructL; iTimer.CreateLocal() error, Leave error=%d", err );
+ User::Leave(err);
+ }
}
CUsbDummyClassController::~CUsbDummyClassController()
@@ -174,18 +183,19 @@
* @param aBehaviour The behaviour struct to read to.
*/
{
- LOG_FUNC
-#ifdef __FLOG_ACTIVE
- TBuf8<KMaxName> buf;
- buf.Copy(aSection);
- LOGTEXT2(_L8("\taSection = %S"), &buf);
-#endif // __FLOG_ACTIVE
+ OstTraceFunctionEntry0( CUSBDUMMYCLASSCONTROLLER_GETBEHAVIOUR_ENTRY );
+#ifdef _DEBUG
+ OstTraceExt1( TRACE_NORMAL, CUSBDUMMYCLASSCONTROLLER_GETBEHAVIOUR,
+ "CUsbDummyClassController::GetBehaviour;aSection=%S", aSection );
+#endif//_DEBUG
TPtrC temp;
if ( !aIniFile.FindVar(aSection, KType(), temp) )
{
- LOGTEXT2(_L8("\tPANICKING: can't find Type item in section %S"), &aSection);
- _USB_PANIC(KDummyControllerPanic, EDummyPanicBadIniFile);
+ OstTraceExt1( TRACE_NORMAL, CUSBDUMMYCLASSCONTROLLER_GETBEHAVIOUR_DUP1,
+ "CUsbDummyClassController::GetBehaviour;PANICKING: can't find Type item in section %S", aSection );
+ OstTrace1( TRACE_FATAL, CUSBDUMMYCLASSCONTROLLER_GETBEHAVIOUR_DUP2, "CUsbDummyClassController::GetBehaviour; panic code=%d", EDummyPanicBadIniFile );
+ User::Panic(KDummyControllerPanic, EDummyPanicBadIniFile );
}
if ( temp == KSync )
{
@@ -201,21 +211,28 @@
}
else
{
- LOGTEXT3(_L8("\tPANICKING: bad Type value (%S) in section %S"), &temp, &aSection);
- _USB_PANIC(KDummyControllerPanic, EDummyPanicBadIniFile);
+ OstTraceExt2( TRACE_NORMAL, CUSBDUMMYCLASSCONTROLLER_GETBEHAVIOUR_DUP3,
+ "CUsbDummyClassController::GetBehaviour;PANICKING: bad Type value (%S) in section %S", temp, aSection );
+ OstTrace1( TRACE_FATAL, CUSBDUMMYCLASSCONTROLLER_GETBEHAVIOUR_DUP4, "CUsbDummyClassController::GetBehaviour; panic code=%d", EDummyPanicBadIniFile );
+ User::Panic(KDummyControllerPanic, EDummyPanicBadIniFile);
}
TInt delay;
if ( !aIniFile.FindVar(aSection, KTime(), delay) )
{
- LOGTEXT2(_L8("\tPANICKING: can't find Time item in section %S"), &aSection);
- _USB_PANIC(KDummyControllerPanic, EDummyPanicBadIniFile);
+ OstTraceExt1( TRACE_NORMAL, CUSBDUMMYCLASSCONTROLLER_GETBEHAVIOUR_DUP5,
+ "CUsbDummyClassController::GetBehaviour;PANICKING: can't find Time item in section %S", aSection );
+ OstTrace1( TRACE_FATAL, CUSBDUMMYCLASSCONTROLLER_GETBEHAVIOUR_DUP6, "CUsbDummyClassController::GetBehaviour;panic code=%d", EDummyPanicBadIniFile );
+ User::Panic(KDummyControllerPanic, EDummyPanicBadIniFile);
}
aBehaviour.iDelay = delay;
if ( !aIniFile.FindVar(aSection, KError(), aBehaviour.iErrorCode) )
{
- LOGTEXT2(_L8("\tPANICKING: can't find Error item in section %S"), &aSection);
- _USB_PANIC(KDummyControllerPanic, EDummyPanicBadIniFile);
+ OstTraceExt1( TRACE_NORMAL, CUSBDUMMYCLASSCONTROLLER_GETBEHAVIOUR_DUP7,
+ "CUsbDummyClassController::GetBehaviour;aSection=%S", aSection );
+ OstTrace1( TRACE_FATAL, CUSBDUMMYCLASSCONTROLLER_GETBEHAVIOUR_DUP8, "CUsbDummyClassController::GetBehaviour;panic code=%d", EDummyPanicBadIniFile );
+ User::Panic(KDummyControllerPanic, EDummyPanicBadIniFile );
}
+ OstTraceFunctionExit0( CUSBDUMMYCLASSCONTROLLER_GETBEHAVIOUR_EXIT );
}
void CUsbDummyClassController::DoGetConfigL()
@@ -223,7 +240,7 @@
* Reads the config from the ini file.
*/
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CUSBDUMMYCLASSCONTROLLER_DOGETCONFIGL_ENTRY );
CIniFile* iniFile = CIniFile::NewL(_L("dummy.ini"));
CleanupStack::PushL(iniFile);
@@ -237,6 +254,7 @@
GetBehaviour(*iniFile, section, iShutdownBehaviour);
CleanupStack::PopAndDestroy(iniFile);
+ OstTraceFunctionExit0( CUSBDUMMYCLASSCONTROLLER_DOGETCONFIGL_EXIT );
}
void CUsbDummyClassController::GetConfig()
@@ -247,7 +265,7 @@
* the user to figure out what's gone wrong.
*/
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CUSBDUMMYCLASSCONTROLLER_GETCONFIG_ENTRY );
// Always use dummy.ini. The entity setting up the test is responsible for
// copying the correct file to c:\\dummy.ini. The first found
@@ -255,16 +273,25 @@
TRAPD(err, DoGetConfigL());
if ( err != KErrNone )
{
- _USB_PANIC(KDummyControllerPanic, EDummyPanicUnhandledError);
+ OstTrace1( TRACE_FATAL, CUSBDUMMYCLASSCONTROLLER_GETCONFIG_DUP7, "CUsbDummyClassController::GetConfig;panic code=%d", EDummyPanicUnhandledError );
+ User::Panic(KDummyControllerPanic, EDummyPanicUnhandledError);
}
- LOGTEXT2(_L8("\tLogging dummy class controller behaviour for instance %d"), iIndex);
- LOGTEXT2(_L8("\tiStartupBehaviour.iSynchronicity = %d"), iStartupBehaviour.iSynchronicity);
- LOGTEXT2(_L8("\tiStartupBehaviour.iDelay = %d"), iStartupBehaviour.iDelay.Int());
- LOGTEXT2(_L8("\tiStartupBehaviour.iErrorCode = %d"), iStartupBehaviour.iErrorCode);
- LOGTEXT2(_L8("\tiShutdownBehaviour.iSynchronicity = %d"), iShutdownBehaviour.iSynchronicity);
- LOGTEXT2(_L8("\tiShutdownBehaviour.iDelay = %d"), iShutdownBehaviour.iDelay.Int());
- LOGTEXT2(_L8("\tiShutdownBehaviour.iErrorCode = %d"), iShutdownBehaviour.iErrorCode);
+ OstTrace1( TRACE_NORMAL, CUSBDUMMYCLASSCONTROLLER_GETCONFIG,
+ "CUsbDummyClassController::GetConfig; Logging dummy class controller behaviour for instance %d", iIndex );
+ OstTrace1( TRACE_NORMAL, CUSBDUMMYCLASSCONTROLLER_GETCONFIG_DUP1,
+ "CUsbDummyClassController::GetConfig;iStartupBehaviour.iSynchronicity=%d", iStartupBehaviour.iSynchronicity );
+ OstTrace1( TRACE_NORMAL, CUSBDUMMYCLASSCONTROLLER_GETCONFIG_DUP2,
+ "CUsbDummyClassController::GetConfig;iStartupBehaviour.iDelay.Int()=%d", iStartupBehaviour.iDelay.Int() );
+ OstTrace1( TRACE_NORMAL, CUSBDUMMYCLASSCONTROLLER_GETCONFIG_DUP3,
+ "CUsbDummyClassController::GetConfig;iStartupBehaviour.iErrorCode=%d", iStartupBehaviour.iErrorCode );
+ OstTrace1( TRACE_NORMAL, CUSBDUMMYCLASSCONTROLLER_GETCONFIG_DUP4,
+ "CUsbDummyClassController::GetConfig;iShutdownBehaviour.iSynchronicity=%d", iShutdownBehaviour.iSynchronicity );
+ OstTrace1( TRACE_NORMAL, CUSBDUMMYCLASSCONTROLLER_GETCONFIG_DUP5,
+ "CUsbDummyClassController::GetConfig;iShutdownBehaviour.iDelay.Int()=%d", iShutdownBehaviour.iDelay.Int() );
+ OstTrace1( TRACE_NORMAL, CUSBDUMMYCLASSCONTROLLER_GETCONFIG_DUP6,
+ "CUsbDummyClassController::GetConfig;iShutdownBehaviour.iErrorCode=%d", iShutdownBehaviour.iErrorCode );
+ OstTraceFunctionExit0( CUSBDUMMYCLASSCONTROLLER_GETCONFIG_EXIT );
}
void CUsbDummyClassController::Start(TRequestStatus& aStatus)
@@ -274,11 +301,16 @@
* @param aStatus Will be completed with success or failure.
*/
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CUSBDUMMYCLASSCONTROLLER_START_ENTRY );
+
+ //Start() should only be called if the CC is idle or started
- //Start() should only be called if the CC is idle or started
- __ASSERT_DEBUG((iState == EUsbServiceIdle || iState == EUsbServiceStarted),
- _USB_PANIC(KDummyControllerPanic, EDummyPanicBadApiCallStart) );
+ if(!(iState == EUsbServiceIdle || iState == EUsbServiceStarted))
+ {
+ OstTrace1( TRACE_FATAL, CUSBDUMMYCLASSCONTROLLER_START, "CUsbDummyClassController::Start;panic code=%d", EDummyPanicBadApiCallStart );
+ __ASSERT_DEBUG(EFalse,
+ User::Panic(KDummyControllerPanic, EDummyPanicBadApiCallStart) );
+ }
// Get config from ini file. Note that can't be done once in ConstructL
// because then, in the case of a CC which doesn't Stop, we'd never be
@@ -286,8 +318,12 @@
GetConfig();
// NB We enforce that the device doesn't re-post requests on us.
- __ASSERT_DEBUG(!iReportStatus,
- _USB_PANIC(KDummyControllerPanic, EDummyPanicOutstandingRequestFromDevice));
+ if(iReportStatus)
+ {
+ OstTrace1( TRACE_FATAL, CUSBDUMMYCLASSCONTROLLER_START_DUP1, "CUsbDummyClassController::Start;panic code=%d", EDummyPanicOutstandingRequestFromDevice );
+ __ASSERT_DEBUG(EFalse,
+ User::Panic(KDummyControllerPanic, EDummyPanicOutstandingRequestFromDevice));
+ }
aStatus = KRequestPending;
iReportStatus = &aStatus;
@@ -304,7 +340,13 @@
case EAsynchronous:
iTimer.After(iStatus, iStartupBehaviour.iDelay);
- __ASSERT_DEBUG(!IsActive(), _USB_PANIC(KDummyControllerPanic, EDummyPanicAlreadyActive));
+#ifdef _DEBUG
+ if(IsActive())
+ {
+ OstTrace1( TRACE_FATAL, CUSBDUMMYCLASSCONTROLLER_START_DUP2, "CUsbDummyClassController::Start;panic code=%d", EDummyPanicAlreadyActive );
+ User::Panic(KDummyControllerPanic, EDummyPanicAlreadyActive);
+ }
+#endif
SetActive();
break;
@@ -313,9 +355,11 @@
break;
default:
- _USB_PANIC(KDummyControllerPanic, EDummyPanicBadSynchronicity);
+ OstTrace1( TRACE_FATAL, CUSBDUMMYCLASSCONTROLLER_START_DUP3, "CUsbDummyClassController::Start;panic code=%d", EDummyPanicBadSynchronicity );
+ User::Panic(KDummyControllerPanic, EDummyPanicBadSynchronicity);
break;
}
+ OstTraceFunctionExit0( CUSBDUMMYCLASSCONTROLLER_START_EXIT );
}
void CUsbDummyClassController::Stop(TRequestStatus& aStatus)
@@ -325,11 +369,15 @@
* @param aStatus Will be completed with success or failure.
*/
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CUSBDUMMYCLASSCONTROLLER_STOP_ENTRY );
//Stop() should only be called if the CC is Started or Idle
- __ASSERT_DEBUG((iState == EUsbServiceStarted || iState == EUsbServiceIdle),
- _USB_PANIC(KDummyControllerPanic, EDummyPanicBadApiCallStop));
+ if(!(iState == EUsbServiceStarted || iState == EUsbServiceIdle))
+ {
+ OstTrace1( TRACE_FATAL, CUSBDUMMYCLASSCONTROLLER_STOP, "CUsbDummyClassController::Stop;panic code=%d", EDummyPanicBadApiCallStop );
+ __ASSERT_DEBUG(EFalse,
+ User::Panic(KDummyControllerPanic, EDummyPanicBadApiCallStop));
+ }
// Get config from ini file. Note that can't be done once in ConstructL
// because then, in the case of a CC which doesn't Stop, we'd never be
@@ -337,8 +385,12 @@
GetConfig();
// NB We enforce that the device doesn't re-post requests on us.
- __ASSERT_DEBUG(!iReportStatus,
- _USB_PANIC(KDummyControllerPanic, EDummyPanicOutstandingRequestFromDevice));
+ if(iReportStatus)
+ {
+ OstTrace1( TRACE_FATAL, CUSBDUMMYCLASSCONTROLLER_STOP_DUP1, "CUsbDummyClassController::Stop;panic code=%d", EDummyPanicOutstandingRequestFromDevice );
+ __ASSERT_DEBUG(EFalse,
+ User::Panic(KDummyControllerPanic, EDummyPanicOutstandingRequestFromDevice));
+ }
aStatus = KRequestPending;
iReportStatus = &aStatus;
@@ -355,7 +407,13 @@
case EAsynchronous:
iTimer.After(iStatus, iShutdownBehaviour.iDelay);
- __ASSERT_DEBUG(!IsActive(), _USB_PANIC(KDummyControllerPanic, EDummyPanicAlreadyActive));
+#ifdef _DEBUG
+ if(IsActive())
+ {
+ OstTrace1( TRACE_FATAL, CUSBDUMMYCLASSCONTROLLER_STOP_DUP2, "CUsbDummyClassController::Stop;panic code=%d", EDummyPanicAlreadyActive );
+ User::Panic(KDummyControllerPanic, EDummyPanicAlreadyActive);
+ }
+#endif
SetActive();
break;
@@ -364,9 +422,11 @@
break;
default:
- _USB_PANIC(KDummyControllerPanic, EDummyPanicBadSynchronicity);
+ OstTrace1( TRACE_FATAL, CUSBDUMMYCLASSCONTROLLER_STOP_DUP3, "CUsbDummyClassController::Stop;panic code=%d", EDummyPanicBadSynchronicity );
+ User::Panic(KDummyControllerPanic, EDummyPanicBadSynchronicity);
break;
}
+ OstTraceFunctionExit0( CUSBDUMMYCLASSCONTROLLER_STOP_EXIT );
}
void CUsbDummyClassController::GetDescriptorInfo(TUsbDescriptor& aDescriptorInfo) const
@@ -385,8 +445,9 @@
* Standard active object RunL.
*/
{
- LOGTEXT3(_L8(">>CUsbDummyClassController::RunL [iStatus=%d,iState=%d]"),
- iStatus.Int(), iState);
+ OstTraceFunctionEntry0( CUSBDUMMYCLASSCONTROLLER_RUNL_ENTRY );
+ OstTraceExt2( TRACE_NORMAL, CUSBDUMMYCLASSCONTROLLER_RUNL, "CUsbDummyClassController::RunL;iStatus.Int()=%d;iState=%d", iStatus.Int(), iState );
+
if ( iStatus != KErrNone )
{
@@ -394,18 +455,27 @@
// there's no point trying to code round them. This is part of the
// test framework and if it's failing we want to alert the user
// without faffing around. (It invalidates the test.)
- _USB_PANIC(KDummyControllerPanic, EDummyPanicUnhandledError);
+ OstTrace1( TRACE_FATAL, CUSBDUMMYCLASSCONTROLLER_RUNL_DUP1, "CUsbDummyClassController::RunL;panic code=%d", EDummyPanicUnhandledError );
+ User::Panic(KDummyControllerPanic, EDummyPanicUnhandledError);
}
- __ASSERT_DEBUG(iReportStatus,
- _USB_PANIC(KDummyControllerPanic, EDummyPanicBadState));
+ if(!iReportStatus)
+ {
+ OstTrace1( TRACE_FATAL, CUSBDUMMYCLASSCONTROLLER_RUNL_DUP2, "CUsbDummyClassController::RunL;panic code=%d", EDummyPanicBadState );
+ __ASSERT_DEBUG(EFalse,
+ User::Panic(KDummyControllerPanic, EDummyPanicBadState));
+ }
switch ( iState )
{
case EUsbServiceStarting:
// Completion of asynchronous startup...
- __ASSERT_DEBUG(iStartupBehaviour.iSynchronicity == EAsynchronous,
- _USB_PANIC(KDummyControllerPanic, EDummyPanicBadSynchronicity));
+ if(iStartupBehaviour.iSynchronicity != EAsynchronous)
+ {
+ OstTrace1( TRACE_FATAL, CUSBDUMMYCLASSCONTROLLER_RUNL_DUP3, "CUsbDummyClassController::RunL;panic code=%d", EDummyPanicBadSynchronicity );
+ __ASSERT_DEBUG(EFalse,
+ User::Panic(KDummyControllerPanic, EDummyPanicBadSynchronicity));
+ }
iState = EUsbServiceStarted;
User::RequestComplete(iReportStatus, iStartupBehaviour.iErrorCode);
iReportStatus = NULL;
@@ -413,8 +483,12 @@
case EUsbServiceStopping:
// Completion of asynchronous shutdown...
- __ASSERT_DEBUG(iShutdownBehaviour.iSynchronicity == EAsynchronous,
- _USB_PANIC(KDummyControllerPanic, EDummyPanicBadSynchronicity));
+ if(iShutdownBehaviour.iSynchronicity != EAsynchronous)
+ {
+ OstTrace1( TRACE_FATAL, CUSBDUMMYCLASSCONTROLLER_RUNL_DUP4, "CUsbDummyClassController::RunL;panic code=%d", EDummyPanicBadSynchronicity );
+ __ASSERT_DEBUG(EFalse,
+ User::Panic(KDummyControllerPanic, EDummyPanicBadSynchronicity));
+ }
iState = EUsbServiceIdle;
User::RequestComplete(iReportStatus, iShutdownBehaviour.iErrorCode);
iReportStatus = NULL;
@@ -423,11 +497,12 @@
case EUsbServiceIdle:
case EUsbServiceStarted:
default:
- _USB_PANIC(KDummyControllerPanic, EDummyPanicBadState);
+ OstTrace1( TRACE_FATAL, CUSBDUMMYCLASSCONTROLLER_RUNL_DUP5, "CUsbDummyClassController::RunL;panic code=%d", EDummyPanicBadState );
+ User::Panic(KDummyControllerPanic, EDummyPanicBadState);
break;
}
- LOGTEXT(_L8("<<CUsbDummyClassController::RunL"));
+ OstTraceFunctionExit0( CUSBDUMMYCLASSCONTROLLER_RUNL_EXIT );
}
void CUsbDummyClassController::DoCancel()
@@ -435,7 +510,7 @@
* Standard active object cancellation function.
*/
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CUSBDUMMYCLASSCONTROLLER_DOCANCEL_ENTRY );
// Note that CActive::Cancel does not call DoCancel unless we are active.
// Therefore we are at this point active. Therefore, we should have
@@ -451,8 +526,13 @@
// the middle of a Start, then immediately issue another Start.
// Cancel our own asynchronous operation.
- __ASSERT_DEBUG(iTimer.Handle(),
- _USB_PANIC(KDummyControllerPanic, EDummyPanicBadState));
+#ifdef _DEBUG
+ if(!iTimer.Handle())
+ {
+ OstTrace1( TRACE_FATAL, CUSBDUMMYCLASSCONTROLLER_DOCANCEL, "CUsbDummyClassController::DoCancel;panic code=%d", EDummyPanicBadState );
+ User::Panic(KDummyControllerPanic, EDummyPanicBadState);
+ }
+#endif
iTimer.Cancel();
// Update our iState. If we're starting, then roll back to idle. If we're
@@ -460,29 +540,43 @@
switch ( iState )
{
case EUsbServiceStarting:
- __ASSERT_DEBUG(iStartupBehaviour.iSynchronicity == EAsynchronous,
- _USB_PANIC(KDummyControllerPanic, EDummyPanicBadSynchronicity));
+ if(iStartupBehaviour.iSynchronicity != EAsynchronous)
+ {
+ OstTrace1( TRACE_FATAL, CUSBDUMMYCLASSCONTROLLER_DOCANCEL_DUP1, "CUsbDummyClassController::DoCancel;panic code=%d", EDummyPanicBadSynchronicity );
+ __ASSERT_DEBUG(EFalse,
+ User::Panic(KDummyControllerPanic, EDummyPanicBadSynchronicity));
+ }
iState = EUsbServiceIdle;
break;
case EUsbServiceStopping:
- __ASSERT_DEBUG(iShutdownBehaviour.iSynchronicity == EAsynchronous,
- _USB_PANIC(KDummyControllerPanic, EDummyPanicBadSynchronicity));
+ if(iShutdownBehaviour.iSynchronicity != EAsynchronous)
+ {
+ OstTrace1( TRACE_FATAL, CUSBDUMMYCLASSCONTROLLER_DOCANCEL_DUP2, "CUsbDummyClassController::DoCancel;panic code=%d", EDummyPanicBadSynchronicity );
+ __ASSERT_DEBUG(EFalse,
+ User::Panic(KDummyControllerPanic, EDummyPanicBadSynchronicity));
+ }
iState = EUsbServiceStarted;
break;
case EUsbServiceIdle:
case EUsbServiceStarted:
default:
- _USB_PANIC(KDummyControllerPanic, EDummyPanicBadState);
+ OstTrace1( TRACE_FATAL, CUSBDUMMYCLASSCONTROLLER_DOCANCEL_DUP3, "CUsbDummyClassController::DoCancel;panic code=%d", EDummyPanicBadState );
+ User::Panic(KDummyControllerPanic, EDummyPanicBadState);
break;
}
- // Complete the client's request.
- __ASSERT_DEBUG(iReportStatus,
- _USB_PANIC(KDummyControllerPanic, EDummyPanicBadState));
+ // Complete the client's request.
+ if(!iReportStatus)
+ {
+ OstTrace1( TRACE_FATAL, CUSBDUMMYCLASSCONTROLLER_DOCANCEL_DUP4, "CUsbDummyClassController::DoCancel;panic code=%d", EDummyPanicBadState );
+ __ASSERT_DEBUG(EFalse,
+ User::Panic(KDummyControllerPanic, EDummyPanicBadState));
+ }
User::RequestComplete(iReportStatus, KErrCancel);
iReportStatus = NULL;
+ OstTraceFunctionExit0( CUSBDUMMYCLASSCONTROLLER_DOCANCEL_EXIT );
}
TInt CUsbDummyClassController::RunError(TInt /*aError*/)
@@ -493,8 +587,9 @@
* should never be called as there is another mechanism for catching errors.
*/
{
- __ASSERT_DEBUG(EFalse,
- _USB_PANIC(KDummyControllerPanic, EDummyPanicBadState));
+ OstTrace1( TRACE_FATAL, CUSBDUMMYCLASSCONTROLLER_RUNERROR, "CUsbDummyClassController::RunError;panic code=%d", EDummyPanicBadState );
+ __ASSERT_DEBUG(EFalse,
+ User::Panic(KDummyControllerPanic, EDummyPanicBadState));
return KErrNone;
}
--- a/usbmgmt/usbmgr/usbman/server/SRC/CUsbOtg.cpp Wed Jul 07 14:16:40 2010 +0800
+++ b/usbmgmt/usbmgr/usbman/server/SRC/CUsbOtg.cpp Wed Jul 07 15:08:54 2010 +0800
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2008-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"
@@ -21,20 +21,22 @@
@file
*/
+#include <e32property.h> //Publish & Subscribe header
#include "CUsbOtg.h"
#include "cusbotgwatcher.h"
#include "CUsbDevice.h"
#include "musbotghostnotifyobserver.h"
#include "CUsbServer.h"
-#include <e32property.h> //Publish & Subscribe header
#include "usberrors.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "CUsbOtgTraces.h"
+#endif
+
//Name used in call to User::LoadLogicalDevice/User::FreeLogicalDevice
_LIT(KUsbOtgLDDName,"otgdi");
-#ifdef __FLOG_ACTIVE
-_LIT8(KLogComponent, "USBSVR-OTG");
-#endif
CUsbOtg* CUsbOtg::NewL()
@@ -44,12 +46,13 @@
* @return A new CUsbOtg object
*/
{
- LOG_STATIC_FUNC_ENTRY
+ OstTraceFunctionEntry0( CUSBOTG_NEWL_ENTRY );
CUsbOtg* self = new (ELeave) CUsbOtg();
CleanupStack::PushL(self);
self->ConstructL();
CleanupStack::Pop(self);
+ OstTraceFunctionExit0( CUSBOTG_NEWL_EXIT );
return self;
}
@@ -59,8 +62,7 @@
* Destructor.
*/
{
- LOG_FUNC
-
+ OstTraceFunctionEntry0( CUSBOTG_CUSBOTG_DES_ENTRY );
// Cancel any outstanding asynchronous operation.
Stop();
@@ -69,76 +71,93 @@
// the observers themselves.
iObservers.Reset();
- LOGTEXT2(_L8("about to stop Id-Pin watcher @ %08x"), (TUint32) iIdPinWatcher);
+ OstTrace1( TRACE_NORMAL, CUSBOTG_CUSBOTG, "CUsbOtg::~CUsbOtg;iIdPinWatcher=%08x", (TUint32)iIdPinWatcher );
+
if (iIdPinWatcher)
{
iIdPinWatcher->Cancel();
delete iIdPinWatcher;
iIdPinWatcher = NULL;
- LOGTEXT(_L8("deleted Id-Pin watcher"));
+ OstTrace0( TRACE_NORMAL, CUSBOTG_CUSBOTG_DUP1, "CUsbOtg::~CUsbOtg;deleted Id-Pin watcher" );
+
}
- LOGTEXT2(_L8("about to stop Vbus watcher @ %08x"), (TUint32) iVbusWatcher);
+ OstTrace1( TRACE_NORMAL, CUSBOTG_CUSBOTG_DUP2, "CUsbOtg::~CUsbOtg;about to stop Vbus watcher @ %08x", (TUint32)iVbusWatcher );
+
if (iVbusWatcher)
{
iVbusWatcher->Cancel();
delete iVbusWatcher;
iVbusWatcher = NULL;
- LOGTEXT(_L8("deleted Vbus watcher"));
+ OstTrace0( TRACE_NORMAL, CUSBOTG_CUSBOTG_DUP3, "CUsbOtg::~CUsbOtg;deleted Vbus watcher" );
+
}
- LOGTEXT2(_L8("about to stop OTG State watcher @ %08x"), (TUint32) iVbusWatcher);
+ OstTrace1( TRACE_NORMAL, CUSBOTG_CUSBOTG_DUP4, "CUsbOtg::~CUsbOtg;about to stop OTG State watcher @ %08x", (TUint32) iVbusWatcher );
+
if (iOtgStateWatcher)
{
iOtgStateWatcher->Cancel();
delete iOtgStateWatcher;
iOtgStateWatcher = NULL;
- LOGTEXT(_L8("deleted OTG State watcher"));
+ OstTrace0( TRACE_NORMAL, CUSBOTG_CUSBOTG_DUP5, "CUsbOtg::~CUsbOtg;deleted OTG State watcher" );
+
}
- LOGTEXT2(_L8("about to stop OTG Event watcher @ %08x"), (TUint32) iVbusWatcher);
+ OstTrace1( TRACE_NORMAL, CUSBOTG_CUSBOTG_DUP6, "CUsbOtg::~CUsbOtg;about to stop OTG Event watcher @ %08x", (TUint32) iVbusWatcher );
+
if (iOtgEventWatcher)
{
iOtgEventWatcher->Cancel();
delete iOtgEventWatcher;
iOtgEventWatcher = NULL;
- LOGTEXT(_L8("deleted OTG Event watcher"));
+ OstTrace0( TRACE_NORMAL, CUSBOTG_CUSBOTG_DUP7, "CUsbOtg::~CUsbOtg;deleted OTG Event watcher" );
+
}
if (iRequestSessionWatcher)
{
delete iRequestSessionWatcher;
- LOGTEXT(_L8("deleted Session Request watcher"));
+ OstTrace0( TRACE_NORMAL, CUSBOTG_CUSBOTG_DUP8, "CUsbOtg::~CUsbOtg;deleted Session Request watcher" );
+
}
- LOGTEXT2(_L8("about to stop Connection Idle watcher @ %08x"), (TUint32)iOtgConnectionIdleWatcher);
+ OstTrace1( TRACE_NORMAL, CUSBOTG_CUSBOTG_DUP9,
+ "CUsbOtg::~CUsbOtg;about to stop Connection Idle watcher @ %08x", (TUint32)iOtgConnectionIdleWatcher );
+
if (iOtgConnectionIdleWatcher)
{
iOtgConnectionIdleWatcher->Cancel();
delete iOtgConnectionIdleWatcher;
iOtgConnectionIdleWatcher= NULL;
- LOGTEXT(_L8("deleted Connection Idle watcher"));
+ OstTrace0( TRACE_NORMAL, CUSBOTG_CUSBOTG_DUP10, "CUsbOtg::~CUsbOtg;deleted Connection Idle watcher" );
+
}
// Unload OTGDI components if it was ever started
if ( iOtgDriver.Handle() )
{
- LOGTEXT(_L8("Stopping stacks"));
+ OstTrace0( TRACE_NORMAL, CUSBOTG_CUSBOTG_DUP11, "CUsbOtg::~CUsbOtg; Stopping stacks" );
+
iOtgDriver.StopStacks();
iOtgDriver.Close();
}
else
{
- LOGTEXT(_L8("No OTG Driver session was opened, nothing to do"));
+ OstTrace0( TRACE_NORMAL, CUSBOTG_CUSBOTG_DUP12, "CUsbOtg::~CUsbOtg; No OTG Driver session was opened, nothing to do" );
+
}
- LOGTEXT(_L8("Freeing logical device"));
+ OstTrace0( TRACE_NORMAL, CUSBOTG_CUSBOTG_DUP13, "CUsbOtg::~CUsbOtg; Freeing logical device" );
+
TInt err = User::FreeLogicalDevice(KUsbOtgLDDName);
//Putting the LOGTEXT2 inside the if statement prevents a compiler
//warning about err being unused in UREL builds.
if(err)
{
- LOGTEXT2(_L8(" User::FreeLogicalDevice returned %d"),err);
+ OstTrace1( TRACE_NORMAL, CUSBOTG_CUSBOTG_DUP14, "CUsbOtg::~CUsbOtg; User::FreeLogicalDevice returned %d", err );
+
}
iCriticalSection.Close();
+ OstTraceFunctionExit0( CUSBOTG_CUSBOTG_DES_EXIT );
}
@@ -147,7 +166,9 @@
* Constructor.
*/
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CUSBOTG_CUSBOTG_CONS_ENTRY );
+
+ OstTraceFunctionExit0( CUSBOTG_CUSBOTG_CONS_EXIT );
}
@@ -156,31 +177,41 @@
* Performs 2nd phase construction of the OTG object.
*/
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CUSBOTG_CONSTRUCTL_ENTRY );
- LOGTEXT(_L8("About to open LDD"));
+ OstTrace0( TRACE_NORMAL, CUSBOTG_CONSTRUCTL, "CUsbOtg::ConstructL; About to open LDD" );
+
iLastError = User::LoadLogicalDevice(KUsbOtgLDDName);
if ( (iLastError != KErrNone) && (iLastError != KErrAlreadyExists) )
{
- LOGTEXT3(_L8("Error %d: Unable to load driver: %S"), iLastError, &KUsbOtgLDDName);
- LEAVEIFERRORL(iLastError);
+ if(iLastError < 0)
+ {
+ OstTraceExt2( TRACE_NORMAL, CUSBOTG_CONSTRUCTL_DUP1, "CUsbOtg::ConstructL; Error %d: Unable to load driver: %S", iLastError, KUsbOtgLDDName );
+ User::Leave(iLastError);
+ }
}
-
- LOGTEXT(_L8("About to open RUsbOtgDriver"));
+ OstTrace0( TRACE_NORMAL, CUSBOTG_CONSTRUCTL_DUP3, "CUsbOtg::ConstructL; About to open RUsbOtgDriver" );
+
iLastError = iOtgDriver.Open();
if ( (iLastError != KErrNone) && (iLastError != KErrAlreadyExists) )
{
- LOGTEXT2(_L8("Error %d: Unable to open RUsbOtgDriver session"), iLastError);
- LEAVEIFERRORL(iLastError);
+ if(iLastError < 0)
+ {
+ OstTrace1( TRACE_NORMAL, CUSBOTG_CONSTRUCTL_DUP4, "CUsbOtg::ConstructL; Error %d: Unable to open RUsbOtgDriver session", iLastError );
+ User::Leave(iLastError);
+ }
}
-
- LOGTEXT(_L8("About to start OTG stacks"));
+ OstTrace0( TRACE_NORMAL, CUSBOTG_CONSTRUCTL_DUP2, "CUsbOtg::ConstructL; About to start OTG stacks" );
+
iLastError = iOtgDriver.StartStacks();
if (iLastError != KErrNone)
{
- LOGTEXT2(_L8("Error %d: Unable to open start OTG stacks"), iLastError);
- LEAVEIFERRORL(iLastError);
+ if(iLastError < 0)
+ {
+ OstTrace1( TRACE_NORMAL, CUSBOTG_CONSTRUCTL_DUP5, "CUsbOtg::ConstructL; Error %d: Unable to open start OTG stacks", iLastError );
+ User::Leave(iLastError);
+ }
}
// Request Otg notifications
@@ -203,7 +234,9 @@
iCriticalSection.CreateLocal(EOwnerProcess);
- LOGTEXT(_L8("UsbOtg::ConstructL() finished"));
+ OstTrace0( TRACE_NORMAL, CUSBOTG_CONSTRUCTL_DUP6, "CUsbOtg::ConstructL; UsbOtg::ConstructL() finished" );
+
+ OstTraceFunctionExit0( CUSBOTG_CONSTRUCTL_EXIT );
}
void CUsbOtg::NotifyMessage(TInt aMessage)
@@ -275,7 +308,9 @@
TInt otgEvent = TranslateOtgEvent();
if ( otgEvent == KErrBadName )
{
- LOGTEXT2(_L8("CUsbOtg::NotifyOtgEvent(): OTG event %d was reported, but not propagated"), (TInt) iOtgEvent);
+ OstTrace1( TRACE_NORMAL, CUSBOTG_NOTIFYOTGEVENT,
+ "CUsbOtg::NotifyOtgEvent;OTG event %d was reported, but not propagated", (TInt)iOtgEvent );
+
return;
}
@@ -293,9 +328,16 @@
* @param aObserver New Observer of the OTG events
*/
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CUSBOTG_REGISTEROBSERVERL_ENTRY );
- LEAVEIFERRORL(iObservers.Append(&aObserver));
+ TInt err = iObservers.Append(&aObserver);
+ if(err < 0)
+ {
+ OstTrace1( TRACE_NORMAL, CUSBOTG_REGISTEROBSERVERL, "CUsbOtg::RegisterObserverL; iObservers.Append(&aObserver) error, Leave error=%d", err );
+ User::Leave(err);
+ }
+
+ OstTraceFunctionExit0( CUSBOTG_REGISTEROBSERVERL_EXIT );
}
@@ -306,7 +348,7 @@
* @param aObserver The existing OTG events observer to be de-registered
*/
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CUSBOTG_DEREGISTEROBSERVER_ENTRY );
TInt index = iObservers.Find(&aObserver);
@@ -314,6 +356,7 @@
{
iObservers.Remove(index);
}
+ OstTraceFunctionExit0( CUSBOTG_DEREGISTEROBSERVER_EXIT );
}
@@ -323,10 +366,11 @@
* Reports errors and OTG events via observer interface.
*/
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CUSBOTG_STARTL_ENTRY );
iOtgWatcher = CUsbOtgWatcher::NewL(*this, iOtgDriver, iOtgMessage);
iOtgWatcher->Start();
+ OstTraceFunctionExit0( CUSBOTG_STARTL_EXIT );
}
void CUsbOtg::Stop()
@@ -334,41 +378,44 @@
* Stop the USB OTG events watcher
*/
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CUSBOTG_STOP_ENTRY );
- LOGTEXT2(_L8("about to stop OTG watcher @ %08x"), (TUint32) iOtgWatcher);
+ OstTrace1( TRACE_NORMAL, CUSBOTG_STOP, "CUsbOtg::Stop;about to stop OTG watcher @ %08x", (TUint32)iOtgWatcher );
+
if (iOtgWatcher)
{
iOtgWatcher->Cancel();
delete iOtgWatcher;
iOtgWatcher = NULL;
- LOGTEXT(_L8("deleted OTG watcher"));
+ OstTrace0( TRACE_NORMAL, CUSBOTG_STOP_DUP1, "CUsbOtg::Stop" );
+
}
iLastError = KErrNone;
+ OstTraceFunctionExit0( CUSBOTG_STOP_EXIT );
}
TInt CUsbOtg::BusRequest()
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CUSBOTG_BUSREQUEST_ENTRY );
return iOtgDriver.BusRequest();
}
TInt CUsbOtg::BusRespondSrp()
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CUSBOTG_BUSRESPONDSRP_ENTRY );
return iOtgDriver.BusRespondSrp();
}
TInt CUsbOtg::BusClearError()
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CUSBOTG_BUSCLEARERROR_ENTRY );
return iOtgDriver.BusClearError();
}
TInt CUsbOtg::BusDrop()
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CUSBOTG_BUSDROP_ENTRY );
return iOtgDriver.BusDrop();
}
--- a/usbmgmt/usbmgr/usbman/server/SRC/CUsbScheduler.cpp Wed Jul 07 14:16:40 2010 +0800
+++ b/usbmgmt/usbmgr/usbman/server/SRC/CUsbScheduler.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"
@@ -19,13 +19,14 @@
@file
*/
-#include <usb/usblogger.h>
#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)
{
--- a/usbmgmt/usbmgr/usbman/server/SRC/CUsbServer.cpp Wed Jul 07 14:16:40 2010 +0800
+++ b/usbmgmt/usbmgr/usbman/server/SRC/CUsbServer.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"
@@ -21,24 +21,25 @@
*/
#include <e32svr.h>
+#include <usb/usblogger.h>
#include "UsbSettings.h"
#include "CUsbServer.h"
#include "CUsbSession.h"
#include "CUsbDevice.h"
#ifdef SYMBIAN_ENABLE_USB_OTG_HOST_PRIV
+#include <e32property.h> //Publish & Subscribe header
#include "CUsbOtg.h"
#include "cusbhost.h"
-#include <e32property.h> //Publish & Subscribe header
#endif // SYMBIAN_ENABLE_USB_OTG_HOST_PRIV
-#include <usb/usblogger.h>
#include "UsbmanServerSecurityPolicy.h"
-#include <usb/usblogger.h>
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "CUsbServerTraces.h"
+#endif
-#ifdef __FLOG_ACTIVE
-_LIT8(KLogComponent, "USBSVR");
-#endif
+
/**
* The CUsbServer::NewL method
@@ -51,12 +52,13 @@
*/
CUsbServer* CUsbServer::NewLC()
{
- LOG_STATIC_FUNC_ENTRY
+ OstTraceFunctionEntry0( CUSBSERVER_NEWLC_ENTRY );
CUsbServer* self = new(ELeave) CUsbServer;
CleanupStack::PushL(self);
self->StartL(KUsbServerName);
self->ConstructL();
+ OstTraceFunctionExit0( CUSBSERVER_NEWLC_EXIT );
return self;
}
@@ -70,7 +72,7 @@
*/
CUsbServer::~CUsbServer()
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CUSBSERVER_CUSBSERVER_DES_ENTRY );
delete iShutdownTimer;
delete iUsbDevice;
@@ -80,21 +82,21 @@
#ifndef __OVER_DUMMYUSBDI__
// Check that this is A-Device
- LOGTEXT(_L8("Checking Id-Pin state..."));
+ OstTrace0( TRACE_NORMAL, CUSBSERVER_CUSBSERVER, "CUsbServer::~CUsbServer; Checking Id-Pin state..." );
TInt value = 0;
TInt err = RProperty::Get(KUidUsbManCategory, KUsbOtgIdPinPresentProperty,value);
if (err == 0 && value == 1)
{
// Ensure VBus is dropped when Usb server exits
- LOGTEXT(_L8("Checking VBus state..."));
+ OstTrace0( TRACE_NORMAL, CUSBSERVER_CUSBSERVER_DUP1, "CUsbServer::~CUsbServer; Checking VBus state..." );
err = RProperty::Get(KUidUsbManCategory, KUsbOtgVBusPoweredProperty,value);
if ( err == KErrNone && value != 0 )
{
if ( iUsbOtg )
{
err = iUsbOtg->BusDrop();
- LOGTEXT2(_L8("BusDrop() returned err = %d"),err);
- LOGTEXT(_L8("USBMAN will wait until VBus is actually dropped"));
+ OstTrace1( TRACE_NORMAL, CUSBSERVER_CUSBSERVER_DUP2, "CUsbServer::~CUsbServer;BusDrop() returned err = %d", err );
+ OstTrace0( TRACE_NORMAL, CUSBSERVER_CUSBSERVER_DUP3, "CUsbServer::~CUsbServer; USBMAN will wait until VBus is actually dropped" );
// Wait 1 second for Hub driver to perform VBus drop
RTimer timer;
err = timer.CreateLocal();
@@ -107,31 +109,29 @@
}
else
{
- LOGTEXT2(_L8("Failed to create local timer: err = %d"),err);
+ OstTrace1( TRACE_NORMAL, CUSBSERVER_CUSBSERVER_DUP4, "CUsbServer::~CUsbServer;Failed to create local timer: err = %d", err );
}
}
else
{
- LOGTEXT(_L8("Unexpected: OTG object is NULL"));
+ OstTrace0( TRACE_NORMAL, CUSBSERVER_CUSBSERVER_DUP5, "CUsbServer::~CUsbServer; Unexpected: OTG object is NULL" );
}
}
else
{
- LOGTEXT3(_L8("VBus is already dropped or an error occured: err = %d, value =%d"),err,value);
+ OstTraceExt2( TRACE_NORMAL, CUSBSERVER_CUSBSERVER_DUP6, "CUsbServer::~CUsbServer;VBus is already dropped or an error occured: err = %d, value =%d", err, value );
}
}
else
{
- LOGTEXT3(_L8("No Id-Pin is found or an error occured: err = %d, value = %d"), err, value);
+ OstTraceExt2( TRACE_NORMAL, CUSBSERVER_CUSBSERVER_DUP7, "CUsbServer::~CUsbServer;No Id-Pin is found or an error occured: err = %d, value = %d", err, value );
}
delete iUsbOtg;
#endif
#endif // SYMBIAN_ENABLE_USB_OTG_HOST_PRIV
-#ifdef __FLOG_ACTIVE
- CUsbLog::Close();
-#endif
+ OstTraceFunctionExit0( CUSBSERVER_CUSBSERVER_DES_EXIT );
}
@@ -156,12 +156,7 @@
*/
void CUsbServer::ConstructL()
{
-#ifdef __FLOG_ACTIVE
- // Set the logger up so that everything in this thread that logs using it
- // will do so 'connectedly' (i.e. quickly). If this fails, we don't care-
- // logging will still work, just 'statically' (i.e. slowly).
- static_cast<void>(CUsbLog::Connect());
-#endif
+
iShutdownTimer = new(ELeave) CShutdownTimer;
iShutdownTimer->ConstructL();
@@ -174,7 +169,7 @@
#endif // SYMBIAN_ENABLE_USB_OTG_HOST_PRIV
iUsbDevice = CUsbDevice::NewL(*this);
- LOGTEXT(_L8("About to load USB classes"));
+ OstTrace0( TRACE_NORMAL, CUSBSERVER_CONSTRUCTL, "CUsbServer::ConstructL; About to load USB classes" );
iUsbDevice->EnumerateClassControllersL();
#ifndef USE_DUMMY_CLASS_CONTROLLER
@@ -188,11 +183,11 @@
}
else
{
- LOGTEXT(_L8("Personalities unconfigured, so using fallback CCs"));
+ OstTrace0( TRACE_NORMAL, CUSBSERVER_CONSTRUCTL_DUP1, "CUsbServer::ConstructL;Personalities unconfigured, so using fallback CCs" );
iUsbDevice->LoadFallbackClassControllersL();
}
#else // USE_DUMMY_CLASS_CONTROLLER
- LOGTEXT(_L8("Using Dummy Class Controller, so using fallback CCs"));
+ OstTrace0( TRACE_NORMAL, CUSBSERVER_CONSTRUCTL_DUP2, "CUsbServer::ConstructL; Using Dummy Class Controller, so using fallback CCs" );
iUsbDevice->LoadFallbackClassControllersL();
#endif // USE_DUMMY_CLASS_CONTROLLER
@@ -204,7 +199,7 @@
iUsbHost->StartL();
#endif // SYMBIAN_ENABLE_USB_OTG_HOST_PRIV
- LOGTEXT(_L8("CUsbServer constructed"));
+ OstTrace0( TRACE_NORMAL, CUSBSERVER_CONSTRUCTL_DUP3, "CUsbServer::ConstructL; CUsbServer constructed" );
}
@@ -221,23 +216,24 @@
*/
CSession2* CUsbServer::NewSessionL(const TVersion &aVersion, const RMessage2& aMessage) const
{
- LOG_LINE
- LOG_FUNC
+ OstTraceFunctionEntry0( CUSBSERVER_NEWSESSIONL_ENTRY );
(void)aMessage;//Remove compiler warning
TVersion v(KUsbSrvMajorVersionNumber,KUsbSrvMinorVersionNumber,KUsbSrvBuildVersionNumber);
- LOGTEXT(_L8("CUsbServer::NewSessionL - creating new session..."));
+ OstTrace0( TRACE_NORMAL, CUSBSERVER_NEWSESSIONL, "CUsbServer::NewSessionL; CUsbServer::NewSessionL - creating new session..." );
if (!User::QueryVersionSupported(v, aVersion))
{
- LEAVEL(KErrNotSupported);
+ OstTrace1( TRACE_NORMAL, CUSBSERVER_NEWSESSIONL_DUP1, "CUsbServer::NewSessionL;leave reason=%d", KErrNotSupported );
+ User::Leave(KErrNotSupported);
}
CUsbServer* ncThis = const_cast<CUsbServer*>(this);
CUsbSession* sess = CUsbSession::NewL(ncThis);
+ OstTraceFunctionExit0( CUSBSERVER_NEWSESSIONL_EXIT );
return sess;
}
@@ -249,7 +245,7 @@
*/
void CUsbServer::Error(TInt aError)
{
- LOGTEXT2(_L8("CUsbServer::Error [aError=%d]"), aError);
+ OstTrace1( TRACE_NORMAL, CUSBSERVER_ERROR, "CUsbServer::Error;aError=%d", aError );
Message().Complete(aError);
ReStart();
@@ -262,13 +258,18 @@
*/
void CUsbServer::IncrementSessionCount()
{
- LOGTEXT2(_L8(">CUsbServer::IncrementSessionCount %d"), iSessionCount);
- __ASSERT_DEBUG(iSessionCount >= 0, _USB_PANIC(KUsbSvrPncCat, EICSInvalidCount));
+ OstTraceFunctionEntry0( CUSBSERVER_INCREMENTSESSIONCOUNT_ENTRY );
+ OstTrace1( TRACE_NORMAL, CUSBSERVER_INCREMENTSESSIONCOUNT, "CUsbServer::IncrementSessionCount;iSessionCount=%d", iSessionCount );
+ if(iSessionCount < 0)
+ {
+ OstTrace1( TRACE_FATAL, CUSBSERVER_INCREMENTSESSIONCOUNT_DUP1, "CUsbServer::IncrementSessionCount;panic code=%d", EICSInvalidCount );
+ __ASSERT_DEBUG(EFalse, User::Panic(KUsbSvrPncCat, EICSInvalidCount));
+ }
++iSessionCount;
iShutdownTimer->Cancel();
- LOGTEXT(_L8("<CUsbServer::IncrementSessionCount"));
+ OstTraceFunctionExit0( CUSBSERVER_INCREMENTSESSIONCOUNT_EXIT );
}
/**
@@ -278,8 +279,12 @@
*/
void CUsbServer::DecrementSessionCount()
{
- LOGTEXT3(_L8("CUsbServer::DecrementSessionCount %d, %d"), iSessionCount, Device().ServiceState());
- __ASSERT_DEBUG(iSessionCount > 0, _USB_PANIC(KUsbSvrPncCat, EDCSInvalidCount));
+ OstTraceExt2( TRACE_NORMAL, CUSBSERVER_DECREMENTSESSIONCOUNT, "CUsbServer::DecrementSessionCount;iSessionCount=%d;Device().ServiceState()=%d", iSessionCount, Device().ServiceState() );
+ if(iSessionCount <= 0)
+ {
+ OstTrace1( TRACE_FATAL, CUSBSERVER_DECREMENTSESSIONCOUNT_DUP1, "CUsbServer::DecrementSessionCount;panic code=%d", EDCSInvalidCount );
+ __ASSERT_DEBUG(EFalse, User::Panic(KUsbSvrPncCat, EDCSInvalidCount));
+ }
--iSessionCount;
@@ -300,11 +305,17 @@
*/
void CUsbServer::LaunchShutdownTimerIfNoSessions()
{
- LOGTEXT(_L8("CUsbServer::LaunchShutdownTimerIfNoSessions"));
- __ASSERT_DEBUG(Device().ServiceState() == EUsbServiceIdle, _USB_PANIC(KUsbSvrPncCat, ELSTNSNotIdle));
-
+ OstTraceFunctionEntry0( CUSBSERVER_LAUNCHSHUTDOWNTIMERIFNOSESSIONS_ENTRY );
+#ifdef _DEBUG
+ if(Device().ServiceState() != EUsbServiceIdle)
+ {
+ OstTrace1( TRACE_FATAL, CUSBSERVER_LAUNCHSHUTDOWNTIMERIFNOSESSIONS, "CUsbServer::LaunchShutdownTimerIfNoSessions;panic code=%d", ELSTNSNotIdle );
+ User::Panic(KUsbSvrPncCat, ELSTNSNotIdle);
+ }
+#endif
if (iSessionCount == 0)
iShutdownTimer->After(KShutdownDelay);
+ OstTraceFunctionExit0( CUSBSERVER_LAUNCHSHUTDOWNTIMERIFNOSESSIONS_EXIT );
}
/**
--- a/usbmgmt/usbmgr/usbman/server/SRC/CUsbSession.cpp Wed Jul 07 14:16:40 2010 +0800
+++ b/usbmgmt/usbmgr/usbman/server/SRC/CUsbSession.cpp Wed Jul 07 15:08:54 2010 +0800
@@ -20,7 +20,11 @@
@file
*/
+#include <usbstates.h>
+#include <usberrors.h>
+#include <usb/usbshared.h>
#include <usb/usblogger.h>
+
#include "CUsbSession.h"
#include "CUsbDevice.h"
#include "CUsbServer.h"
@@ -30,17 +34,15 @@
#include "cusbhost.h"
#endif // SYMBIAN_ENABLE_USB_OTG_HOST_PRIV
-#include <usbstates.h>
-#include <usberrors.h>
-
-#include <usb/usbshared.h>
#include "CPersonality.h"
#include "rusb.h"
#include "UsbSettings.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "CUsbSessionTraces.h"
+#endif
-#ifdef __FLOG_ACTIVE
-_LIT8(KLogComponent, "USBSVR");
-#endif
+
#ifdef SYMBIAN_ENABLE_USB_OTG_HOST_PRIV
CUsbSession* CUsbSession::iCtlSession = NULL;
@@ -56,7 +58,7 @@
*/
CUsbSession* CUsbSession::NewL(CUsbServer* aServer)
{
- LOG_STATIC_FUNC_ENTRY
+ OstTraceFunctionEntry0( CUSBSESSION_NEWL_ENTRY );
//this class has moved away from standard NewL() semantics
//and now uses the virtual CSession2::CreateL() function
@@ -75,9 +77,10 @@
CUsbSession::CUsbSession(CUsbServer* aServer)
: iUsbServer(aServer)
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CUSBSESSION_CUSBSESSION_CONS_ENTRY );
iUsbServer->IncrementSessionCount();
+ OstTraceFunctionExit0( CUSBSESSION_CUSBSESSION_CONS_EXIT );
}
@@ -86,18 +89,18 @@
*/
CUsbSession::~CUsbSession()
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CUSBSESSION_CUSBSESSION_DES_ENTRY );
- LOGTEXT2(_L8("About to Device().DeRegisterObserver(%08x"),this);
+ OstTrace1( TRACE_NORMAL, CUSBSESSION_CUSBSESSION, "CUsbSession::~CUsbSession;About to Device().DeRegisterObserver(%08x)", this );
iUsbServer->Device().DeRegisterObserver(*this);
#ifdef SYMBIAN_ENABLE_USB_OTG_HOST_PRIV
#ifndef __OVER_DUMMYUSBDI__
- LOGTEXT2(_L8("About to Otg().DeRegisterObserver(%08x"),this);
+ OstTrace1( TRACE_NORMAL, CUSBSESSION_CUSBSESSION_DUP1, "CUsbSession::~CUsbSession;About to Otg().DeRegisterObserver(%08x)", this );
iUsbServer->Otg().DeRegisterObserver(*this);
#endif
- LOGTEXT2(_L8("About to Host().DeRegisterObserver(%08x"),this);
+ OstTrace1( TRACE_NORMAL, CUSBSESSION_CUSBSESSION_DUP2, "CUsbSession::~CUsbSession;About to Host().DeRegisterObserver(%08x)", this );
iUsbServer->Host().DeregisterObserver(*this);
if ( iCtlSession && (iCtlSession == this) )
@@ -106,8 +109,9 @@
}
#endif // SYMBIAN_ENABLE_USB_OTG_HOST_PRIV
- LOGTEXT(_L8("About to iUsbServer->DecrementSessionCount()"));
+ OstTrace0( TRACE_NORMAL, CUSBSESSION_CUSBSESSION_DUP3, "CUsbSession::~CUsbSession;About to iUsbServer->DecrementSessionCount()" );
iUsbServer->DecrementSessionCount();
+ OstTraceFunctionExit0( CUSBSESSION_CUSBSESSION_DES_EXIT );
}
@@ -118,9 +122,10 @@
*/
void CUsbSession::ServiceL(const RMessage2& aMessage)
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CUSBSESSION_SERVICEL_ENTRY );
DispatchMessageL(aMessage);
+ OstTraceFunctionExit0( CUSBSESSION_SERVICEL_EXIT );
}
/**
@@ -130,7 +135,7 @@
*/
void CUsbSession::CreateL()
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CUSBSESSION_CREATEL_ENTRY );
// This code originally existed in the typical non-virtual ConstructL() method.
// However it was moved to this method for minor optimisation reasons [three less
@@ -138,18 +143,19 @@
iPersonalityCfged = iUsbServer->Device().isPersonalityCfged();
- LOGTEXT(_L8("Registering Device Observer\n"));
+ OstTrace0( TRACE_NORMAL, CUSBSESSION_CREATEL, "CUsbSession::CreateL;Registering Device Observer" );
iUsbServer->Device().RegisterObserverL(*this);
#ifdef SYMBIAN_ENABLE_USB_OTG_HOST_PRIV
#ifndef __OVER_DUMMYUSBDI__
- LOGTEXT(_L8("Registering OTG Observer\n"));
+ OstTrace0( TRACE_NORMAL, CUSBSESSION_CREATEL_DUP1, "CUsbSession::CreateL;Registering OTG Observer" );
iUsbServer->Otg().RegisterObserverL(*this);
#endif
- LOGTEXT(_L8("Registering HOST Observer\n"));
+ OstTrace0( TRACE_NORMAL, CUSBSESSION_CREATEL_DUP2, "CUsbSession::CreateL;Registering HOST Observer" );
iUsbServer->Host().RegisterObserverL(*this);
#endif // SYMBIAN_ENABLE_USB_OTG_HOST_PRIV
+ OstTraceFunctionExit0( CUSBSESSION_CREATEL_EXIT );
}
/**
@@ -163,8 +169,8 @@
void CUsbSession::UsbServiceStateChange(TInt aLastError, TUsbServiceState aOldState,
TUsbServiceState aNewState)
{
- LOG_FUNC
- LOGTEXT3(_L8(" aOldState=0x%X, aNewState=0x%X"), aOldState, aNewState);
+ OstTraceFunctionEntry0( CUSBSESSION_USBSERVICESTATECHANGE_ENTRY );
+ OstTraceExt2( TRACE_NORMAL, CUSBSESSION_USBSERVICESTATECHANGE, "CUsbSession::UsbServiceStateChange;aOldState=0x%X, aNewState=0x%X", aOldState, aNewState );
(void) aOldState; // a-void build warning in UREL
// Note that it's possible to have both a start and a stop outstanding!
@@ -188,6 +194,7 @@
const TInt err = iServiceObserverMessage.Write(0, pckg);
iServiceObserverMessage.Complete(err);
}
+ OstTraceFunctionExit0( CUSBSESSION_USBSERVICESTATECHANGE_EXIT );
}
/**
@@ -199,17 +206,17 @@
void CUsbSession::HandleServiceStateChangeWhileStarting(TInt aLastError,
TUsbServiceState aNewState)
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CUSBSESSION_HANDLESERVICESTATECHANGEWHILESTARTING_ENTRY );
switch (aNewState)
{
case EUsbServiceStarted:
- LOGTEXT(_L8(" Completing Start successfully"));
+ OstTrace0( TRACE_NORMAL, CUSBSESSION_HANDLESERVICESTATECHANGEWHILESTARTING, "CUsbSession::HandleServiceStateChangeWhileStarting Completing Start successfully" );
// If the user has tried to cancel the start, they're too late!
if (iCancelOutstanding)
{
- LOGTEXT(_L8(" Completing cancel request with KErrNone"));
+ OstTrace0( TRACE_NORMAL, CUSBSESSION_HANDLESERVICESTATECHANGEWHILESTARTING_DUP1, "CUsbSession::HandleServiceStateChangeWhileStarting Completing cancel request with KErrNone" );
iCancelOutstanding = EFalse;
iCancelMessage.Complete(KErrNone);
}
@@ -219,7 +226,7 @@
break;
case EUsbServiceIdle:
- LOGTEXT2(_L8(" Completing Start with error=%d"), aLastError);
+ OstTrace1( TRACE_NORMAL, CUSBSESSION_HANDLESERVICESTATECHANGEWHILESTARTING_DUP2, "CUsbSession::HandleServiceStateChangeWhileStarting; Completing Start with error=%d", aLastError );
// If there hasn't actually been an error, but we're in an unexpected
// state now, that means that this client cancelled the request, or
@@ -230,7 +237,7 @@
// the start message should be completed with KErrCancel.
if (iCancelOutstanding)
{
- LOGTEXT(_L8(" Completing original message with KErrCancel"));
+ OstTrace0( TRACE_NORMAL, CUSBSESSION_HANDLESERVICESTATECHANGEWHILESTARTING_DUP3, "CUsbSession::HandleServiceStateChangeWhileStarting Completing original message with KErrCancel" );
iCancelOutstanding = EFalse;
iCancelMessage.Complete(KErrNone);
iStartMessage.Complete(KErrCancel);
@@ -258,6 +265,7 @@
default:
break;
}
+ OstTraceFunctionExit0( CUSBSESSION_HANDLESERVICESTATECHANGEWHILESTARTING_EXIT );
}
/**
@@ -269,12 +277,12 @@
void CUsbSession::HandleServiceStateChangeWhileStopping(TInt aLastError,
TUsbServiceState aNewState)
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CUSBSESSION_HANDLESERVICESTATECHANGEWHILESTOPPING_ENTRY );
switch (aNewState)
{
case EUsbServiceStarted:
- LOGTEXT2(_L8(" Completing Stop with error=%d"), aLastError);
+ OstTrace1( TRACE_NORMAL, CUSBSESSION_HANDLESERVICESTATECHANGEWHILESTOPPING, "CUsbSession::HandleServiceStateChangeWhileStopping; Completing Stop with error=%d", aLastError );
// If there hasn't actually been an error, but we're in an unexpected
// state now, that means that this client cancelled the request, or
@@ -285,7 +293,7 @@
// the stop message should be completed with KErrCancel.
if (iCancelOutstanding)
{
- LOGTEXT(_L8(" Completing original message with KErrCancel"));
+ OstTrace0( TRACE_NORMAL, CUSBSESSION_HANDLESERVICESTATECHANGEWHILESTOPPING_DUP1, "CUsbSession::HandleServiceStateChangeWhileStopping; Completing original message with KErrCancel" );
iCancelOutstanding = EFalse;
iCancelMessage.Complete(KErrNone);
iStopMessage.Complete(KErrCancel);
@@ -311,12 +319,12 @@
break;
case EUsbServiceIdle:
- LOGTEXT(_L8(" Completing Stop with KErrNone"));
+ OstTrace0( TRACE_NORMAL, CUSBSESSION_HANDLESERVICESTATECHANGEWHILESTOPPING_DUP2, "CUsbSession::HandleServiceStateChangeWhileStopping Completing Stop with KErrNone" );
// If the user has tried to cancel the stop, they're too late!
if (iCancelOutstanding)
{
- LOGTEXT(_L8(" Completing cancel request with KErrNone"));
+ OstTrace0( TRACE_NORMAL, CUSBSESSION_HANDLESERVICESTATECHANGEWHILESTOPPING_DUP3, "CUsbSession::HandleServiceStateChangeWhileStopping Completing cancel request with KErrNone" );
iCancelOutstanding = EFalse;
iCancelMessage.Complete(KErrNone);
}
@@ -328,6 +336,7 @@
default:
break;
}
+ OstTraceFunctionExit0( CUSBSESSION_HANDLESERVICESTATECHANGEWHILESTOPPING_EXIT );
}
/**
@@ -343,7 +352,7 @@
void CUsbSession::UsbDeviceStateChange(TInt /*aLastError*/, TUsbDeviceState /*aOldState*/,
TUsbDeviceState aNewState)
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CUSBSESSION_USBDEVICESTATECHANGE_ENTRY );
// can we bypass the queue?
if ((iDeviceObserverOutstanding) && (iDevStateQueueHead == iDevStateQueueTail))
@@ -384,9 +393,8 @@
if (aNewState == iDeviceStateQueue[queuePtr])
{
// Event is already queued; discard the duplicate and in-between events
- LOGTEXT3(_L8("--- collapsing queue head (%d, %d)"),
- iDevStateQueueHead,
- (queuePtr + 1) % KDeviceStatesQueueSize);
+ OstTraceExt2( TRACE_NORMAL, CUSBSESSION_USBDEVICESTATECHANGE, "CUsbSession::UsbDeviceStateChange;--- collapsing queue head (%d, %d)", iDevStateQueueHead, ((queuePtr + 1) % KDeviceStatesQueueSize) );
+
// queue head moved to position following the match
iDevStateQueueHead = (queuePtr + 1) % KDeviceStatesQueueSize;
@@ -405,13 +413,13 @@
// add event to head of queue
iDeviceStateQueue[iDevStateQueueHead] = aNewState;
iDevStateQueueHead = (iDevStateQueueHead + 1) % KDeviceStatesQueueSize;
- LOGTEXT3(_L8("+++ addqueue (%d, %d)"), iDevStateQueueHead,
- iDevStateQueueTail);
+ OstTraceExt2( TRACE_NORMAL, CUSBSESSION_USBDEVICESTATECHANGE_DUP1, "CUsbSession::UsbDeviceStateChange;+++ addqueue (%d, %d)", iDevStateQueueHead, iDevStateQueueTail );
}
// UsbDeviceDequeueEvent() will read from queue when RegisterObserver()
// is next called.
}
+ OstTraceFunctionExit0( CUSBSESSION_USBDEVICESTATECHANGE_EXIT );
}
/**
@@ -419,7 +427,7 @@
*/
void CUsbSession::UsbDeviceDequeueEvent()
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CUSBSESSION_USBDEVICEDEQUEUEEVENT_ENTRY );
// Work our way through the queue, until we reach the end
// OR we find an event the current observer wants.
@@ -440,7 +448,7 @@
iNotifiedDevState = newState;
- LOGTEXT3(_L8(">>> dequeued event #%d (0x%x)"), iDevStateQueueTail, newState);
+ OstTraceExt2( TRACE_NORMAL, CUSBSESSION_USBDEVICEDEQUEUEEVENT, "CUsbSession::UsbDeviceDequeueEvent;dequeued event #%d (0x%x)", iDevStateQueueTail, newState );
iDeviceObserverOutstanding = EFalse;
const TInt err = iDeviceObserverMessage.Write(1, pckg);
@@ -448,6 +456,7 @@
break;
}
}
+ OstTraceFunctionExit0( CUSBSESSION_USBDEVICEDEQUEUEEVENT_EXIT );
}
/**
@@ -458,12 +467,12 @@
*/
void CUsbSession::DispatchMessageL(const RMessage2& aMessage)
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CUSBSESSION_DISPATCHMESSAGEL_ENTRY );
TBool complete = ETrue;
TInt ret = KErrNone;
- LOGTEXT2(_L8("CUsbSession::DispatchMessageL(): func# %d"), aMessage.Function());
+ OstTrace1( TRACE_NORMAL, CUSBSESSION_DISPATCHMESSAGEL, "CUsbSession::DispatchMessageL;func#=%d", aMessage.Function() );
switch (aMessage.Function())
{
@@ -529,20 +538,20 @@
// Heap failure debug APIs.
case EUsbDbgMarkHeap:
- LOGTEXT(_L8("Marking heap"));
+ OstTrace0( TRACE_NORMAL, CUSBSESSION_DISPATCHMESSAGEL_DUP1, "CUsbSession::DispatchMessageL;Marking heap" );
__UHEAP_MARK;
break;
case EUsbDbgCheckHeap:
- LOGTEXT2(_L8("Checking heap (expecting %d cells)"), aMessage.Int0());
+ OstTrace1( TRACE_NORMAL, CUSBSESSION_DISPATCHMESSAGEL_DUP2, "CUsbSession::DispatchMessageL;Checking heap (expecting %d cells)", aMessage.Int0() );
__UHEAP_CHECK(aMessage.Int0());
break;
case EUsbDbgMarkEnd:
- LOGTEXT2(_L8("End of marking heap (expecting %d cells)"), aMessage.Int0());
+ OstTrace1( TRACE_NORMAL, CUSBSESSION_DISPATCHMESSAGEL_DUP3, "CUsbSession::DispatchMessageL;End of marking heap (expecting %d cells)", aMessage.Int0() );
__UHEAP_MARKENDC(aMessage.Int0());
break;
case EUsbDbgFailNext:
{
- LOGTEXT2(_L8("Simulating failure after %d allocation(s)"), aMessage.Int0());
+ OstTrace1( TRACE_NORMAL, CUSBSESSION_DISPATCHMESSAGEL_DUP4, "CUsbSession::DispatchMessageL;Simulating failure after %d allocation(s)", aMessage.Int0() );
if (aMessage.Int0() == 0)
__UHEAP_RESET;
else
@@ -553,7 +562,7 @@
{
ret = KErrNone;
#ifdef _DEBUG
- LOGTEXT(_L8("\tallocate on the heap"));
+ OstTrace0( TRACE_NORMAL, CUSBSESSION_DISPATCHMESSAGEL_DUP5, "CUsbSession::DispatchMessageL;allocate on the heap" );
TInt* x = NULL;
TRAP(ret, x = new(ELeave) TInt);
delete x;
@@ -643,7 +652,7 @@
#endif // SYMBIAN_ENABLE_USB_OTG_HOST_PRIV
default:
- LOGTEXT2(_L8("Illegal IPC argument(%d) - Panicking Client..."), aMessage.Function());
+ OstTrace1( TRACE_NORMAL, CUSBSESSION_DISPATCHMESSAGEL_DUP6, "CUsbSession::DispatchMessageL;Illegal IPC argument(%d) - Panicking Client...", aMessage.Function() );
aMessage.Panic(KUsbCliPncCat, EUsbPanicIllegalIPC);
complete = EFalse;
break;
@@ -651,6 +660,7 @@
if (complete)
aMessage.Complete(ret);
+ OstTraceFunctionExit0( CUSBSESSION_DISPATCHMESSAGEL_EXIT );
}
@@ -663,12 +673,13 @@
*/
TInt CUsbSession::StartDeviceL(const RMessage2& aMessage, TBool& aComplete)
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CUSBSESSION_STARTDEVICEL_ENTRY );
#ifdef SYMBIAN_ENABLE_USB_OTG_HOST_PRIV
// Only 'control' session is allowed to start USB support
if ( !iSessionCtlMode )
{
+ OstTraceFunctionExit0( CUSBSESSION_STARTDEVICEL_EXIT );
return KErrAccessDenied;
}
#endif
@@ -702,6 +713,7 @@
iStartOutstanding = ETrue;
}
+ OstTraceFunctionExit0( CUSBSESSION_STARTDEVICEL_EXIT_DUP1 );
return KErrNone;
#else
@@ -712,6 +724,7 @@
iStartOutstanding = EFalse;
aMessage.IsNull();
aComplete = ETrue;
+ OstTraceFunctionExit0( CUSBSESSION_STARTDEVICEL_EXIT_DUP2 );
return KErrNone;
#endif
@@ -726,18 +739,20 @@
*/
TInt CUsbSession::StopDeviceL(const RMessage2& aMessage, TBool& aComplete)
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CUSBSESSION_STOPDEVICEL_ENTRY );
#ifdef SYMBIAN_ENABLE_USB_OTG_HOST_PRIV
// Only 'control' session is allowed to stop USB support
if ( !iSessionCtlMode )
{
+ OstTraceFunctionExit0( CUSBSESSION_STOPDEVICEL_EXIT );
return KErrAccessDenied;
}
#endif
if (iStopOutstanding)
{
+ OstTraceFunctionExit0( CUSBSESSION_STOPDEVICEL_EXIT_DUP1 );
return KErrInUse;
}
@@ -757,6 +772,7 @@
iStopOutstanding = ETrue;
}
+ OstTraceFunctionExit0( CUSBSESSION_STOPDEVICEL_EXIT_DUP2 );
return KErrNone;
#else
@@ -767,6 +783,7 @@
aComplete = ETrue;
aMessage.IsNull();
iStopOutstanding = EFalse;
+ OstTraceFunctionExit0( CUSBSESSION_STOPDEVICEL_EXIT_DUP3 );
return KErrNone;
#endif
@@ -783,12 +800,13 @@
*/
TInt CUsbSession::StartCancel(const RMessage2& aMessage, TBool& aComplete)
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CUSBSESSION_STARTCANCEL_ENTRY );
#ifdef SYMBIAN_ENABLE_USB_OTG_HOST_PRIV
// Only 'control' session is allowed to cancel outstaning start request
if ( !iSessionCtlMode )
{
+ OstTraceFunctionExit0( CUSBSESSION_STARTCANCEL_EXIT );
return KErrAccessDenied;
}
#endif
@@ -808,6 +826,7 @@
#endif
}
+ OstTraceFunctionExit0( CUSBSESSION_STARTCANCEL_EXIT_DUP1 );
return KErrNone;
}
@@ -822,18 +841,19 @@
*/
TInt CUsbSession::StopCancel(const RMessage2& aMessage, TBool& aComplete)
{
- LOG_FUNC
-
+ OstTraceFunctionEntry0( CUSBSESSION_STOPCANCEL_ENTRY );
#ifdef SYMBIAN_ENABLE_USB_OTG_HOST_PRIV
// Only 'control' session is allowed to cancel outstaning stop request
if ( !iSessionCtlMode )
{
+ OstTraceFunctionExit0( CUSBSESSION_STOPCANCEL_EXIT );
return KErrAccessDenied;
}
#endif
if (!iStopOutstanding)
{
+ OstTraceFunctionExit0( CUSBSESSION_STOPCANCEL_EXIT_DUP1 );
return KErrNone;
}
@@ -847,6 +867,7 @@
return errHost;
#endif
TRAPD(err, iUsbServer->Device().StartL());
+ OstTraceFunctionExit0( CUSBSESSION_STOPCANCEL_EXIT_DUP2 );
return err;
}
@@ -862,10 +883,11 @@
*/
TInt CUsbSession::RegisterDeviceObserver(const RMessage2& aMessage, TBool& aComplete)
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CUSBSESSION_REGISTERDEVICEOBSERVER_ENTRY );
if (iDeviceObserverOutstanding)
{
+ OstTraceFunctionExit0( CUSBSESSION_REGISTERDEVICEOBSERVER_EXIT );
return KErrInUse;
}
@@ -877,7 +899,7 @@
{
// This is the first observer after c'tor or DeregisterObserver(),
// so zap the device event queue.
- LOGTEXT(_L8(" Reset Device Event Queue"));
+ OstTrace0( TRACE_NORMAL, CUSBSESSION_REGISTERDEVICEOBSERVER, "CUsbSession::RegisterDeviceObserver Reset Device Event Queue" );
iDevStateQueueHead = 0;
iDevStateQueueTail = 0;
iObserverQueueEvents = ETrue;
@@ -888,6 +910,7 @@
UsbDeviceDequeueEvent();
}
+ OstTraceFunctionExit0( CUSBSESSION_REGISTERDEVICEOBSERVER_EXIT_DUP1 );
return KErrNone;
}
@@ -903,16 +926,18 @@
*/
TInt CUsbSession::RegisterServiceObserver(const RMessage2& aMessage, TBool& aComplete)
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CUSBSESSION_REGISTERSERVICEOBSERVER_ENTRY );
if (iServiceObserverOutstanding)
{
+ OstTraceFunctionExit0( CUSBSESSION_REGISTERSERVICEOBSERVER_EXIT );
return KErrInUse;
}
iServiceObserverMessage = aMessage;
iServiceObserverOutstanding = ETrue;
aComplete = EFalse;
+ OstTraceFunctionExit0( CUSBSESSION_REGISTERSERVICEOBSERVER_EXIT_DUP1 );
return KErrNone;
}
@@ -928,10 +953,10 @@
*/
TInt CUsbSession::GetCurrentServiceState(const RMessage2& aMessage)
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CUSBSESSION_GETCURRENTSERVICESTATE_ENTRY );
TUsbServiceState state = iUsbServer->Device().ServiceState();
- LOGTEXT2(_L8("\tstate = %d"), state);
+ OstTrace1( TRACE_NORMAL, CUSBSESSION_GETCURRENTSERVICESTATE, "CUsbSession::GetCurrentServiceState;state=%d", state );
TPckg<TUint32> pckg(state);
return aMessage.Write(0, pckg);
}
@@ -947,10 +972,10 @@
*/
TInt CUsbSession::GetCurrentDeviceState(const RMessage2& aMessage)
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CUSBSESSION_GETCURRENTDEVICESTATE_ENTRY );
TUsbDeviceState state = iUsbServer->Device().DeviceState();
- LOGTEXT2(_L8("\tstate = %d"), state);
+ OstTrace1( TRACE_NORMAL, CUSBSESSION_GETCURRENTDEVICESTATE, "CUsbSession::GetCurrentDeviceState;state=%d", state );
TPckg<TUint32> pckg(state);
return aMessage.Write(0, pckg);
}
@@ -965,10 +990,11 @@
*/
TInt CUsbSession::DeRegisterDeviceObserver()
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CUSBSESSION_DEREGISTERDEVICEOBSERVER_ENTRY );
if (!iDeviceObserverOutstanding)
{
+ OstTraceFunctionExit0( CUSBSESSION_DEREGISTERDEVICEOBSERVER_EXIT );
return KErrNone;
}
@@ -978,6 +1004,7 @@
// client doesn't need events queuing any more
iObserverQueueEvents = EFalse;
+ OstTraceFunctionExit0( CUSBSESSION_DEREGISTERDEVICEOBSERVER_EXIT_DUP1 );
return KErrNone;
}
@@ -990,15 +1017,17 @@
*/
TInt CUsbSession::DeRegisterServiceObserver()
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CUSBSESSION_DEREGISTERSERVICEOBSERVER_ENTRY );
if (!iServiceObserverOutstanding)
{
+ OstTraceFunctionExit0( CUSBSESSION_DEREGISTERSERVICEOBSERVER_EXIT );
return KErrNone;
}
iServiceObserverOutstanding = EFalse;
iServiceObserverMessage.Complete(KErrCancel);
+ OstTraceFunctionExit0( CUSBSESSION_DEREGISTERSERVICEOBSERVER_EXIT_DUP1 );
return KErrNone;
}
@@ -1012,7 +1041,7 @@
*/
TInt CUsbSession::TryStartDeviceL(const RMessage2& aMessage, TBool& aComplete)
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CUSBSESSION_TRYSTARTDEVICEL_ENTRY );
#ifndef __OVER_DUMMYUSBDI__
@@ -1020,17 +1049,20 @@
// Only 'control' session is allowed to start USB support
if ( !iSessionCtlMode )
{
+ OstTraceFunctionExit0( CUSBSESSION_TRYSTARTDEVICEL_EXIT );
return KErrAccessDenied;
}
#endif
if (!iPersonalityCfged)
{
+ OstTraceFunctionExit0( CUSBSESSION_TRYSTARTDEVICEL_EXIT_DUP1 );
return KErrNotSupported;
}
if (iStartOutstanding || iStopOutstanding)
{
+ OstTraceFunctionExit0( CUSBSESSION_TRYSTARTDEVICEL_EXIT_DUP2 );
return KErrServerBusy;
}
@@ -1067,6 +1099,7 @@
{
if (aMessage.Int0() != iUsbServer->Device().CurrentPersonalityId())
{
+ OstTraceFunctionExit0( CUSBSESSION_TRYSTARTDEVICEL_EXIT_DUP3 );
return KErrAbort;
}
@@ -1079,9 +1112,11 @@
}
else if (state == EUsbServiceStopping)
{
+ OstTraceFunctionExit0( CUSBSESSION_TRYSTARTDEVICEL_EXIT_DUP4 );
return KErrServerBusy;
}
+ OstTraceFunctionExit0( CUSBSESSION_TRYSTARTDEVICEL_EXIT_DUP5 );
return KErrNone;
#else
@@ -1092,6 +1127,7 @@
iStartOutstanding = EFalse;
aMessage.IsNull();
aComplete = ETrue;
+ OstTraceFunctionExit0( CUSBSESSION_TRYSTARTDEVICEL_EXIT_DUP6 );
return KErrNone;
#endif
}
@@ -1106,7 +1142,7 @@
*/
TInt CUsbSession::TryStopDeviceL(const RMessage2& aMessage, TBool& aComplete)
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CUSBSESSION_TRYSTOPDEVICEL_ENTRY );
#ifndef __OVER_DUMMYUSBDI__
@@ -1114,17 +1150,20 @@
// Only 'control' session is allowed to stop USB support
if ( !iSessionCtlMode )
{
+ OstTraceFunctionExit0( CUSBSESSION_TRYSTOPDEVICEL_EXIT );
return KErrAccessDenied;
}
#endif
if (!iPersonalityCfged)
{
+ OstTraceFunctionExit0( CUSBSESSION_TRYSTOPDEVICEL_EXIT_DUP1 );
return KErrNotSupported;
}
if (iStartOutstanding || iStopOutstanding)
{
+ OstTraceFunctionExit0( CUSBSESSION_TRYSTOPDEVICEL_EXIT_DUP2 );
return KErrServerBusy;
}
@@ -1154,6 +1193,7 @@
}
else if (state == EUsbServiceStarting)
{
+ OstTraceFunctionExit0( CUSBSESSION_TRYSTOPDEVICEL_EXIT_DUP3 );
return KErrServerBusy;
}
else if (state == EUsbServiceStopping)
@@ -1163,6 +1203,7 @@
iStopOutstanding = ETrue;
}
+ OstTraceFunctionExit0( CUSBSESSION_TRYSTOPDEVICEL_EXIT_DUP4 );
return KErrNone;
#else
@@ -1173,6 +1214,7 @@
aMessage.IsNull();
aComplete = ETrue;
iStopOutstanding = EFalse;
+ OstTraceFunctionExit0( CUSBSESSION_TRYSTOPDEVICEL_EXIT_DUP5 );
return KErrNone;
#endif
}
@@ -1187,10 +1229,11 @@
*/
TInt CUsbSession::CancelInterest(const RMessage2& aMessage)
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CUSBSESSION_CANCELINTEREST_ENTRY );
if (!iPersonalityCfged)
{
+ OstTraceFunctionExit0( CUSBSESSION_CANCELINTEREST_EXIT );
return KErrNotSupported;
}
@@ -1212,6 +1255,7 @@
}
}
+ OstTraceFunctionExit0( CUSBSESSION_CANCELINTEREST_EXIT_DUP1 );
return KErrCancel;
}
@@ -1224,15 +1268,16 @@
*/
TInt CUsbSession::GetCurrentPersonalityId(const RMessage2& aMessage)
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CUSBSESSION_GETCURRENTPERSONALITYID_ENTRY );
if (!iPersonalityCfged)
{
+ OstTraceFunctionExit0( CUSBSESSION_GETCURRENTPERSONALITYID_EXIT );
return KErrNotSupported;
}
TInt currentPersonalityId = iUsbServer->Device().CurrentPersonalityId();
- LOGTEXT2(_L8("\tcurrentPersonalityId = %d"), currentPersonalityId);
+ OstTrace1( TRACE_NORMAL, CUSBSESSION_GETCURRENTPERSONALITYID, "CUsbSession::GetCurrentPersonalityId;currentPersonalityId=%d", currentPersonalityId );
TPckgC<TInt> pckg(currentPersonalityId);
return aMessage.Write(0, pckg);
}
@@ -1248,10 +1293,11 @@
*/
TInt CUsbSession::GetSupportedClasses(const RMessage2& aMessage)
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CUSBSESSION_GETSUPPORTEDCLASSES_ENTRY );
if (!iPersonalityCfged)
{
+ OstTraceFunctionExit0( CUSBSESSION_GETSUPPORTEDCLASSES_EXIT );
return KErrNotSupported;
}
@@ -1263,7 +1309,11 @@
TInt personalityCount = personalities.Count();
for (TInt i = 0; i < personalityCount; i++)
{
- __ASSERT_ALWAYS(personalities[i] != NULL, _USB_PANIC(KUsbSvrPncCat, ENullPersonalityPointer));
+ if(personalities[i] == NULL)
+ {
+ OstTrace1( TRACE_NORMAL, CUSBSESSION_GETSUPPORTEDCLASSES, "CUsbSession::GetSupportedClasses;ENullPersonalityPointer=%d", ENullPersonalityPointer );
+ User::Panic(KUsbSvrPncCat, ENullPersonalityPointer);
+ }
if (aMessage.Int0() == personalities[i]->PersonalityId())
{
classUids[0] = personalities[i]->SupportedClasses().Count();
@@ -1272,10 +1322,12 @@
if (j < KUsbMaxSupportedClasses + 1)
{
classUids[j] = personalities[i]->SupportedClasses()[j - 1].iClassUid.iUid;
- LOGTEXT3(_L8("\tclassUids[%d] = %d"), j, classUids[j]);
+ OstTrace1( TRACE_NORMAL, CUSBSESSION_GETSUPPORTEDCLASSES_DUP1, "CUsbSession::GetSupportedClasses;classUids[%d] = ", j );
+ OstTrace1( TRACE_NORMAL, CUSBSESSION_GETSUPPORTEDCLASSES_DUP2, "%d", classUids[j] );
}
else
{
+ OstTraceFunctionExit0( CUSBSESSION_GETSUPPORTEDCLASSES_EXIT_DUP1 );
return KErrTooBig;
}
}
@@ -1286,6 +1338,7 @@
if (classUids[0] == 0)
{
// No supported classes are found
+ OstTraceFunctionExit0( CUSBSESSION_GETSUPPORTEDCLASSES_EXIT_DUP2 );
return KErrNotSupported;
}
@@ -1300,6 +1353,7 @@
}
delete buf;
+ OstTraceFunctionExit0( CUSBSESSION_GETSUPPORTEDCLASSES_EXIT_DUP3 );
return ret;
}
@@ -1312,10 +1366,11 @@
*/
TInt CUsbSession::GetPersonalityIds(const RMessage2& aMessage)
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CUSBSESSION_GETPERSONALITYIDS_ENTRY );
if (!iPersonalityCfged)
{
+ OstTraceFunctionExit0( CUSBSESSION_GETPERSONALITYIDS_EXIT );
return KErrNotSupported;
}
@@ -1326,7 +1381,11 @@
TInt personalityCount = personalities.Count();
for (TInt i = 0; i < personalityCount; ++i)
{
- __ASSERT_ALWAYS(personalities[i] != NULL, _USB_PANIC(KUsbSvrPncCat, ENullPersonalityPointer));
+ if(personalities[i] == NULL)
+ {
+ OstTrace1( TRACE_NORMAL, CUSBSESSION_GETPERSONALITYIDS, "CUsbSession::GetPersonalityIds;Panic reason=%d", ENullPersonalityPointer );
+ User::Panic(KUsbSvrPncCat, ENullPersonalityPointer);
+ }
personalityIds[i + 1] = personalities[i]->PersonalityId();
}
personalityIds[0] = personalityCount;
@@ -1342,6 +1401,7 @@
}
delete buf;
+ OstTraceFunctionExit0( CUSBSESSION_GETPERSONALITYIDS_EXIT_DUP1 );
return ret;
}
@@ -1354,10 +1414,11 @@
*/
TInt CUsbSession::GetDescription(const RMessage2& aMessage)
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CUSBSESSION_GETDESCRIPTION_ENTRY );
if (!iPersonalityCfged)
{
+ OstTraceFunctionExit0( CUSBSESSION_GETDESCRIPTION_EXIT );
return KErrNotSupported;
}
@@ -1369,6 +1430,7 @@
}
// We should never reach here
+ OstTraceFunctionExit0( CUSBSESSION_GETDESCRIPTION_EXIT_DUP1 );
return KErrNotSupported;
}
@@ -1382,10 +1444,11 @@
*/
TInt CUsbSession::GetPersonalityProperty(const RMessage2& aMessage)
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CUSBSESSION_GETPERSONALITYPROPERTY_ENTRY );
if (!iPersonalityCfged)
{
+ OstTraceFunctionExit0( CUSBSESSION_GETPERSONALITYPROPERTY_EXIT );
return KErrNotSupported;
}
@@ -1397,6 +1460,7 @@
return aMessage.Write(1, pckg);
}
+ OstTraceFunctionExit0( CUSBSESSION_GETPERSONALITYPROPERTY_EXIT_DUP2 );
return KErrNotSupported;
}
@@ -1409,10 +1473,10 @@
*/
TInt CUsbSession::ClassSupported(const RMessage2& aMessage)
{
- LOG_FUNC
-
+ OstTraceFunctionEntry0( CUSBSESSION_CLASSSUPPORTED_ENTRY );
if (!iPersonalityCfged)
{
+ OstTraceFunctionExit0( CUSBSESSION_CLASSSUPPORTED_EXIT );
return KErrNotSupported;
}
@@ -1428,6 +1492,7 @@
}
// We should never reach here
+ OstTraceFunctionExit0( CUSBSESSION_CLASSSUPPORTED_EXIT_DUP1 );
return KErrNotSupported;
}
@@ -1441,12 +1506,12 @@
*/
TInt CUsbSession::SetCtlSessionMode(const RMessage2& aMessage)
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CUSBSESSION_SETCTLSESSIONMODE_ENTRY );
TInt ret = KErrNone;
TBool value = (TBool)aMessage.Int0();
- LOGTEXT2(_L8("\tSetting = %d"), static_cast<TInt>(value));
+ OstTrace1( TRACE_NORMAL, CUSBSESSION_SETCTLSESSIONMODE, "CUsbSession::SetCtlSessionMode;Setting = %d", static_cast<TInt>(value) );
// Verify if this is the same session which set the value before
if ( iCtlSession && (iCtlSession != this) )
@@ -1468,6 +1533,7 @@
}
}
+ OstTraceFunctionExit0( CUSBSESSION_SETCTLSESSIONMODE_EXIT );
return ret;
}
@@ -1480,7 +1546,7 @@
*/
TInt CUsbSession::BusRequest()
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CUSBSESSION_BUSREQUEST_ENTRY );
TInt ret = KErrNone;
if ( iSessionCtlMode )
@@ -1492,6 +1558,7 @@
ret = KErrAccessDenied;
}
+ OstTraceFunctionExit0( CUSBSESSION_BUSREQUEST_EXIT );
return ret;
}
@@ -1506,7 +1573,7 @@
*/
TInt CUsbSession::BusRespondSrp()
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CUSBSESSION_BUSRESPONDSRP_ENTRY );
TInt ret = KErrNone;
if ( iSessionCtlMode )
@@ -1518,6 +1585,7 @@
ret = KErrAccessDenied;
}
+ OstTraceFunctionExit0( CUSBSESSION_BUSRESPONDSRP_EXIT );
return ret;
}
@@ -1531,7 +1599,7 @@
*/
TInt CUsbSession::BusClearError()
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CUSBSESSION_BUSCLEARERROR_ENTRY );
TInt ret = KErrNone;
if ( iSessionCtlMode )
@@ -1543,6 +1611,7 @@
ret = KErrAccessDenied;
}
+ OstTraceFunctionExit0( CUSBSESSION_BUSCLEARERROR_EXIT );
return ret;
}
@@ -1555,7 +1624,7 @@
*/
TInt CUsbSession::BusDrop()
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CUSBSESSION_BUSDROP_ENTRY );
TInt ret = KErrNone;
if ( iSessionCtlMode )
@@ -1567,6 +1636,7 @@
ret = KErrAccessDenied;
}
+ OstTraceFunctionExit0( CUSBSESSION_BUSDROP_EXIT );
return ret;
}
@@ -1579,7 +1649,7 @@
*/
TInt CUsbSession::EnableFunctionDriverLoading()
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CUSBSESSION_ENABLEFUNCTIONDRIVERLOADING_ENTRY );
TInt ret = KErrNone;
if ( iSessionCtlMode )
@@ -1591,6 +1661,7 @@
ret = KErrAccessDenied;
}
+ OstTraceFunctionExit0( CUSBSESSION_ENABLEFUNCTIONDRIVERLOADING_EXIT );
return ret;
}
@@ -1603,7 +1674,7 @@
*/
TInt CUsbSession::DisableFunctionDriverLoading()
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CUSBSESSION_DISABLEFUNCTIONDRIVERLOADING_ENTRY );
TInt ret = KErrNone;
if ( iSessionCtlMode )
@@ -1615,6 +1686,7 @@
ret = KErrAccessDenied;
}
+ OstTraceFunctionExit0( CUSBSESSION_DISABLEFUNCTIONDRIVERLOADING_EXIT );
return ret;
}
@@ -1627,8 +1699,9 @@
*/
TInt CUsbSession::GetSupportedLanguages(const RMessage2& aMessage)
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CUSBSESSION_GETSUPPORTEDLANGUAGES_ENTRY );
TRAPD(err, GetSupportedLanguagesL(aMessage));
+ OstTraceFunctionExit0( CUSBSESSION_GETSUPPORTEDLANGUAGES_EXIT );
return err;
}
@@ -1641,11 +1714,10 @@
*/
TInt CUsbSession::GetSupportedLanguagesL(const RMessage2& aMessage)
{
- LOG_FUNC
-
+ OstTraceFunctionEntry0( CUSBSESSION_GETSUPPORTEDLANGUAGESL_ENTRY );
const TUint deviceId = aMessage.Int0();
- LOGTEXT2(_L8("\tdeviceId = %d"), deviceId);
+ OstTrace1( TRACE_NORMAL, CUSBSESSION_GETSUPPORTEDLANGUAGESL, "CUsbSession::GetSupportedLanguagesL;deviceId=%d", deviceId );
RArray<TUint> langIds;
CleanupClosePushL(langIds);
@@ -1654,7 +1726,7 @@
if (ret == KErrNone)
{
const TUint count = langIds.Count();
- LOGTEXT2(_L8("\tcount = %d"), count);
+ OstTrace1( TRACE_NORMAL, CUSBSESSION_GETSUPPORTEDLANGUAGESL_DUP1, "CUsbSession::GetSupportedLanguagesL;count=%d", count );
// Set error code if there is no languages or there are too many
if ( count == 0 )
@@ -1680,7 +1752,7 @@
for ( TUint ii = 0 ; ii < count; ++ii )
{
buf.Append((TUint8*)&(langIds[ii]), sizeof(TUint));
- LOGTEXT3(_L8("Append langID[%d] = %d"),ii,langIds[ii]);
+ OstTraceExt2( TRACE_NORMAL, CUSBSESSION_GETSUPPORTEDLANGUAGESL_DUP2, "CUsbSession::GetSupportedLanguagesL;Append langID[%d] = %d", ii, langIds[ii] );
}
// Write back to the client.
@@ -1691,6 +1763,7 @@
CleanupStack::PopAndDestroy();
+ OstTraceFunctionExit0( CUSBSESSION_GETSUPPORTEDLANGUAGESL_EXIT );
return ret;
}
@@ -1703,20 +1776,21 @@
*/
TInt CUsbSession::GetManufacturerStringDescriptor(const RMessage2& aMessage)
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CUSBSESSION_GETMANUFACTURERSTRINGDESCRIPTOR_ENTRY );
const TUint deviceId = aMessage.Int0();
const TUint langId = aMessage.Int1();
- LOGTEXT3(_L8("\tdeviceId = %d, langId = %d"), deviceId, langId);
+ OstTraceExt2( TRACE_NORMAL, CUSBSESSION_GETMANUFACTURERSTRINGDESCRIPTOR, "CUsbSession::GetManufacturerStringDescriptor;langId=%d;deviceId=%d", langId, deviceId );
TName string;
TInt ret = iUsbServer->Host().GetManufacturerStringDescriptor(deviceId,langId,string);
if (ret == KErrNone)
{
- LOGTEXT2(_L("\tstring = \"%S\""), &string);
+ OstTraceExt1( TRACE_NORMAL, CUSBSESSION_GETMANUFACTURERSTRINGDESCRIPTOR_DUP1, "CUsbSession::GetManufacturerStringDescriptor;string = \"%S\"", string );
ret = aMessage.Write(2, string);
}
+ OstTraceFunctionExit0( CUSBSESSION_GETMANUFACTURERSTRINGDESCRIPTOR_EXIT );
return ret;
}
@@ -1729,20 +1803,21 @@
*/
TInt CUsbSession::GetProductStringDescriptor(const RMessage2& aMessage)
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CUSBSESSION_GETPRODUCTSTRINGDESCRIPTOR_ENTRY );
const TUint deviceId = aMessage.Int0();
const TUint langId = aMessage.Int1();
- LOGTEXT3(_L8("\tdeviceId = %d, langId = %d"), deviceId, langId);
+ OstTraceExt2( TRACE_NORMAL, CUSBSESSION_GETPRODUCTSTRINGDESCRIPTOR, "CUsbSession::GetProductStringDescriptor;deviceId=%d;langId=%d", deviceId, langId );
TName string;
TInt ret = iUsbServer->Host().GetProductStringDescriptor(deviceId,langId,string);
if (ret == KErrNone)
{
- LOGTEXT2(_L("\tstring = \"%S\""), &string);
+ OstTraceExt1( TRACE_NORMAL, CUSBSESSION_GETPRODUCTSTRINGDESCRIPTOR_DUP1, "CUsbSession::GetProductStringDescriptor;string = \"%S\"", string );
ret = aMessage.Write(2, string);
}
+ OstTraceFunctionExit0( CUSBSESSION_GETPRODUCTSTRINGDESCRIPTOR_EXIT );
return ret;
}
@@ -1755,10 +1830,10 @@
*/
TInt CUsbSession::GetOtgDescriptor(const RMessage2& aMessage)
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CUSBSESSION_GETOTGDESCRIPTOR_ENTRY );
const TUint deviceId = aMessage.Int0();
- LOGTEXT2(_L8("\tdeviceId = %d"), deviceId);
+ OstTrace1( TRACE_NORMAL, CUSBSESSION_GETOTGDESCRIPTOR, "CUsbSession::GetOtgDescriptor;deviceId=%d", deviceId );
TOtgDescriptor otgDescriptor;
TInt ret = iUsbServer->Host().GetOtgDescriptor(deviceId, otgDescriptor);
@@ -1768,6 +1843,7 @@
ret = aMessage.Write(1, buf);
}
+ OstTraceFunctionExit0( CUSBSESSION_GETOTGDESCRIPTOR_EXIT );
return ret;
}
@@ -1785,10 +1861,11 @@
*/
TInt CUsbSession::RegisterHostObserver(const RMessage2& aMessage, TBool& aComplete)
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CUSBSESSION_REGISTERHOSTOBSERVER_ENTRY );
if (iHostEventObserverOutstanding)
{
+ OstTraceFunctionExit0( CUSBSESSION_REGISTERHOSTOBSERVER_EXIT );
return KErrInUse;
}
@@ -1800,7 +1877,7 @@
{
// This is the first observer after c'tor or DeregisterObserver(),
// so zap the device event queue.
- LOGTEXT(_L8(" Reset OTG Host State Queue"));
+ OstTrace0( TRACE_NORMAL, CUSBSESSION_REGISTERHOSTOBSERVER, "CUsbSession::RegisterHostObserver; Reset OTG Host State Queue" );
iHostEventQueueHead = 0;
iHostEventQueueTail = 0;
iHostEventObserverQueueEvents = ETrue;
@@ -1811,6 +1888,7 @@
UsbHostEventDequeue();
}
+ OstTraceFunctionExit0( CUSBSESSION_REGISTERHOSTOBSERVER_EXIT_DUP1 );
return KErrNone;
}
@@ -1822,13 +1900,13 @@
*/
TInt CUsbSession::DeRegisterHostObserver()
{
- LOG_FUNC
-
+ OstTraceFunctionEntry0( CUSBSESSION_DEREGISTERHOSTOBSERVER_ENTRY );
if (!iHostEventObserverQueueEvents)
{
//Never register
- LOGTEXT(_L8("iHostEventObserverQueueEvents is FALSE!"));
+ OstTrace0( TRACE_NORMAL, CUSBSESSION_DEREGISTERHOSTOBSERVER, "CUsbSession::DeRegisterHostObserver;iHostEventObserverQueueEvents is FALSE!" );
+ OstTraceFunctionExit0( CUSBSESSION_DEREGISTERHOSTOBSERVER_EXIT );
return KErrNone;
}
@@ -1836,7 +1914,7 @@
{
iHostEventObserverOutstanding = EFalse;
iHostEventObserverMessage.Complete(KErrCancel);
- LOGTEXT(_L8("iHostEventObserverMessage.Complete(KErrCancel);"));
+ OstTrace0( TRACE_NORMAL, CUSBSESSION_DEREGISTERHOSTOBSERVER_DUP1, "CUsbSession::DeRegisterHostObserver;iHostEventObserverMessage.Complete(KErrCancel);" );
}
// client doesn't need events queuing any more
@@ -1845,6 +1923,7 @@
iHostEventQueueHead = 0;
iHostEventQueueTail = 0;
+ OstTraceFunctionExit0( CUSBSESSION_DEREGISTERHOSTOBSERVER_EXIT_DUP1 );
return KErrNone;
}
@@ -1862,10 +1941,11 @@
*/
TInt CUsbSession::RegisterMsgObserver(const RMessage2& aMessage, TBool& aComplete)
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CUSBSESSION_REGISTERMSGOBSERVER_ENTRY );
if (iMsgObserverOutstanding)
{
+ OstTraceFunctionExit0( CUSBSESSION_REGISTERMSGOBSERVER_EXIT );
return KErrInUse;
}
@@ -1877,7 +1957,7 @@
{
// This is the first observer after c'tor or DeregisterObserver(),
// so zap the device event queue.
- LOGTEXT(_L8(" Reset OTG Message Queue"));
+ OstTrace0( TRACE_NORMAL, CUSBSESSION_REGISTERMSGOBSERVER, "CUsbSession::RegisterMsgObserver; Reset OTG Message Queue" );
iMsgQueueHead = 0;
iMsgQueueTail = 0;
iMsgObserverQueueEvents = ETrue;
@@ -1888,6 +1968,7 @@
UsbMsgDequeue();
}
+ OstTraceFunctionExit0( CUSBSESSION_REGISTERMSGOBSERVER_EXIT_DUP1 );
return KErrNone;
}
@@ -1899,10 +1980,11 @@
*/
TInt CUsbSession::DeRegisterMsgObserver()
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CUSBSESSION_DEREGISTERMSGOBSERVER_ENTRY );
if (!iMsgObserverOutstanding)
{
+ OstTraceFunctionExit0( CUSBSESSION_DEREGISTERMSGOBSERVER_EXIT );
return KErrNone;
}
@@ -1912,6 +1994,7 @@
// client doesn't need events queuing any more
iMsgObserverQueueEvents = EFalse;
+ OstTraceFunctionExit0( CUSBSESSION_DEREGISTERMSGOBSERVER_EXIT_DUP1 );
return KErrNone;
}
@@ -1925,7 +2008,7 @@
*/
void CUsbSession::UsbOtgHostMessage(TInt aMessage)
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CUSBSESSION_USBOTGHOSTMESSAGE_ENTRY );
// can we bypass the queue?
if ((iMsgObserverOutstanding) && (iMsgQueueHead == iMsgQueueTail))
@@ -1943,12 +2026,12 @@
// add event to head of queue
iMsgQueue[iMsgQueueHead] = aMessage;
iMsgQueueHead = (iMsgQueueHead + 1) % KOtgHostMessageQueueSize;
- LOGTEXT3(_L8("+++ CUsbSession::UsbOtgMessage() addqueue (%d, %d)"), iMsgQueueHead,
- iMsgQueueTail);
+ OstTraceExt2( TRACE_NORMAL, CUSBSESSION_USBOTGHOSTMESSAGE, "CUsbSession::UsbOtgHostMessage; addqueue (%d, %d)", iMsgQueueHead, iMsgQueueTail );
// UsbMsgDequeueEvent() will read from queue when RegisterMsgObserver()
// is next called.
}
+ OstTraceFunctionExit0( CUSBSESSION_USBOTGHOSTMESSAGE_EXIT );
}
/**
@@ -1962,7 +2045,7 @@
*/
void CUsbSession::UsbHostEvent(TDeviceEventInformation& aDevInfo)
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CUSBSESSION_USBHOSTEVENT_ENTRY );
// can we bypass the queue?
if ((iHostEventObserverOutstanding) && (iHostEventQueueHead == iHostEventQueueTail))
@@ -1970,24 +2053,24 @@
iNotifiedHostState = aDevInfo;
iHostEventObserverOutstanding = EFalse;
- LOGTEXT(_L8("CUsbSession::UsbHostEvent() detected outstanding request"));
+ OstTrace0( TRACE_NORMAL, CUSBSESSION_USBHOSTEVENT, "CUsbSession::UsbHostEvent detected outstanding request" );
TPckg<TDeviceEventInformation> info(aDevInfo);
const TInt err = iHostEventObserverMessage.Write(0, info);
iHostEventObserverMessage.Complete(err);
- LOGTEXT2(_L8("CUsbSession::UsbHostEvent() detects outstanding request: request is compeleted with %d"), err);
+ OstTrace1( TRACE_NORMAL, CUSBSESSION_USBHOSTEVENT_DUP1, "CUsbSession::UsbHostEvent; detects outstanding request: request is compeleted with %d", err );
}
else if (iHostEventObserverQueueEvents)
{
// add dev info to head of queue
iHostStateQueue[iHostEventQueueHead] = aDevInfo;
iHostEventQueueHead = (iHostEventQueueHead + 1) % KDeviceStatesQueueSize;
- LOGTEXT3(_L8("+++ CUsbSession::UsbHostEvent() addqueue (%d, %d)"), iHostEventQueueHead,
- iHostEventQueueTail);
+ OstTraceExt2( TRACE_NORMAL, CUSBSESSION_USBHOSTEVENT_DUP2, "CUsbSession::UsbHostEvent; addqueue (%d, %d)", iHostEventQueueHead, iHostEventQueueTail );
// UsbHostStateDequeueEvent() will read from queue when RegisterHostObserver()
// is next called.
}
+ OstTraceFunctionExit0( CUSBSESSION_USBHOSTEVENT_EXIT );
}
/**
@@ -1995,7 +2078,7 @@
*/
void CUsbSession::UsbMsgDequeue()
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CUSBSESSION_USBMSGDEQUEUE_ENTRY );
// Work our way through the queue, until we reach the end
// OR we find an event the current observer wants.
@@ -2009,12 +2092,13 @@
TPckg<TUint32> pckg(newMsg);
iNotifiedMsg = newMsg;
- LOGTEXT3(_L8(">>> dequeued event #%d (0x%x)"), iMsgQueueTail, newMsg);
+ OstTraceExt2( TRACE_NORMAL, CUSBSESSION_USBMSGDEQUEUE, "CUsbSession::UsbMsgDequeue;dequeued event #%d (0x%x)", iMsgQueueTail, newMsg );
iMsgObserverOutstanding = EFalse;
const TInt err = iMsgObserverMessage.Write(0, pckg);
iMsgObserverMessage.Complete(err);
}
+ OstTraceFunctionExit0( CUSBSESSION_USBMSGDEQUEUE_EXIT );
}
/**
@@ -2022,7 +2106,7 @@
*/
void CUsbSession::UsbHostEventDequeue()
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CUSBSESSION_USBHOSTEVENTDEQUEUE_ENTRY );
// Work our way through the queue, until we reach the end
// OR we find an event the current observer wants.
@@ -2036,15 +2120,16 @@
// advance tail towards the head
iHostEventQueueTail = (iHostEventQueueTail + 1) % KDeviceStatesQueueSize;
- LOGTEXT3(_L8(">>> CUsbSession::UsbHostStateDequeueEvent() dequeued event #%d (0x%x)"), iHostEventQueueTail, newDevInfo.iEventType);
+ OstTraceExt2( TRACE_NORMAL, CUSBSESSION_USBHOSTEVENTDEQUEUE, "CUsbSession::UsbHostEventDequeue; dequeued event #%d (0x%x)", iHostEventQueueTail, newDevInfo.iEventType );
TPckg<TDeviceEventInformation> info(newDevInfo);
iHostEventObserverOutstanding = EFalse;
const TInt err = iHostEventObserverMessage.Write(0, info);
iHostEventObserverMessage.Complete(err);
- LOGTEXT2(_L8("CUsbSession::UsbHostStateDequeueEvent() detects outstanding request: request is compeleted with %d"), err);
+ OstTrace1( TRACE_NORMAL, CUSBSESSION_USBHOSTEVENTDEQUEUE_DUP1, "CUsbSession::UsbHostStateDequeueEvent() detects outstanding request: request is compeleted with %d", err );
}
+ OstTraceFunctionExit0( CUSBSESSION_USBHOSTEVENTDEQUEUE_EXIT );
}
TInt CUsbSession::RequestSession()
--- a/usbmgmt/usbmgr/usbman/server/SRC/UsbSvr.cpp Wed Jul 07 14:16:40 2010 +0800
+++ b/usbmgmt/usbmgr/usbman/server/SRC/UsbSvr.cpp Wed Jul 07 15:08:54 2010 +0800
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2003-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2003-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"
@@ -17,16 +17,18 @@
#include <e32base.h>
#include <usb/usbshared.h>
+#include <usb/usblogger.h>
#include "CUsbScheduler.h"
#include "CUsbServer.h"
-#include <usb/usblogger.h>
#include "rusb.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "UsbSvrTraces.h"
+#endif
+
static void RunServerL();
-#ifdef __FLOG_ACTIVE
-_LIT8(KLogComponent, "USBSVR");
-#endif
GLDEF_C TInt E32Main()
@@ -60,7 +62,13 @@
//
{
// naming the server thread after the server helps to debug panics
- LEAVEIFERRORL(User::RenameThread(KUsbServerName));
+ TInt err = User::RenameThread(KUsbServerName);
+ if(err < 0)
+ {
+ OstTrace1( TRACE_NORMAL, USBSVR_RUNSERVERL, "::RunServerL; User::RenameThread(KUsbServerName) error, leave reason=%d", err );
+ User::Leave(err);
+ }
+
//
// create and install the active scheduler we need
CUsbScheduler* scheduler = CUsbScheduler::NewL();
--- a/usbmgmt/usbmgr/usbman/server/SRC/cusbhost.cpp Wed Jul 07 14:16:40 2010 +0800
+++ b/usbmgmt/usbmgr/usbman/server/SRC/cusbhost.cpp Wed Jul 07 15:08:54 2010 +0800
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2008-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"
@@ -15,13 +15,13 @@
*
*/
+#include <usb/usblogger.h>
#include "cusbhost.h"
-#include <usb/usblogger.h>
-
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "cusbhostTraces.h"
+#endif
-#ifdef __FLOG_ACTIVE
-_LIT8(KLogComponent, "usbhost");
-#endif
CUsbHost* CUsbHost::iInstance = 0;
@@ -39,7 +39,7 @@
CUsbHost::~CUsbHost()
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CUSBHOST_CUSBHOST_DES_ENTRY );
Stop();
@@ -51,30 +51,37 @@
}
iObservers.Close();
iInstance = 0;
+ OstTraceFunctionExit0( CUSBHOST_CUSBHOST_DES_EXIT );
}
CUsbHost::CUsbHost()
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CUSBHOST_CUSBHOST_CONS_ENTRY );
+ OstTraceFunctionExit0( CUSBHOST_CUSBHOST_CONS_EXIT );
}
void CUsbHost::ConstructL()
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CUSBHOST_CONSTRUCTL_ENTRY );
iUsbHostWatcher[EHostEventMonitor] =
CActiveUsbHostEventWatcher::NewL(iUsbHostStack,*this,iHostEventInfo);
iUsbHostWatcher[EHostMessageMonitor] =
CActiveUsbHostMessageWatcher::NewL(iUsbHostStack,*this,iHostMessage);
+ OstTraceFunctionExit0( CUSBHOST_CONSTRUCTL_EXIT );
}
void CUsbHost::StartL()
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CUSBHOST_STARTL_ENTRY );
if(!iHasBeenStarted)
{
-
- LEAVEIFERRORL(iUsbHostStack.Connect());
+ TInt err = iUsbHostStack.Connect();
+ if(err < 0)
+ {
+ OstTrace1( TRACE_NORMAL, CUSBHOST_STARTL, "CUsbHost::StartL; iUsbHostStack.Connect() error. Leave error=%d", err );
+ User::Leave(err);
+ }
for(TInt i=0;i<ENumMonitor;i++)
{
@@ -82,11 +89,12 @@
}
iHasBeenStarted = ETrue;
}
+ OstTraceFunctionExit0( CUSBHOST_STARTL_EXIT );
}
void CUsbHost::Stop()
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CUSBHOST_STOP_ENTRY );
TInt i=0;
for(i=0;i<ENumMonitor;i++)
@@ -100,23 +108,25 @@
iUsbHostStack.Close();
iHasBeenStarted = EFalse;
+ OstTraceFunctionExit0( CUSBHOST_STOP_EXIT );
}
void CUsbHost::RegisterObserverL(MUsbOtgHostNotifyObserver& aObserver)
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CUSBHOST_REGISTEROBSERVERL_ENTRY );
iObservers.AppendL(&aObserver);
UpdateNumOfObservers();
+ OstTraceFunctionExit0( CUSBHOST_REGISTEROBSERVERL_EXIT );
}
void CUsbHost::DeregisterObserver(MUsbOtgHostNotifyObserver& aObserver)
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CUSBHOST_DEREGISTEROBSERVER_ENTRY );
TInt index = iObservers.Find(&aObserver);
if(index == KErrNotFound)
{
- LOGTEXT(_L8("\t Cannot remove observer, not found"));
+ OstTrace0( TRACE_NORMAL, CUSBHOST_DEREGISTEROBSERVER, "CUsbHost::DeregisterObserver; Cannot remove observer, not found" );
}
else
{
@@ -124,11 +134,12 @@
}
UpdateNumOfObservers();
+ OstTraceFunctionExit0( CUSBHOST_DEREGISTEROBSERVER_EXIT );
}
TInt CUsbHost::GetSupportedLanguages(TUint aDeviceId,RArray<TUint>& aLangIds)
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CUSBHOST_GETSUPPORTEDLANGUAGES_ENTRY );
TInt err = KErrNone;
if ( iUsbHostStack.Handle() )
{
@@ -138,12 +149,13 @@
{
err = KErrBadHandle;
}
+ OstTraceFunctionExit0( CUSBHOST_GETSUPPORTEDLANGUAGES_EXIT );
return err;
}
TInt CUsbHost::GetManufacturerStringDescriptor(TUint aDeviceId,TUint aLangId,TName& aString)
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CUSBHOST_GETMANUFACTURERSTRINGDESCRIPTOR_ENTRY );
TInt err = KErrNone;
if ( iUsbHostStack.Handle() )
{
@@ -153,12 +165,13 @@
{
err = KErrBadHandle;
}
+ OstTraceFunctionExit0( CUSBHOST_GETMANUFACTURERSTRINGDESCRIPTOR_EXIT );
return err;
}
TInt CUsbHost::GetProductStringDescriptor(TUint aDeviceId,TUint aLangId,TName& aString)
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CUSBHOST_GETPRODUCTSTRINGDESCRIPTOR_ENTRY );
TInt err = KErrNone;
if ( iUsbHostStack.Handle() )
{
@@ -168,12 +181,13 @@
{
err = KErrBadHandle;
}
+ OstTraceFunctionExit0( CUSBHOST_GETPRODUCTSTRINGDESCRIPTOR_EXIT );
return err;
}
TInt CUsbHost::GetOtgDescriptor(TUint aDeviceId, TOtgDescriptor& otgDescriptor)
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CUSBHOST_GETOTGDESCRIPTOR_ENTRY );
TInt err(KErrNone);
@@ -186,20 +200,21 @@
err = KErrBadHandle;
}
+ OstTraceFunctionExit0( CUSBHOST_GETOTGDESCRIPTOR_EXIT );
return err;
}
void CUsbHost::NotifyHostEvent(TUint aWatcherId)
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CUSBHOST_NOTIFYHOSTEVENT_ENTRY );
+
if(aWatcherId == EHostEventMonitor)
{
-
- LOGTEXT2(_L8("\t Device id %d"),iHostEventInfo.iDeviceId);
- LOGTEXT2(_L8("\t iEventType %d"),iHostEventInfo.iEventType);
- LOGTEXT2(_L8("\t TDriverLoadStatus %d"),iHostEventInfo.iDriverLoadStatus);
- LOGTEXT2(_L8("\t VID %d"),iHostEventInfo.iVid);
- LOGTEXT2(_L8("\t PID %d"),iHostEventInfo.iPid);
+ OstTrace1( TRACE_NORMAL, CUSBHOST_NOTIFYHOSTEVENT, "CUsbHost::NotifyHostEvent;DeviceId=%d", iHostEventInfo.iDeviceId );
+ OstTrace1( TRACE_NORMAL, CUSBHOST_NOTIFYHOSTEVENT_DUP1, "CUsbHost::NotifyHostEvent;iEventType=%d", iHostEventInfo.iEventType );
+ OstTrace1( TRACE_NORMAL, CUSBHOST_NOTIFYHOSTEVENT_DUP2, "CUsbHost::NotifyHostEvent;TDriverLoadStatus=%d", iHostEventInfo.iDriverLoadStatus );
+ OstTrace1( TRACE_NORMAL, CUSBHOST_NOTIFYHOSTEVENT_DUP3, "CUsbHost::NotifyHostEvent;VID=%d", iHostEventInfo.iVid );
+ OstTrace1( TRACE_NORMAL, CUSBHOST_NOTIFYHOSTEVENT_DUP4, "CUsbHost::NotifyHostEvent;Pid=%d", iHostEventInfo.iPid );
for(TUint i=0;i<iNumOfObservers;i++)
{
@@ -208,24 +223,26 @@
}
else
{
- LOGTEXT2(_L8("\t Host Message %d"),iHostMessage);
-
+ OstTrace1( TRACE_NORMAL, CUSBHOST_NOTIFYHOSTEVENT_DUP5, "CUsbHost::NotifyHostEvent;Host Message=%d", iHostMessage );
+
for(TUint i=0;i<iNumOfObservers;i++)
{
iObservers[i]->UsbOtgHostMessage(iHostMessage);
}
}
+ OstTraceFunctionExit0( CUSBHOST_NOTIFYHOSTEVENT_EXIT );
}
void CUsbHost::UpdateNumOfObservers()
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CUSBHOST_UPDATENUMOFOBSERVERS_ENTRY );
iNumOfObservers = iObservers.Count();
+ OstTraceFunctionExit0( CUSBHOST_UPDATENUMOFOBSERVERS_EXIT );
}
TInt CUsbHost::EnableDriverLoading()
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CUSBHOST_ENABLEDRIVERLOADING_ENTRY );
TInt err = KErrNone;
if ( iUsbHostStack.Handle() )
{
@@ -235,14 +252,16 @@
{
err = KErrBadHandle;
}
+ OstTraceFunctionExit0( CUSBHOST_ENABLEDRIVERLOADING_EXIT );
return err;
}
void CUsbHost::DisableDriverLoading()
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CUSBHOST_DISABLEDRIVERLOADING_ENTRY );
if ( iUsbHostStack.Handle() )
{
iUsbHostStack.DisableDriverLoading();
}
+ OstTraceFunctionExit0( CUSBHOST_DISABLEDRIVERLOADING_EXIT );
}
--- a/usbmgmt/usbmgr/usbman/server/SRC/cusbhostwatcher.cpp Wed Jul 07 14:16:40 2010 +0800
+++ b/usbmgmt/usbmgr/usbman/server/SRC/cusbhostwatcher.cpp Wed Jul 07 15:08:54 2010 +0800
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2008-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"
@@ -17,13 +17,14 @@
#include "cusbhostwatcher.h"
-#include <usb/usblogger.h>
#include "cusbhost.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "cusbhostwatcherTraces.h"
+#endif
+
-#ifdef __FLOG_ACTIVE
-_LIT8(KLogComponent, "hoststatewatcher");
-#endif
/*
* Base class for USB Host watchers
@@ -36,23 +37,26 @@
iOwner(aOwner),
iWatcherId(aWatcherId)
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CACTIVEUSBHOSTWATCHER_CACTIVEUSBHOSTWATCHER_CONS_ENTRY );
CActiveScheduler::Add(this);
+ OstTraceFunctionExit0( CACTIVEUSBHOSTWATCHER_CACTIVEUSBHOSTWATCHER_CONS_EXIT );
}
CActiveUsbHostWatcher::~CActiveUsbHostWatcher()
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CACTIVEUSBHOSTWATCHER_CACTIVEUSBHOSTWATCHER_DES_ENTRY );
Cancel();
+ OstTraceFunctionExit0( CACTIVEUSBHOSTWATCHER_CACTIVEUSBHOSTWATCHER_DES_EXIT );
}
void CActiveUsbHostWatcher::RunL()
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CACTIVEUSBHOSTWATCHER_RUNL_ENTRY );
ASSERT(iStatus.Int() == KErrNone);
iOwner.NotifyHostEvent(iWatcherId);
Post();
+ OstTraceFunctionExit0( CACTIVEUSBHOSTWATCHER_RUNL_EXIT );
}
@@ -80,28 +84,32 @@
, iHostEventInfo(aHostEventInfo)
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CACTIVEUSBHOSTEVENTWATCHER_CACTIVEUSBHOSTEVENTWATCHER_CONS_ENTRY );
+ OstTraceFunctionExit0( CACTIVEUSBHOSTEVENTWATCHER_CACTIVEUSBHOSTEVENTWATCHER_CONS_EXIT );
}
CActiveUsbHostEventWatcher::~CActiveUsbHostEventWatcher()
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CACTIVEUSBHOSTEVENTWATCHER_CACTIVEUSBHOSTEVENTWATCHER_DES_ENTRY );
Cancel();
+ OstTraceFunctionExit0( CACTIVEUSBHOSTEVENTWATCHER_CACTIVEUSBHOSTEVENTWATCHER_DES_EXIT );
}
void CActiveUsbHostEventWatcher::Post()
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CACTIVEUSBHOSTEVENTWATCHER_POST_ENTRY );
iUsbHostStack.NotifyDeviceEvent(iStatus, iHostEventInfo);
SetActive();
+ OstTraceFunctionExit0( CACTIVEUSBHOSTEVENTWATCHER_POST_EXIT );
}
void CActiveUsbHostEventWatcher::DoCancel()
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CACTIVEUSBHOSTEVENTWATCHER_DOCANCEL_ENTRY );
iUsbHostStack.NotifyDeviceEventCancel();
+ OstTraceFunctionExit0( CACTIVEUSBHOSTEVENTWATCHER_DOCANCEL_EXIT );
}
@@ -120,9 +128,9 @@
CActiveUsbHostMessageWatcher::~CActiveUsbHostMessageWatcher()
{
- LOG_FUNC
-
+ OstTraceFunctionEntry0( CACTIVEUSBHOSTMESSAGEWATCHER_CACTIVEUSBHOSTMESSAGEWATCHER_DES_ENTRY );
Cancel();
+ OstTraceFunctionExit0( CACTIVEUSBHOSTMESSAGEWATCHER_CACTIVEUSBHOSTMESSAGEWATCHER_DES_EXIT );
}
CActiveUsbHostMessageWatcher::CActiveUsbHostMessageWatcher(
@@ -134,22 +142,25 @@
KHostMessageMonitor)
, iHostMessage(aHostMessage)
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CACTIVEUSBHOSTMESSAGEWATCHER_CACTIVEUSBHOSTMESSAGEWATCHER_CONS_ENTRY );
+ OstTraceFunctionExit0( CACTIVEUSBHOSTMESSAGEWATCHER_CACTIVEUSBHOSTMESSAGEWATCHER_CONS_EXIT );
}
void CActiveUsbHostMessageWatcher::Post()
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CACTIVEUSBHOSTMESSAGEWATCHER_POST_ENTRY );
iUsbHostStack.NotifyDevmonEvent(iStatus, iHostMessage);
SetActive();
+ OstTraceFunctionExit0( CACTIVEUSBHOSTMESSAGEWATCHER_POST_EXIT );
}
void CActiveUsbHostMessageWatcher::DoCancel()
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CACTIVEUSBHOSTMESSAGEWATCHER_DOCANCEL_ENTRY );
iUsbHostStack.NotifyDevmonEventCancel();
+ OstTraceFunctionExit0( CACTIVEUSBHOSTMESSAGEWATCHER_DOCANCEL_EXIT );
}
--- a/usbmgmt/usbmgr/usbman/server/SRC/cusbotgwatcher.cpp Wed Jul 07 14:16:40 2010 +0800
+++ b/usbmgmt/usbmgr/usbman/server/SRC/cusbotgwatcher.cpp Wed Jul 07 15:08:54 2010 +0800
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2008-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"
@@ -21,15 +21,16 @@
@file
*/
+#include <usb/usbshared.h>
#include <usb/usblogger.h>
#include "CUsbScheduler.h"
#include "cusbotgwatcher.h"
#include "CUsbOtg.h"
-#include <usb/usbshared.h>
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "cusbotgwatcherTraces.h"
+#endif
-#ifdef __FLOG_ACTIVE
-_LIT8(KLogComponent, "USBSVR-OTGWATCHER");
-#endif
static _LIT_SECURITY_POLICY_PASS(KAllowAllPolicy);
static _LIT_SECURITY_POLICY_S1(KNetworkControlPolicy,KUsbmanSvrSid,ECapabilityNetworkControl);
@@ -50,8 +51,9 @@
CUsbOtgBaseWatcher::CUsbOtgBaseWatcher(RUsbOtgDriver& aLdd)
: CActive(CActive::EPriorityStandard), iLdd(aLdd)
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CUSBOTGBASEWATCHER_CUSBOTGBASEWATCHER_CONS_ENTRY );
CActiveScheduler::Add(this);
+ OstTraceFunctionExit0( CUSBOTGBASEWATCHER_CUSBOTGBASEWATCHER_CONS_EXIT );
}
/**
@@ -63,8 +65,9 @@
*/
CUsbOtgBaseWatcher::~CUsbOtgBaseWatcher()
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CUSBOTGBASEWATCHER_CUSBOTGBASEWATCHER_DES_ENTRY );
Cancel();
+ OstTraceFunctionExit0( CUSBOTGBASEWATCHER_CUSBOTGBASEWATCHER_DES_EXIT );
}
/**
@@ -72,8 +75,9 @@
*/
void CUsbOtgBaseWatcher::Start()
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CUSBOTGBASEWATCHER_START_ENTRY );
Post();
+ OstTraceFunctionExit0( CUSBOTGBASEWATCHER_START_EXIT );
}
//---------------------------- Id-Pin watcher class ---------------------------
@@ -89,12 +93,13 @@
*/
CUsbOtgIdPinWatcher* CUsbOtgIdPinWatcher::NewL(RUsbOtgDriver& aLdd)
{
- LOG_STATIC_FUNC_ENTRY
+ OstTraceFunctionEntry0( CUSBOTGIDPINWATCHER_NEWL_ENTRY );
CUsbOtgIdPinWatcher* self = new (ELeave) CUsbOtgIdPinWatcher(aLdd);
CleanupStack::PushL(self);
self->ConstructL();
CleanupStack::Pop(self);
+ OstTraceFunctionExit0( CUSBOTGIDPINWATCHER_NEWL_EXIT );
return self;
}
@@ -108,9 +113,10 @@
*/
CUsbOtgIdPinWatcher::~CUsbOtgIdPinWatcher()
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CUSBOTGIDPINWATCHER_CUSBOTGIDPINWATCHER_DES_ENTRY );
Cancel();
RProperty::Delete(KUsbOtgIdPinPresentProperty);
+ OstTraceFunctionExit0( CUSBOTGIDPINWATCHER_CUSBOTGIDPINWATCHER_DES_EXIT );
}
void CUsbOtgIdPinWatcher::ConstructL()
@@ -118,7 +124,7 @@
* Performs 2nd phase construction of the OTG object.
*/
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CUSBOTGIDPINWATCHER_CONSTRUCTL_ENTRY );
TInt err = RProperty::Define(KUsbOtgIdPinPresentProperty, RProperty::EInt, KAllowAllPolicy, KNetworkControlPolicy);
if ( err != KErrNone && err != KErrAlreadyExists )
@@ -130,6 +136,7 @@
{
User::LeaveIfError(err);
}
+ OstTraceFunctionExit0( CUSBOTGIDPINWATCHER_CONSTRUCTL_EXIT );
}
/**
@@ -143,7 +150,8 @@
CUsbOtgIdPinWatcher::CUsbOtgIdPinWatcher(RUsbOtgDriver& aLdd)
: CUsbOtgBaseWatcher(aLdd)
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CUSBOTGIDPINWATCHER_CUSBOTGIDPINWATCHER_CONS_ENTRY );
+ OstTraceFunctionExit0( CUSBOTGIDPINWATCHER_CUSBOTGIDPINWATCHER_CONS_EXIT );
}
/**
@@ -151,14 +159,19 @@
*/
void CUsbOtgIdPinWatcher::RunL()
{
- LOG_FUNC
- LOGTEXT2(_L8(">>CUsbOtgIdPinWatcher::RunL [iStatus=%d]"), iStatus.Int());
+ OstTraceFunctionEntry0( CUSBOTGIDPINWATCHER_RUNL_ENTRY );
+ OstTrace1( TRACE_NORMAL, CUSBOTGIDPINWATCHER_RUNL, "CUsbOtgIdPinWatcher::RunL;iStatus=%d", iStatus.Int() );
- LEAVEIFERRORL(iStatus.Int());
+ TInt err = iStatus.Int();
+ if(err < 0)
+ {
+ OstTrace1( TRACE_NORMAL, CUSBOTGIDPINWATCHER_RUNL_DUP1, "CUsbOtgIdPinWatcher::RunL;iStatus.Int() with error=%d", err );
+ User::Leave(err);
+ }
Post();
- LOGTEXT(_L8("<<CUsbOtgIdPinWatcher::RunL"));
+ OstTraceFunctionExit0( CUSBOTGIDPINWATCHER_RUNL_EXIT );
}
@@ -167,8 +180,9 @@
*/
void CUsbOtgIdPinWatcher::DoCancel()
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CUSBOTGIDPINWATCHER_DOCANCEL_ENTRY );
iLdd.CancelOtgIdPinNotification();
+ OstTraceFunctionExit0( CUSBOTGIDPINWATCHER_DOCANCEL_EXIT );
}
/**
@@ -176,38 +190,45 @@
*/
void CUsbOtgIdPinWatcher::Post()
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CUSBOTGIDPINWATCHER_POST_ENTRY );
- LOGTEXT(_L8("CUsbOtgIdPinWatcher::Post() - About to call QueueOtgIdPinNotification"));
+ OstTrace0( TRACE_NORMAL, CUSBOTGIDPINWATCHER_POST, "CUsbOtgIdPinWatcher::Post - About to call QueueOtgIdPinNotification" );
+
iLdd.QueueOtgIdPinNotification(iOtgIdPin, iStatus);
switch (iOtgIdPin)
{
case RUsbOtgDriver::EIdPinAPlug:
if (RProperty::Set(KUidUsbManCategory,KUsbOtgIdPinPresentProperty,ETrue) != KErrNone)
{
- LOGTEXT2(_L8(">>CUsbOtgIdPinWatcher::Post [iOtgIdPin=%d] - failed to set the property value"), iOtgIdPin);
+ OstTrace1( TRACE_NORMAL, CUSBOTGIDPINWATCHER_POST_DUP1,
+ "CUsbOtgIdPinWatcher::Post; [iOtgIdPin=%d] - failed to set the property value", iOtgIdPin );
}
else
{
- LOGTEXT2(_L8(">>CUsbOtgIdPinWatcher::Post [iOtgIdPin=%d] - property is set to 1"), iOtgIdPin);
+ OstTrace1( TRACE_NORMAL, CUSBOTGIDPINWATCHER_POST_DUP2,
+ "CUsbOtgIdPinWatcher::Post; [iOtgIdPin=%d] - property is set to 1", iOtgIdPin );
}
break;
case RUsbOtgDriver::EIdPinBPlug:
case RUsbOtgDriver::EIdPinUnknown:
if (RProperty::Set(KUidUsbManCategory,KUsbOtgIdPinPresentProperty,EFalse) != KErrNone)
{
- LOGTEXT2(_L8(">>CUsbOtgIdPinWatcher::Post [iOtgIdPin=%d] - failed to set the property value"), iOtgIdPin);
+ OstTrace1( TRACE_NORMAL, CUSBOTGIDPINWATCHER_POST_DUP3,
+ "CUsbOtgIdPinWatcher::Post; [iOtgIdPin=%d] - failed to set the property value", iOtgIdPin );
}
else
{
- LOGTEXT2(_L8(">>CUsbOtgIdPinWatcher::Post [iOtgIdPin=%d] - property is set to 0"), iOtgIdPin);
+ OstTrace1( TRACE_NORMAL, CUSBOTGIDPINWATCHER_POST_DUP4,
+ "CUsbOtgIdPinWatcher::Post; [iOtgIdPin=%d] - property is set to 0", iOtgIdPin );
}
break;
default:
- LOGTEXT2(_L8(">>CUsbOtgIdPinWatcher::Post [iOtgIdPin=%d] is unrecognized, re-request QueueOtgIdPinNotification"), iOtgIdPin);
+ OstTrace1( TRACE_NORMAL, CUSBOTGIDPINWATCHER_POST_DUP5,
+ "CUsbOtgIdPinWatcher::Post; [iOtgIdPin=%d] is unrecognized, re-request QueueOtgIdPinNotification", iOtgIdPin );
break;
}
SetActive();
+ OstTraceFunctionExit0( CUSBOTGIDPINWATCHER_POST_EXIT );
}
//----------------------------- VBus watcher class ----------------------------
@@ -223,12 +244,13 @@
*/
CUsbOtgVbusWatcher* CUsbOtgVbusWatcher::NewL(RUsbOtgDriver& aLdd)
{
- LOG_STATIC_FUNC_ENTRY
+ OstTraceFunctionEntry0( CUSBOTGVBUSWATCHER_NEWL_ENTRY );
CUsbOtgVbusWatcher* self = new (ELeave) CUsbOtgVbusWatcher(aLdd);
CleanupStack::PushL(self);
self->ConstructL();
CleanupStack::Pop(self);
+ OstTraceFunctionExit0( CUSBOTGVBUSWATCHER_NEWL_EXIT );
return self;
}
@@ -242,10 +264,11 @@
*/
CUsbOtgVbusWatcher::~CUsbOtgVbusWatcher()
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CUSBOTGVBUSWATCHER_CUSBOTGVBUSWATCHER_DES_ENTRY );
Cancel();
RProperty::Delete(KUsbOtgVBusPoweredProperty);
+ OstTraceFunctionExit0( CUSBOTGVBUSWATCHER_CUSBOTGVBUSWATCHER_DES_EXIT );
}
void CUsbOtgVbusWatcher::ConstructL()
@@ -253,7 +276,7 @@
* Performs 2nd phase construction of the OTG object.
*/
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CUSBOTGVBUSWATCHER_CONSTRUCTL_ENTRY );
TInt err = RProperty::Define(KUsbOtgVBusPoweredProperty, RProperty::EInt, KAllowAllPolicy, KNetworkControlPolicy);
if ( err != KErrNone && err != KErrAlreadyExists )
@@ -265,6 +288,7 @@
{
User::LeaveIfError(err);
}
+ OstTraceFunctionExit0( CUSBOTGVBUSWATCHER_CONSTRUCTL_EXIT );
}
/**
@@ -277,7 +301,8 @@
CUsbOtgVbusWatcher::CUsbOtgVbusWatcher(RUsbOtgDriver& aLdd)
: CUsbOtgBaseWatcher(aLdd)
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CUSBOTGVBUSWATCHER_CUSBOTGVBUSWATCHER_CONS_ENTRY );
+ OstTraceFunctionExit0( CUSBOTGVBUSWATCHER_CUSBOTGVBUSWATCHER_CONS_EXIT );
}
/**
@@ -285,14 +310,19 @@
*/
void CUsbOtgVbusWatcher::RunL()
{
- LOG_FUNC
- LOGTEXT2(_L8(">>CUsbOtgVbusWatcher::RunL [iStatus=%d]"), iStatus.Int());
+ OstTraceFunctionEntry0( CUSBOTGVBUSWATCHER_RUNL_ENTRY );
+ OstTrace1( TRACE_NORMAL, CUSBOTGVBUSWATCHER_RUNL, "CUsbOtgVbusWatcher::RunL;iStatus=%d", iStatus.Int() );
- LEAVEIFERRORL(iStatus.Int());
+ TInt err = iStatus.Int();
+ if(err < 0)
+ {
+ OstTrace1( TRACE_NORMAL, CUSBOTGVBUSWATCHER_RUNL_DUP1, "CUsbOtgVbusWatcher::RunL;iStatus.Int() with error=%d", err );
+ User::Leave(err);
+ }
Post();
- LOGTEXT(_L8("<<CUsbOtgVbusWatcher::RunL"));
+ OstTraceFunctionExit0( CUSBOTGVBUSWATCHER_RUNL_EXIT );
}
@@ -301,8 +331,9 @@
*/
void CUsbOtgVbusWatcher::DoCancel()
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CUSBOTGVBUSWATCHER_DOCANCEL_ENTRY );
iLdd.CancelOtgVbusNotification();
+ OstTraceFunctionExit0( CUSBOTGVBUSWATCHER_DOCANCEL_EXIT );
}
/**
@@ -310,38 +341,45 @@
*/
void CUsbOtgVbusWatcher::Post()
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CUSBOTGVBUSWATCHER_POST_ENTRY );
- LOGTEXT(_L8("CUsbOtgVbusWatcher::Post() - About to call QueueOtgVbusNotification"));
+ OstTrace0( TRACE_NORMAL, CUSBOTGVBUSWATCHER_POST, "CUsbOtgVbusWatcher::Post - About to call QueueOtgVbusNotification" );
+
iLdd.QueueOtgVbusNotification(iOtgVbus, iStatus);
switch (iOtgVbus)
{
case RUsbOtgDriver::EVbusHigh:
if (RProperty::Set(KUidUsbManCategory,KUsbOtgVBusPoweredProperty,ETrue) != KErrNone)
{
- LOGTEXT2(_L8(">>CUsbOtgVbusWatcher::Post [iOtgVbus=%d](EVbusHigh) - failed to set the property value"), iOtgVbus);
+ OstTrace1( TRACE_NORMAL, CUSBOTGVBUSWATCHER_POST_DUP1,
+ "CUsbOtgVbusWatcher::Post;[iOtgVbus=%d](EVbusHigh) - failed to set the property value", iOtgVbus );
}
else
{
- LOGTEXT2(_L8(">>CUsbOtgVbusWatcher::Post [iOtgVbus=%d](EVbusHigh) - property is set to ETrue"), iOtgVbus);
+ OstTrace1( TRACE_NORMAL, CUSBOTGVBUSWATCHER_POST_DUP2,
+ "CUsbOtgVbusWatcher::Post;[iOtgVbus=%d](EVbusHigh) - property is set to ETrue", iOtgVbus );
}
break;
case RUsbOtgDriver::EVbusLow:
case RUsbOtgDriver::EVbusUnknown:
if (RProperty::Set(KUidUsbManCategory,KUsbOtgVBusPoweredProperty,EFalse) != KErrNone)
{
- LOGTEXT2(_L8(">>CUsbOtgVbusWatcher::Post [iOtgVbus=%d](1 - EVbusLow, 2 - EVbusUnknown) - failed to set the property value"), iOtgVbus);
+ OstTrace1( TRACE_NORMAL, CUSBOTGVBUSWATCHER_POST_DUP3,
+ "CUsbOtgVbusWatcher::Post;[iOtgVbus=%d](1 - EVbusLow, 2 - EVbusUnknown) - failed to set the property value", iOtgVbus );
}
else
{
- LOGTEXT2(_L8(">>CUsbOtgVbusWatcher::Post [iOtgVbus=%d](1 - EVbusLow, 2 - EVbusUnknown) - property is set to EFalse"), iOtgVbus);
+ OstTrace1( TRACE_NORMAL, CUSBOTGVBUSWATCHER_POST_DUP4,
+ "CUsbOtgVbusWatcher::Post;[iOtgVbus=%d](1 - EVbusLow, 2 - EVbusUnknown) - property is set to EFalse", iOtgVbus );
}
break;
default:
- LOGTEXT2(_L8(">>CUsbOtgVbusWatcher::RunL [iOtgVbus=%d] is unrecognized, re-request QueueOtgVbusNotification"), iOtgVbus);
+ OstTrace1( TRACE_NORMAL, CUSBOTGVBUSWATCHER_POST_DUP5,
+ "CUsbOtgVbusWatcher::Post;iOtgVbus=%d] is unrecognized, re-request QueueOtgVbusNotification", iOtgVbus );
break;
}
SetActive();
+ OstTraceFunctionExit0( CUSBOTGVBUSWATCHER_POST_EXIT );
}
@@ -358,12 +396,13 @@
*/
CUsbOtgStateWatcher* CUsbOtgStateWatcher::NewL(RUsbOtgDriver& aLdd)
{
- LOG_STATIC_FUNC_ENTRY
+ OstTraceFunctionEntry0( CUSBOTGSTATEWATCHER_NEWL_ENTRY );
CUsbOtgStateWatcher* self = new (ELeave) CUsbOtgStateWatcher(aLdd);
CleanupStack::PushL(self);
self->ConstructL();
CleanupStack::Pop(self);
+ OstTraceFunctionExit0( CUSBOTGSTATEWATCHER_NEWL_EXIT );
return self;
}
@@ -377,9 +416,10 @@
*/
CUsbOtgStateWatcher::~CUsbOtgStateWatcher()
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CUSBOTGSTATEWATCHER_CUSBOTGSTATEWATCHER_DES_ENTRY );
Cancel();
RProperty::Delete(KUsbOtgStateProperty);
+ OstTraceFunctionExit0( CUSBOTGSTATEWATCHER_CUSBOTGSTATEWATCHER_DES_EXIT );
}
void CUsbOtgStateWatcher::ConstructL()
@@ -387,7 +427,7 @@
* Performs 2nd phase construction of the OTG object.
*/
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CUSBOTGSTATEWATCHER_CONSTRUCTL_ENTRY );
TInt err = RProperty::Define(KUsbOtgStateProperty, RProperty::EInt, KAllowAllPolicy, KNetworkControlPolicy);
if ( err != KErrNone && err != KErrAlreadyExists )
@@ -399,6 +439,7 @@
{
User::LeaveIfError(err);
}
+ OstTraceFunctionExit0( CUSBOTGSTATEWATCHER_CONSTRUCTL_EXIT );
}
/**
@@ -412,8 +453,9 @@
CUsbOtgStateWatcher::CUsbOtgStateWatcher(RUsbOtgDriver& aLdd)
: CUsbOtgBaseWatcher(aLdd)
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CUSBOTGSTATEWATCHER_CUSBOTGSTATEWATCHER_CONS_ENTRY );
iOtgState = RUsbOtgDriver::EStateReset;
+ OstTraceFunctionExit0( CUSBOTGSTATEWATCHER_CUSBOTGSTATEWATCHER_CONS_EXIT );
}
/**
@@ -421,14 +463,19 @@
*/
void CUsbOtgStateWatcher::RunL()
{
- LOG_FUNC
- LOGTEXT2(_L8(">>CUsbOtgStateWatcher::RunL [iStatus=%d]"), iStatus.Int());
+ OstTraceFunctionEntry0( CUSBOTGSTATEWATCHER_RUNL_ENTRY );
+ OstTrace1( TRACE_NORMAL, CUSBOTGSTATEWATCHER_RUNL, "CUsbOtgStateWatcher::RunL;iStatus.Int()=%d", iStatus.Int() );
- LEAVEIFERRORL(iStatus.Int());
+ TInt err = iStatus.Int();
+ if(err < 0)
+ {
+ OstTrace1( TRACE_NORMAL, CUSBOTGSTATEWATCHER_RUNL_DUP1, "CUsbOtgStateWatcher::RunL;iStatus.Int() with error=%d", err );
+ User::Leave(err);
+ }
Post();
- LOGTEXT(_L8("<<CUsbOtgStateWatcher::RunL"));
+ OstTraceFunctionExit0( CUSBOTGSTATEWATCHER_RUNL_EXIT );
}
@@ -437,8 +484,9 @@
*/
void CUsbOtgStateWatcher::DoCancel()
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CUSBOTGSTATEWATCHER_DOCANCEL_ENTRY );
iLdd.CancelOtgStateNotification();
+ OstTraceFunctionExit0( CUSBOTGSTATEWATCHER_DOCANCEL_EXIT );
}
/**
@@ -446,17 +494,20 @@
*/
void CUsbOtgStateWatcher::Post()
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CUSBOTGSTATEWATCHER_POST_ENTRY );
- LOGTEXT(_L8("CUsbOtgStateWatcher::Post() - About to call QueueOtgStateNotification"));
+ OstTrace0( TRACE_NORMAL, CUSBOTGSTATEWATCHER_POST, "CUsbOtgStateWatcher::Post - About to call QueueOtgStateNotification" );
iLdd.QueueOtgStateNotification(iOtgState, iStatus);
- LOGTEXT3(_L8(">>CUsbOtgStateWatcher::RunL [iStatus=%d], iOtgState = %d"), iStatus.Int(), iOtgState);
+ OstTraceExt2( TRACE_NORMAL, CUSBOTGSTATEWATCHER_POST_DUP1,
+ "CUsbOtgStateWatcher::Post;[iStatus=%d], iOtgState = %d", iStatus.Int(), iOtgState );
if (RProperty::Set(KUidUsbManCategory,KUsbOtgStateProperty,(TInt)iOtgState) != KErrNone)
{
- LOGTEXT3(_L8(">>CUsbOtgStateWatcher::RunL [iStatus=%d], iOtgState = %d - failed to set the property"), iStatus.Int(), iOtgState);
+ OstTraceExt2( TRACE_NORMAL, CUSBOTGSTATEWATCHER_POST_DUP2,
+ "CUsbOtgStateWatcher::Post;[iStatus=%d], iOtgState = %d - failed to set the property", iStatus.Int(), iOtgState );
}
SetActive();
+ OstTraceFunctionExit0( CUSBOTGSTATEWATCHER_POST_EXIT );
}
//-------------------------- OTG Events watcher class -------------------------
@@ -475,12 +526,13 @@
CUsbOtgEventWatcher* CUsbOtgEventWatcher::NewL(CUsbOtg& aOwner, RUsbOtgDriver& aLdd,
RUsbOtgDriver::TOtgEvent& aOtgEvent)
{
- LOG_STATIC_FUNC_ENTRY
+ OstTraceFunctionEntry0( CUSBOTGEVENTWATCHER_NEWL_ENTRY );
CUsbOtgEventWatcher* self = new (ELeave) CUsbOtgEventWatcher(aOwner, aLdd, aOtgEvent);
CleanupStack::PushL(self);
self->ConstructL();
CleanupStack::Pop(self);
+ OstTraceFunctionExit0( CUSBOTGEVENTWATCHER_NEWL_EXIT );
return self;
}
@@ -494,8 +546,9 @@
*/
CUsbOtgEventWatcher::~CUsbOtgEventWatcher()
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CUSBOTGEVENTWATCHER_CUSBOTGEVENTWATCHER_DES_ENTRY );
Cancel();
+ OstTraceFunctionExit0( CUSBOTGEVENTWATCHER_CUSBOTGEVENTWATCHER_DES_EXIT );
}
void CUsbOtgEventWatcher::ConstructL()
@@ -503,7 +556,8 @@
* Performs 2nd phase construction of the OTG object.
*/
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CUSBOTGEVENTWATCHER_CONSTRUCTL_ENTRY );
+ OstTraceFunctionExit0( CUSBOTGEVENTWATCHER_CONSTRUCTL_EXIT );
}
/**
@@ -519,7 +573,8 @@
RUsbOtgDriver::TOtgEvent& aOtgEvent)
: CUsbOtgBaseWatcher(aLdd), iOwner(aOwner), iOtgEvent(aOtgEvent)
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CUSBOTGEVENTWATCHER_CUSBOTGEVENTWATCHER_CONS_ENTRY );
+ OstTraceFunctionExit0( CUSBOTGEVENTWATCHER_CUSBOTGEVENTWATCHER_CONS_EXIT );
}
/**
@@ -527,11 +582,17 @@
*/
void CUsbOtgEventWatcher::RunL()
{
- LOG_FUNC
- LOGTEXT2(_L8(">>CUsbOtgEventWatcher::RunL [iStatus=%d]"), iStatus.Int());
-
- LEAVEIFERRORL(iStatus.Int());
- LOGTEXT2(_L8("CUsbOtgEventWatcher::RunL() - Otg Event reported: %d"), (TInt)iOtgEvent);
+ OstTraceFunctionEntry0( CUSBOTGEVENTWATCHER_RUNL_ENTRY );
+ OstTrace1( TRACE_NORMAL, CUSBOTGEVENTWATCHER_RUNL, "CUsbOtgEventWatcher::RunL;iStatus=%d", iStatus.Int() );
+ TInt err = iStatus.Int();
+ if(err < 0)
+ {
+ OstTrace1( TRACE_NORMAL, CUSBOTGEVENTWATCHER_RUNL_DUP3, "CUsbOtgEventWatcher::RunL;iStatus.Int() with error=%d", err );
+ User::Leave(err);
+ }
+
+ OstTrace1( TRACE_NORMAL, CUSBOTGEVENTWATCHER_RUNL_DUP1,
+ "CUsbOtgEventWatcher::RunL; - Otg Event reported: %d", (TInt)iOtgEvent );
if ( ( iOtgEvent == RUsbOtgDriver::EEventHnpDisabled )
||( iOtgEvent == RUsbOtgDriver::EEventHnpEnabled )
||( iOtgEvent == RUsbOtgDriver::EEventSrpInitiated )
@@ -541,13 +602,14 @@
)
{
iOwner.NotifyOtgEvent();
- LOGTEXT2(_L8("CUsbOtgEventWatcher::RunL() - The owner is notified about Otg Event = %d"), (TInt)iOtgEvent);
+ OstTrace1( TRACE_NORMAL, CUSBOTGEVENTWATCHER_RUNL_DUP2,
+ "CUsbOtgEventWatcher::RunL - The owner is notified about Otg Event = %d", (TInt)iOtgEvent );
}
Post();
- LOGTEXT(_L8("<<CUsbOtgEventWatcher::RunL"));
+ OstTraceFunctionExit0( CUSBOTGEVENTWATCHER_RUNL_EXIT );
}
-#ifndef __FLOG_ACTIVE
+#ifndef _DEBUG
void CUsbOtgEventWatcher::LogEventText(RUsbOtgDriver::TOtgEvent /*aState*/)
{
}
@@ -557,37 +619,48 @@
switch (aEvent)
{
case RUsbOtgDriver::EEventAPlugInserted:
- LOGTEXT(_L8(" ***** A-Plug Inserted *****"));
+ OstTrace0( TRACE_NORMAL, CUSBOTGEVENTWATCHER_LOGEVENTTEXT,
+ "CUsbOtgEventWatcher::LogEventText ***** A-Plug Inserted *****" );
break;
case RUsbOtgDriver::EEventAPlugRemoved:
- LOGTEXT(_L8(" ***** A-Plug Removed *****"));
+ OstTrace0( TRACE_NORMAL, CUSBOTGEVENTWATCHER_LOGEVENTTEXT_DUP1,
+ "CUsbOtgEventWatcher::LogEventText ***** A-Plug Removed *****" );
break;
case RUsbOtgDriver::EEventVbusRaised:
- LOGTEXT(_L8(" ***** VBus Raised *****"));
+ OstTrace0( TRACE_NORMAL, CUSBOTGEVENTWATCHER_LOGEVENTTEXT_DUP2,
+ "CUsbOtgEventWatcher::LogEventText ***** VBus Raised *****" );
break;
case RUsbOtgDriver::EEventVbusDropped:
- LOGTEXT(_L8(" ***** VBus Dropped *****"));
+ OstTrace0( TRACE_NORMAL, CUSBOTGEVENTWATCHER_LOGEVENTTEXT_DUP3,
+ "CUsbOtgEventWatcher::LogEventText ***** VBus Dropped *****" );
break;
case RUsbOtgDriver::EEventSrpInitiated:
- LOGTEXT(_L8(" ***** SRP Initiated *****"));
+ OstTrace0( TRACE_NORMAL, CUSBOTGEVENTWATCHER_LOGEVENTTEXT_DUP4,
+ "CUsbOtgEventWatcher::LogEventText ***** SRP Initiated *****" );
break;
case RUsbOtgDriver::EEventSrpReceived:
- LOGTEXT(_L8(" ***** SRP Received *****"));
+ OstTrace0( TRACE_NORMAL, CUSBOTGEVENTWATCHER_LOGEVENTTEXT_DUP5,
+ "CUsbOtgEventWatcher::LogEventText ***** SRP Received *****" );
break;
case RUsbOtgDriver::EEventHnpEnabled:
- LOGTEXT(_L8(" ***** HNP Enabled *****"));
+ OstTrace0( TRACE_NORMAL, CUSBOTGEVENTWATCHER_LOGEVENTTEXT_DUP6,
+ "CUsbOtgEventWatcher::LogEventText ***** HNP Enabled *****" );
break;
case RUsbOtgDriver::EEventHnpDisabled:
- LOGTEXT(_L8(" ***** HNP Disabled *****"));
+ OstTrace0( TRACE_NORMAL, CUSBOTGEVENTWATCHER_LOGEVENTTEXT_DUP7,
+ "CUsbOtgEventWatcher::LogEventText ***** HNP Disabled *****" );
break;
case RUsbOtgDriver::EEventRoleChangedToHost:
- LOGTEXT(_L8(" ***** Role Changed to Host *****"));
+ OstTrace0( TRACE_NORMAL, CUSBOTGEVENTWATCHER_LOGEVENTTEXT_DUP8,
+ "CUsbOtgEventWatcher::LogEventText ***** Role Changed to Host *****" );
break;
case RUsbOtgDriver::EEventRoleChangedToDevice:
- LOGTEXT(_L8(" ***** Role Changed to Device *****"));
+ OstTrace0( TRACE_NORMAL, CUSBOTGEVENTWATCHER_LOGEVENTTEXT_DUP9,
+ "CUsbOtgEventWatcher::LogEventText ***** Role Changed to Device *****" );
break;
case RUsbOtgDriver::EEventRoleChangedToIdle:
- LOGTEXT(_L8(" ***** Role Changed to Idle *****"));
+ OstTrace0( TRACE_NORMAL, CUSBOTGEVENTWATCHER_LOGEVENTTEXT_DUP10,
+ "CUsbOtgEventWatcher::LogEventText ***** Role Changed to Idle *****" );
break;
default:
break;
@@ -600,8 +673,9 @@
*/
void CUsbOtgEventWatcher::DoCancel()
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CUSBOTGEVENTWATCHER_DOCANCEL_ENTRY );
iLdd.CancelOtgEventRequest();
+ OstTraceFunctionExit0( CUSBOTGEVENTWATCHER_DOCANCEL_EXIT );
}
/**
@@ -609,11 +683,12 @@
*/
void CUsbOtgEventWatcher::Post()
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CUSBOTGEVENTWATCHER_POST_ENTRY );
- LOGTEXT(_L8("CUsbOtgEventWatcher::Post() - About to call QueueOtgEventRequest"));
+ OstTrace0( TRACE_NORMAL, CUSBOTGEVENTWATCHER_POST, "CUsbOtgEventWatcher::Post - About to call QueueOtgEventRequest" );
iLdd.QueueOtgEventRequest(iOtgEvent, iStatus);
SetActive();
+ OstTraceFunctionExit0( CUSBOTGEVENTWATCHER_POST_EXIT );
}
@@ -633,9 +708,10 @@
*/
CUsbOtgWatcher* CUsbOtgWatcher::NewL(MUsbOtgObserver& aOwner, RUsbOtgDriver& aLdd, TUint& aOtgMessage)
{
- LOG_STATIC_FUNC_ENTRY
+ OstTraceFunctionEntry0( CUSBOTGWATCHER_NEWL_ENTRY );
CUsbOtgWatcher* r = new (ELeave) CUsbOtgWatcher(aOwner, aLdd, aOtgMessage);
+ OstTraceFunctionExit0( CUSBOTGWATCHER_NEWL_EXIT );
return r;
}
@@ -649,8 +725,7 @@
*/
CUsbOtgWatcher::~CUsbOtgWatcher()
{
- LOG_FUNC
- LOGTEXT2(_L8(">CUsbOtgWatcher::~CUsbOtgWatcher (0x%08x)"), (TUint32) this);
+ OstTraceFunctionEntry1( CUSBOTGWATCHER_CUSBOTGWATCHER_DES_ENTRY, this );
Cancel();
}
@@ -666,8 +741,9 @@
CUsbOtgWatcher::CUsbOtgWatcher(MUsbOtgObserver& aOwner, RUsbOtgDriver& aLdd, TUint& aOtgMessage)
: CActive(CActive::EPriorityStandard), iOwner(aOwner), iLdd(aLdd), iOtgMessage(aOtgMessage)
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CUSBOTGWATCHER_CUSBOTGWATCHER_CONS_ENTRY );
CActiveScheduler::Add(this);
+ OstTraceFunctionExit0( CUSBOTGWATCHER_CUSBOTGWATCHER_CONS_EXIT );
}
/**
@@ -675,17 +751,19 @@
*/
void CUsbOtgWatcher::RunL()
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CUSBOTGWATCHER_RUNL_ENTRY );
if (iStatus.Int() != KErrNone)
{
- LOGTEXT2(_L8("CUsbOtgWatcher::RunL() - Error = %d"), iStatus.Int());
+ OstTrace1( TRACE_NORMAL, CUSBOTGWATCHER_RUNL, "CUsbOtgWatcher::RunL;Error=%d", iStatus.Int() );
+ OstTraceFunctionExit0( CUSBOTGWATCHER_RUNL_EXIT );
return;
}
- LOGTEXT2(_L8("CUsbOtgWatcher::RunL() - Otg Message reported: %d"), iOtgMessage);
+ OstTrace1( TRACE_NORMAL, CUSBOTGWATCHER_RUNL_DUP1, "CUsbOtgWatcher::RunL;Otg Message reported: %d", iOtgMessage );
iOwner.NotifyMessage();
Post();
+ OstTraceFunctionExit0( CUSBOTGWATCHER_RUNL_EXIT_DUP1 );
}
@@ -694,8 +772,9 @@
*/
void CUsbOtgWatcher::DoCancel()
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CUSBOTGWATCHER_DOCANCEL_ENTRY );
iLdd.CancelOtgMessageRequest();
+ OstTraceFunctionExit0( CUSBOTGWATCHER_DOCANCEL_EXIT );
}
@@ -704,8 +783,9 @@
*/
void CUsbOtgWatcher::Start()
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CUSBOTGWATCHER_START_ENTRY );
Post();
+ OstTraceFunctionExit0( CUSBOTGWATCHER_START_EXIT );
}
/**
@@ -713,11 +793,12 @@
*/
void CUsbOtgWatcher::Post()
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CUSBOTGWATCHER_POST_ENTRY );
- LOGTEXT(_L8("CUsbOtgWatcher::Post() - About to call QueueOtgMessageRequest"));
+ OstTrace0( TRACE_NORMAL, CUSBOTGWATCHER_POST, "CUsbOtgWatcher::Post - About to call QueueOtgMessageRequest" );
iLdd.QueueOtgMessageRequest((RUsbOtgDriver::TOtgMessage&)iOtgMessage, iStatus);
SetActive();
+ OstTraceFunctionExit0( CUSBOTGWATCHER_POST_EXIT );
}
@@ -747,7 +828,7 @@
* Performs 2nd phase construction of the OTG object.
*/
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CREQUESTSESSIONWATCHER_CONSTRUCTL_ENTRY );
TInt err = RProperty::Define(KUsbRequestSessionProperty, RProperty::EInt, KAllowAllPolicy, KRequestSessionPolicy);
if ( err != KErrNone && err != KErrAlreadyExists )
@@ -762,13 +843,15 @@
User::LeaveIfError(iProp.Attach(KUidUsbManCategory, KUsbRequestSessionProperty));
iProp.Subscribe(iStatus);
SetActive();
+ OstTraceFunctionExit0( CREQUESTSESSIONWATCHER_CONSTRUCTL_EXIT );
}
CRequestSessionWatcher::CRequestSessionWatcher(MUsbOtgObserver& aOwner)
: CActive(CActive::EPriorityStandard), iOwner(aOwner)
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CREQUESTSESSIONWATCHER_CREQUESTSESSIONWATCHER_CONS_ENTRY );
CActiveScheduler::Add(this);
+ OstTraceFunctionExit0( CREQUESTSESSIONWATCHER_CREQUESTSESSIONWATCHER_CONS_EXIT );
}
/**
@@ -776,8 +859,8 @@
*/
void CRequestSessionWatcher::RunL()
{
- LOG_FUNC
- LOGTEXT2(_L8(">>CRequestSessionWatcher::RunL [iStatus=%d]"), iStatus.Int());
+ OstTraceFunctionEntry0( CREQUESTSESSIONWATCHER_RUNL_ENTRY );
+ OstTrace1( TRACE_NORMAL, CREQUESTSESSIONWATCHER_RUNL, "CRequestSessionWatcher::RunL;iStatus=%d", iStatus.Int() );
RDebug::Printf(">>CRequestSessionWatcher::RunL [iStatus=%d]", iStatus.Int());
iProp.Subscribe(iStatus);
@@ -789,7 +872,7 @@
iOwner.NotifyMessage(KUsbMessageRequestSession);
- LOGTEXT(_L8("<<CRequestSessionWatcher::RunL"));
+ OstTraceFunctionExit0( CREQUESTSESSIONWATCHER_RUNL_EXIT );
}
@@ -798,8 +881,9 @@
*/
void CRequestSessionWatcher::DoCancel()
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CREQUESTSESSIONWATCHER_DOCANCEL_ENTRY );
iProp.Cancel();
+ OstTraceFunctionExit0( CREQUESTSESSIONWATCHER_DOCANCEL_EXIT );
}
//---------------------------- Connection Idle watcher class ---------------------------
@@ -815,12 +899,13 @@
*/
CUsbOtgConnectionIdleWatcher* CUsbOtgConnectionIdleWatcher::NewL(RUsbOtgDriver& aLdd)
{
- LOG_STATIC_FUNC_ENTRY
+ OstTraceFunctionEntry0( CUSBOTGCONNECTIONIDLEWATCHER_NEWL_ENTRY );
CUsbOtgConnectionIdleWatcher* self = new (ELeave) CUsbOtgConnectionIdleWatcher(aLdd);
CleanupStack::PushL(self);
self->ConstructL();
CleanupStack::Pop(self);
+ OstTraceFunctionExit0( CUSBOTGCONNECTIONIDLEWATCHER_NEWL_EXIT );
return self;
}
@@ -834,9 +919,10 @@
*/
CUsbOtgConnectionIdleWatcher::~CUsbOtgConnectionIdleWatcher()
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CUSBOTGCONNECTIONIDLEWATCHER_CUSBOTGCONNECTIONIDLEWATCHER_DES_ENTRY );
Cancel();
RProperty::Delete(KUsbOtgConnectionIdleProperty);
+ OstTraceFunctionExit0( CUSBOTGCONNECTIONIDLEWATCHER_CUSBOTGCONNECTIONIDLEWATCHER_DES_EXIT );
}
/**
@@ -844,7 +930,7 @@
*/
void CUsbOtgConnectionIdleWatcher::ConstructL()
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CUSBOTGCONNECTIONIDLEWATCHER_CONSTRUCTL_ENTRY );
TInt err = RProperty::Define(KUsbOtgConnectionIdleProperty, RProperty::EInt, KAllowAllPolicy, KNetworkControlPolicy);
if ( err != KErrNone && err != KErrAlreadyExists )
@@ -856,6 +942,7 @@
{
User::LeaveIfError(err);
}
+ OstTraceFunctionExit0( CUSBOTGCONNECTIONIDLEWATCHER_CONSTRUCTL_EXIT );
}
/**
@@ -869,7 +956,8 @@
CUsbOtgConnectionIdleWatcher::CUsbOtgConnectionIdleWatcher(RUsbOtgDriver& aLdd)
: CUsbOtgBaseWatcher(aLdd)
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CUSBOTGCONNECTIONIDLEWATCHER_CUSBOTGCONNECTIONIDLEWATCHER_CONS_ENTRY );
+ OstTraceFunctionExit0( CUSBOTGCONNECTIONIDLEWATCHER_CUSBOTGCONNECTIONIDLEWATCHER_CONS_EXIT );
}
/**
@@ -877,14 +965,20 @@
*/
void CUsbOtgConnectionIdleWatcher::RunL()
{
- LOG_FUNC
- LOGTEXT2(_L8(">>CUsbOtgConnectionIdleWatcher::RunL [iStatus=%d]"), iStatus.Int());
-
- LEAVEIFERRORL(iStatus.Int());
+ OstTraceFunctionEntry0( CUSBOTGCONNECTIONIDLEWATCHER_RUNL_ENTRY );
+ OstTrace1( TRACE_NORMAL, CUSBOTGCONNECTIONIDLEWATCHER_RUNL,
+ "CUsbOtgConnectionIdleWatcher::RunL;iStatus=%d", iStatus.Int() );
+ TInt err = iStatus.Int();
+ if(err < 0)
+ {
+ OstTrace1( TRACE_NORMAL, CUSBOTGCONNECTIONIDLEWATCHER_RUNL_DUP1, "CUsbOtgConnectionIdleWatcher::RunL;iStatus.Int() with error=%d", err );
+ User::Leave(err);
+ }
+
Post();
- LOGTEXT(_L8("<<CUsbOtgConnectionIdleWatcher::RunL"));
+ OstTraceFunctionExit0( CUSBOTGCONNECTIONIDLEWATCHER_RUNL_EXIT );
}
@@ -893,8 +987,9 @@
*/
void CUsbOtgConnectionIdleWatcher::DoCancel()
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CUSBOTGCONNECTIONIDLEWATCHER_DOCANCEL_ENTRY );
iLdd.CancelOtgConnectionNotification();
+ OstTraceFunctionExit0( CUSBOTGCONNECTIONIDLEWATCHER_DOCANCEL_EXIT );
}
/**
@@ -902,26 +997,31 @@
*/
void CUsbOtgConnectionIdleWatcher::Post()
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CUSBOTGCONNECTIONIDLEWATCHER_POST_ENTRY );
- LOGTEXT(_L8("CUsbOtgConnectionIdleWatcher::Post() - About to call QueueOtgIdPinNotification"));
+ OstTrace0( TRACE_NORMAL, CUSBOTGCONNECTIONIDLEWATCHER_POST,
+ "CUsbOtgConnectionIdleWatcher::Post - About to call QueueOtgIdPinNotification" );
iLdd.QueueOtgConnectionNotification(iConnectionIdle, iStatus);
switch (iConnectionIdle)
{
case RUsbOtgDriver::EConnectionIdle:
case RUsbOtgDriver::EConnectionUnknown:
RProperty::Set(KUidUsbManCategory,KUsbOtgConnectionIdleProperty,ETrue);
- LOGTEXT2(_L8(">>CUsbOtgConnectionIdleWatcher::Post [iConnectionIdle=%d] - property is set to 1"), iConnectionIdle);
+ OstTrace1( TRACE_NORMAL, CUSBOTGCONNECTIONIDLEWATCHER_POST_DUP1,
+ "CUsbOtgConnectionIdleWatcher::Post;[iConnectionIdle=%d] - property is set to 1", iConnectionIdle );
break;
case RUsbOtgDriver::EConnectionBusy:
RProperty::Set(KUidUsbManCategory,KUsbOtgConnectionIdleProperty,EFalse);
- LOGTEXT2(_L8(">>CUsbOtgConnectionIdleWatcher::Post [iConnectionIdle=%d] - property is set to 0"), iConnectionIdle);
+ OstTrace1( TRACE_NORMAL, CUSBOTGCONNECTIONIDLEWATCHER_POST_DUP2,
+ "CUsbOtgConnectionIdleWatcher::Post;[iConnectionIdle=%d] - property is set to 0", iConnectionIdle );
break;
default:
- LOGTEXT2(_L8(">>CUsbOtgConnectionIdleWatcher::Post [iConnectionIdle=%d] is unrecognized, re-request QueueOtgIdPinNotification"), iConnectionIdle);
+ OstTrace1( TRACE_NORMAL, CUSBOTGCONNECTIONIDLEWATCHER_POST_DUP3,
+ "CUsbOtgConnectionIdleWatcher::Post;[iConnectionIdle=%d] is unrecognized, re-request QueueOtgIdPinNotification", iConnectionIdle );
break;
}
SetActive();
+ OstTraceFunctionExit0( CUSBOTGCONNECTIONIDLEWATCHER_POST_EXIT );
}
--- a/usbmgmt/usbmgr/usbman/server/SRC/usbmancenrepmanager.cpp Wed Jul 07 14:16:40 2010 +0800
+++ b/usbmgmt/usbmgr/usbman/server/SRC/usbmancenrepmanager.cpp Wed Jul 07 15:08:54 2010 +0800
@@ -26,11 +26,11 @@
#include "CPersonality.h"
#include "usbmancenrepmanager.h"
#include "CUsbDevice.h"
-
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "usbmancenrepmanagerTraces.h"
+#endif
-#ifdef __FLOG_ACTIVE
-_LIT8(KLogComponent, "USBSVR");
-#endif
_LIT(KUsbCenRepPanic, "UsbCenRep");
@@ -52,7 +52,8 @@
CUsbManCenRepManager::CUsbManCenRepManager(CUsbDevice& aUsbDevice)
: iUsbDevice( aUsbDevice )
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CUSBMANCENREPMANAGER_CUSBMANCENREPMANAGER_CONS_ENTRY );
+ OstTraceFunctionExit0( CUSBMANCENREPMANAGER_CUSBMANCENREPMANAGER_CONS_EXIT );
}
// ---------------------------------------------------------------------------
@@ -61,11 +62,12 @@
//
CUsbManCenRepManager* CUsbManCenRepManager::NewL(CUsbDevice& aUsbDevice)
{
- LOG_STATIC_FUNC_ENTRY
+ OstTraceFunctionEntry0( CUSBMANCENREPMANAGER_NEWL_ENTRY );
CUsbManCenRepManager* self = new (ELeave) CUsbManCenRepManager(aUsbDevice);
CleanupStack::PushL( self );
self->ConstructL();
CleanupStack::Pop( self );
+ OstTraceFunctionExit0( CUSBMANCENREPMANAGER_NEWL_EXIT );
return self;
}
@@ -75,10 +77,11 @@
//
void CUsbManCenRepManager::ConstructL()
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CUSBMANCENREPMANAGER_CONSTRUCTL_ENTRY );
// Open the Central Repository
iRepository = CRepository::NewL( KCRUidUSBManagerConfiguration );
CheckSignatureL();
+ OstTraceFunctionExit0( CUSBMANCENREPMANAGER_CONSTRUCTL_EXIT );
}
// ---------------------------------------------------------------------------
@@ -87,8 +90,9 @@
//
CUsbManCenRepManager::~CUsbManCenRepManager()
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CUSBMANCENREPMANAGER_CUSBMANCENREPMANAGER_DES_ENTRY );
delete iRepository;
+ OstTraceFunctionExit0( CUSBMANCENREPMANAGER_CUSBMANCENREPMANAGER_DES_EXIT );
}
// ---------------------------------------------------------------------------
@@ -97,13 +101,15 @@
//
HBufC* CUsbManCenRepManager::ReadStringKeyLC( TUint32 aKeyId )
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CUSBMANCENREPMANAGER_READSTRINGKEYLC_ENTRY );
HBufC* keyBuf = HBufC::NewLC( NCentralRepositoryConstants::KMaxUnicodeStringLength );
TPtr key = keyBuf->Des();
- LEAVEIFERRORL( iRepository->Get( aKeyId, key ) );
- LOGTEXT3(_L("LocSets: ReadStringKeyLC id: %x, val: %S"), aKeyId, &key );
+ TInt err = iRepository->Get( aKeyId, key );
+ LEAVEIFERRORL( err, OstTrace1( TRACE_NORMAL, CUSBMANCENREPMANAGER_READSTRINGKEYLC, "CUsbManCenRepManager::ReadStringKeyLC;Leave err=%d", err ););
+ OstTraceExt2( TRACE_NORMAL, CUSBMANCENREPMANAGER_READSTRINGKEYLC_DUP1, "CUsbManCenRepManager::ReadStringKeyLC;aKeyId=%x;key=%S", aKeyId, key );
+ OstTraceFunctionExit0( CUSBMANCENREPMANAGER_READSTRINGKEYLC_EXIT );
return keyBuf;
}
@@ -113,12 +119,14 @@
//
TInt CUsbManCenRepManager::ReadKeyL( TUint32 aKeyId )
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CUSBMANCENREPMANAGER_READKEYL_ENTRY );
TInt key;
- LEAVEIFERRORL( iRepository->Get( aKeyId, key ) );
- LOGTEXT3(_L("LocSets: ReadKeyL id: 0x%x, val: 0x%x"), aKeyId, key);
+ TInt err = iRepository->Get( aKeyId, key );
+ LEAVEIFERRORL( err, OstTrace1( TRACE_NORMAL, CUSBMANCENREPMANAGER_READKEYL, "CUsbManCenRepManager::ReadKeyL;Leave err=%d", err ); );
+ OstTraceExt2( TRACE_NORMAL, CUSBMANCENREPMANAGER_READKEYL_DUP1, "CUsbManCenRepManager::ReadKeyL;LocSets: ReadKeyL id: 0x%x, val: 0x%x", aKeyId, (TInt32)key );
+ OstTraceFunctionExit0( CUSBMANCENREPMANAGER_READKEYL_EXIT );
return key;
}
@@ -128,14 +136,15 @@
//
void CUsbManCenRepManager::CheckSignatureL()
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CUSBMANCENREPMANAGER_CHECKSIGNATUREL_ENTRY );
iSignature = ReadKeyL( KUsbManConfigSign );
if ( iSignature < TUsbManagerSupportedVersionMin ||
iSignature > TUsbManagerSupportedVersionMax )
{
- LEAVEL(KErrNotSupported);
+ OstTrace1( TRACE_NORMAL, CUSBMANCENREPMANAGER_CHECKSIGNATUREL, "CUsbManCenRepManager::CheckSignatureL;Leave reason=%d", KErrNotSupported );
}
+ OstTraceFunctionExit0( CUSBMANCENREPMANAGER_CHECKSIGNATUREL_EXIT );
}
// ---------------------------------------------------------------------------
@@ -144,27 +153,38 @@
//
void CUsbManCenRepManager::ReadDeviceConfigurationL(CUsbDevice::TUsbDeviceConfiguration& aDeviceConfig)
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CUSBMANCENREPMANAGER_READDEVICECONFIGURATIONL_ENTRY );
//Only support version four right now.
- __ASSERT_DEBUG( ( TUsbManagerSupportedVersionFour == iSignature ), _USB_PANIC( KUsbCenRepPanic, ECenRepConfigError ) );
+ if(TUsbManagerSupportedVersionFour != iSignature)
+ {
+ OstTrace1( TRACE_NORMAL, CUSBMANCENREPMANAGER_READDEVICECONFIGURATIONL, "CUsbManCenRepManager::ReadDeviceConfigurationL;Panic error=%d", ECenRepConfigError );
+ __ASSERT_DEBUG( EFalse, User::Panic( KUsbCenRepPanic, ECenRepConfigError ) );
+ }
+
//Shall only have on device configuration setting.
TUint32 devConfigCount = ReadKeyL( KUsbManDeviceCountIndexKey );
- __ASSERT_DEBUG( ( devConfigCount == 1 ), _USB_PANIC( KUsbCenRepPanic, ECenRepConfigError ) );
+ if(devConfigCount != 1)
+ {
+ OstTrace1( TRACE_NORMAL, CUSBMANCENREPMANAGER_READDEVICECONFIGURATIONL_DUP1, "CUsbManCenRepManager::ReadDeviceConfigurationL;Panic error=%d", ECenRepConfigError );
+ __ASSERT_DEBUG( EFalse, User::Panic( KUsbCenRepPanic, ECenRepConfigError ) );
+ }
+
RArray<TUint32> keyArray;
CleanupClosePushL( keyArray );
- LEAVEIFERRORL( iRepository->FindL( KUsbManDevicePartialKey, KUsbManConfigKeyMask, keyArray ) );
+ TInt err = iRepository->FindL( KUsbManDevicePartialKey, KUsbManConfigKeyMask, keyArray );
+ LEAVEIFERRORL( err, OstTrace1( TRACE_NORMAL, CUSBMANCENREPMANAGER_READDEVICECONFIGURATIONL_DUP2, "CUsbManCenRepManager::ReadDeviceConfigurationL;Leave err=%d", err ); );
TInt keyCount = keyArray.Count();
- LOGTEXT2( _L("CUsbManCenRepManager::ReadDeviceConfigurationL keyCount of device config = %d"), keyCount );
+ OstTrace1( TRACE_NORMAL, CUSBMANCENREPMANAGER_READDEVICECONFIGURATIONL_DUP3, "CUsbManCenRepManager::ReadDeviceConfigurationL;keyCount of device config = %d", keyCount );
//Get each extension type key value and store in iExtList array
for( TInt index = 0; index < keyCount; index++ )
{
TUint32 key = keyArray[index];
TUint32 fieldId = ( key & KUsbManConfigFieldMask );
- LOGTEXT2( _L("CUsbManCenRepManager::ReadDeviceConfigurationL fieldId = %d"), fieldId );
+ OstTrace1( TRACE_NORMAL, CUSBMANCENREPMANAGER_READDEVICECONFIGURATIONL_DUP4, "CUsbManCenRepManager::ReadDeviceConfigurationL;fieldId=%d", fieldId );
if( fieldId == KUsbManDeviceVendorIdKey )
{
aDeviceConfig.iVendorId = ReadKeyL( key );
@@ -185,10 +205,12 @@
}
else
{
- _USB_PANIC( KUsbCenRepPanic, ECenRepConfigError );
+ OstTrace1( TRACE_FATAL, CUSBMANCENREPMANAGER_READDEVICECONFIGURATIONL_DUP5, "CUsbManCenRepManager::ReadDeviceConfigurationL;panic error=%d", ECenRepConfigError );
+ User::Panic( KUsbCenRepPanic, ECenRepConfigError );
}
}
CleanupStack::PopAndDestroy( &keyArray );
+ OstTraceFunctionExit0( CUSBMANCENREPMANAGER_READDEVICECONFIGURATIONL_EXIT );
}
@@ -198,14 +220,18 @@
//
void CUsbManCenRepManager::ReadPersonalitiesL(RPointerArray<CPersonality>& aPersonalities)
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CUSBMANCENREPMANAGER_READPERSONALITIESL_ENTRY );
//Only support version four right now.
- __ASSERT_DEBUG( ( TUsbManagerSupportedVersionFour == iSignature ), _USB_PANIC( KUsbCenRepPanic, ECenRepConfigError ) );
-
+ if(TUsbManagerSupportedVersionFour != iSignature)
+ {
+ OstTrace1( TRACE_FATAL, CUSBMANCENREPMANAGER_READPERSONALITIESL, "CUsbManCenRepManager::ReadPersonalitiesL;ECenRepConfigError=%d", ECenRepConfigError );
+ __ASSERT_DEBUG( EFalse, User::Panic( KUsbCenRepPanic, ECenRepConfigError ) );
+ }
+
// Get the personality count.
TUint32 personalityCount = ReadKeyL( KUsbManDevicePersonalitiesCountIndexKey );
- LOGTEXT2( _L("CUsbManCenRepManager::ReadPersonalitiesL personalityCount = %d"), personalityCount );
+ OstTrace1( TRACE_NORMAL, CUSBMANCENREPMANAGER_READPERSONALITIESL_DUP3, "CUsbManCenRepManager::ReadPersonalitiesL;personalityCount=%d", personalityCount );
RArray<TUint32> keyArray;
CleanupClosePushL( keyArray );
@@ -219,17 +245,18 @@
// Find the keys belonging to the personality
TUint32 devicePersonalitiesKey = KUsbManDevicePersonalitiesPartialKey | ( personalityIdx << KUsbManPersonalitiesOffset );
- LEAVEIFERRORL( iRepository->FindL( devicePersonalitiesKey, KUsbManConfigKeyMask, keyArray ) );
+ TInt err = iRepository->FindL( devicePersonalitiesKey, KUsbManConfigKeyMask, keyArray );
+ LEAVEIFERRORL( err, OstTrace1( TRACE_NORMAL, CUSBMANCENREPMANAGER_READPERSONALITIESL_DUP1, "CUsbManCenRepManager::ReadPersonalitiesL;Leave err=%d", err ); );
TInt keyCount = keyArray.Count();
- LOGTEXT2( _L("CUsbManCenRepManager::ReadPersonalitiesL keyCount of personality = %d"), keyCount );
+ OstTrace1( TRACE_NORMAL, DUP2_CUSBMANCENREPMANAGER_READPERSONALITIESL_DUP2, "CUsbManCenRepManager::ReadPersonalitiesL; keyCount of personality = %d", keyCount );
// Get each key value of the personality and store it.
for( TInt keyIdx = 0; keyIdx < keyCount; keyIdx++ )
{
TUint32 key = keyArray[keyIdx];
TUint32 fieldId = (key & KUsbManConfigFieldMask);
- LOGTEXT2( _L("CUsbManCenRepManager::ReadPersonalitiesL key id of personality = %d"), fieldId );
+ OstTrace1( TRACE_NORMAL, CUSBMANCENREPMANAGER_READPERSONALITIESL_DUP4, "CUsbManCenRepManager::ReadPersonalitiesL;key id of personality=%d", fieldId );
switch( fieldId )
{
case KUsbManDevicePersonalitiesDeviceClassKey:
@@ -269,7 +296,8 @@
break;
}
default:
- _USB_PANIC( KUsbCenRepPanic, ECenRepConfigError );
+ OstTrace1( TRACE_FATAL, CUSBMANCENREPMANAGER_READPERSONALITIESL_DUP5, "CUsbManCenRepManager::ReadPersonalitiesL;Panic error=%d", ECenRepConfigError );
+ User::Panic( KUsbCenRepPanic, ECenRepConfigError );
break;
}
}
@@ -305,17 +333,18 @@
if(isPersonalitySupport)
{
- LOGTEXT2( _L("CUsbManCenRepManager::ReadPersonalitiesL Personality ID: %d is supported"), personality->PersonalityId() );
+ OstTrace1( TRACE_NORMAL, CUSBMANCENREPMANAGER_READPERSONALITIESL_DUP6, "CUsbManCenRepManager::ReadPersonalitiesL; Personality ID: %d is supported", personality->PersonalityId() );
aPersonalities.Append( personality );
CleanupStack::Pop( personality );
}
else
{
- LOGTEXT2( _L("CUsbManCenRepManager::ReadPersonalitiesL Personality ID: %d is not supported"), personality->PersonalityId() );
+ OstTrace1( TRACE_NORMAL, CUSBMANCENREPMANAGER_READPERSONALITIESL_DUP7, "CUsbManCenRepManager::ReadPersonalitiesL;Personality ID: %d is not supported", personality->PersonalityId() );
CleanupStack::PopAndDestroy(personality);
}
}
CleanupStack::PopAndDestroy( &keyArray );
+ OstTraceFunctionExit0( CUSBMANCENREPMANAGER_READPERSONALITIESL_EXIT );
}
// ---------------------------------------------------------------------------
@@ -324,20 +353,26 @@
//
void CUsbManCenRepManager::ReadConfigurationsForPersonalityL(TInt aPersonalityId, CPersonality& aPersonality)
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CUSBMANCENREPMANAGER_READCONFIGURATIONSFORPERSONALITYL_ENTRY );
RArray<TUint32> configArray;
CleanupClosePushL(configArray);
//Only support version four right now.
- __ASSERT_DEBUG( ( TUsbManagerSupportedVersionFour == iSignature ), _USB_PANIC( KUsbCenRepPanic, ECenRepConfigError ) );
-
- LEAVEIFERRORL( iRepository->FindEqL( KUsbManDeviceConfigurationsPartialKey, KUsbManConfigFirstEntryMask, aPersonalityId, configArray ) );
+ if(TUsbManagerSupportedVersionFour != iSignature)
+ {
+ OstTrace1( TRACE_FATAL, CUSBMANCENREPMANAGER_READCONFIGURATIONSFORPERSONALITYL, "CUsbManCenRepManager::ReadConfigurationsForPersonalityL;Panic error=%d", ECenRepConfigError );
+ __ASSERT_DEBUG( EFalse, User::Panic( KUsbCenRepPanic, ECenRepConfigError ) );
+ }
+
+ TInt err = iRepository->FindEqL( KUsbManDeviceConfigurationsPartialKey, KUsbManConfigFirstEntryMask, aPersonalityId, configArray );
+ LEAVEIFERRORL( err, OstTrace1( TRACE_NORMAL, CUSBMANCENREPMANAGER_READCONFIGURATIONSFORPERSONALITYL_DUP1, "CUsbManCenRepManager::ReadConfigurationsForPersonalityL;Leave err=%d", err ); );
// Get the configuration count.
TUint32 configCount = configArray.Count();
TUint32 totalConfigCount = ReadKeyL( KUsbManDeviceConfigurationsCountIndexKey );
- LOGTEXT4( _L("ReadConfigurationsForPersonalityL: aPersonalityId = %d total configCount = %d configArray.Count() = %d"), aPersonalityId, totalConfigCount, configArray.Count());
+ OstTraceExt3( TRACE_NORMAL, CUSBMANCENREPMANAGER_READCONFIGURATIONSFORPERSONALITYL_DUP2,
+ "CUsbManCenRepManager::ReadConfigurationsForPersonalityL;aPersonalityId = %d total configCount = %d configArray.Count() = %d", aPersonalityId, totalConfigCount, configArray.Count() );
//This is intend to handle one special case that key 0x2ff00's value
// equal our target personality id.
@@ -364,14 +399,18 @@
{
TUint32 fieldId = ( (key + keyIdx ) & KUsbManConfigFieldMask );
TInt keyValue = -1;
- LOGTEXT4( _L("ReadConfigurationsForPersonalityL fieldId = %d configIdx = %d keyIdx = %d"), fieldId, configIdx, keyIdx );
+ OstTraceExt3( TRACE_NORMAL, CUSBMANCENREPMANAGER_READCONFIGURATIONSFORPERSONALITYL_DUP3, "CUsbManCenRepManager::ReadConfigurationsForPersonalityL;fieldId=%d;configIdx=%d;keyIdx=%d", fieldId, configIdx, keyIdx );
if(KUsbManDeviceConfigurationsPersonalityIdKey == fieldId)
{
TRAPD( err, keyValue = ReadKeyL( key + keyIdx ) );
if( err == KErrNone )
{
- __ASSERT_DEBUG( ( keyValue == aPersonalityId ), _USB_PANIC( KUsbCenRepPanic, ECenRepConfigError ) );
+ if(keyValue != aPersonalityId)
+ {
+ OstTrace1( TRACE_FATAL, CUSBMANCENREPMANAGER_READCONFIGURATIONSFORPERSONALITYL_DUP4, "CUsbManCenRepManager::ReadConfigurationsForPersonalityL;Panic error=%d", ECenRepConfigError );
+ __ASSERT_DEBUG( EFalse, User::Panic( KUsbCenRepPanic, ECenRepConfigError ) );
+ }
config->SetPersonalityId( keyValue );
}
}
@@ -420,7 +459,8 @@
}
else
{
- _USB_PANIC( KUsbCenRepPanic, ECenRepConfigError );
+ OstTrace1( TRACE_FATAL, CUSBMANCENREPMANAGER_READCONFIGURATIONSFORPERSONALITYL_DUP5, "CUsbManCenRepManager::ReadConfigurationsForPersonalityL;Panic error=%d", ECenRepConfigError );
+ User::Panic( KUsbCenRepPanic, ECenRepConfigError );
}
}
aPersonality.AppendPersonalityConfigsL( config );
@@ -429,6 +469,7 @@
}
CleanupStack::PopAndDestroy( &configArray );
+ OstTraceFunctionExit0( CUSBMANCENREPMANAGER_READCONFIGURATIONSFORPERSONALITYL_EXIT );
}
// ---------------------------------------------------------------------------
@@ -437,31 +478,39 @@
//
TBool CUsbManCenRepManager::IsClassConfigurableL(TUint aClassId, TInt& aFeatureId)
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CUSBMANCENREPMANAGER_ISCLASSCONFIGURABLEL_ENTRY );
TBool classConfigurable = EFalse;
RArray<TUint32> keyArray;
CleanupClosePushL(keyArray);
TInt err = iRepository->FindEqL( KUsbManDeviceConfigurableClassesPartialKey, KUsbManConfigFirstEntryMask, (TInt)aClassId, keyArray );
- LOGTEXT3( _L("CUsbManCenRepManager::IsClassConfigurableL: aClassId = 0x%x err = %d "), aClassId, err);
+ OstTraceExt2( TRACE_NORMAL, CUSBMANCENREPMANAGER_ISCLASSCONFIGURABLEL, "CUsbManCenRepManager::IsClassConfigurableL;aClassId=0x%x;err=%d", aClassId, err );
switch ( err )
{
case KErrNotFound:
break;
case KErrNone:
{
- __ASSERT_DEBUG( ( keyArray.Count() == 1 ), _USB_PANIC( KUsbCenRepPanic, ECenRepConfigError ) );
+#ifdef _DEBUG
+ if(keyArray.Count() != 1)
+ {
+ OstTrace1( TRACE_FATAL, DUP1_CUSBMANCENREPMANAGER_ISCLASSCONFIGURABLEL_DUP1, "CUsbManCenRepManager::IsClassConfigurableL;panic error=%d", ECenRepConfigError );
+ User::Panic( KUsbCenRepPanic, ECenRepConfigError );
+ }
+#endif
// The array size always is 1, so here using 0 as index.
aFeatureId = ReadKeyL( keyArray[0] | KUsbManDeviceConfigurableClassesFeatureIdKey );
classConfigurable = ETrue;
break;
}
default:
- LEAVEL( err );
+ OstTrace1( TRACE_NORMAL, CUSBMANCENREPMANAGER_ISCLASSCONFIGURABLEL_DUP2, "CUsbManCenRepManager::IsClassConfigurableL;Leave err=%d", err );
+ User::Leave( err );
break;
}
CleanupStack::PopAndDestroy( &keyArray );
+ OstTraceFunctionExit0( CUSBMANCENREPMANAGER_ISCLASSCONFIGURABLEL_EXIT );
return classConfigurable;
}
@@ -471,19 +520,22 @@
//
TBool CUsbManCenRepManager::IsFeatureSupportedL(TInt aFeatureId)
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CUSBMANCENREPMANAGER_ISFEATURESUPPORTEDL_ENTRY );
#ifdef SYMBIAN_FEATURE_MANAGER
if(CFeatureDiscovery::IsFeatureSupportedL(TUid::Uid(aFeatureId)))
{
- LOGTEXT2( _L("CUsbManCenRepManager::IsFeatureSupportedL featureId = 0x%x supported"), aFeatureId );
+ OstTrace1( TRACE_NORMAL, DUP1_CUSBMANCENREPMANAGER_ISFEATURESUPPORTEDL_DUP1, "CUsbManCenRepManager::IsFeatureSupportedL;featureId = 0x%x supported", aFeatureId );
+ OstTraceFunctionExit0( CUSBMANCENREPMANAGER_ISFEATURESUPPORTEDL_EXIT );
return ETrue;
}
else
{
- LOGTEXT2( _L("CUsbManCenRepManager::IsFeatureSupportedL featureId = 0x%x not supported"), aFeatureId );
+ OstTrace1( TRACE_NORMAL, CUSBMANCENREPMANAGER_ISFEATURESUPPORTEDL_DUP2, "CUsbManCenRepManager::IsFeatureSupportedL;featureId = 0x%x not supported", aFeatureId );
+ OstTraceFunctionExit0( CUSBMANCENREPMANAGER_ISFEATURESUPPORTEDL_EXIT_DUP1 );
return EFalse;
}
#else
- _USB_PANIC( KUsbCenRepPanic, ECenRepFeatureManagerError )
+ OstTrace1( TRACE_FATAL, CUSBMANCENREPMANAGER_ISFEATURESUPPORTEDL, "CUsbManCenRepManager::IsFeatureSupportedL;panic error code=%d", ECenRepFeatureManagerError );
+ User::Panic( KUsbCenRepPanic, ECenRepFeatureManagerError )
#endif
}
--- a/usbmgmt/usbmgr/usbman/server/group/usbsvrbase.mmp Wed Jul 07 14:16:40 2010 +0800
+++ b/usbmgmt/usbmgr/usbman/server/group/usbsvrbase.mmp Wed Jul 07 15:08:54 2010 +0800
@@ -41,7 +41,8 @@
userinclude ../INC
userinclude ../public
-userinclude ../../../host/fdf/production/client/public
+userinclude ../../../host/fdf/production/client/public
+userinclude ../traces
OS_LAYER_SYSTEMINCLUDE_SYMBIAN
library euser.lib
@@ -56,5 +57,3 @@
#ifdef SYMBIAN_FEATURE_MANAGER
library featdiscovery.lib
#endif
-
-#include <usb/usblogger.mmh>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usbmgmt/usbmgr/usbman/server/traces/OstTraceDefinitions.h Wed Jul 07 15:08:54 2010 +0800
@@ -0,0 +1,7 @@
+#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
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usbmgmt/usbmgr/usbman/server/traces/fixed_id.definitions Wed Jul 07 15:08:54 2010 +0800
@@ -0,0 +1,1117 @@
+#Fixed group and trace id definitions. If this file is removed, the identifiers are rebuilt.
+[GROUP]TRACE_DUMP=0x89
+[GROUP]TRACE_FATAL=0x81
+[GROUP]TRACE_FLOW=0x8a
+[GROUP]TRACE_NORMAL=0x86
+[TRACE]TRACE_DUMP[0x89]_CUSBDEVICE_PRINTDESCRIPTOR=0x2
+[TRACE]TRACE_DUMP[0x89]_CUSBDEVICE_PRINTDESCRIPTOR_DUP1=0x3
+[TRACE]TRACE_DUMP[0x89]_CUSBDEVICE_PRINTDESCRIPTOR_DUP10=0xc
+[TRACE]TRACE_DUMP[0x89]_CUSBDEVICE_PRINTDESCRIPTOR_DUP11=0xd
+[TRACE]TRACE_DUMP[0x89]_CUSBDEVICE_PRINTDESCRIPTOR_DUP12=0xe
+[TRACE]TRACE_DUMP[0x89]_CUSBDEVICE_PRINTDESCRIPTOR_DUP2=0x4
+[TRACE]TRACE_DUMP[0x89]_CUSBDEVICE_PRINTDESCRIPTOR_DUP3=0x5
+[TRACE]TRACE_DUMP[0x89]_CUSBDEVICE_PRINTDESCRIPTOR_DUP4=0x6
+[TRACE]TRACE_DUMP[0x89]_CUSBDEVICE_PRINTDESCRIPTOR_DUP5=0x7
+[TRACE]TRACE_DUMP[0x89]_CUSBDEVICE_PRINTDESCRIPTOR_DUP6=0x8
+[TRACE]TRACE_DUMP[0x89]_CUSBDEVICE_PRINTDESCRIPTOR_DUP7=0x9
+[TRACE]TRACE_DUMP[0x89]_CUSBDEVICE_PRINTDESCRIPTOR_DUP8=0xa
+[TRACE]TRACE_DUMP[0x89]_CUSBDEVICE_PRINTDESCRIPTOR_DUP9=0xb
+[TRACE]TRACE_FATAL[0x81]_CPERSONALITY_CLASSSUPPORTED=0x75
+[TRACE]TRACE_FATAL[0x81]_CPERSONALITY_SUPPORTEDCLASSES=0x74
+[TRACE]TRACE_FATAL[0x81]_CUSBDEVICE_CONVERTUIDSL=0x52
+[TRACE]TRACE_FATAL[0x81]_CUSBDEVICE_DOCANCEL=0x2
+[TRACE]TRACE_FATAL[0x81]_CUSBDEVICE_RUNERROR_DUP1=0x51
+[TRACE]TRACE_FATAL[0x81]_CUSBDEVICE_RUNL_DUP5=0x1
+[TRACE]TRACE_FATAL[0x81]_CUSBDUMMYCLASSCONTROLLER_CONSTRUCTL=0x76
+[TRACE]TRACE_FATAL[0x81]_CUSBDUMMYCLASSCONTROLLER_DOCANCEL=0x89
+[TRACE]TRACE_FATAL[0x81]_CUSBDUMMYCLASSCONTROLLER_DOCANCEL_DUP1=0x8a
+[TRACE]TRACE_FATAL[0x81]_CUSBDUMMYCLASSCONTROLLER_DOCANCEL_DUP2=0x8b
+[TRACE]TRACE_FATAL[0x81]_CUSBDUMMYCLASSCONTROLLER_DOCANCEL_DUP3=0x8c
+[TRACE]TRACE_FATAL[0x81]_CUSBDUMMYCLASSCONTROLLER_DOCANCEL_DUP4=0x8d
+[TRACE]TRACE_FATAL[0x81]_CUSBDUMMYCLASSCONTROLLER_GETBEHAVIOUR_DUP2=0x77
+[TRACE]TRACE_FATAL[0x81]_CUSBDUMMYCLASSCONTROLLER_GETBEHAVIOUR_DUP4=0x78
+[TRACE]TRACE_FATAL[0x81]_CUSBDUMMYCLASSCONTROLLER_GETBEHAVIOUR_DUP6=0x79
+[TRACE]TRACE_FATAL[0x81]_CUSBDUMMYCLASSCONTROLLER_GETBEHAVIOUR_DUP8=0x7a
+[TRACE]TRACE_FATAL[0x81]_CUSBDUMMYCLASSCONTROLLER_GETCONFIG_DUP7=0x7b
+[TRACE]TRACE_FATAL[0x81]_CUSBDUMMYCLASSCONTROLLER_RUNERROR=0x8e
+[TRACE]TRACE_FATAL[0x81]_CUSBDUMMYCLASSCONTROLLER_RUNL_DUP1=0x84
+[TRACE]TRACE_FATAL[0x81]_CUSBDUMMYCLASSCONTROLLER_RUNL_DUP2=0x85
+[TRACE]TRACE_FATAL[0x81]_CUSBDUMMYCLASSCONTROLLER_RUNL_DUP3=0x86
+[TRACE]TRACE_FATAL[0x81]_CUSBDUMMYCLASSCONTROLLER_RUNL_DUP4=0x87
+[TRACE]TRACE_FATAL[0x81]_CUSBDUMMYCLASSCONTROLLER_RUNL_DUP5=0x88
+[TRACE]TRACE_FATAL[0x81]_CUSBDUMMYCLASSCONTROLLER_START=0x7c
+[TRACE]TRACE_FATAL[0x81]_CUSBDUMMYCLASSCONTROLLER_START_DUP1=0x7d
+[TRACE]TRACE_FATAL[0x81]_CUSBDUMMYCLASSCONTROLLER_START_DUP2=0x7e
+[TRACE]TRACE_FATAL[0x81]_CUSBDUMMYCLASSCONTROLLER_START_DUP3=0x7f
+[TRACE]TRACE_FATAL[0x81]_CUSBDUMMYCLASSCONTROLLER_STOP=0x80
+[TRACE]TRACE_FATAL[0x81]_CUSBDUMMYCLASSCONTROLLER_STOP_DUP1=0x81
+[TRACE]TRACE_FATAL[0x81]_CUSBDUMMYCLASSCONTROLLER_STOP_DUP2=0x82
+[TRACE]TRACE_FATAL[0x81]_CUSBDUMMYCLASSCONTROLLER_STOP_DUP3=0x83
+[TRACE]TRACE_FATAL[0x81]_CUSBMANCENREPMANAGER_ISFEATURESUPPORTEDL=0x6c
+[TRACE]TRACE_FATAL[0x81]_CUSBMANCENREPMANAGER_READCONFIGURATIONSFORPERSONALITYL=0x70
+[TRACE]TRACE_FATAL[0x81]_CUSBMANCENREPMANAGER_READCONFIGURATIONSFORPERSONALITYL_DUP4=0x71
+[TRACE]TRACE_FATAL[0x81]_CUSBMANCENREPMANAGER_READCONFIGURATIONSFORPERSONALITYL_DUP5=0x72
+[TRACE]TRACE_FATAL[0x81]_CUSBMANCENREPMANAGER_READDEVICECONFIGURATIONL_DUP5=0x6d
+[TRACE]TRACE_FATAL[0x81]_CUSBMANCENREPMANAGER_READPERSONALITIESL=0x6e
+[TRACE]TRACE_FATAL[0x81]_CUSBMANCENREPMANAGER_READPERSONALITIESL_DUP5=0x6f
+[TRACE]TRACE_FATAL[0x81]_CUSBSERVER_DECREMENTSESSIONCOUNT_DUP1=0x1d
+[TRACE]TRACE_FATAL[0x81]_CUSBSERVER_INCREMENTSESSIONCOUNT_DUP1=0x1c
+[TRACE]TRACE_FATAL[0x81]_CUSBSERVER_LAUNCHSHUTDOWNTIMERIFNOSESSIONS=0x1e
+[TRACE]TRACE_FATAL[0x81]_DUP1_CUSBMANCENREPMANAGER_ISCLASSCONFIGURABLEL_DUP1=0x73
+[TRACE]TRACE_FLOW[0x8A]_CINIFILE_CINIFILE_CONS_ENTRY=0x629
+[TRACE]TRACE_FLOW[0x8A]_CINIFILE_NEWL_TDESC_ENTRY=0x62a
+[TRACE]TRACE_FLOW[0x8A]_CINIFILE_NEWL_TDESC_EXIT=0x62b
+[TRACE]TRACE_FLOW[0x8A]_CINIFILE_NEWL_TDESC_TDESC_ENTRY=0x62c
+[TRACE]TRACE_FLOW[0x8A]_CINIFILE_NEWL_TDESC_TDESC_EXIT=0x62d
+[TRACE]TRACE_FLOW[0x8A]_CPERSONALITYCONFIGURATIONS_CPERSONALITYCONFIGURATIONS_DES_ENTRY=0x623
+[TRACE]TRACE_FLOW[0x8A]_CPERSONALITYCONFIGURATIONS_CPERSONALITYCONFIGURATIONS_DES_EXIT=0x624
+[TRACE]TRACE_FLOW[0x8A]_CPERSONALITY_CONSTRUCTL_ENTRY=0x3
+[TRACE]TRACE_FLOW[0x8A]_CPERSONALITY_CONSTRUCTL_EXIT=0x4
+[TRACE]TRACE_FLOW[0x8A]_CPERSONALITY_CPERSONALITY_DES_ENTRY=0x454
+[TRACE]TRACE_FLOW[0x8A]_CPERSONALITY_CPERSONALITY_DES_EXIT=0x455
+[TRACE]TRACE_FLOW[0x8A]_CPERSONALITY_NEWL_ENTRY=0x1
+[TRACE]TRACE_FLOW[0x8A]_CPERSONALITY_NEWL_EXIT=0x2
+[TRACE]TRACE_FLOW[0x8A]_CUSBDEVICESTATEWATCHER_DOCANCEL_ENTRY=0x105
+[TRACE]TRACE_FLOW[0x8A]_CUSBDEVICESTATEWATCHER_DOCANCEL_EXIT=0x106
+[TRACE]TRACE_FLOW[0x8A]_CUSBDEVICESTATEWATCHER_NEWL_ENTRY=0x103
+[TRACE]TRACE_FLOW[0x8A]_CUSBDEVICESTATEWATCHER_NEWL_EXIT=0x104
+[TRACE]TRACE_FLOW[0x8A]_CUSBDEVICESTATEWATCHER_START_ENTRY=0x107
+[TRACE]TRACE_FLOW[0x8A]_CUSBDEVICESTATEWATCHER_START_EXIT=0x108
+[TRACE]TRACE_FLOW[0x8A]_CUSBDEVICE_ADDCLASSCONTROLLERL_ENTRY=0x12b
+[TRACE]TRACE_FLOW[0x8A]_CUSBDEVICE_ADDCLASSCONTROLLERL_EXIT=0x12c
+[TRACE]TRACE_FLOW[0x8A]_CUSBDEVICE_BUSENUMERATIONCOMPLETED_ENTRY=0x139
+[TRACE]TRACE_FLOW[0x8A]_CUSBDEVICE_BUSENUMERATIONCOMPLETED_EXIT=0x13a
+[TRACE]TRACE_FLOW[0x8A]_CUSBDEVICE_CONSTRUCTL_ENTRY=0x124
+[TRACE]TRACE_FLOW[0x8A]_CUSBDEVICE_CONSTRUCTL_EXIT=0x125
+[TRACE]TRACE_FLOW[0x8A]_CUSBDEVICE_CONVERTUIDSL_ENTRY=0x625
+[TRACE]TRACE_FLOW[0x8A]_CUSBDEVICE_CONVERTUIDSL_EXIT=0x626
+[TRACE]TRACE_FLOW[0x8A]_CUSBDEVICE_CREATECLASSCONTROLLERSL_ENTRY=0x21a
+[TRACE]TRACE_FLOW[0x8A]_CUSBDEVICE_CURRENTPERSONALITYID_ENTRY=0x207
+[TRACE]TRACE_FLOW[0x8A]_CUSBDEVICE_CUSBDEVICE_DES_ENTRY=0x366
+[TRACE]TRACE_FLOW[0x8A]_CUSBDEVICE_CUSBDEVICE_DES_EXIT=0x367
+[TRACE]TRACE_FLOW[0x8A]_CUSBDEVICE_DEREGISTEROBSERVER_ENTRY=0x12f
+[TRACE]TRACE_FLOW[0x8A]_CUSBDEVICE_DEREGISTEROBSERVER_EXIT=0x130
+[TRACE]TRACE_FLOW[0x8A]_CUSBDEVICE_DOCANCEL_ENTRY=0x143
+[TRACE]TRACE_FLOW[0x8A]_CUSBDEVICE_DOCANCEL_EXIT=0x144
+[TRACE]TRACE_FLOW[0x8A]_CUSBDEVICE_ENUMERATECLASSCONTROLLERSL_ENTRY=0x129
+[TRACE]TRACE_FLOW[0x8A]_CUSBDEVICE_ENUMERATECLASSCONTROLLERSL_EXIT=0x12a
+[TRACE]TRACE_FLOW[0x8A]_CUSBDEVICE_GETPERSONALITY_ENTRY=0x209
+[TRACE]TRACE_FLOW[0x8A]_CUSBDEVICE_GETPERSONALITY_EXIT=0x20a
+[TRACE]TRACE_FLOW[0x8A]_CUSBDEVICE_GETPERSONALITY_EXIT_DUP1=0x368
+[TRACE]TRACE_FLOW[0x8A]_CUSBDEVICE_INSTANTIATEEXTENSIONPLUGINSL=0x127
+[TRACE]TRACE_FLOW[0x8A]_CUSBDEVICE_INSTANTIATEEXTENSIONPLUGINSL_ENTRY=0x126
+[TRACE]TRACE_FLOW[0x8A]_CUSBDEVICE_INSTANTIATEEXTENSIONPLUGINSL_EXIT=0x128
+[TRACE]TRACE_FLOW[0x8A]_CUSBDEVICE_LOADFALLBACKCLASSCONTROLLERSL_ENTRY=0x212
+[TRACE]TRACE_FLOW[0x8A]_CUSBDEVICE_LOADFALLBACKCLASSCONTROLLERSL_EXIT=0x213
+[TRACE]TRACE_FLOW[0x8A]_CUSBDEVICE_NEWL_ENTRY=0x120
+[TRACE]TRACE_FLOW[0x8A]_CUSBDEVICE_NEWL_EXIT=0x121
+[TRACE]TRACE_FLOW[0x8A]_CUSBDEVICE_PERSONALITIES_ENTRY=0x208
+[TRACE]TRACE_FLOW[0x8A]_CUSBDEVICE_POWERUPANDCONNECT_ENTRY=0x13f
+[TRACE]TRACE_FLOW[0x8A]_CUSBDEVICE_POWERUPANDCONNECT_EXIT=0x140
+[TRACE]TRACE_FLOW[0x8A]_CUSBDEVICE_READPERSONALITIESL_ENTRY=0x627
+[TRACE]TRACE_FLOW[0x8A]_CUSBDEVICE_READPERSONALITIESL_EXIT=0x628
+[TRACE]TRACE_FLOW[0x8A]_CUSBDEVICE_REGISTEROBSERVERL_ENTRY=0x12d
+[TRACE]TRACE_FLOW[0x8A]_CUSBDEVICE_REGISTEROBSERVERL_EXIT=0x12e
+[TRACE]TRACE_FLOW[0x8A]_CUSBDEVICE_RUNL_ENTRY=0x141
+[TRACE]TRACE_FLOW[0x8A]_CUSBDEVICE_RUNL_EXIT=0x142
+[TRACE]TRACE_FLOW[0x8A]_CUSBDEVICE_SELECTCLASSCONTROLLERSL_ENTRY=0x218
+[TRACE]TRACE_FLOW[0x8A]_CUSBDEVICE_SELECTCLASSCONTROLLERSL_EXIT=0x219
+[TRACE]TRACE_FLOW[0x8A]_CUSBDEVICE_SETCURRENTPERSONALITYL_ENTRY=0x20c
+[TRACE]TRACE_FLOW[0x8A]_CUSBDEVICE_SETCURRENTPERSONALITYL_EXIT=0x20d
+[TRACE]TRACE_FLOW[0x8A]_CUSBDEVICE_SETDEFAULTPERSONALITYL_ENTRY=0x210
+[TRACE]TRACE_FLOW[0x8A]_CUSBDEVICE_SETDEFAULTPERSONALITYL_EXIT=0x211
+[TRACE]TRACE_FLOW[0x8A]_CUSBDEVICE_SETDEVICEDESCRIPTORL_ENTRY=0x1fc
+[TRACE]TRACE_FLOW[0x8A]_CUSBDEVICE_SETDEVICEDESCRIPTORL_EXIT=0x1fd
+[TRACE]TRACE_FLOW[0x8A]_CUSBDEVICE_SETDEVICESTATE_ENTRY=0x137
+[TRACE]TRACE_FLOW[0x8A]_CUSBDEVICE_SETDEVICESTATE_EXIT=0x138
+[TRACE]TRACE_FLOW[0x8A]_CUSBDEVICE_SETSERVICESTATE_ENTRY=0x135
+[TRACE]TRACE_FLOW[0x8A]_CUSBDEVICE_SETSERVICESTATE_EXIT=0x136
+[TRACE]TRACE_FLOW[0x8A]_CUSBDEVICE_SETUSBDEVICESETTINGSFROMPERSONALITYL_ENTRY=0x203
+[TRACE]TRACE_FLOW[0x8A]_CUSBDEVICE_STARTCURRENTCLASSCONTROLLER_ENTRY=0x13b
+[TRACE]TRACE_FLOW[0x8A]_CUSBDEVICE_STARTCURRENTCLASSCONTROLLER_EXIT=0x13c
+[TRACE]TRACE_FLOW[0x8A]_CUSBDEVICE_STARTL_ENTRY=0x131
+[TRACE]TRACE_FLOW[0x8A]_CUSBDEVICE_STARTL_EXIT=0x132
+[TRACE]TRACE_FLOW[0x8A]_CUSBDEVICE_STOPCURRENTCLASSCONTROLLER_ENTRY=0x13d
+[TRACE]TRACE_FLOW[0x8A]_CUSBDEVICE_STOPCURRENTCLASSCONTROLLER_EXIT=0x13e
+[TRACE]TRACE_FLOW[0x8A]_CUSBDEVICE_STOP_ENTRY=0x133
+[TRACE]TRACE_FLOW[0x8A]_CUSBDEVICE_STOP_EXIT=0x134
+[TRACE]TRACE_FLOW[0x8A]_CUSBDEVICE_TRYSTARTL_ENTRY=0x205
+[TRACE]TRACE_FLOW[0x8A]_CUSBDEVICE_TRYSTARTL_EXIT=0x206
+[TRACE]TRACE_FLOW[0x8A]_CUSBDEVICE_UCCNERROR_ENTRY=0x146
+[TRACE]TRACE_FLOW[0x8A]_CUSBDEVICE_UCCNERROR_EXIT=0x147
+[TRACE]TRACE_FLOW[0x8A]_CUSBDEVICE_UCCNGETCLASSCONTROLLERITERATORL_ENTRY=0x145
+[TRACE]TRACE_FLOW[0x8A]_CUSBDEVICE_VALIDATEPERSONALITIESL_ENTRY=0x20e
+[TRACE]TRACE_FLOW[0x8A]_CUSBDEVICE_VALIDATEPERSONALITIESL_EXIT=0x20f
+[TRACE]TRACE_FLOW[0x8A]_CUSBDUMMYCLASSCONTROLLER_DOCANCEL_ENTRY=0x63e
+[TRACE]TRACE_FLOW[0x8A]_CUSBDUMMYCLASSCONTROLLER_DOCANCEL_EXIT=0x63f
+[TRACE]TRACE_FLOW[0x8A]_CUSBDUMMYCLASSCONTROLLER_DOGETCONFIGL_ENTRY=0x634
+[TRACE]TRACE_FLOW[0x8A]_CUSBDUMMYCLASSCONTROLLER_DOGETCONFIGL_EXIT=0x635
+[TRACE]TRACE_FLOW[0x8A]_CUSBDUMMYCLASSCONTROLLER_GETBEHAVIOUR_ENTRY=0x632
+[TRACE]TRACE_FLOW[0x8A]_CUSBDUMMYCLASSCONTROLLER_GETBEHAVIOUR_EXIT=0x633
+[TRACE]TRACE_FLOW[0x8A]_CUSBDUMMYCLASSCONTROLLER_GETCONFIG_ENTRY=0x636
+[TRACE]TRACE_FLOW[0x8A]_CUSBDUMMYCLASSCONTROLLER_GETCONFIG_EXIT=0x637
+[TRACE]TRACE_FLOW[0x8A]_CUSBDUMMYCLASSCONTROLLER_NEWL_MUSBCLASSCONTROLLERNOTIFY_TUINT_ENTRY=0x62e
+[TRACE]TRACE_FLOW[0x8A]_CUSBDUMMYCLASSCONTROLLER_NEWL_MUSBCLASSCONTROLLERNOTIFY_TUINT_EXIT=0x62f
+[TRACE]TRACE_FLOW[0x8A]_CUSBDUMMYCLASSCONTROLLER_NEWL_MUSBCLASSCONTROLLERNOTIFY_TUINT_TINT_ENTRY=0x630
+[TRACE]TRACE_FLOW[0x8A]_CUSBDUMMYCLASSCONTROLLER_NEWL_MUSBCLASSCONTROLLERNOTIFY_TUINT_TINT_EXIT=0x631
+[TRACE]TRACE_FLOW[0x8A]_CUSBDUMMYCLASSCONTROLLER_RUNL_ENTRY=0x63c
+[TRACE]TRACE_FLOW[0x8A]_CUSBDUMMYCLASSCONTROLLER_RUNL_EXIT=0x63d
+[TRACE]TRACE_FLOW[0x8A]_CUSBDUMMYCLASSCONTROLLER_START_ENTRY=0x638
+[TRACE]TRACE_FLOW[0x8A]_CUSBDUMMYCLASSCONTROLLER_START_EXIT=0x639
+[TRACE]TRACE_FLOW[0x8A]_CUSBDUMMYCLASSCONTROLLER_STOP_ENTRY=0x63a
+[TRACE]TRACE_FLOW[0x8A]_CUSBDUMMYCLASSCONTROLLER_STOP_EXIT=0x63b
+[TRACE]TRACE_FLOW[0x8A]_CUSBMANCENREPMANAGER_CHECKSIGNATUREL_ENTRY=0x616
+[TRACE]TRACE_FLOW[0x8A]_CUSBMANCENREPMANAGER_CHECKSIGNATUREL_EXIT=0x617
+[TRACE]TRACE_FLOW[0x8A]_CUSBMANCENREPMANAGER_CONSTRUCTL_ENTRY=0x60e
+[TRACE]TRACE_FLOW[0x8A]_CUSBMANCENREPMANAGER_CONSTRUCTL_EXIT=0x60f
+[TRACE]TRACE_FLOW[0x8A]_CUSBMANCENREPMANAGER_CUSBMANCENREPMANAGER_CONS_ENTRY=0x60a
+[TRACE]TRACE_FLOW[0x8A]_CUSBMANCENREPMANAGER_CUSBMANCENREPMANAGER_CONS_EXIT=0x60b
+[TRACE]TRACE_FLOW[0x8A]_CUSBMANCENREPMANAGER_CUSBMANCENREPMANAGER_DES_ENTRY=0x610
+[TRACE]TRACE_FLOW[0x8A]_CUSBMANCENREPMANAGER_CUSBMANCENREPMANAGER_DES_EXIT=0x611
+[TRACE]TRACE_FLOW[0x8A]_CUSBMANCENREPMANAGER_ISCLASSCONFIGURABLEL_ENTRY=0x61e
+[TRACE]TRACE_FLOW[0x8A]_CUSBMANCENREPMANAGER_ISCLASSCONFIGURABLEL_EXIT=0x61f
+[TRACE]TRACE_FLOW[0x8A]_CUSBMANCENREPMANAGER_ISFEATURESUPPORTEDL_ENTRY=0x620
+[TRACE]TRACE_FLOW[0x8A]_CUSBMANCENREPMANAGER_ISFEATURESUPPORTEDL_EXIT=0x621
+[TRACE]TRACE_FLOW[0x8A]_CUSBMANCENREPMANAGER_ISFEATURESUPPORTEDL_EXIT_DUP1=0x622
+[TRACE]TRACE_FLOW[0x8A]_CUSBMANCENREPMANAGER_NEWL_ENTRY=0x60c
+[TRACE]TRACE_FLOW[0x8A]_CUSBMANCENREPMANAGER_NEWL_EXIT=0x60d
+[TRACE]TRACE_FLOW[0x8A]_CUSBMANCENREPMANAGER_READCONFIGURATIONSFORPERSONALITYL_ENTRY=0x61c
+[TRACE]TRACE_FLOW[0x8A]_CUSBMANCENREPMANAGER_READCONFIGURATIONSFORPERSONALITYL_EXIT=0x61d
+[TRACE]TRACE_FLOW[0x8A]_CUSBMANCENREPMANAGER_READDEVICECONFIGURATIONL_ENTRY=0x618
+[TRACE]TRACE_FLOW[0x8A]_CUSBMANCENREPMANAGER_READDEVICECONFIGURATIONL_EXIT=0x619
+[TRACE]TRACE_FLOW[0x8A]_CUSBMANCENREPMANAGER_READKEYL_ENTRY=0x614
+[TRACE]TRACE_FLOW[0x8A]_CUSBMANCENREPMANAGER_READKEYL_EXIT=0x615
+[TRACE]TRACE_FLOW[0x8A]_CUSBMANCENREPMANAGER_READPERSONALITIESL_ENTRY=0x61a
+[TRACE]TRACE_FLOW[0x8A]_CUSBMANCENREPMANAGER_READPERSONALITIESL_EXIT=0x61b
+[TRACE]TRACE_FLOW[0x8A]_CUSBMANCENREPMANAGER_READSTRINGKEYLC_ENTRY=0x612
+[TRACE]TRACE_FLOW[0x8A]_CUSBMANCENREPMANAGER_READSTRINGKEYLC_EXIT=0x613
+[TRACE]TRACE_FLOW[0x8A]_CUSBSCHEDULER_NEWL_ENTRY=0x2f
+[TRACE]TRACE_FLOW[0x8A]_CUSBSCHEDULER_NEWL_EXIT=0x30
+[TRACE]TRACE_FLOW[0x8A]_CUSBSERVER_CUSBSERVER_DES_ENTRY=0x468
+[TRACE]TRACE_FLOW[0x8A]_CUSBSERVER_CUSBSERVER_DES_EXIT=0x469
+[TRACE]TRACE_FLOW[0x8A]_CUSBSERVER_INCREMENTSESSIONCOUNT_ENTRY=0x1f8
+[TRACE]TRACE_FLOW[0x8A]_CUSBSERVER_INCREMENTSESSIONCOUNT_EXIT=0x1f9
+[TRACE]TRACE_FLOW[0x8A]_CUSBSERVER_LAUNCHSHUTDOWNTIMERIFNOSESSIONS_ENTRY=0x1fa
+[TRACE]TRACE_FLOW[0x8A]_CUSBSERVER_LAUNCHSHUTDOWNTIMERIFNOSESSIONS_EXIT=0x1fb
+[TRACE]TRACE_FLOW[0x8A]_CUSBSERVER_NEWLC_ENTRY=0x15c
+[TRACE]TRACE_FLOW[0x8A]_CUSBSERVER_NEWLC_EXIT=0x15d
+[TRACE]TRACE_FLOW[0x8A]_CUSBSERVER_NEWSESSIONL_ENTRY=0x1f6
+[TRACE]TRACE_FLOW[0x8A]_CUSBSERVER_NEWSESSIONL_EXIT=0x1f7
+[TRACE]TRACE_FLOW[0x8A]_CUSBSESSION_BUSCLEARERROR_ENTRY=0x27f
+[TRACE]TRACE_FLOW[0x8A]_CUSBSESSION_BUSCLEARERROR_EXIT=0x280
+[TRACE]TRACE_FLOW[0x8A]_CUSBSESSION_BUSDROP_ENTRY=0x281
+[TRACE]TRACE_FLOW[0x8A]_CUSBSESSION_BUSDROP_EXIT=0x282
+[TRACE]TRACE_FLOW[0x8A]_CUSBSESSION_BUSREQUEST_ENTRY=0x27b
+[TRACE]TRACE_FLOW[0x8A]_CUSBSESSION_BUSREQUEST_EXIT=0x27c
+[TRACE]TRACE_FLOW[0x8A]_CUSBSESSION_BUSRESPONDSRP_ENTRY=0x27d
+[TRACE]TRACE_FLOW[0x8A]_CUSBSESSION_BUSRESPONDSRP_EXIT=0x27e
+[TRACE]TRACE_FLOW[0x8A]_CUSBSESSION_CANCELINTEREST_ENTRY=0x25e
+[TRACE]TRACE_FLOW[0x8A]_CUSBSESSION_CANCELINTEREST_EXIT=0x25f
+[TRACE]TRACE_FLOW[0x8A]_CUSBSESSION_CANCELINTEREST_EXIT_DUP1=0x260
+[TRACE]TRACE_FLOW[0x8A]_CUSBSESSION_CLASSSUPPORTED_ENTRY=0x276
+[TRACE]TRACE_FLOW[0x8A]_CUSBSESSION_CLASSSUPPORTED_EXIT=0x277
+[TRACE]TRACE_FLOW[0x8A]_CUSBSESSION_CLASSSUPPORTED_EXIT_DUP1=0x278
+[TRACE]TRACE_FLOW[0x8A]_CUSBSESSION_CREATEL_ENTRY=0x223
+[TRACE]TRACE_FLOW[0x8A]_CUSBSESSION_CREATEL_EXIT=0x224
+[TRACE]TRACE_FLOW[0x8A]_CUSBSESSION_CUSBSESSION_CONS_ENTRY=0x21d
+[TRACE]TRACE_FLOW[0x8A]_CUSBSESSION_CUSBSESSION_CONS_EXIT=0x21e
+[TRACE]TRACE_FLOW[0x8A]_CUSBSESSION_CUSBSESSION_DES_ENTRY=0x21f
+[TRACE]TRACE_FLOW[0x8A]_CUSBSESSION_CUSBSESSION_DES_EXIT=0x220
+[TRACE]TRACE_FLOW[0x8A]_CUSBSESSION_DEREGISTERDEVICEOBSERVER_ENTRY=0x249
+[TRACE]TRACE_FLOW[0x8A]_CUSBSESSION_DEREGISTERDEVICEOBSERVER_EXIT=0x24a
+[TRACE]TRACE_FLOW[0x8A]_CUSBSESSION_DEREGISTERDEVICEOBSERVER_EXIT_DUP1=0x24b
+[TRACE]TRACE_FLOW[0x8A]_CUSBSESSION_DEREGISTERHOSTOBSERVER_ENTRY=0x294
+[TRACE]TRACE_FLOW[0x8A]_CUSBSESSION_DEREGISTERHOSTOBSERVER_EXIT=0x295
+[TRACE]TRACE_FLOW[0x8A]_CUSBSESSION_DEREGISTERHOSTOBSERVER_EXIT_DUP1=0x296
+[TRACE]TRACE_FLOW[0x8A]_CUSBSESSION_DEREGISTERMSGOBSERVER_ENTRY=0x29a
+[TRACE]TRACE_FLOW[0x8A]_CUSBSESSION_DEREGISTERMSGOBSERVER_EXIT=0x29b
+[TRACE]TRACE_FLOW[0x8A]_CUSBSESSION_DEREGISTERMSGOBSERVER_EXIT_DUP1=0x29c
+[TRACE]TRACE_FLOW[0x8A]_CUSBSESSION_DEREGISTERSERVICEOBSERVER_ENTRY=0x24c
+[TRACE]TRACE_FLOW[0x8A]_CUSBSESSION_DEREGISTERSERVICEOBSERVER_EXIT=0x24d
+[TRACE]TRACE_FLOW[0x8A]_CUSBSESSION_DEREGISTERSERVICEOBSERVER_EXIT_DUP1=0x24e
+[TRACE]TRACE_FLOW[0x8A]_CUSBSESSION_DISABLEFUNCTIONDRIVERLOADING_ENTRY=0x285
+[TRACE]TRACE_FLOW[0x8A]_CUSBSESSION_DISABLEFUNCTIONDRIVERLOADING_EXIT=0x286
+[TRACE]TRACE_FLOW[0x8A]_CUSBSESSION_DISPATCHMESSAGEL_ENTRY=0x22f
+[TRACE]TRACE_FLOW[0x8A]_CUSBSESSION_DISPATCHMESSAGEL_EXIT=0x230
+[TRACE]TRACE_FLOW[0x8A]_CUSBSESSION_ENABLEFUNCTIONDRIVERLOADING_ENTRY=0x283
+[TRACE]TRACE_FLOW[0x8A]_CUSBSESSION_ENABLEFUNCTIONDRIVERLOADING_EXIT=0x284
+[TRACE]TRACE_FLOW[0x8A]_CUSBSESSION_GETCURRENTDEVICESTATE_ENTRY=0x248
+[TRACE]TRACE_FLOW[0x8A]_CUSBSESSION_GETCURRENTPERSONALITYID_ENTRY=0x261
+[TRACE]TRACE_FLOW[0x8A]_CUSBSESSION_GETCURRENTPERSONALITYID_EXIT=0x262
+[TRACE]TRACE_FLOW[0x8A]_CUSBSESSION_GETCURRENTSERVICESTATE_ENTRY=0x247
+[TRACE]TRACE_FLOW[0x8A]_CUSBSESSION_GETDESCRIPTION_ENTRY=0x26b
+[TRACE]TRACE_FLOW[0x8A]_CUSBSESSION_GETDESCRIPTION_EXIT=0x26c
+[TRACE]TRACE_FLOW[0x8A]_CUSBSESSION_GETDESCRIPTION_EXIT_DUP1=0x26d
+[TRACE]TRACE_FLOW[0x8A]_CUSBSESSION_GETMANUFACTURERSTRINGDESCRIPTOR_ENTRY=0x28b
+[TRACE]TRACE_FLOW[0x8A]_CUSBSESSION_GETMANUFACTURERSTRINGDESCRIPTOR_EXIT=0x28c
+[TRACE]TRACE_FLOW[0x8A]_CUSBSESSION_GETOTGDESCRIPTOR_ENTRY=0x28f
+[TRACE]TRACE_FLOW[0x8A]_CUSBSESSION_GETOTGDESCRIPTOR_EXIT=0x290
+[TRACE]TRACE_FLOW[0x8A]_CUSBSESSION_GETPERSONALITYIDS_ENTRY=0x268
+[TRACE]TRACE_FLOW[0x8A]_CUSBSESSION_GETPERSONALITYIDS_EXIT=0x269
+[TRACE]TRACE_FLOW[0x8A]_CUSBSESSION_GETPERSONALITYIDS_EXIT_DUP1=0x26a
+[TRACE]TRACE_FLOW[0x8A]_CUSBSESSION_GETPERSONALITYPROPERTY_ENTRY=0x272
+[TRACE]TRACE_FLOW[0x8A]_CUSBSESSION_GETPERSONALITYPROPERTY_EXIT=0x273
+[TRACE]TRACE_FLOW[0x8A]_CUSBSESSION_GETPERSONALITYPROPERTY_EXIT_DUP2=0x275
+[TRACE]TRACE_FLOW[0x8A]_CUSBSESSION_GETPRODUCTSTRINGDESCRIPTOR_ENTRY=0x28d
+[TRACE]TRACE_FLOW[0x8A]_CUSBSESSION_GETPRODUCTSTRINGDESCRIPTOR_EXIT=0x28e
+[TRACE]TRACE_FLOW[0x8A]_CUSBSESSION_GETSUPPORTEDCLASSES_ENTRY=0x263
+[TRACE]TRACE_FLOW[0x8A]_CUSBSESSION_GETSUPPORTEDCLASSES_EXIT=0x264
+[TRACE]TRACE_FLOW[0x8A]_CUSBSESSION_GETSUPPORTEDCLASSES_EXIT_DUP1=0x265
+[TRACE]TRACE_FLOW[0x8A]_CUSBSESSION_GETSUPPORTEDCLASSES_EXIT_DUP2=0x266
+[TRACE]TRACE_FLOW[0x8A]_CUSBSESSION_GETSUPPORTEDCLASSES_EXIT_DUP3=0x267
+[TRACE]TRACE_FLOW[0x8A]_CUSBSESSION_GETSUPPORTEDLANGUAGESL_ENTRY=0x289
+[TRACE]TRACE_FLOW[0x8A]_CUSBSESSION_GETSUPPORTEDLANGUAGESL_EXIT=0x28a
+[TRACE]TRACE_FLOW[0x8A]_CUSBSESSION_GETSUPPORTEDLANGUAGES_ENTRY=0x287
+[TRACE]TRACE_FLOW[0x8A]_CUSBSESSION_GETSUPPORTEDLANGUAGES_EXIT=0x288
+[TRACE]TRACE_FLOW[0x8A]_CUSBSESSION_HANDLESERVICESTATECHANGEWHILESTARTING_ENTRY=0x227
+[TRACE]TRACE_FLOW[0x8A]_CUSBSESSION_HANDLESERVICESTATECHANGEWHILESTARTING_EXIT=0x228
+[TRACE]TRACE_FLOW[0x8A]_CUSBSESSION_HANDLESERVICESTATECHANGEWHILESTOPPING_ENTRY=0x229
+[TRACE]TRACE_FLOW[0x8A]_CUSBSESSION_HANDLESERVICESTATECHANGEWHILESTOPPING_EXIT=0x22a
+[TRACE]TRACE_FLOW[0x8A]_CUSBSESSION_NEWL_ENTRY=0x21c
+[TRACE]TRACE_FLOW[0x8A]_CUSBSESSION_REGISTERDEVICEOBSERVER_ENTRY=0x241
+[TRACE]TRACE_FLOW[0x8A]_CUSBSESSION_REGISTERDEVICEOBSERVER_EXIT=0x242
+[TRACE]TRACE_FLOW[0x8A]_CUSBSESSION_REGISTERDEVICEOBSERVER_EXIT_DUP1=0x243
+[TRACE]TRACE_FLOW[0x8A]_CUSBSESSION_REGISTERHOSTOBSERVER_ENTRY=0x291
+[TRACE]TRACE_FLOW[0x8A]_CUSBSESSION_REGISTERHOSTOBSERVER_EXIT=0x292
+[TRACE]TRACE_FLOW[0x8A]_CUSBSESSION_REGISTERHOSTOBSERVER_EXIT_DUP1=0x293
+[TRACE]TRACE_FLOW[0x8A]_CUSBSESSION_REGISTERMSGOBSERVER_ENTRY=0x297
+[TRACE]TRACE_FLOW[0x8A]_CUSBSESSION_REGISTERMSGOBSERVER_EXIT=0x298
+[TRACE]TRACE_FLOW[0x8A]_CUSBSESSION_REGISTERMSGOBSERVER_EXIT_DUP1=0x299
+[TRACE]TRACE_FLOW[0x8A]_CUSBSESSION_REGISTERSERVICEOBSERVER_ENTRY=0x244
+[TRACE]TRACE_FLOW[0x8A]_CUSBSESSION_REGISTERSERVICEOBSERVER_EXIT=0x245
+[TRACE]TRACE_FLOW[0x8A]_CUSBSESSION_REGISTERSERVICEOBSERVER_EXIT_DUP1=0x246
+[TRACE]TRACE_FLOW[0x8A]_CUSBSESSION_SERVICEL_ENTRY=0x221
+[TRACE]TRACE_FLOW[0x8A]_CUSBSESSION_SERVICEL_EXIT=0x222
+[TRACE]TRACE_FLOW[0x8A]_CUSBSESSION_SETCTLSESSIONMODE_ENTRY=0x279
+[TRACE]TRACE_FLOW[0x8A]_CUSBSESSION_SETCTLSESSIONMODE_EXIT=0x27a
+[TRACE]TRACE_FLOW[0x8A]_CUSBSESSION_STARTCANCEL_ENTRY=0x23a
+[TRACE]TRACE_FLOW[0x8A]_CUSBSESSION_STARTCANCEL_EXIT=0x23b
+[TRACE]TRACE_FLOW[0x8A]_CUSBSESSION_STARTCANCEL_EXIT_DUP1=0x23c
+[TRACE]TRACE_FLOW[0x8A]_CUSBSESSION_STARTDEVICEL_ENTRY=0x231
+[TRACE]TRACE_FLOW[0x8A]_CUSBSESSION_STARTDEVICEL_EXIT=0x232
+[TRACE]TRACE_FLOW[0x8A]_CUSBSESSION_STARTDEVICEL_EXIT_DUP1=0x233
+[TRACE]TRACE_FLOW[0x8A]_CUSBSESSION_STARTDEVICEL_EXIT_DUP2=0x234
+[TRACE]TRACE_FLOW[0x8A]_CUSBSESSION_STOPCANCEL_ENTRY=0x23d
+[TRACE]TRACE_FLOW[0x8A]_CUSBSESSION_STOPCANCEL_EXIT=0x23e
+[TRACE]TRACE_FLOW[0x8A]_CUSBSESSION_STOPCANCEL_EXIT_DUP1=0x23f
+[TRACE]TRACE_FLOW[0x8A]_CUSBSESSION_STOPCANCEL_EXIT_DUP2=0x240
+[TRACE]TRACE_FLOW[0x8A]_CUSBSESSION_STOPDEVICEL_ENTRY=0x235
+[TRACE]TRACE_FLOW[0x8A]_CUSBSESSION_STOPDEVICEL_EXIT=0x236
+[TRACE]TRACE_FLOW[0x8A]_CUSBSESSION_STOPDEVICEL_EXIT_DUP1=0x237
+[TRACE]TRACE_FLOW[0x8A]_CUSBSESSION_STOPDEVICEL_EXIT_DUP2=0x238
+[TRACE]TRACE_FLOW[0x8A]_CUSBSESSION_STOPDEVICEL_EXIT_DUP3=0x239
+[TRACE]TRACE_FLOW[0x8A]_CUSBSESSION_TRYSTARTDEVICEL_ENTRY=0x24f
+[TRACE]TRACE_FLOW[0x8A]_CUSBSESSION_TRYSTARTDEVICEL_EXIT=0x250
+[TRACE]TRACE_FLOW[0x8A]_CUSBSESSION_TRYSTARTDEVICEL_EXIT_DUP1=0x251
+[TRACE]TRACE_FLOW[0x8A]_CUSBSESSION_TRYSTARTDEVICEL_EXIT_DUP2=0x252
+[TRACE]TRACE_FLOW[0x8A]_CUSBSESSION_TRYSTARTDEVICEL_EXIT_DUP3=0x253
+[TRACE]TRACE_FLOW[0x8A]_CUSBSESSION_TRYSTARTDEVICEL_EXIT_DUP4=0x254
+[TRACE]TRACE_FLOW[0x8A]_CUSBSESSION_TRYSTARTDEVICEL_EXIT_DUP5=0x255
+[TRACE]TRACE_FLOW[0x8A]_CUSBSESSION_TRYSTARTDEVICEL_EXIT_DUP6=0x256
+[TRACE]TRACE_FLOW[0x8A]_CUSBSESSION_TRYSTOPDEVICEL_ENTRY=0x257
+[TRACE]TRACE_FLOW[0x8A]_CUSBSESSION_TRYSTOPDEVICEL_EXIT=0x258
+[TRACE]TRACE_FLOW[0x8A]_CUSBSESSION_TRYSTOPDEVICEL_EXIT_DUP1=0x259
+[TRACE]TRACE_FLOW[0x8A]_CUSBSESSION_TRYSTOPDEVICEL_EXIT_DUP2=0x25a
+[TRACE]TRACE_FLOW[0x8A]_CUSBSESSION_TRYSTOPDEVICEL_EXIT_DUP3=0x25b
+[TRACE]TRACE_FLOW[0x8A]_CUSBSESSION_TRYSTOPDEVICEL_EXIT_DUP4=0x25c
+[TRACE]TRACE_FLOW[0x8A]_CUSBSESSION_TRYSTOPDEVICEL_EXIT_DUP5=0x25d
+[TRACE]TRACE_FLOW[0x8A]_CUSBSESSION_USBDEVICEDEQUEUEEVENT_ENTRY=0x22d
+[TRACE]TRACE_FLOW[0x8A]_CUSBSESSION_USBDEVICEDEQUEUEEVENT_EXIT=0x22e
+[TRACE]TRACE_FLOW[0x8A]_CUSBSESSION_USBDEVICESTATECHANGE_ENTRY=0x22b
+[TRACE]TRACE_FLOW[0x8A]_CUSBSESSION_USBDEVICESTATECHANGE_EXIT=0x22c
+[TRACE]TRACE_FLOW[0x8A]_CUSBSESSION_USBHOSTEVENTDEQUEUE_ENTRY=0x2a3
+[TRACE]TRACE_FLOW[0x8A]_CUSBSESSION_USBHOSTEVENTDEQUEUE_EXIT=0x2a4
+[TRACE]TRACE_FLOW[0x8A]_CUSBSESSION_USBHOSTEVENT_ENTRY=0x29f
+[TRACE]TRACE_FLOW[0x8A]_CUSBSESSION_USBHOSTEVENT_EXIT=0x2a0
+[TRACE]TRACE_FLOW[0x8A]_CUSBSESSION_USBMSGDEQUEUE_ENTRY=0x2a1
+[TRACE]TRACE_FLOW[0x8A]_CUSBSESSION_USBMSGDEQUEUE_EXIT=0x2a2
+[TRACE]TRACE_FLOW[0x8A]_CUSBSESSION_USBOTGHOSTMESSAGE_ENTRY=0x29d
+[TRACE]TRACE_FLOW[0x8A]_CUSBSESSION_USBOTGHOSTMESSAGE_EXIT=0x29e
+[TRACE]TRACE_FLOW[0x8A]_CUSBSESSION_USBSERVICESTATECHANGE_ENTRY=0x225
+[TRACE]TRACE_FLOW[0x8A]_CUSBSESSION_USBSERVICESTATECHANGE_EXIT=0x226
+[TRACE]TRACE_NORMAL[0x86]_CINIFILE_CONSTRUCTL=0x3e1
+[TRACE]TRACE_NORMAL[0x86]_CINIFILE_CONSTRUCTL_DUP1=0x3e2
+[TRACE]TRACE_NORMAL[0x86]_CINIFILE_CONSTRUCTL_DUP2=0x3e3
+[TRACE]TRACE_NORMAL[0x86]_CINIFILE_CONSTRUCTL_DUP3=0x3e4
+[TRACE]TRACE_NORMAL[0x86]_CINIFILE_CONSTRUCTL_DUP4=0x3e5
+[TRACE]TRACE_NORMAL[0x86]_CINIFILE_PANIC=0x3e0
+[TRACE]TRACE_NORMAL[0x86]_CUSBDEVICESTATEWATCHER_CUSBDEVICESTATEWATCHER=0x89
+[TRACE]TRACE_NORMAL[0x86]_CUSBDEVICESTATEWATCHER_RUNL=0x8a
+[TRACE]TRACE_NORMAL[0x86]_CUSBDEVICESTATEWATCHER_RUNL_DUP1=0x8b
+[TRACE]TRACE_NORMAL[0x86]_CUSBDEVICESTATEWATCHER_RUNL_DUP2=0x8c
+[TRACE]TRACE_NORMAL[0x86]_CUSBDEVICESTATEWATCHER_RUNL_DUP3=0x8d
+[TRACE]TRACE_NORMAL[0x86]_CUSBDEVICE_ADDCLASSCONTROLLERL=0x178
+[TRACE]TRACE_NORMAL[0x86]_CUSBDEVICE_BUSENUMERATIONCOMPLETED=0xcb
+[TRACE]TRACE_NORMAL[0x86]_CUSBDEVICE_BUSENUMERATIONFAILED=0xcc
+[TRACE]TRACE_NORMAL[0x86]_CUSBDEVICE_BUSENUMERATIONFAILED_DUP1=0xcd
+[TRACE]TRACE_NORMAL[0x86]_CUSBDEVICE_CONSTRUCTL=0xbf
+[TRACE]TRACE_NORMAL[0x86]_CUSBDEVICE_CONSTRUCTL_DUP1=0x16f
+[TRACE]TRACE_NORMAL[0x86]_CUSBDEVICE_CONSTRUCTL_DUP10=0x171
+[TRACE]TRACE_NORMAL[0x86]_CUSBDEVICE_CONSTRUCTL_DUP11=0x172
+[TRACE]TRACE_NORMAL[0x86]_CUSBDEVICE_CONSTRUCTL_DUP12=0x174
+[TRACE]TRACE_NORMAL[0x86]_CUSBDEVICE_CONSTRUCTL_DUP13=0x175
+[TRACE]TRACE_NORMAL[0x86]_CUSBDEVICE_CONSTRUCTL_DUP2=0xc1
+[TRACE]TRACE_NORMAL[0x86]_CUSBDEVICE_CONSTRUCTL_DUP3=0xc2
+[TRACE]TRACE_NORMAL[0x86]_CUSBDEVICE_CONSTRUCTL_DUP4=0xc3
+[TRACE]TRACE_NORMAL[0x86]_CUSBDEVICE_CONSTRUCTL_DUP5=0xc4
+[TRACE]TRACE_NORMAL[0x86]_CUSBDEVICE_CONSTRUCTL_DUP6=0xc5
+[TRACE]TRACE_NORMAL[0x86]_CUSBDEVICE_CONSTRUCTL_DUP7=0xc6
+[TRACE]TRACE_NORMAL[0x86]_CUSBDEVICE_CONSTRUCTL_DUP8=0xc7
+[TRACE]TRACE_NORMAL[0x86]_CUSBDEVICE_CONSTRUCTL_DUP9=0x170
+[TRACE]TRACE_NORMAL[0x86]_CUSBDEVICE_CONVERTUIDSL_DUP1=0x1a1
+[TRACE]TRACE_NORMAL[0x86]_CUSBDEVICE_CREATECLASSCONTROLLERSL=0x16e
+[TRACE]TRACE_NORMAL[0x86]_CUSBDEVICE_CREATECLASSCONTROLLERSL_DUP1=0x1a5
+[TRACE]TRACE_NORMAL[0x86]_CUSBDEVICE_CUSBDEVICE=0xbb
+[TRACE]TRACE_NORMAL[0x86]_CUSBDEVICE_CUSBDEVICE_DUP1=0xbc
+[TRACE]TRACE_NORMAL[0x86]_CUSBDEVICE_CUSBDEVICE_DUP2=0xbd
+[TRACE]TRACE_NORMAL[0x86]_CUSBDEVICE_CUSBDEVICE_DUP3=0xbe
+[TRACE]TRACE_NORMAL[0x86]_CUSBDEVICE_ENUMERATECLASSCONTROLLERSL=0x138
+[TRACE]TRACE_NORMAL[0x86]_CUSBDEVICE_ENUMERATECLASSCONTROLLERSL_DUP1=0x139
+[TRACE]TRACE_NORMAL[0x86]_CUSBDEVICE_ENUMERATECLASSCONTROLLERSL_DUP2=0x176
+[TRACE]TRACE_NORMAL[0x86]_CUSBDEVICE_ENUMERATECLASSCONTROLLERSL_DUP3=0x192
+[TRACE]TRACE_NORMAL[0x86]_CUSBDEVICE_INSTANTIATEEXTENSIONPLUGINSL_DUP1=0xc8
+[TRACE]TRACE_NORMAL[0x86]_CUSBDEVICE_MUEPODOREGISTERSTATEOBSERVERL=0x150
+[TRACE]TRACE_NORMAL[0x86]_CUSBDEVICE_POWERUPANDCONNECT=0xce
+[TRACE]TRACE_NORMAL[0x86]_CUSBDEVICE_POWERUPANDCONNECT_DUP1=0xcf
+[TRACE]TRACE_NORMAL[0x86]_CUSBDEVICE_POWERUPANDCONNECT_DUP2=0xd0
+[TRACE]TRACE_NORMAL[0x86]_CUSBDEVICE_REGISTEROBSERVERL=0x179
+[TRACE]TRACE_NORMAL[0x86]_CUSBDEVICE_RUNERROR=0xd5
+[TRACE]TRACE_NORMAL[0x86]_CUSBDEVICE_RUNL=0xd1
+[TRACE]TRACE_NORMAL[0x86]_CUSBDEVICE_RUNL_DUP1=0xd2
+[TRACE]TRACE_NORMAL[0x86]_CUSBDEVICE_RUNL_DUP2=0xd3
+[TRACE]TRACE_NORMAL[0x86]_CUSBDEVICE_RUNL_DUP3=0xd4
+[TRACE]TRACE_NORMAL[0x86]_CUSBDEVICE_RUNL_DUP4=0x193
+[TRACE]TRACE_NORMAL[0x86]_CUSBDEVICE_SETCURRENTPERSONALITYL=0x154
+[TRACE]TRACE_NORMAL[0x86]_CUSBDEVICE_SETDEVICEDESCRIPTORL=0x146
+[TRACE]TRACE_NORMAL[0x86]_CUSBDEVICE_SETDEVICEDESCRIPTORL_DUP1=0x147
+[TRACE]TRACE_NORMAL[0x86]_CUSBDEVICE_SETDEVICEDESCRIPTORL_DUP2=0x148
+[TRACE]TRACE_NORMAL[0x86]_CUSBDEVICE_SETDEVICEDESCRIPTORL_DUP3=0x3c6
+[TRACE]TRACE_NORMAL[0x86]_CUSBDEVICE_SETDEVICESTATE=0xca
+[TRACE]TRACE_NORMAL[0x86]_CUSBDEVICE_SETSERVICESTATE=0xc9
+[TRACE]TRACE_NORMAL[0x86]_CUSBDEVICE_SETUSBDEVICESETTINGSFROMPERSONALITYL=0x151
+[TRACE]TRACE_NORMAL[0x86]_CUSBDEVICE_SETUSBDEVICESETTINGSFROMPERSONALITYL_DUP1=0x157
+[TRACE]TRACE_NORMAL[0x86]_CUSBDEVICE_SETUSBDEVICESETTINGSFROMPERSONALITYL_DUP2=0x158
+[TRACE]TRACE_NORMAL[0x86]_CUSBDEVICE_SETUSBDEVICESETTINGSFROMPERSONALITYL_DUP3=0x19e
+[TRACE]TRACE_NORMAL[0x86]_CUSBDEVICE_SETUSBDEVICESETTINGSFROMPERSONALITYL_DUP4=0x1a0
+[TRACE]TRACE_NORMAL[0x86]_CUSBDEVICE_SETUSBDEVICESETTINGSFROMPERSONALITYL_DUP5=0x19f
+[TRACE]TRACE_NORMAL[0x86]_CUSBDEVICE_SETUSBDEVICESETTINGSFROMPERSONALITYL_DUP6=0x19d
+[TRACE]TRACE_NORMAL[0x86]_CUSBDEVICE_SETUSBDEVICESETTINGSFROMPERSONALITYL_DUP7=0x19c
+[TRACE]TRACE_NORMAL[0x86]_CUSBDEVICE_STARTL=0x17a
+[TRACE]TRACE_NORMAL[0x86]_CUSBDEVICE_TRYSTARTL=0x18a
+[TRACE]TRACE_NORMAL[0x86]_CUSBDEVICE_VALIDATEPERSONALITIESL=0x155
+[TRACE]TRACE_NORMAL[0x86]_CUSBDEVICE_VALIDATEPERSONALITIESL_DUP1=0x3c7
+[TRACE]TRACE_NORMAL[0x86]_CUSBDEVICE_VALIDATEPERSONALITIESL_DUP2=0x3c8
+[TRACE]TRACE_NORMAL[0x86]_CUSBDUMMYCLASSCONTROLLER_GETBEHAVIOUR=0x3e6
+[TRACE]TRACE_NORMAL[0x86]_CUSBDUMMYCLASSCONTROLLER_GETBEHAVIOUR_DUP1=0x3e7
+[TRACE]TRACE_NORMAL[0x86]_CUSBDUMMYCLASSCONTROLLER_GETBEHAVIOUR_DUP3=0x3e8
+[TRACE]TRACE_NORMAL[0x86]_CUSBDUMMYCLASSCONTROLLER_GETBEHAVIOUR_DUP5=0x3e9
+[TRACE]TRACE_NORMAL[0x86]_CUSBDUMMYCLASSCONTROLLER_GETBEHAVIOUR_DUP7=0x3ea
+[TRACE]TRACE_NORMAL[0x86]_CUSBDUMMYCLASSCONTROLLER_GETCONFIG=0x3eb
+[TRACE]TRACE_NORMAL[0x86]_CUSBDUMMYCLASSCONTROLLER_GETCONFIG_DUP1=0x3ec
+[TRACE]TRACE_NORMAL[0x86]_CUSBDUMMYCLASSCONTROLLER_GETCONFIG_DUP2=0x3ed
+[TRACE]TRACE_NORMAL[0x86]_CUSBDUMMYCLASSCONTROLLER_GETCONFIG_DUP3=0x3ee
+[TRACE]TRACE_NORMAL[0x86]_CUSBDUMMYCLASSCONTROLLER_GETCONFIG_DUP4=0x3ef
+[TRACE]TRACE_NORMAL[0x86]_CUSBDUMMYCLASSCONTROLLER_GETCONFIG_DUP5=0x3f0
+[TRACE]TRACE_NORMAL[0x86]_CUSBDUMMYCLASSCONTROLLER_GETCONFIG_DUP6=0x3f1
+[TRACE]TRACE_NORMAL[0x86]_CUSBDUMMYCLASSCONTROLLER_RUNL=0x3f2
+[TRACE]TRACE_NORMAL[0x86]_CUSBMANCENREPMANAGER_CHECKSIGNATUREL=0x3cc
+[TRACE]TRACE_NORMAL[0x86]_CUSBMANCENREPMANAGER_ISCLASSCONFIGURABLEL=0x3dc
+[TRACE]TRACE_NORMAL[0x86]_CUSBMANCENREPMANAGER_ISCLASSCONFIGURABLEL_DUP2=0x3dd
+[TRACE]TRACE_NORMAL[0x86]_CUSBMANCENREPMANAGER_ISFEATURESUPPORTEDL_DUP2=0x3df
+[TRACE]TRACE_NORMAL[0x86]_CUSBMANCENREPMANAGER_READCONFIGURATIONSFORPERSONALITYL_DUP1=0x3d9
+[TRACE]TRACE_NORMAL[0x86]_CUSBMANCENREPMANAGER_READCONFIGURATIONSFORPERSONALITYL_DUP2=0x3da
+[TRACE]TRACE_NORMAL[0x86]_CUSBMANCENREPMANAGER_READCONFIGURATIONSFORPERSONALITYL_DUP3=0x3db
+[TRACE]TRACE_NORMAL[0x86]_CUSBMANCENREPMANAGER_READDEVICECONFIGURATIONL=0x3cd
+[TRACE]TRACE_NORMAL[0x86]_CUSBMANCENREPMANAGER_READDEVICECONFIGURATIONL_DUP1=0x3d1
+[TRACE]TRACE_NORMAL[0x86]_CUSBMANCENREPMANAGER_READDEVICECONFIGURATIONL_DUP2=0x3d2
+[TRACE]TRACE_NORMAL[0x86]_CUSBMANCENREPMANAGER_READDEVICECONFIGURATIONL_DUP3=0x3cf
+[TRACE]TRACE_NORMAL[0x86]_CUSBMANCENREPMANAGER_READDEVICECONFIGURATIONL_DUP4=0x3d0
+[TRACE]TRACE_NORMAL[0x86]_CUSBMANCENREPMANAGER_READKEYL=0x3c9
+[TRACE]TRACE_NORMAL[0x86]_CUSBMANCENREPMANAGER_READKEYL_DUP1=0x3cb
+[TRACE]TRACE_NORMAL[0x86]_CUSBMANCENREPMANAGER_READPERSONALITIESL_DUP1=0x3d4
+[TRACE]TRACE_NORMAL[0x86]_CUSBMANCENREPMANAGER_READPERSONALITIESL_DUP3=0x3d3
+[TRACE]TRACE_NORMAL[0x86]_CUSBMANCENREPMANAGER_READPERSONALITIESL_DUP4=0x3d6
+[TRACE]TRACE_NORMAL[0x86]_CUSBMANCENREPMANAGER_READPERSONALITIESL_DUP6=0x3d7
+[TRACE]TRACE_NORMAL[0x86]_CUSBMANCENREPMANAGER_READPERSONALITIESL_DUP7=0x3d8
+[TRACE]TRACE_NORMAL[0x86]_CUSBMANCENREPMANAGER_READSTRINGKEYLC=0x3c4
+[TRACE]TRACE_NORMAL[0x86]_CUSBMANCENREPMANAGER_READSTRINGKEYLC_DUP1=0x3c5
+[TRACE]TRACE_NORMAL[0x86]_CUSBSCHEDULER_ERROR=0x1d
+[TRACE]TRACE_NORMAL[0x86]_CUSBSERVER_CONSTRUCTL=0x12c
+[TRACE]TRACE_NORMAL[0x86]_CUSBSERVER_CONSTRUCTL_DUP1=0x12d
+[TRACE]TRACE_NORMAL[0x86]_CUSBSERVER_CONSTRUCTL_DUP2=0x12e
+[TRACE]TRACE_NORMAL[0x86]_CUSBSERVER_CONSTRUCTL_DUP3=0x12f
+[TRACE]TRACE_NORMAL[0x86]_CUSBSERVER_CUSBSERVER=0x124
+[TRACE]TRACE_NORMAL[0x86]_CUSBSERVER_CUSBSERVER_DUP1=0x125
+[TRACE]TRACE_NORMAL[0x86]_CUSBSERVER_CUSBSERVER_DUP2=0x126
+[TRACE]TRACE_NORMAL[0x86]_CUSBSERVER_CUSBSERVER_DUP3=0x127
+[TRACE]TRACE_NORMAL[0x86]_CUSBSERVER_CUSBSERVER_DUP4=0x128
+[TRACE]TRACE_NORMAL[0x86]_CUSBSERVER_CUSBSERVER_DUP5=0x129
+[TRACE]TRACE_NORMAL[0x86]_CUSBSERVER_CUSBSERVER_DUP6=0x12a
+[TRACE]TRACE_NORMAL[0x86]_CUSBSERVER_CUSBSERVER_DUP7=0x12b
+[TRACE]TRACE_NORMAL[0x86]_CUSBSERVER_DECREMENTSESSIONCOUNT=0x135
+[TRACE]TRACE_NORMAL[0x86]_CUSBSERVER_ERROR=0x132
+[TRACE]TRACE_NORMAL[0x86]_CUSBSERVER_INCREMENTSESSIONCOUNT=0x133
+[TRACE]TRACE_NORMAL[0x86]_CUSBSERVER_NEWSESSIONL=0x130
+[TRACE]TRACE_NORMAL[0x86]_CUSBSERVER_NEWSESSIONL_DUP1=0x131
+[TRACE]TRACE_NORMAL[0x86]_CUSBSESSION_CREATEL=0x1c8
+[TRACE]TRACE_NORMAL[0x86]_CUSBSESSION_CREATEL_DUP1=0x1c9
+[TRACE]TRACE_NORMAL[0x86]_CUSBSESSION_CREATEL_DUP2=0x1ca
+[TRACE]TRACE_NORMAL[0x86]_CUSBSESSION_CUSBSESSION=0x1d2
+[TRACE]TRACE_NORMAL[0x86]_CUSBSESSION_CUSBSESSION_DUP1=0x1d5
+[TRACE]TRACE_NORMAL[0x86]_CUSBSESSION_CUSBSESSION_DUP2=0x1d6
+[TRACE]TRACE_NORMAL[0x86]_CUSBSESSION_CUSBSESSION_DUP3=0x1d7
+[TRACE]TRACE_NORMAL[0x86]_CUSBSESSION_DEREGISTERHOSTOBSERVER=0x1ad
+[TRACE]TRACE_NORMAL[0x86]_CUSBSESSION_DEREGISTERHOSTOBSERVER_DUP1=0x1ae
+[TRACE]TRACE_NORMAL[0x86]_CUSBSESSION_DISPATCHMESSAGEL=0x1c2
+[TRACE]TRACE_NORMAL[0x86]_CUSBSESSION_DISPATCHMESSAGEL_DUP1=0x1d0
+[TRACE]TRACE_NORMAL[0x86]_CUSBSESSION_DISPATCHMESSAGEL_DUP2=0x1dd
+[TRACE]TRACE_NORMAL[0x86]_CUSBSESSION_DISPATCHMESSAGEL_DUP3=0x1de
+[TRACE]TRACE_NORMAL[0x86]_CUSBSESSION_DISPATCHMESSAGEL_DUP4=0x1df
+[TRACE]TRACE_NORMAL[0x86]_CUSBSESSION_DISPATCHMESSAGEL_DUP5=0x1e0
+[TRACE]TRACE_NORMAL[0x86]_CUSBSESSION_DISPATCHMESSAGEL_DUP6=0x1e1
+[TRACE]TRACE_NORMAL[0x86]_CUSBSESSION_GETCURRENTDEVICESTATE=0x1ba
+[TRACE]TRACE_NORMAL[0x86]_CUSBSESSION_GETCURRENTPERSONALITYID=0x1bb
+[TRACE]TRACE_NORMAL[0x86]_CUSBSESSION_GETCURRENTSERVICESTATE=0x1b9
+[TRACE]TRACE_NORMAL[0x86]_CUSBSESSION_GETMANUFACTURERSTRINGDESCRIPTOR=0x1a9
+[TRACE]TRACE_NORMAL[0x86]_CUSBSESSION_GETMANUFACTURERSTRINGDESCRIPTOR_DUP1=0x1db
+[TRACE]TRACE_NORMAL[0x86]_CUSBSESSION_GETOTGDESCRIPTOR=0x1ab
+[TRACE]TRACE_NORMAL[0x86]_CUSBSESSION_GETPERSONALITYIDS=0x1b8
+[TRACE]TRACE_NORMAL[0x86]_CUSBSESSION_GETPRODUCTSTRINGDESCRIPTOR=0x1aa
+[TRACE]TRACE_NORMAL[0x86]_CUSBSESSION_GETPRODUCTSTRINGDESCRIPTOR_DUP1=0x1dc
+[TRACE]TRACE_NORMAL[0x86]_CUSBSESSION_GETSUPPORTEDCLASSES=0x1bc
+[TRACE]TRACE_NORMAL[0x86]_CUSBSESSION_GETSUPPORTEDCLASSES_DUP1=0x1be
+[TRACE]TRACE_NORMAL[0x86]_CUSBSESSION_GETSUPPORTEDCLASSES_DUP2=0x1d9
+[TRACE]TRACE_NORMAL[0x86]_CUSBSESSION_GETSUPPORTEDLANGUAGESL=0x1a6
+[TRACE]TRACE_NORMAL[0x86]_CUSBSESSION_GETSUPPORTEDLANGUAGESL_DUP1=0x1a7
+[TRACE]TRACE_NORMAL[0x86]_CUSBSESSION_GETSUPPORTEDLANGUAGESL_DUP2=0x1a8
+[TRACE]TRACE_NORMAL[0x86]_CUSBSESSION_HANDLESERVICESTATECHANGEWHILESTARTING=0x1cb
+[TRACE]TRACE_NORMAL[0x86]_CUSBSESSION_HANDLESERVICESTATECHANGEWHILESTARTING_DUP1=0x1cc
+[TRACE]TRACE_NORMAL[0x86]_CUSBSESSION_HANDLESERVICESTATECHANGEWHILESTARTING_DUP2=0x1cd
+[TRACE]TRACE_NORMAL[0x86]_CUSBSESSION_HANDLESERVICESTATECHANGEWHILESTARTING_DUP3=0x1ce
+[TRACE]TRACE_NORMAL[0x86]_CUSBSESSION_HANDLESERVICESTATECHANGEWHILESTOPPING=0x1c4
+[TRACE]TRACE_NORMAL[0x86]_CUSBSESSION_HANDLESERVICESTATECHANGEWHILESTOPPING_DUP1=0x1c5
+[TRACE]TRACE_NORMAL[0x86]_CUSBSESSION_HANDLESERVICESTATECHANGEWHILESTOPPING_DUP2=0x1c6
+[TRACE]TRACE_NORMAL[0x86]_CUSBSESSION_HANDLESERVICESTATECHANGEWHILESTOPPING_DUP3=0x1c7
+[TRACE]TRACE_NORMAL[0x86]_CUSBSESSION_REGISTERDEVICEOBSERVER=0x1c3
+[TRACE]TRACE_NORMAL[0x86]_CUSBSESSION_REGISTERHOSTOBSERVER=0x1ac
+[TRACE]TRACE_NORMAL[0x86]_CUSBSESSION_REGISTERMSGOBSERVER=0x1af
+[TRACE]TRACE_NORMAL[0x86]_CUSBSESSION_SETCTLSESSIONMODE=0x1b7
+[TRACE]TRACE_NORMAL[0x86]_CUSBSESSION_USBDEVICEDEQUEUEEVENT=0x1c1
+[TRACE]TRACE_NORMAL[0x86]_CUSBSESSION_USBDEVICESTATECHANGE=0x1bf
+[TRACE]TRACE_NORMAL[0x86]_CUSBSESSION_USBDEVICESTATECHANGE_DUP1=0x1c0
+[TRACE]TRACE_NORMAL[0x86]_CUSBSESSION_USBHOSTEVENT=0x1b1
+[TRACE]TRACE_NORMAL[0x86]_CUSBSESSION_USBHOSTEVENTDEQUEUE=0x1b5
+[TRACE]TRACE_NORMAL[0x86]_CUSBSESSION_USBHOSTEVENTDEQUEUE_DUP1=0x1b6
+[TRACE]TRACE_NORMAL[0x86]_CUSBSESSION_USBHOSTEVENT_DUP1=0x1b2
+[TRACE]TRACE_NORMAL[0x86]_CUSBSESSION_USBHOSTEVENT_DUP2=0x1b3
+[TRACE]TRACE_NORMAL[0x86]_CUSBSESSION_USBMSGDEQUEUE=0x1b4
+[TRACE]TRACE_NORMAL[0x86]_CUSBSESSION_USBOTGHOSTMESSAGE=0x1b0
+[TRACE]TRACE_NORMAL[0x86]_CUSBSESSION_USBSERVICESTATECHANGE=0x1d8
+[TRACE]TRACE_NORMAL[0x86]_DUP1_CUSBMANCENREPMANAGER_ISFEATURESUPPORTEDL_DUP1=0x3de
+[TRACE]TRACE_NORMAL[0x86]_DUP2_CUSBMANCENREPMANAGER_READPERSONALITIESL_DUP2=0x3d5
+[TRACE]TRACE_NORMAL[0x86]_USBSVR_RUNSERVERL=0x2ed
+[[OBSOLETE]][TRACE]TRACE_DUMP[0x89]_CUSBDEVICE_READPERSONALITIESL_DUP10=0x12
+[[OBSOLETE]][TRACE]TRACE_DUMP[0x89]_CUSBDEVICE_READPERSONALITIESL_DUP11=0x13
+[[OBSOLETE]][TRACE]TRACE_DUMP[0x89]_CUSBDEVICE_READPERSONALITIESL_DUP12=0x14
+[[OBSOLETE]][TRACE]TRACE_DUMP[0x89]_CUSBDEVICE_READPERSONALITIESL_DUP13=0x15
+[[OBSOLETE]][TRACE]TRACE_DUMP[0x89]_CUSBDEVICE_READPERSONALITIESL_DUP14=0x16
+[[OBSOLETE]][TRACE]TRACE_DUMP[0x89]_CUSBDEVICE_READPERSONALITIESL_DUP15=0x17
+[[OBSOLETE]][TRACE]TRACE_DUMP[0x89]_CUSBDEVICE_READPERSONALITIESL_DUP16=0x18
+[[OBSOLETE]][TRACE]TRACE_DUMP[0x89]_CUSBDEVICE_READPERSONALITIESL_DUP17=0x19
+[[OBSOLETE]][TRACE]TRACE_DUMP[0x89]_CUSBDEVICE_READPERSONALITIESL_DUP18=0x1a
+[[OBSOLETE]][TRACE]TRACE_DUMP[0x89]_CUSBDEVICE_READPERSONALITIESL_DUP19=0x1b
+[[OBSOLETE]][TRACE]TRACE_DUMP[0x89]_CUSBDEVICE_READPERSONALITIESL_DUP20=0x1c
+[[OBSOLETE]][TRACE]TRACE_DUMP[0x89]_CUSBDEVICE_READPERSONALITIESL_DUP21=0x1d
+[[OBSOLETE]][TRACE]TRACE_DUMP[0x89]_CUSBDEVICE_READPERSONALITIESL_DUP7=0xf
+[[OBSOLETE]][TRACE]TRACE_DUMP[0x89]_CUSBDEVICE_READPERSONALITIESL_DUP8=0x10
+[[OBSOLETE]][TRACE]TRACE_DUMP[0x89]_CUSBDEVICE_READPERSONALITIESL_DUP9=0x11
+[[OBSOLETE]][TRACE]TRACE_DUMP[0x89]_DUP1_CUSBSESSION_GETMANUFACTURERSTRINGDESCRIPTOR=0x1
+[[OBSOLETE]][TRACE]TRACE_FATAL[0x81]_CUSBDUMMYCLASSCONTROLLER_CONSTRUCTL=0x53
+[[OBSOLETE]][TRACE]TRACE_FATAL[0x81]_CUSBDUMMYCLASSCONTROLLER_DOCANCEL=0x66
+[[OBSOLETE]][TRACE]TRACE_FATAL[0x81]_CUSBDUMMYCLASSCONTROLLER_DOCANCEL_DUP1=0x67
+[[OBSOLETE]][TRACE]TRACE_FATAL[0x81]_CUSBDUMMYCLASSCONTROLLER_DOCANCEL_DUP2=0x68
+[[OBSOLETE]][TRACE]TRACE_FATAL[0x81]_CUSBDUMMYCLASSCONTROLLER_DOCANCEL_DUP3=0x69
+[[OBSOLETE]][TRACE]TRACE_FATAL[0x81]_CUSBDUMMYCLASSCONTROLLER_DOCANCEL_DUP4=0x6a
+[[OBSOLETE]][TRACE]TRACE_FATAL[0x81]_CUSBDUMMYCLASSCONTROLLER_GETBEHAVIOUR_DUP2=0x54
+[[OBSOLETE]][TRACE]TRACE_FATAL[0x81]_CUSBDUMMYCLASSCONTROLLER_GETBEHAVIOUR_DUP4=0x55
+[[OBSOLETE]][TRACE]TRACE_FATAL[0x81]_CUSBDUMMYCLASSCONTROLLER_GETBEHAVIOUR_DUP6=0x56
+[[OBSOLETE]][TRACE]TRACE_FATAL[0x81]_CUSBDUMMYCLASSCONTROLLER_GETBEHAVIOUR_DUP8=0x57
+[[OBSOLETE]][TRACE]TRACE_FATAL[0x81]_CUSBDUMMYCLASSCONTROLLER_GETCONFIG_DUP7=0x58
+[[OBSOLETE]][TRACE]TRACE_FATAL[0x81]_CUSBDUMMYCLASSCONTROLLER_RUNERROR=0x6b
+[[OBSOLETE]][TRACE]TRACE_FATAL[0x81]_CUSBDUMMYCLASSCONTROLLER_RUNL_DUP1=0x61
+[[OBSOLETE]][TRACE]TRACE_FATAL[0x81]_CUSBDUMMYCLASSCONTROLLER_RUNL_DUP2=0x62
+[[OBSOLETE]][TRACE]TRACE_FATAL[0x81]_CUSBDUMMYCLASSCONTROLLER_RUNL_DUP3=0x63
+[[OBSOLETE]][TRACE]TRACE_FATAL[0x81]_CUSBDUMMYCLASSCONTROLLER_RUNL_DUP4=0x64
+[[OBSOLETE]][TRACE]TRACE_FATAL[0x81]_CUSBDUMMYCLASSCONTROLLER_RUNL_DUP5=0x65
+[[OBSOLETE]][TRACE]TRACE_FATAL[0x81]_CUSBDUMMYCLASSCONTROLLER_START=0x59
+[[OBSOLETE]][TRACE]TRACE_FATAL[0x81]_CUSBDUMMYCLASSCONTROLLER_START_DUP1=0x5a
+[[OBSOLETE]][TRACE]TRACE_FATAL[0x81]_CUSBDUMMYCLASSCONTROLLER_START_DUP2=0x5b
+[[OBSOLETE]][TRACE]TRACE_FATAL[0x81]_CUSBDUMMYCLASSCONTROLLER_START_DUP3=0x5c
+[[OBSOLETE]][TRACE]TRACE_FATAL[0x81]_CUSBDUMMYCLASSCONTROLLER_STOP=0x5d
+[[OBSOLETE]][TRACE]TRACE_FATAL[0x81]_CUSBDUMMYCLASSCONTROLLER_STOP_DUP1=0x5e
+[[OBSOLETE]][TRACE]TRACE_FATAL[0x81]_CUSBDUMMYCLASSCONTROLLER_STOP_DUP2=0x5f
+[[OBSOLETE]][TRACE]TRACE_FATAL[0x81]_CUSBDUMMYCLASSCONTROLLER_STOP_DUP3=0x60
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CACTIVEUSBHOSTEVENTWATCHER_CACTIVEUSBHOSTEVENTWATCHER_CONS_ENTRY=0x598
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CACTIVEUSBHOSTEVENTWATCHER_CACTIVEUSBHOSTEVENTWATCHER_CONS_EXIT=0x599
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CACTIVEUSBHOSTEVENTWATCHER_CACTIVEUSBHOSTEVENTWATCHER_DES_ENTRY=0x59a
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CACTIVEUSBHOSTEVENTWATCHER_CACTIVEUSBHOSTEVENTWATCHER_DES_EXIT=0x59b
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CACTIVEUSBHOSTEVENTWATCHER_CACTIVEUSBHOSTEVENTWATCHER_ENTRY=0x3e2
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CACTIVEUSBHOSTEVENTWATCHER_CACTIVEUSBHOSTEVENTWATCHER_ENTRY_DUP1=0x3e4
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CACTIVEUSBHOSTEVENTWATCHER_CACTIVEUSBHOSTEVENTWATCHER_EXIT=0x3e3
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CACTIVEUSBHOSTEVENTWATCHER_CACTIVEUSBHOSTEVENTWATCHER_EXIT_DUP1=0x3e5
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CACTIVEUSBHOSTEVENTWATCHER_DOCANCEL_ENTRY=0x59e
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CACTIVEUSBHOSTEVENTWATCHER_DOCANCEL_EXIT=0x59f
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CACTIVEUSBHOSTEVENTWATCHER_POST_ENTRY=0x59c
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CACTIVEUSBHOSTEVENTWATCHER_POST_EXIT=0x59d
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CACTIVEUSBHOSTMESSAGEWATCHER_CACTIVEUSBHOSTMESSAGEWATCHER_CONS_ENTRY=0x5a2
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CACTIVEUSBHOSTMESSAGEWATCHER_CACTIVEUSBHOSTMESSAGEWATCHER_CONS_EXIT=0x5a3
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CACTIVEUSBHOSTMESSAGEWATCHER_CACTIVEUSBHOSTMESSAGEWATCHER_DES_ENTRY=0x5a0
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CACTIVEUSBHOSTMESSAGEWATCHER_CACTIVEUSBHOSTMESSAGEWATCHER_DES_EXIT=0x5a1
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CACTIVEUSBHOSTMESSAGEWATCHER_CACTIVEUSBHOSTMESSAGEWATCHER_ENTRY=0x3ea
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CACTIVEUSBHOSTMESSAGEWATCHER_CACTIVEUSBHOSTMESSAGEWATCHER_ENTRY_DUP1=0x3ec
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CACTIVEUSBHOSTMESSAGEWATCHER_CACTIVEUSBHOSTMESSAGEWATCHER_EXIT=0x3eb
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CACTIVEUSBHOSTMESSAGEWATCHER_CACTIVEUSBHOSTMESSAGEWATCHER_EXIT_DUP1=0x3ed
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CACTIVEUSBHOSTMESSAGEWATCHER_DOCANCEL_ENTRY=0x5a6
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CACTIVEUSBHOSTMESSAGEWATCHER_DOCANCEL_EXIT=0x5a7
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CACTIVEUSBHOSTMESSAGEWATCHER_POST_ENTRY=0x5a4
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CACTIVEUSBHOSTMESSAGEWATCHER_POST_EXIT=0x5a5
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CACTIVEUSBHOSTWATCHER_CACTIVEUSBHOSTWATCHER_CONS_ENTRY=0x592
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CACTIVEUSBHOSTWATCHER_CACTIVEUSBHOSTWATCHER_CONS_EXIT=0x593
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CACTIVEUSBHOSTWATCHER_CACTIVEUSBHOSTWATCHER_DES_ENTRY=0x594
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CACTIVEUSBHOSTWATCHER_CACTIVEUSBHOSTWATCHER_DES_EXIT=0x595
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CACTIVEUSBHOSTWATCHER_CACTIVEUSBHOSTWATCHER_ENTRY=0x2ee
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CACTIVEUSBHOSTWATCHER_CACTIVEUSBHOSTWATCHER_ENTRY_DUP1=0x2f0
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CACTIVEUSBHOSTWATCHER_CACTIVEUSBHOSTWATCHER_EXIT=0x2ef
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CACTIVEUSBHOSTWATCHER_CACTIVEUSBHOSTWATCHER_EXIT_DUP1=0x2f1
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CACTIVEUSBHOSTWATCHER_RUNL_ENTRY=0x596
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CACTIVEUSBHOSTWATCHER_RUNL_EXIT=0x597
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CINIFILE_CINIFILE_CONS_ENTRY=0x549
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CINIFILE_CINIFILE_ENTRY=0x2a5
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CINIFILE_NEWL_ENTRY=0x3a6
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CINIFILE_NEWL_ENTRY_DUP1=0x3a8
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CINIFILE_NEWL_ENTRY_DUP1_EXIT=0x2a9
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CINIFILE_NEWL_EXIT=0x3a7
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CINIFILE_NEWL_EXIT_DUP1=0x3a9
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CINIFILE_NEWL_TDESC_ENTRY=0x54a
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CINIFILE_NEWL_TDESC_EXIT=0x54b
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CINIFILE_NEWL_TDESC_TDESC_ENTRY=0x54c
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CINIFILE_NEWL_TDESC_TDESC_EXIT=0x54d
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CPERSONALITY_CPERSONALITY_ENTRY=0x5
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CPERSONALITY_CPERSONALITY_EXIT=0x6
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CREQUESTSESSIONWATCHER_CONSTRUCTL_ENTRY=0x5f4
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CREQUESTSESSIONWATCHER_CONSTRUCTL_EXIT=0x5f5
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CREQUESTSESSIONWATCHER_CREQUESTSESSIONWATCHER_CONS_ENTRY=0x5f6
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CREQUESTSESSIONWATCHER_CREQUESTSESSIONWATCHER_CONS_EXIT=0x5f7
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CREQUESTSESSIONWATCHER_CREQUESTSESSIONWATCHER_ENTRY=0x352
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CREQUESTSESSIONWATCHER_CREQUESTSESSIONWATCHER_EXIT=0x353
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CREQUESTSESSIONWATCHER_DOCANCEL_ENTRY=0x5fa
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CREQUESTSESSIONWATCHER_DOCANCEL_EXIT=0x5fb
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CREQUESTSESSIONWATCHER_RUNL_ENTRY=0x5f8
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CREQUESTSESSIONWATCHER_RUNL_EXIT=0x5f9
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBDEVICE_ADDCLASSCONTROLLERL_ENTRY=0x84
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBDEVICE_ADDCLASSCONTROLLERL_EXIT=0x85
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBDEVICE_BUSENUMERATIONCOMPLETED_ENTRY=0x92
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBDEVICE_BUSENUMERATIONCOMPLETED_EXIT=0x93
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBDEVICE_CONSTRUCTL_ENTRY=0x7d
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBDEVICE_CONSTRUCTL_EXIT=0x7e
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBDEVICE_CUSBDEVICE_ENTRY=0x122
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBDEVICE_CUSBDEVICE_EXIT=0x123
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBDEVICE_DEREGISTEROBSERVER_ENTRY=0x88
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBDEVICE_DEREGISTEROBSERVER_EXIT=0x89
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBDEVICE_DOCANCEL_ENTRY=0x9c
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBDEVICE_DOCANCEL_EXIT=0x9d
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBDEVICE_ENUMERATECLASSCONTROLLERSL_ENTRY=0x82
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBDEVICE_ENUMERATECLASSCONTROLLERSL_EXIT=0x83
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBDEVICE_INSTANTIATEEXTENSIONPLUGINSL=0x80
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBDEVICE_INSTANTIATEEXTENSIONPLUGINSL_ENTRY=0x7f
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBDEVICE_INSTANTIATEEXTENSIONPLUGINSL_EXIT=0x81
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBDEVICE_NEWL_ENTRY=0x79
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBDEVICE_NEWL_EXIT=0x7a
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBDEVICE_POWERUPANDCONNECT_ENTRY=0x98
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBDEVICE_POWERUPANDCONNECT_EXIT=0x99
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBDEVICE_READPERSONALITIESL_ENTRY=0x214
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBDEVICE_READPERSONALITIESL_EXIT=0x215
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBDEVICE_READPERSONALITIESL_EXIT_DUP1=0x369
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBDEVICE_READPERSONALITIESL_EXIT_DUP2=0x21b
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBDEVICE_REGISTEROBSERVERL_ENTRY=0x86
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBDEVICE_REGISTEROBSERVERL_EXIT=0x87
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBDEVICE_RESOURCEFILENAMEL_ENTRY=0x201
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBDEVICE_RESOURCEFILENAMEL_EXIT=0x202
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBDEVICE_RUNL_ENTRY=0x9a
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBDEVICE_RUNL_EXIT=0x9b
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBDEVICE_SETDEVICESTATE_ENTRY=0x90
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBDEVICE_SETDEVICESTATE_EXIT=0x91
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBDEVICE_SETSERVICESTATE_ENTRY=0x8e
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBDEVICE_SETSERVICESTATE_EXIT=0x8f
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBDEVICE_SETUSBDEVICESETTINGSFROMPERSONALITYL_EXIT=0x204
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBDEVICE_SETUSBDEVICESETTINGSL_ENTRY=0x1fe
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBDEVICE_SETUSBDEVICESETTINGSL_EXIT=0x1ff
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBDEVICE_SETUSBDEVICESETTINGSL_EXIT_DUP1=0x200
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBDEVICE_STARTCURRENTCLASSCONTROLLER_ENTRY=0x94
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBDEVICE_STARTCURRENTCLASSCONTROLLER_EXIT=0x95
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBDEVICE_STARTL_ENTRY=0x8a
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBDEVICE_STARTL_EXIT=0x8b
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBDEVICE_STOPCURRENTCLASSCONTROLLER_ENTRY=0x96
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBDEVICE_STOPCURRENTCLASSCONTROLLER_EXIT=0x97
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBDEVICE_STOP_ENTRY=0x8c
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBDEVICE_STOP_EXIT=0x8d
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBDEVICE_UCCNERROR_ENTRY=0x9f
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBDEVICE_UCCNERROR_EXIT=0xa0
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBDEVICE_UCCNGETCLASSCONTROLLERITERATORL_ENTRY=0x9e
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBDUMMYCLASSCONTROLLER_DOCANCEL_ENTRY=0x55e
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBDUMMYCLASSCONTROLLER_DOCANCEL_EXIT=0x55f
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBDUMMYCLASSCONTROLLER_DOGETCONFIGL_ENTRY=0x554
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBDUMMYCLASSCONTROLLER_DOGETCONFIGL_EXIT=0x555
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBDUMMYCLASSCONTROLLER_GETBEHAVIOUR_ENTRY=0x552
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBDUMMYCLASSCONTROLLER_GETBEHAVIOUR_EXIT=0x553
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBDUMMYCLASSCONTROLLER_GETCONFIG_ENTRY=0x556
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBDUMMYCLASSCONTROLLER_GETCONFIG_EXIT=0x557
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBDUMMYCLASSCONTROLLER_NEWL_ENTRY=0x456
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBDUMMYCLASSCONTROLLER_NEWL_ENTRY_DUP1=0x458
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBDUMMYCLASSCONTROLLER_NEWL_EXIT=0x457
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBDUMMYCLASSCONTROLLER_NEWL_EXIT_DUP1=0x459
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBDUMMYCLASSCONTROLLER_NEWL_MUSBCLASSCONTROLLERNOTIFY_TUINT_ENTRY=0x54e
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBDUMMYCLASSCONTROLLER_NEWL_MUSBCLASSCONTROLLERNOTIFY_TUINT_EXIT=0x54f
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBDUMMYCLASSCONTROLLER_NEWL_MUSBCLASSCONTROLLERNOTIFY_TUINT_TINT_ENTRY=0x550
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBDUMMYCLASSCONTROLLER_NEWL_MUSBCLASSCONTROLLERNOTIFY_TUINT_TINT_EXIT=0x551
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBDUMMYCLASSCONTROLLER_RUNL_ENTRY=0x55c
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBDUMMYCLASSCONTROLLER_RUNL_EXIT=0x55d
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBDUMMYCLASSCONTROLLER_START_ENTRY=0x558
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBDUMMYCLASSCONTROLLER_START_EXIT=0x559
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBDUMMYCLASSCONTROLLER_STOP_ENTRY=0x55a
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBDUMMYCLASSCONTROLLER_STOP_EXIT=0x55b
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBHOST_CONSTRUCTL_ENTRY=0x578
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBHOST_CONSTRUCTL_EXIT=0x579
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBHOST_CUSBHOST_CONS_ENTRY=0x576
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBHOST_CUSBHOST_CONS_EXIT=0x577
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBHOST_CUSBHOST_DES_ENTRY=0x574
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBHOST_CUSBHOST_DES_EXIT=0x575
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBHOST_CUSBHOST_ENTRY=0x2d0
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBHOST_CUSBHOST_ENTRY_DUP1=0x2d2
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBHOST_CUSBHOST_EXIT=0x2d1
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBHOST_CUSBHOST_EXIT_DUP1=0x2d3
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBHOST_DEREGISTEROBSERVER_ENTRY=0x580
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBHOST_DEREGISTEROBSERVER_EXIT=0x581
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBHOST_DISABLEDRIVERLOADING_ENTRY=0x590
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBHOST_DISABLEDRIVERLOADING_EXIT=0x591
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBHOST_ENABLEDRIVERLOADING_ENTRY=0x58e
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBHOST_ENABLEDRIVERLOADING_EXIT=0x58f
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBHOST_GETMANUFACTURERSTRINGDESCRIPTOR_ENTRY=0x584
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBHOST_GETMANUFACTURERSTRINGDESCRIPTOR_EXIT=0x585
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBHOST_GETOTGDESCRIPTOR_ENTRY=0x588
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBHOST_GETOTGDESCRIPTOR_EXIT=0x589
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBHOST_GETPRODUCTSTRINGDESCRIPTOR_ENTRY=0x586
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBHOST_GETPRODUCTSTRINGDESCRIPTOR_EXIT=0x587
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBHOST_GETSUPPORTEDLANGUAGES_ENTRY=0x582
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBHOST_GETSUPPORTEDLANGUAGES_EXIT=0x583
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBHOST_NOTIFYHOSTEVENT_ENTRY=0x58a
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBHOST_NOTIFYHOSTEVENT_EXIT=0x58b
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBHOST_REGISTEROBSERVERL_ENTRY=0x57e
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBHOST_REGISTEROBSERVERL_EXIT=0x57f
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBHOST_STARTL_ENTRY=0x57a
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBHOST_STARTL_EXIT=0x57b
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBHOST_STOP_ENTRY=0x57c
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBHOST_STOP_EXIT=0x57d
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBHOST_UPDATENUMOFOBSERVERS_ENTRY=0x58c
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBHOST_UPDATENUMOFOBSERVERS_EXIT=0x58d
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBOTGBASEWATCHER_CUSBOTGBASEWATCHER_CONS_ENTRY=0x5a8
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBOTGBASEWATCHER_CUSBOTGBASEWATCHER_CONS_EXIT=0x5a9
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBOTGBASEWATCHER_CUSBOTGBASEWATCHER_DES_ENTRY=0x5aa
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBOTGBASEWATCHER_CUSBOTGBASEWATCHER_DES_EXIT=0x5ab
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBOTGBASEWATCHER_CUSBOTGBASEWATCHER_ENTRY=0x304
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBOTGBASEWATCHER_CUSBOTGBASEWATCHER_ENTRY_DUP1=0x306
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBOTGBASEWATCHER_CUSBOTGBASEWATCHER_EXIT=0x305
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBOTGBASEWATCHER_CUSBOTGBASEWATCHER_EXIT_DUP1=0x307
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBOTGBASEWATCHER_START_ENTRY=0x5ac
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBOTGBASEWATCHER_START_EXIT=0x5ad
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBOTGCONNECTIONIDLEWATCHER_CONSTRUCTL_ENTRY=0x600
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBOTGCONNECTIONIDLEWATCHER_CONSTRUCTL_EXIT=0x601
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBOTGCONNECTIONIDLEWATCHER_CUSBOTGCONNECTIONIDLEWATCHER_CONS_ENTRY=0x602
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBOTGCONNECTIONIDLEWATCHER_CUSBOTGCONNECTIONIDLEWATCHER_CONS_EXIT=0x603
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBOTGCONNECTIONIDLEWATCHER_CUSBOTGCONNECTIONIDLEWATCHER_DES_ENTRY=0x5fe
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBOTGCONNECTIONIDLEWATCHER_CUSBOTGCONNECTIONIDLEWATCHER_DES_EXIT=0x5ff
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBOTGCONNECTIONIDLEWATCHER_CUSBOTGCONNECTIONIDLEWATCHER_ENTRY=0x35a
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBOTGCONNECTIONIDLEWATCHER_CUSBOTGCONNECTIONIDLEWATCHER_ENTRY_DUP1=0x35e
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBOTGCONNECTIONIDLEWATCHER_CUSBOTGCONNECTIONIDLEWATCHER_EXIT=0x35b
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBOTGCONNECTIONIDLEWATCHER_CUSBOTGCONNECTIONIDLEWATCHER_EXIT_DUP1=0x35f
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBOTGCONNECTIONIDLEWATCHER_DOCANCEL_ENTRY=0x606
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBOTGCONNECTIONIDLEWATCHER_DOCANCEL_EXIT=0x607
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBOTGCONNECTIONIDLEWATCHER_NEWL_ENTRY=0x5fc
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBOTGCONNECTIONIDLEWATCHER_NEWL_EXIT=0x5fd
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBOTGCONNECTIONIDLEWATCHER_POST_ENTRY=0x608
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBOTGCONNECTIONIDLEWATCHER_POST_EXIT=0x609
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBOTGCONNECTIONIDLEWATCHER_RUNL_ENTRY=0x604
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBOTGCONNECTIONIDLEWATCHER_RUNL_EXIT=0x605
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBOTGEVENTWATCHER_CONSTRUCTL_ENTRY=0x5dc
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBOTGEVENTWATCHER_CONSTRUCTL_EXIT=0x5dd
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBOTGEVENTWATCHER_CUSBOTGEVENTWATCHER_CONS_ENTRY=0x5de
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBOTGEVENTWATCHER_CUSBOTGEVENTWATCHER_CONS_EXIT=0x5df
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBOTGEVENTWATCHER_CUSBOTGEVENTWATCHER_DES_ENTRY=0x5da
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBOTGEVENTWATCHER_CUSBOTGEVENTWATCHER_DES_EXIT=0x5db
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBOTGEVENTWATCHER_CUSBOTGEVENTWATCHER_ENTRY=0x336
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBOTGEVENTWATCHER_CUSBOTGEVENTWATCHER_ENTRY_DUP1=0x33a
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBOTGEVENTWATCHER_CUSBOTGEVENTWATCHER_EXIT=0x337
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBOTGEVENTWATCHER_CUSBOTGEVENTWATCHER_EXIT_DUP1=0x33b
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBOTGEVENTWATCHER_DOCANCEL_ENTRY=0x5e2
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBOTGEVENTWATCHER_DOCANCEL_EXIT=0x5e3
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBOTGEVENTWATCHER_NEWL_ENTRY=0x5d8
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBOTGEVENTWATCHER_NEWL_EXIT=0x5d9
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBOTGEVENTWATCHER_POST_ENTRY=0x5e4
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBOTGEVENTWATCHER_POST_EXIT=0x5e5
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBOTGEVENTWATCHER_RUNL_ENTRY=0x5e0
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBOTGEVENTWATCHER_RUNL_EXIT=0x5e1
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBOTGIDPINWATCHER_CONSTRUCTL_ENTRY=0x5b2
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBOTGIDPINWATCHER_CONSTRUCTL_EXIT=0x5b3
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBOTGIDPINWATCHER_CUSBOTGIDPINWATCHER_CONS_ENTRY=0x5b4
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBOTGIDPINWATCHER_CUSBOTGIDPINWATCHER_CONS_EXIT=0x5b5
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBOTGIDPINWATCHER_CUSBOTGIDPINWATCHER_DES_ENTRY=0x5b0
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBOTGIDPINWATCHER_CUSBOTGIDPINWATCHER_DES_EXIT=0x5b1
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBOTGIDPINWATCHER_CUSBOTGIDPINWATCHER_ENTRY=0x30c
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBOTGIDPINWATCHER_CUSBOTGIDPINWATCHER_ENTRY_DUP1=0x310
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBOTGIDPINWATCHER_CUSBOTGIDPINWATCHER_EXIT=0x30d
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBOTGIDPINWATCHER_CUSBOTGIDPINWATCHER_EXIT_DUP1=0x311
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBOTGIDPINWATCHER_DOCANCEL_ENTRY=0x5b8
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBOTGIDPINWATCHER_DOCANCEL_EXIT=0x5b9
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBOTGIDPINWATCHER_NEWL_ENTRY=0x5ae
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBOTGIDPINWATCHER_NEWL_EXIT=0x5af
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBOTGIDPINWATCHER_POST_ENTRY=0x5ba
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBOTGIDPINWATCHER_POST_EXIT=0x5bb
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBOTGIDPINWATCHER_RUNL_ENTRY=0x5b6
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBOTGIDPINWATCHER_RUNL_EXIT=0x5b7
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBOTGSTATEWATCHER_CONSTRUCTL_ENTRY=0x5ce
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBOTGSTATEWATCHER_CONSTRUCTL_EXIT=0x5cf
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBOTGSTATEWATCHER_CUSBOTGSTATEWATCHER_CONS_ENTRY=0x5d0
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBOTGSTATEWATCHER_CUSBOTGSTATEWATCHER_CONS_EXIT=0x5d1
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBOTGSTATEWATCHER_CUSBOTGSTATEWATCHER_DES_ENTRY=0x5cc
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBOTGSTATEWATCHER_CUSBOTGSTATEWATCHER_DES_EXIT=0x5cd
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBOTGSTATEWATCHER_CUSBOTGSTATEWATCHER_ENTRY=0x328
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBOTGSTATEWATCHER_CUSBOTGSTATEWATCHER_EXIT=0x329
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBOTGSTATEWATCHER_DOCANCEL_ENTRY=0x5d4
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBOTGSTATEWATCHER_DOCANCEL_EXIT=0x5d5
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBOTGSTATEWATCHER_NEWL_ENTRY=0x5ca
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBOTGSTATEWATCHER_NEWL_EXIT=0x5cb
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBOTGSTATEWATCHER_POST_ENTRY=0x5d6
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBOTGSTATEWATCHER_POST_EXIT=0x5d7
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBOTGSTATEWATCHER_RUNL_ENTRY=0x5d2
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBOTGSTATEWATCHER_RUNL_EXIT=0x5d3
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBOTGVBUSWATCHER_CONSTRUCTL_ENTRY=0x5c0
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBOTGVBUSWATCHER_CONSTRUCTL_EXIT=0x5c1
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBOTGVBUSWATCHER_CUSBOTGVBUSWATCHER_CONS_ENTRY=0x5c2
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBOTGVBUSWATCHER_CUSBOTGVBUSWATCHER_CONS_EXIT=0x5c3
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBOTGVBUSWATCHER_CUSBOTGVBUSWATCHER_DES_ENTRY=0x5be
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBOTGVBUSWATCHER_CUSBOTGVBUSWATCHER_DES_EXIT=0x5bf
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBOTGVBUSWATCHER_CUSBOTGVBUSWATCHER_ENTRY=0x31a
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBOTGVBUSWATCHER_CUSBOTGVBUSWATCHER_ENTRY_DUP1=0x31e
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBOTGVBUSWATCHER_CUSBOTGVBUSWATCHER_EXIT=0x31b
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBOTGVBUSWATCHER_CUSBOTGVBUSWATCHER_EXIT_DUP1=0x31f
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBOTGVBUSWATCHER_DOCANCEL_ENTRY=0x5c6
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBOTGVBUSWATCHER_DOCANCEL_EXIT=0x5c7
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBOTGVBUSWATCHER_NEWL_ENTRY=0x5bc
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBOTGVBUSWATCHER_NEWL_EXIT=0x5bd
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBOTGVBUSWATCHER_POST_ENTRY=0x5c8
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBOTGVBUSWATCHER_POST_EXIT=0x5c9
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBOTGVBUSWATCHER_RUNL_ENTRY=0x5c4
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBOTGVBUSWATCHER_RUNL_EXIT=0x5c5
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBOTGWATCHER_CUSBOTGWATCHER_CONS_ENTRY=0x5e9
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBOTGWATCHER_CUSBOTGWATCHER_CONS_EXIT=0x5ea
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBOTGWATCHER_CUSBOTGWATCHER_DES_ENTRY=0x5e8
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBOTGWATCHER_CUSBOTGWATCHER_ENTRY=0x344
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBOTGWATCHER_CUSBOTGWATCHER_ENTRY_DUP1=0x345
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBOTGWATCHER_CUSBOTGWATCHER_EXIT_DUP1=0x346
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBOTGWATCHER_DOCANCEL_ENTRY=0x5ee
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBOTGWATCHER_DOCANCEL_EXIT=0x5ef
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBOTGWATCHER_NEWL_ENTRY=0x5e6
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBOTGWATCHER_NEWL_EXIT=0x5e7
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBOTGWATCHER_POST_ENTRY=0x5f2
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBOTGWATCHER_POST_EXIT=0x5f3
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBOTGWATCHER_RUNL_ENTRY=0x5eb
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBOTGWATCHER_RUNL_EXIT=0x5ec
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBOTGWATCHER_RUNL_EXIT_DUP1=0x5ed
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBOTGWATCHER_START_ENTRY=0x5f0
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBOTGWATCHER_START_EXIT=0x5f1
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBOTG_BUSCLEARERROR_ENTRY=0x572
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBOTG_BUSDROP_ENTRY=0x573
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBOTG_BUSREQUEST_ENTRY=0x570
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBOTG_BUSRESPONDSRP_ENTRY=0x571
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBOTG_CONSTRUCTL_ENTRY=0x566
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBOTG_CONSTRUCTL_EXIT=0x567
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBOTG_CUSBOTG_CONS_ENTRY=0x564
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBOTG_CUSBOTG_CONS_EXIT=0x565
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBOTG_CUSBOTG_DES_ENTRY=0x562
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBOTG_CUSBOTG_DES_EXIT=0x563
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBOTG_CUSBOTG_ENTRY=0x2be
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBOTG_CUSBOTG_ENTRY_DUP1=0x2c0
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBOTG_CUSBOTG_ENTRY_DUP1_EXIT=0x2c1
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBOTG_CUSBOTG_EXIT=0x2bf
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBOTG_DEREGISTEROBSERVER_ENTRY=0x56a
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBOTG_DEREGISTEROBSERVER_EXIT=0x56b
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBOTG_NEWL_ENTRY=0x560
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBOTG_NEWL_EXIT=0x561
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBOTG_REGISTEROBSERVERL_ENTRY=0x568
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBOTG_REGISTEROBSERVERL_EXIT=0x569
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBOTG_STARTL_ENTRY=0x56c
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBOTG_STARTL_EXIT=0x56d
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBOTG_STOP_ENTRY=0x56e
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBOTG_STOP_EXIT=0x56f
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBSERVER_CUSBSERVER_ENTRY=0x15e
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBSERVER_CUSBSERVER_EXIT=0x15f
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBSESSION_GETDETAILEDDESCRIPTION_ENTRY=0x26e
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBSESSION_GETDETAILEDDESCRIPTION_EXIT=0x26f
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBSESSION_GETDETAILEDDESCRIPTION_EXIT_DUP1=0x270
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBSESSION_GETDETAILEDDESCRIPTION_EXIT_DUP2=0x271
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CUSBSESSION_GETPERSONALITYPROPERTY_EXIT_DUP1=0x274
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_CUSBDEVICE_GETPERSONALITY_EXIT=0x20b
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_CUSBDEVICE_READPERSONALITIESL_EXIT=0x216
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_CUSBOTGSTATEWATCHER_CUSBOTGSTATEWATCHER_ENTRY=0x32c
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_CUSBOTGSTATEWATCHER_CUSBOTGSTATEWATCHER_EXIT=0x32d
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP2_CUSBDEVICE_READPERSONALITIESL_EXIT=0x217
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CINIFILE_CONSTRUCTL=0x361
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CINIFILE_CONSTRUCTL_DUP1=0x362
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CINIFILE_CONSTRUCTL_DUP2=0x363
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CINIFILE_CONSTRUCTL_DUP3=0x364
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CINIFILE_CONSTRUCTL_DUP4=0x365
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CINIFILE_PANIC=0x360
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CREQUESTSESSIONWATCHER_RUNL=0x3bd
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CREQUESTSESSIONWATCHER_RUNL_DUP1=0x34c
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBDEVICE_BUSENUMERATIONCOMPLETED=0x52
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBDEVICE_BUSENUMERATIONFAILED=0x53
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBDEVICE_BUSENUMERATIONFAILED_DUP1=0x54
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBDEVICE_CONSTRUCTL=0x46
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBDEVICE_CONSTRUCTL_DUP1=0xc0
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBDEVICE_CONSTRUCTL_DUP2=0x48
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBDEVICE_CONSTRUCTL_DUP3=0x49
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBDEVICE_CONSTRUCTL_DUP4=0x4a
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBDEVICE_CONSTRUCTL_DUP5=0x4b
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBDEVICE_CONSTRUCTL_DUP6=0x4c
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBDEVICE_CONSTRUCTL_DUP7=0x4d
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBDEVICE_CONSTRUCTL_DUP8=0x4e
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBDEVICE_CONVERTUIDSL=0x18b
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBDEVICE_CUSBDEVICE=0x42
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBDEVICE_CUSBDEVICE_DUP1=0x43
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBDEVICE_CUSBDEVICE_DUP2=0x44
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBDEVICE_CUSBDEVICE_DUP3=0x45
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBDEVICE_DOCANCEL=0x17d
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBDEVICE_INSTANTIATEEXTENSIONPLUGINSL_DUP1=0x4f
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBDEVICE_POWERUPANDCONNECT=0x55
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBDEVICE_POWERUPANDCONNECT_DUP1=0x56
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBDEVICE_POWERUPANDCONNECT_DUP2=0x57
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBDEVICE_PRINTDESCRIPTOR=0xd6
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBDEVICE_PRINTDESCRIPTOR_DUP1=0x13a
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBDEVICE_PRINTDESCRIPTOR_DUP10=0x143
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBDEVICE_PRINTDESCRIPTOR_DUP11=0x144
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBDEVICE_PRINTDESCRIPTOR_DUP12=0x145
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBDEVICE_PRINTDESCRIPTOR_DUP2=0x13b
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBDEVICE_PRINTDESCRIPTOR_DUP3=0x13c
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBDEVICE_PRINTDESCRIPTOR_DUP4=0x13d
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBDEVICE_PRINTDESCRIPTOR_DUP5=0x13e
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBDEVICE_PRINTDESCRIPTOR_DUP6=0x13f
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBDEVICE_PRINTDESCRIPTOR_DUP7=0x140
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBDEVICE_PRINTDESCRIPTOR_DUP8=0x141
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBDEVICE_PRINTDESCRIPTOR_DUP9=0x142
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBDEVICE_READPERSONALITIESL=0x156
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBDEVICE_READPERSONALITIESL_DUP1=0x159
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBDEVICE_READPERSONALITIESL_DUP10=0x162
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBDEVICE_READPERSONALITIESL_DUP11=0x163
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBDEVICE_READPERSONALITIESL_DUP12=0x164
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBDEVICE_READPERSONALITIESL_DUP13=0x165
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBDEVICE_READPERSONALITIESL_DUP14=0x166
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBDEVICE_READPERSONALITIESL_DUP15=0x167
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBDEVICE_READPERSONALITIESL_DUP16=0x168
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBDEVICE_READPERSONALITIESL_DUP17=0x169
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBDEVICE_READPERSONALITIESL_DUP18=0x16a
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBDEVICE_READPERSONALITIESL_DUP19=0x16b
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBDEVICE_READPERSONALITIESL_DUP2=0x15a
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBDEVICE_READPERSONALITIESL_DUP20=0x16c
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBDEVICE_READPERSONALITIESL_DUP21=0x16d
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBDEVICE_READPERSONALITIESL_DUP22=0x1a2
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBDEVICE_READPERSONALITIESL_DUP23=0x1a3
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBDEVICE_READPERSONALITIESL_DUP24=0x1a4
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBDEVICE_READPERSONALITIESL_DUP3=0x15b
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBDEVICE_READPERSONALITIESL_DUP4=0x15c
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBDEVICE_READPERSONALITIESL_DUP5=0x15d
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBDEVICE_READPERSONALITIESL_DUP6=0x15e
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBDEVICE_READPERSONALITIESL_DUP7=0x15f
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBDEVICE_READPERSONALITIESL_DUP8=0x160
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBDEVICE_READPERSONALITIESL_DUP9=0x161
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBDEVICE_RESOURCEFILENAMEL=0x191
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBDEVICE_RUNERROR=0x5c
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBDEVICE_RUNERROR_DUP1=0x195
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBDEVICE_RUNL=0x58
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBDEVICE_RUNL_DUP1=0x59
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBDEVICE_RUNL_DUP2=0x5a
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBDEVICE_RUNL_DUP3=0x5b
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBDEVICE_RUNL_DUP5=0x194
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBDEVICE_SETDEVICESTATE=0x51
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBDEVICE_SETSERVICESTATE=0x50
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBDEVICE_SETUSBDEVICESETTINGSL=0x149
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBDEVICE_SETUSBDEVICESETTINGSL_DUP1=0x14a
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBDEVICE_SETUSBDEVICESETTINGSL_DUP10=0x19b
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBDEVICE_SETUSBDEVICESETTINGSL_DUP11=0x196
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBDEVICE_SETUSBDEVICESETTINGSL_DUP12=0x19a
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBDEVICE_SETUSBDEVICESETTINGSL_DUP2=0x14b
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBDEVICE_SETUSBDEVICESETTINGSL_DUP3=0x14c
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBDEVICE_SETUSBDEVICESETTINGSL_DUP4=0x14d
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBDEVICE_SETUSBDEVICESETTINGSL_DUP5=0x14e
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBDEVICE_SETUSBDEVICESETTINGSL_DUP6=0x14f
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBDEVICE_SETUSBDEVICESETTINGSL_DUP7=0x197
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBDEVICE_SETUSBDEVICESETTINGSL_DUP8=0x198
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBDEVICE_SETUSBDEVICESETTINGSL_DUP9=0x199
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBDUMMYCLASSCONTROLLER_CONSTRUCTL=0x260
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBDUMMYCLASSCONTROLLER_DOCANCEL=0x280
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBDUMMYCLASSCONTROLLER_DOCANCEL_DUP1=0x281
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBDUMMYCLASSCONTROLLER_DOCANCEL_DUP2=0x282
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBDUMMYCLASSCONTROLLER_DOCANCEL_DUP3=0x283
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBDUMMYCLASSCONTROLLER_DOCANCEL_DUP4=0x284
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBDUMMYCLASSCONTROLLER_GETBEHAVIOUR=0x366
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBDUMMYCLASSCONTROLLER_GETBEHAVIOUR_DUP1=0x367
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBDUMMYCLASSCONTROLLER_GETBEHAVIOUR_DUP2=0x263
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBDUMMYCLASSCONTROLLER_GETBEHAVIOUR_DUP3=0x368
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBDUMMYCLASSCONTROLLER_GETBEHAVIOUR_DUP4=0x265
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBDUMMYCLASSCONTROLLER_GETBEHAVIOUR_DUP5=0x369
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBDUMMYCLASSCONTROLLER_GETBEHAVIOUR_DUP6=0x267
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBDUMMYCLASSCONTROLLER_GETBEHAVIOUR_DUP7=0x36a
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBDUMMYCLASSCONTROLLER_GETBEHAVIOUR_DUP8=0x269
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBDUMMYCLASSCONTROLLER_GETCONFIG=0x36b
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBDUMMYCLASSCONTROLLER_GETCONFIG_DUP1=0x36c
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBDUMMYCLASSCONTROLLER_GETCONFIG_DUP2=0x36d
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBDUMMYCLASSCONTROLLER_GETCONFIG_DUP3=0x36e
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBDUMMYCLASSCONTROLLER_GETCONFIG_DUP4=0x36f
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBDUMMYCLASSCONTROLLER_GETCONFIG_DUP5=0x370
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBDUMMYCLASSCONTROLLER_GETCONFIG_DUP6=0x371
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBDUMMYCLASSCONTROLLER_GETCONFIG_DUP7=0x26a
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBDUMMYCLASSCONTROLLER_RUNERROR=0x285
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBDUMMYCLASSCONTROLLER_RUNL=0x372
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBDUMMYCLASSCONTROLLER_RUNL_DUP1=0x27b
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBDUMMYCLASSCONTROLLER_RUNL_DUP2=0x27c
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBDUMMYCLASSCONTROLLER_RUNL_DUP3=0x27d
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBDUMMYCLASSCONTROLLER_RUNL_DUP4=0x27e
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBDUMMYCLASSCONTROLLER_RUNL_DUP5=0x27f
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBDUMMYCLASSCONTROLLER_START=0x272
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBDUMMYCLASSCONTROLLER_START_DUP1=0x273
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBDUMMYCLASSCONTROLLER_START_DUP2=0x274
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBDUMMYCLASSCONTROLLER_START_DUP3=0x275
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBDUMMYCLASSCONTROLLER_STOP=0x276
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBDUMMYCLASSCONTROLLER_STOP_DUP1=0x277
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBDUMMYCLASSCONTROLLER_STOP_DUP2=0x278
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBDUMMYCLASSCONTROLLER_STOP_DUP3=0x279
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBHOST_DEREGISTEROBSERVER=0x38e
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBHOST_NOTIFYHOSTEVENT=0x38f
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBHOST_NOTIFYHOSTEVENT_DUP1=0x390
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBHOST_NOTIFYHOSTEVENT_DUP2=0x391
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBHOST_NOTIFYHOSTEVENT_DUP3=0x392
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBHOST_NOTIFYHOSTEVENT_DUP4=0x393
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBHOST_NOTIFYHOSTEVENT_DUP5=0x394
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBHOST_STARTL=0x38d
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBOTGCONNECTIONIDLEWATCHER_POST=0x3c0
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBOTGCONNECTIONIDLEWATCHER_POST_DUP1=0x3c1
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBOTGCONNECTIONIDLEWATCHER_POST_DUP2=0x3c2
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBOTGCONNECTIONIDLEWATCHER_POST_DUP3=0x3c3
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBOTGCONNECTIONIDLEWATCHER_RUNL=0x3be
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBOTGCONNECTIONIDLEWATCHER_RUNL_DUP1=0x3bf
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBOTGEVENTWATCHER_LOGEVENTTEXT=0x3ae
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBOTGEVENTWATCHER_LOGEVENTTEXT_DUP1=0x3af
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBOTGEVENTWATCHER_LOGEVENTTEXT_DUP10=0x3b8
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBOTGEVENTWATCHER_LOGEVENTTEXT_DUP2=0x3b0
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBOTGEVENTWATCHER_LOGEVENTTEXT_DUP3=0x3b1
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBOTGEVENTWATCHER_LOGEVENTTEXT_DUP4=0x3b2
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBOTGEVENTWATCHER_LOGEVENTTEXT_DUP5=0x3b3
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBOTGEVENTWATCHER_LOGEVENTTEXT_DUP6=0x3b4
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBOTGEVENTWATCHER_LOGEVENTTEXT_DUP7=0x3b5
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBOTGEVENTWATCHER_LOGEVENTTEXT_DUP8=0x3b6
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBOTGEVENTWATCHER_LOGEVENTTEXT_DUP9=0x3b7
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBOTGEVENTWATCHER_POST=0x3b9
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBOTGEVENTWATCHER_RUNL=0x3aa
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBOTGEVENTWATCHER_RUNL_DUP1=0x3ac
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBOTGEVENTWATCHER_RUNL_DUP2=0x3ad
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBOTGEVENTWATCHER_RUNL_DUP3=0x3ab
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBOTGIDPINWATCHER_POST=0x397
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBOTGIDPINWATCHER_POST_DUP1=0x398
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBOTGIDPINWATCHER_POST_DUP2=0x399
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBOTGIDPINWATCHER_POST_DUP3=0x39a
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBOTGIDPINWATCHER_POST_DUP4=0x39b
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBOTGIDPINWATCHER_POST_DUP5=0x39c
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBOTGIDPINWATCHER_RUNL=0x395
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBOTGIDPINWATCHER_RUNL_DUP1=0x396
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBOTGSTATEWATCHER_POST=0x3a7
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBOTGSTATEWATCHER_POST_DUP1=0x3a8
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBOTGSTATEWATCHER_POST_DUP2=0x3a9
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBOTGSTATEWATCHER_RUNL=0x3a5
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBOTGSTATEWATCHER_RUNL_DUP1=0x3a6
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBOTGVBUSWATCHER_POST=0x39f
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBOTGVBUSWATCHER_POST_DUP1=0x3a0
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBOTGVBUSWATCHER_POST_DUP2=0x3a1
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBOTGVBUSWATCHER_POST_DUP3=0x3a2
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBOTGVBUSWATCHER_POST_DUP4=0x3a3
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBOTGVBUSWATCHER_POST_DUP5=0x3a4
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBOTGVBUSWATCHER_RUNL=0x39d
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBOTGVBUSWATCHER_RUNL_DUP1=0x39e
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBOTGWATCHER_POST=0x3bc
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBOTGWATCHER_RUNL=0x3ba
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBOTGWATCHER_RUNL_DUP1=0x3bb
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBOTG_CONSTRUCTL=0x382
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBOTG_CONSTRUCTL_DUP1=0x383
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBOTG_CONSTRUCTL_DUP2=0x386
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBOTG_CONSTRUCTL_DUP3=0x384
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBOTG_CONSTRUCTL_DUP4=0x385
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBOTG_CONSTRUCTL_DUP5=0x387
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBOTG_CONSTRUCTL_DUP6=0x388
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBOTG_CUSBOTG=0x373
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBOTG_CUSBOTG_DUP1=0x374
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBOTG_CUSBOTG_DUP10=0x37d
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBOTG_CUSBOTG_DUP11=0x37e
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBOTG_CUSBOTG_DUP12=0x37f
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBOTG_CUSBOTG_DUP13=0x380
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBOTG_CUSBOTG_DUP14=0x381
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBOTG_CUSBOTG_DUP2=0x375
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBOTG_CUSBOTG_DUP3=0x376
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBOTG_CUSBOTG_DUP4=0x377
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBOTG_CUSBOTG_DUP5=0x378
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBOTG_CUSBOTG_DUP6=0x379
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBOTG_CUSBOTG_DUP7=0x37a
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBOTG_CUSBOTG_DUP8=0x37b
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBOTG_CUSBOTG_DUP9=0x37c
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBOTG_NOTIFYOTGEVENT=0x389
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBOTG_REGISTEROBSERVERL=0x38a
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBOTG_STOP=0x38b
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBOTG_STOP_DUP1=0x38c
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBSERVER_DECREMENTSESSIONCOUNT_DUP1=0x136
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBSERVER_INCREMENTSESSIONCOUNT_DUP1=0x134
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBSERVER_LAUNCHSHUTDOWNTIMERIFNOSESSIONS=0x137
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBSESSION_GETMANUFACTURERSTRINGDESCRIPTOR_DUP1=0x1d1
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP1_CUSBDEVICE_CONSTRUCTL=0x173
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP1_CUSBDEVICE_CONVERTUIDSL=0x18c
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP1_CUSBDEVICE_CREATECLASSCONTROLLERSL=0x190
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP1_CUSBDEVICE_ENUMERATECLASSCONTROLLERSL=0x177
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP1_CUSBDEVICE_READPERSONALITIESL=0x18d
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP1_CUSBDEVICE_RUNERROR=0x17e
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP1_CUSBDEVICE_RUNL=0x17b
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP1_CUSBDEVICE_SETUSBDEVICESETTINGSFROMPERSONALITYL=0x185
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP1_CUSBDEVICE_SETUSBDEVICESETTINGSL=0x17f
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP1_CUSBDUMMYCLASSCONTROLLER_GETBEHAVIOUR=0x91
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP1_CUSBDUMMYCLASSCONTROLLER_RUNL=0xac
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP1_CUSBMANCENREPMANAGER_READKEYL=0x3ca
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP1_CUSBOTGCONNECTIONIDLEWATCHER_POST_DUP1=0x258
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP1_CUSBOTG_CONSTRUCTL=0x21e
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP1_CUSBOTG_CUSBOTG=0x28
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP1_CUSBSESSION_CUSBSESSION=0x1d3
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP1_CUSBSESSION_DISPATCHMESSAGEL=0x1cf
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP1_CUSBSESSION_GETMANUFACTURERSTRINGDESCRIPTOR=0x1da
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP1_CUSBSESSION_GETSUPPORTEDCLASSES=0x1bd
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP2_CUSBDEVICE_READPERSONALITIESL=0x18e
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP2_CUSBDEVICE_RUNL=0x17c
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP2_CUSBDEVICE_SETUSBDEVICESETTINGSFROMPERSONALITYL=0x186
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP2_CUSBDEVICE_SETUSBDEVICESETTINGSL=0x180
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP2_CUSBDUMMYCLASSCONTROLLER_GETBEHAVIOUR=0x92
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP2_CUSBDUMMYCLASSCONTROLLER_RUNL=0xad
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP2_CUSBSESSION_CUSBSESSION=0x1d4
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP3_CUSBDEVICE_READPERSONALITIESL=0x18f
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP3_CUSBDEVICE_SETUSBDEVICESETTINGSFROMPERSONALITYL=0x187
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP3_CUSBDEVICE_SETUSBDEVICESETTINGSL=0x181
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP3_CUSBDUMMYCLASSCONTROLLER_GETBEHAVIOUR=0x93
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP3_CUSBDUMMYCLASSCONTROLLER_RUNL=0xae
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP4_CUSBDEVICE_SETUSBDEVICESETTINGSFROMPERSONALITYL=0x189
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP4_CUSBDEVICE_SETUSBDEVICESETTINGSL=0x182
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP5_CUSBDEVICE_SETUSBDEVICESETTINGSFROMPERSONALITYL=0x188
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP5_CUSBDEVICE_SETUSBDEVICESETTINGSL=0x183
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP6_CUSBDEVICE_SETUSBDEVICESETTINGSL=0x184
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]__RUNSERVERL=0x8e
--- a/usbmgmt/usbmgrtest/ObexClassController/ObexUsbClassController/ObexClassController/group/CUsbObexClassController.mmp Wed Jul 07 14:16:40 2010 +0800
+++ b/usbmgmt/usbmgrtest/ObexClassController/ObexUsbClassController/ObexClassController/group/CUsbObexClassController.mmp Wed Jul 07 15:08:54 2010 +0800
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2005-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"
@@ -42,11 +42,6 @@
target obexclasscontroller.rsc
END
-START RESOURCE obexusbman.rss
-TARGETPATH /private/101fe1db
-HEADER
-END
-
LIBRARY classcontrollerclientsession.lib
LIBRARY euser.lib
LIBRARY usbclasscontroller.lib
--- a/usbmgmt/usbmgrtest/ObexClassController/ObexUsbClassController/ObexClassController/group/bld.inf Wed Jul 07 14:16:40 2010 +0800
+++ b/usbmgmt/usbmgrtest/ObexClassController/ObexUsbClassController/ObexClassController/group/bld.inf Wed Jul 07 15:08:54 2010 +0800
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2005-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"
@@ -20,3 +20,6 @@
PRJ_TESTMMPFILES
CUsbObexClassController.mmp
+
+PRJ_TESTEXPORTS
+../conf/obexusbman_101fe1db.txt /epoc32/data/z/private/10202be9/obexusbman_101fe1db.txt
--- a/usbmgmt/usbmgrtest/ObexClassController/ObexUsbClassController/ObexClassController/src/obexusbman.rss Wed Jul 07 14:16:40 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,72 +0,0 @@
-/*
-* Copyright (c) 2005-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:
-* Resource file for usbman configuration.
-* This file is needed when implementing Obex over USB.
-* This file needs to be placed in usbman\src\ and a new build needs
-* to be made.
-*
-*/
-
-/**
- @file
-*/
-
-NAME USBM
-
-#include <badef.rh>
-#include "usbman.rh"
-
-#ifdef LANGUAGE_01 // UK English
- #include "usbman_01.rls"
-#elif LANGUAGE_02 // French
- #include "usbman_02.rls"
-#elif defined LANGUAGE_03 // German
- #include "usbman_03.rls"
-#elif defined LANGUAGE_10 // US English
- #include "usbman_10.rls"
-#endif
-
-RESOURCE BA_RSS_SIGNATURE
- {
- signature = 1;
- }
-
-RESOURCE usb_configuration usb_config
- {
- }
-
-
-RESOURCE PERSONALITY_ARRAY device_personalities
- {
- personalities =
- {
- PERSONALITY
- {
- bDeviceClass = 02;
- bDeviceSubClass = 0;
- protocol = 0;
- numConfigurations = 1;
- vendorId = 0x0e22;
- productId = 0x000c;
- bcdDevice = 0;
- manufacturer = per_manufacturer1;
- product = per_product1;
- id = 1;
- class_uids = "101fbf24, 10274339";
- description = per_description1;
- }
- };
- }
-
--- a/usbmgmt/usbmgrtest/t_charging_arm/group/t_usbchargingarm.mmp Wed Jul 07 14:16:40 2010 +0800
+++ b/usbmgmt/usbmgrtest/t_charging_arm/group/t_usbchargingarm.mmp Wed Jul 07 15:08:54 2010 +0800
@@ -51,4 +51,3 @@
// -- Add specific libraries here
LIBRARY centralrepository.lib
-#include <usb/usblogger.mmh>
--- a/usbmgmt/usbmgrtest/t_charging_emu/group/TestPlugin.mmp Wed Jul 07 14:16:40 2010 +0800
+++ b/usbmgmt/usbmgrtest/t_charging_emu/group/TestPlugin.mmp Wed Jul 07 15:08:54 2010 +0800
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2005-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"
@@ -47,13 +47,13 @@
USERINCLUDE ../inc ../../../usbmgr/usbman/chargingplugin/inc
USERINCLUDE ../../../usbmgr/usbman/chargingplugin/inc/default
USERINCLUDE ../../../usbmgr/usbman/chargingplugin/public
+USERINCLUDE ../traces
OS_LAYER_SYSTEMINCLUDE_SYMBIAN
LIBRARY euser.lib
LIBRARY usbmanextensionplugin.lib
LIBRARY centralrepository.lib
-#include <usb/usblogger.mmh>
library flogger.lib
--- a/usbmgmt/usbmgrtest/t_charging_emu/group/TestPluginotg.mmp Wed Jul 07 14:16:40 2010 +0800
+++ b/usbmgmt/usbmgrtest/t_charging_emu/group/TestPluginotg.mmp Wed Jul 07 15:08:54 2010 +0800
@@ -47,16 +47,17 @@
target usbbatterychargingtestpluginotg.rsc
END
-USERINCLUDE ../inc ../../../usbmgr/usbman/chargingplugin/inc
+USERINCLUDE ../inc
+USERINCLUDE ../../../usbmgr/usbman/chargingplugin/inc
USERINCLUDE ../../../usbmgr/usbman/chargingplugin/inc/default
USERINCLUDE ../../../usbmgr/usbman/chargingplugin/public
+USERINCLUDE ../traces
OS_LAYER_SYSTEMINCLUDE_SYMBIAN
LIBRARY euser.lib
LIBRARY usbmanextensionplugin.lib
LIBRARY centralrepository.lib
-#include <usb/usblogger.mmh>
library flogger.lib
--- a/usbmgmt/usbmgrtest/t_charging_emu/src/CUsbBatteryChargingTestPlugin.cpp Wed Jul 07 14:16:40 2010 +0800
+++ b/usbmgmt/usbmgrtest/t_charging_emu/src/CUsbBatteryChargingTestPlugin.cpp Wed Jul 07 15:08:54 2010 +0800
@@ -31,6 +31,11 @@
#include <dummyldd.h>
#define __D32USBC_H__ // ensure that d32usbc is ignored, and dummyldd used instead
#include "CUsbBatteryChargingTestPlugin.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "CUsbBatteryChargingTestPluginTraces.h"
+#endif
+
// Define the private interface UIDs
const TImplementationProxy ImplementationTable[] =
@@ -47,8 +52,8 @@
CUsbBatteryChargingTestPlugin* CUsbBatteryChargingTestPlugin::NewL(MUsbmanExtensionPluginObserver& aObserver)
{
- LOGTEXT(_L8("NewL Test plug-n"));
-
+ OstTrace0( TRACE_NORMAL, CUSBBATTERYCHARGINGTESTPLUGIN_NEWL, _L8("NewL Test plug-n"));
+
CUsbBatteryChargingTestPlugin* self = new(ELeave) CUsbBatteryChargingTestPlugin(aObserver);
CleanupStack::PushL(self);
self->ConstructL();
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usbmgmt/usbmgrtest/t_charging_emu/traces/OstTraceDefinitions.h Wed Jul 07 15:08:54 2010 +0800
@@ -0,0 +1,7 @@
+#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
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usbmgmt/usbmgrtest/t_charging_emu/traces/fixed_id.definitions Wed Jul 07 15:08:54 2010 +0800
@@ -0,0 +1,3 @@
+#Fixed group and trace id definitions. If this file is removed, the identifiers are rebuilt.
+[GROUP]TRACE_NORMAL=0x86
+[TRACE]TRACE_NORMAL[0x86]_CUSBBATTERYCHARGINGTESTPLUGIN_NEWL=0x1
--- a/usbmgmt/usbmgrtest/t_headlessecacm/group/t_headlessecacm.mmp Wed Jul 07 14:16:40 2010 +0800
+++ b/usbmgmt/usbmgrtest/t_headlessecacm/group/t_headlessecacm.mmp Wed Jul 07 15:08:54 2010 +0800
@@ -80,4 +80,3 @@
// performance testing at the level of RDevUsbcClient.
MACRO __HEADLESS_ACM_TEST_CODE__
-#include <usb/usblogger.mmh>
--- a/usbmgmt/usbmgrtest/t_usbmanager_suite/Stub1CC/group/Stub1CC.mmp Wed Jul 07 14:16:40 2010 +0800
+++ b/usbmgmt/usbmgrtest/t_usbmanager_suite/Stub1CC/group/Stub1CC.mmp Wed Jul 07 15:08:54 2010 +0800
@@ -34,7 +34,8 @@
SOURCE Stub1CC.cpp
USERINCLUDE ../inc
-USERINCLUDE ../../../../usbmgr/usbman/server/public
+USERINCLUDE ../../../../usbmgr/usbman/server/public
+USERINCLUDE ../traces
OS_LAYER_SYSTEMINCLUDE_SYMBIAN
@@ -47,4 +48,3 @@
LIBRARY usbclasscontroller.lib
LIBRARY esock.lib
-#include <usb/usblogger.mmh>
--- a/usbmgmt/usbmgrtest/t_usbmanager_suite/Stub1CC/group/bld.inf Wed Jul 07 14:16:40 2010 +0800
+++ b/usbmgmt/usbmgrtest/t_usbmanager_suite/Stub1CC/group/bld.inf Wed Jul 07 15:08:54 2010 +0800
@@ -29,4 +29,3 @@
Stub1CC.mmp
#endif
-
--- a/usbmgmt/usbmgrtest/t_usbmanager_suite/Stub1CC/src/Stub1CC.cpp Wed Jul 07 14:16:40 2010 +0800
+++ b/usbmgmt/usbmgrtest/t_usbmanager_suite/Stub1CC/src/Stub1CC.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,11 +22,10 @@
@file
*/
-#include "Stub1CC.h"
#include <usb_std.h>
#include <es_ini.h>
#include <d32usbc.h>
-#include <usb/usblogger.h>
+#include "Stub1CC.h"
#ifdef __FLOG_ACTIVE
_LIT8(KLogComponent, "STUB1CC");
@@ -34,6 +33,11 @@
#include "usbmaninternalconstants.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "Stub1CCTraces.h"
+#endif
+
// Panic category
@@ -160,32 +164,37 @@
*/
void CUsbstub1ClassController::Start(TRequestStatus& aStatus)
{
- LOG_FUNC
-
+ OstTraceFunctionEntry0( CUSBSTUB1CLASSCONTROLLER_START_ENTRY );
+
aStatus = KRequestPending;
iReportStatus = &aStatus;
//If we are already started then just complete the request.
if (iState == EUsbServiceStarted)
{
User::RequestComplete(iReportStatus, KErrNone);
+ OstTraceFunctionExit0( CUSBSTUB1CLASSCONTROLLER_START_EXIT );
return;
}
if (iFailToStart)
{
User::RequestComplete(iReportStatus, KErrGeneral);
+ OstTraceFunctionExit0( CUSBSTUB1CLASSCONTROLLER_START_EXIT_DUP1 );
return;
}
iState = EUsbServiceStarting;
#ifndef __WINS__
TInt ret = iLdd.Open(0);
- LOGTEXT2(_L8("Open LDD, ret=%d"), ret);
+ OstTrace1( TRACE_NORMAL, CUSBSTUB1CLASSCONTROLLER_START, _L8("Open LDD, ret=%d"), ret );
+
ret = SetUpInterface();
- LOGTEXT2(_L8("SetUpInterface(), ret=%d"), ret);
+ OstTrace1( TRACE_NORMAL, CUSBSTUB1CLASSCONTROLLER_START_DUP1, _L8("SetUpInterface(), ret=%d"), ret );
+
#endif
iTimer.After(iStatus, iStartDelay*1000); //convert from usec to msec
SetActive();
+ OstTraceFunctionExit0( CUSBSTUB1CLASSCONTROLLER_START_EXIT_DUP2 );
}
/**
@@ -195,7 +204,7 @@
*/
void CUsbstub1ClassController::Stop(TRequestStatus& aStatus)
{
- LOG_FUNC
+ OstTraceFunctionEntry0( CUSBSTUB1CLASSCONTROLLER_STOP_ENTRY );
aStatus = KRequestPending;
iReportStatus = &aStatus;
@@ -203,12 +212,14 @@
if (iState == EUsbServiceIdle)
{
User::RequestComplete(iReportStatus, KErrNone);
+ OstTraceFunctionExit0( CUSBSTUB1CLASSCONTROLLER_STOP_EXIT );
return;
}
if (iFailToStop)
{
User::RequestComplete(iReportStatus, KErrGeneral);
+ OstTraceFunctionExit0( CUSBSTUB1CLASSCONTROLLER_STOP_EXIT_DUP1 );
return;
}
@@ -220,6 +231,7 @@
iTimer.After(iStatus, iStopDelay*1000); //convert from usec to msec
SetActive();
+ OstTraceFunctionExit0( DUP2_CUSBSTUB1CLASSCONTROLLER_STOP_EXIT );
}
/**
@@ -229,10 +241,11 @@
*/
void CUsbstub1ClassController::GetDescriptorInfo(TUsbDescriptor& aDescriptorInfo) const
{
- LOG_FUNC
-
+ OstTraceFunctionEntry0( CUSBSTUB1CLASSCONTROLLER_GETDESCRIPTORINFO_ENTRY );
+
aDescriptorInfo.iLength = Kstub1DescriptorLength;
aDescriptorInfo.iNumInterfaces = Kstub1NumberOfInterfacesPerstub1Function;
+ OstTraceFunctionExit0( CUSBSTUB1CLASSCONTROLLER_GETDESCRIPTORINFO_EXIT );
}
@@ -241,9 +254,15 @@
*/
void CUsbstub1ClassController::RunL()
{
- LOG_FUNC
-
- __ASSERT_DEBUG( iStatus == KErrNone, _USB_PANIC(Kstub1CcPanicCategory, EPanicUnexpectedStatus) );
+ OstTraceFunctionEntry0( CUSBSTUB1CLASSCONTROLLER_RUNL_ENTRY );
+
+ if(iStatus != KErrNone)
+ {
+ OstTrace1( TRACE_FATAL, CUSBSTUB1CLASSCONTROLLER_RUNL,
+ "CUsbstub1ClassController::RunL panic with error %d",
+ EPanicUnexpectedState);
+ __ASSERT_DEBUG(EFalse,User::Panic(Kstub1CcPanicCategory,EPanicUnexpectedStatus));
+ }
switch (iState)
{
case EUsbServiceStarting:
@@ -253,10 +272,14 @@
iState = EUsbServiceIdle;
break;
default:
- _USB_PANIC(Kstub1CcPanicCategory, EPanicUnexpectedState);
+ OstTrace1( TRACE_FATAL, CUSBSTUB1CLASSCONTROLLER_RUNL_DUP1,
+ "CUsbstub1ClassController::RunL panic with error %d",
+ EPanicUnexpectedState);
+ User::Panic(Kstub1CcPanicCategory,EPanicUnexpectedStatus);
}
*iReportStatus = KErrNone;
User::RequestComplete(iReportStatus, iStatus.Int());
+ OstTraceFunctionExit0( CUSBSTUB1CLASSCONTROLLER_RUNL_EXIT );
}
/**
@@ -279,7 +302,9 @@
iState = EUsbServiceStarted;
break;
default:
- _USB_PANIC(Kstub1CcPanicCategory, EPanicUnexpectedState);
+ OstTrace1( TRACE_FATAL, CUSBSTUB1CLASSCONTROLLER_DOCANCEL,
+ "CUsbstub1ClassController::DoCancel panic with error %d", EPanicUnexpectedState );
+ User::Panic(Kstub1CcPanicCategory,EPanicUnexpectedStatus);
}
*iReportStatus = KErrNone;
User::RequestComplete(iReportStatus, KErrCancel);
@@ -294,7 +319,9 @@
*/
TInt CUsbstub1ClassController::RunError(TInt /*aError*/)
{
- __ASSERT_DEBUG( EFalse, _USB_PANIC(Kstub1CcPanicCategory, EUnusedFunction) );
+ OstTrace1( TRACE_FATAL, CUSBSTUB1CLASSCONTROLLER_RUNERROR,
+ "CUsbstub1ClassController::RunError panic with error %d", EUnusedFunction);
+ __ASSERT_DEBUG(EFalse,User::Panic(Kstub1CcPanicCategory,EPanicUnexpectedStatus));
return KErrNone;
}
@@ -304,25 +331,33 @@
* endpoint and, if found, configuring the interface.
*/
{
- LOGTEXT(_L8(">>CCdcControlInterface::SetUpInterface"));
-
+ OstTrace0( TRACE_NORMAL, CUSBSTUB1CLASSCONTROLLER_SETUPINTERFACE,
+ _L8(">>CCdcControlInterface::SetUpInterface"));
+
TUsbDeviceCaps dCaps;
TInt ret = iLdd.DeviceCaps(dCaps);
- LOGTEXT(_L8("\tchecking result of DeviceCaps"));
+ OstTrace0( TRACE_NORMAL, CUSBSTUB1CLASSCONTROLLER_SETUPINTERFACE_DUP1,
+ _L8("\tchecking result of DeviceCaps"));
+
if ( ret )
{
- LOGTEXT2(_L8("<<CCdcControlInterface::SetUpInterface ret=%d"), ret);
+ OstTrace1( TRACE_ERROR, CUSBSTUB1CLASSCONTROLLER_SETUPINTERFACE_DUP2,
+ _L8("<<CCdcControlInterface::SetUpInterface ret=%d"), ret );
+
return ret;
}
const TUint KRequiredNumberOfEndpoints = 1; // in addition to endpoint 0.
const TUint totalEndpoints = static_cast<TUint>(dCaps().iTotalEndpoints);
- LOGTEXT2(_L8("\tiTotalEndpoints = %d"), totalEndpoints);
+ OstTrace1( TRACE_NORMAL, CUSBSTUB1CLASSCONTROLLER_SETUPINTERFACE_DUP3,
+ _L8("\tiTotalEndpoints = %d"), totalEndpoints);
+
if ( totalEndpoints < KRequiredNumberOfEndpoints )
{
- LOGTEXT2(_L8("<<CCdcControlInterface::SetUpInterface ret=%d"),
- KErrGeneral);
+ OstTrace1( TRACE_ERROR, CUSBSTUB1CLASSCONTROLLER_SETUPINTERFACE_DUP4,
+ _L8("<<CCdcControlInterface::SetUpInterface ret=%d"), KErrGeneral );
+
return KErrGeneral;
}
@@ -330,10 +365,14 @@
TUsbcEndpointData data[KUsbcMaxEndpoints];
TPtr8 dataptr(reinterpret_cast<TUint8*>(data), sizeof(data), sizeof(data));
ret = iLdd.EndpointCaps(dataptr);
- LOGTEXT(_L8("\tchecking result of EndpointCaps"));
+ OstTrace0( TRACE_NORMAL, CUSBSTUB1CLASSCONTROLLER_SETUPINTERFACE_DUP5,
+ _L8("\tchecking result of EndpointCaps"));
+
if ( ret )
{
- LOGTEXT2(_L8("<<CCdcControlInterface::SetUpInterface ret=%d"), ret);
+ OstTrace1( TRACE_ERROR, CUSBSTUB1CLASSCONTROLLER_SETUPINTERFACE_DUP6,
+ _L8("<<CCdcControlInterface::SetUpInterface ret=%d"), ret );
+
return ret;
}
@@ -343,7 +382,12 @@
for ( TUint i = 0 ; i < totalEndpoints ; i++ )
{
const TUsbcEndpointCaps* caps = &data[i].iCaps;
- __ASSERT_DEBUG(caps,_USB_PANIC(Kstub1CcPanicCategory, EPanicUnexpectedStatus));
+ if(!caps)
+ {
+ OstTrace1( TRACE_FATAL, CUSBSTUB1CLASSCONTROLLER_SETUPINTERFACE_DUP7,
+ "CUsbstub1ClassController::SetUpInterface panic with error %d", EPanicUnexpectedStatus);
+ __ASSERT_DEBUG(EFalse,User::Panic(Kstub1CcPanicCategory,EPanicUnexpectedStatus));
+ }
if (data[i].iInUse)
{
@@ -369,11 +413,14 @@
break;
}
}
- LOGTEXT(_L8("\tchecking epFound"));
+ OstTrace0( TRACE_NORMAL, CUSBSTUB1CLASSCONTROLLER_SETUPINTERFACE_DUP8,
+ _L8("\tchecking epFound"));
+
if ( !epFound )
{
- LOGTEXT2(_L8("<<CCdcControlInterface::SetUpInterface ret=%d"),
- KErrGeneral);
+ OstTrace1( TRACE_ERROR, CUSBSTUB1CLASSCONTROLLER_SETUPINTERFACE_DUP9,
+ _L8("<<CCdcControlInterface::SetUpInterface ret=%d"), KErrGeneral);
+
return KErrGeneral;
}
@@ -385,11 +432,15 @@
ifc().iClass.iSubClassNum = 0x02; // Table 16- Abstract Control Model
ifc().iClass.iProtocolNum = 0x01; // Table 17- Hayes compatible
- LOGTEXT(_L8("\tabout to call SetInterface"));
+ OstTrace0( TRACE_NORMAL, CUSBSTUB1CLASSCONTROLLER_SETUPINTERFACE_DUP10,
+ _L8("\tabout to call SetInterface"));
+
// Zero effectively indicates that alternate interfaces are not used.
ret = iLdd.SetInterface(0, ifc);
- LOGTEXT2(_L8("<<CCdcControlInterface::SetUpInterface ret=%d"), ret);
+ OstTrace1( TRACE_NORMAL, CUSBSTUB1CLASSCONTROLLER_SETUPINTERFACE_DUP11,
+ _L8("<<CCdcControlInterface::SetUpInterface ret=%d"), ret );
+
return ret;
}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usbmgmt/usbmgrtest/t_usbmanager_suite/Stub1CC/traces/OstTraceDefinitions.h Wed Jul 07 15:08:54 2010 +0800
@@ -0,0 +1,7 @@
+#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
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usbmgmt/usbmgrtest/t_usbmanager_suite/Stub1CC/traces/fixed_id.definitions Wed Jul 07 15:08:54 2010 +0800
@@ -0,0 +1,44 @@
+#Fixed group and trace id definitions. If this file is removed, the identifiers are rebuilt.
+[GROUP]TRACE_ERROR=0x82
+[GROUP]TRACE_FATAL=0x81
+[GROUP]TRACE_FLOW=0x8a
+[GROUP]TRACE_NORMAL=0x86
+[TRACE]TRACE_ERROR[0x82]_CUSBSTUB1CLASSCONTROLLER_SETUPINTERFACE_DUP2=0x1
+[TRACE]TRACE_ERROR[0x82]_CUSBSTUB1CLASSCONTROLLER_SETUPINTERFACE_DUP4=0x2
+[TRACE]TRACE_ERROR[0x82]_CUSBSTUB1CLASSCONTROLLER_SETUPINTERFACE_DUP6=0x3
+[TRACE]TRACE_ERROR[0x82]_CUSBSTUB1CLASSCONTROLLER_SETUPINTERFACE_DUP9=0x4
+[TRACE]TRACE_FATAL[0x81]_CUSBSTUB1CLASSCONTROLLER_DOCANCEL=0x3
+[TRACE]TRACE_FATAL[0x81]_CUSBSTUB1CLASSCONTROLLER_RUNERROR=0x4
+[TRACE]TRACE_FATAL[0x81]_CUSBSTUB1CLASSCONTROLLER_RUNL=0x1
+[TRACE]TRACE_FATAL[0x81]_CUSBSTUB1CLASSCONTROLLER_RUNL_DUP1=0x2
+[TRACE]TRACE_FATAL[0x81]_CUSBSTUB1CLASSCONTROLLER_SETUPINTERFACE_DUP7=0x5
+[TRACE]TRACE_FLOW[0x8A]_CUSBSTUB1CLASSCONTROLLER_GETDESCRIPTORINFO_ENTRY=0xb
+[TRACE]TRACE_FLOW[0x8A]_CUSBSTUB1CLASSCONTROLLER_GETDESCRIPTORINFO_EXIT=0xc
+[TRACE]TRACE_FLOW[0x8A]_CUSBSTUB1CLASSCONTROLLER_RUNL_ENTRY=0x9
+[TRACE]TRACE_FLOW[0x8A]_CUSBSTUB1CLASSCONTROLLER_RUNL_EXIT=0xa
+[TRACE]TRACE_FLOW[0x8A]_CUSBSTUB1CLASSCONTROLLER_START_ENTRY=0x1
+[TRACE]TRACE_FLOW[0x8A]_CUSBSTUB1CLASSCONTROLLER_START_EXIT=0x2
+[TRACE]TRACE_FLOW[0x8A]_CUSBSTUB1CLASSCONTROLLER_START_EXIT_DUP1=0x3
+[TRACE]TRACE_FLOW[0x8A]_CUSBSTUB1CLASSCONTROLLER_START_EXIT_DUP2=0x4
+[TRACE]TRACE_FLOW[0x8A]_CUSBSTUB1CLASSCONTROLLER_STOP_ENTRY=0x5
+[TRACE]TRACE_FLOW[0x8A]_CUSBSTUB1CLASSCONTROLLER_STOP_EXIT=0x6
+[TRACE]TRACE_FLOW[0x8A]_CUSBSTUB1CLASSCONTROLLER_STOP_EXIT_DUP1=0x7
+[TRACE]TRACE_FLOW[0x8A]_DUP2_CUSBSTUB1CLASSCONTROLLER_STOP_EXIT=0x8
+[TRACE]TRACE_NORMAL[0x86]_CUSBSTUB1CLASSCONTROLLER_SETUPINTERFACE=0x7
+[TRACE]TRACE_NORMAL[0x86]_CUSBSTUB1CLASSCONTROLLER_SETUPINTERFACE_DUP1=0x8
+[TRACE]TRACE_NORMAL[0x86]_CUSBSTUB1CLASSCONTROLLER_SETUPINTERFACE_DUP10=0x11
+[TRACE]TRACE_NORMAL[0x86]_CUSBSTUB1CLASSCONTROLLER_SETUPINTERFACE_DUP11=0x12
+[TRACE]TRACE_NORMAL[0x86]_CUSBSTUB1CLASSCONTROLLER_SETUPINTERFACE_DUP3=0xa
+[TRACE]TRACE_NORMAL[0x86]_CUSBSTUB1CLASSCONTROLLER_SETUPINTERFACE_DUP5=0xc
+[TRACE]TRACE_NORMAL[0x86]_CUSBSTUB1CLASSCONTROLLER_SETUPINTERFACE_DUP8=0xf
+[TRACE]TRACE_NORMAL[0x86]_CUSBSTUB1CLASSCONTROLLER_START=0x1
+[TRACE]TRACE_NORMAL[0x86]_CUSBSTUB1CLASSCONTROLLER_START_DUP1=0x2
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBSTUB1CLASSCONTROLLER_DOCANCEL=0x5
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBSTUB1CLASSCONTROLLER_RUNERROR=0x6
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBSTUB1CLASSCONTROLLER_RUNL=0x3
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBSTUB1CLASSCONTROLLER_RUNL_DUP1=0x4
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBSTUB1CLASSCONTROLLER_SETUPINTERFACE_DUP2=0x9
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBSTUB1CLASSCONTROLLER_SETUPINTERFACE_DUP4=0xb
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBSTUB1CLASSCONTROLLER_SETUPINTERFACE_DUP6=0xd
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBSTUB1CLASSCONTROLLER_SETUPINTERFACE_DUP7=0xe
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBSTUB1CLASSCONTROLLER_SETUPINTERFACE_DUP9=0x10
--- a/usbmgmt/usbmgrtest/t_usbmanager_suite/Stub2CC/group/Stub2CC.mmp Wed Jul 07 14:16:40 2010 +0800
+++ b/usbmgmt/usbmgrtest/t_usbmanager_suite/Stub2CC/group/Stub2CC.mmp Wed Jul 07 15:08:54 2010 +0800
@@ -34,7 +34,8 @@
SOURCE Stub2CC.cpp
USERINCLUDE ../inc
-USERINCLUDE ../../../../usbmgr/usbman/server/public
+USERINCLUDE ../../../../usbmgr/usbman/server/public
+USERINCLUDE ../traces
OS_LAYER_SYSTEMINCLUDE_SYMBIAN
@@ -47,4 +48,3 @@
LIBRARY usbclasscontroller.lib
LIBRARY esock.lib
-#include <usb/usblogger.mmh>
--- a/usbmgmt/usbmgrtest/t_usbmanager_suite/Stub2CC/src/Stub2CC.cpp Wed Jul 07 14:16:40 2010 +0800
+++ b/usbmgmt/usbmgrtest/t_usbmanager_suite/Stub2CC/src/Stub2CC.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"
@@ -21,12 +21,10 @@
/**
@file
*/
-
-#include "Stub2CC.h"
#include <usb_std.h>
#include <es_ini.h>
#include <d32usbc.h>
-#include <usb/usblogger.h>
+#include "Stub2CC.h"
#ifdef __FLOG_ACTIVE
_LIT8(KLogComponent, "STUB2CC");
@@ -34,6 +32,11 @@
#include "usbmaninternalconstants.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "Stub2CCTraces.h"
+#endif
+
// Panic category
@@ -161,34 +164,39 @@
*/
void CUsbstub2ClassController::Start(TRequestStatus& aStatus)
{
- LOG_FUNC
-
+ OstTraceFunctionEntry0( CUSBSTUB2CLASSCONTROLLER_START_ENTRY );
+
aStatus = KRequestPending;
iReportStatus = &aStatus;
//If we are already started then just complete the request.
if (iState == EUsbServiceStarted)
{
User::RequestComplete(iReportStatus, KErrNone);
+ OstTraceFunctionExit0( CUSBSTUB2CLASSCONTROLLER_START_EXIT );
return;
}
if (iFailToStart)
{
User::RequestComplete(iReportStatus, KErrGeneral);
+ OstTraceFunctionExit0( CUSBSTUB2CLASSCONTROLLER_START_EXIT_DUP1 );
return;
}
iState = EUsbServiceStarting;
#ifndef __WINS__
TInt ret = iLdd.Open(0);
- LOGTEXT2(_L8("Open LDD, ret=%d"), ret);
+ OstTrace1( TRACE_NORMAL, CUSBSTUB2CLASSCONTROLLER_START,_L8("Open LDD, ret=%d"),ret);
ret = SetUpInterface();
- LOGTEXT2(_L8("SetUpInterface(), ret=%d"), ret);
+ OstTrace1( TRACE_NORMAL, CUSBSTUB2CLASSCONTROLLER_START_DUP1,
+ _L8("SetUpInterface(),ret=%d"),ret);
+
#endif
iTimer.After(iStatus, iStartDelay*1000); //convert from usec to msec
SetActive();
+ OstTraceFunctionExit0( CUSBSTUB2CLASSCONTROLLER_START_EXIT_DUP2 );
}
/**
@@ -198,20 +206,21 @@
*/
void CUsbstub2ClassController::Stop(TRequestStatus& aStatus)
{
- LOG_FUNC
-
+ OstTraceFunctionEntry0( CUSBSTUB2CLASSCONTROLLER_STOP_ENTRY );
aStatus = KRequestPending;
iReportStatus = &aStatus;
//If we are already idle then just complete the request.
if (iState == EUsbServiceIdle)
{
User::RequestComplete(iReportStatus, KErrNone);
+ OstTraceFunctionExit0( CUSBSTUB2CLASSCONTROLLER_STOP_EXIT );
return;
}
if (iFailToStop)
{
User::RequestComplete(iReportStatus, KErrGeneral);
+ OstTraceFunctionExit0( CUSBSTUB2CLASSCONTROLLER_STOP_EXIT_DUP1 );
return;
}
@@ -223,6 +232,7 @@
iTimer.After(iStatus, iStopDelay*1000); //convert from usec to msec
SetActive();
+ OstTraceFunctionExit0( CUSBSTUB2CLASSCONTROLLER_STOP_EXIT_DUP2 );
}
/**
@@ -232,10 +242,12 @@
*/
void CUsbstub2ClassController::GetDescriptorInfo(TUsbDescriptor& aDescriptorInfo) const
{
- LOG_FUNC
-
+ OstTraceFunctionEntry0( CUSBSTUB2CLASSCONTROLLER_GETDESCRIPTORINFO_ENTRY );
+
aDescriptorInfo.iLength = Kstub2DescriptorLength;
aDescriptorInfo.iNumInterfaces = Kstub2NumberOfInterfacesPerstub2Function;
+
+ OstTraceFunctionExit0( CUSBSTUB2CLASSCONTROLLER_GETDESCRIPTORINFO_EXIT );
}
@@ -244,9 +256,14 @@
*/
void CUsbstub2ClassController::RunL()
{
- LOG_FUNC
-
- __ASSERT_DEBUG( iStatus == KErrNone, _USB_PANIC(Kstub2CcPanicCategory, EPanicUnexpectedStatus) );
+ OstTraceFunctionEntry0( CUSBSTUB2CLASSCONTROLLER_RUNL_ENTRY );
+
+ if(iStatus != KErrNone)
+ {
+ OstTrace1( TRACE_FATAL, CUSBSTUB2CLASSCONTROLLER_RUNL,
+ "CUsbstub2ClassController::RunL panic with error %d", EPanicUnexpectedStatus);
+ __ASSERT_DEBUG(EFalse,User::Panic(Kstub2CcPanicCategory,EPanicUnexpectedStatus));
+ }
switch (iState)
{
case EUsbServiceStarting:
@@ -255,11 +272,14 @@
case EUsbServiceStopping:
iState = EUsbServiceIdle;
break;
- default:
- _USB_PANIC(Kstub2CcPanicCategory, EPanicUnexpectedState);
+ default:
+ OstTrace1( TRACE_FATAL, CUSBSTUB2CLASSCONTROLLER_RUNL_DUP1,
+ "CUsbstub2ClassController::RunL panic with error %d", EPanicUnexpectedStatus);
+ User::Panic(Kstub2CcPanicCategory, EPanicUnexpectedState);
}
*iReportStatus = KErrNone;
User::RequestComplete(iReportStatus, iStatus.Int());
+ OstTraceFunctionExit0( CUSBSTUB2CLASSCONTROLLER_RUNL_EXIT );
}
/**
@@ -281,8 +301,10 @@
case EUsbServiceStopping:
iState = EUsbServiceStarted;
break;
- default:
- _USB_PANIC(Kstub2CcPanicCategory, EPanicUnexpectedState);
+ default:
+ OstTrace1( TRACE_FATAL, CUSBSTUB2CLASSCONTROLLER_DOCANCEL,
+ "CUsbstub2ClassController::DoCancel panic with error %d", EPanicUnexpectedState );
+ User::Panic(Kstub2CcPanicCategory, EPanicUnexpectedState);
}
*iReportStatus = KErrNone;
User::RequestComplete(iReportStatus, KErrCancel);
@@ -297,7 +319,10 @@
*/
TInt CUsbstub2ClassController::RunError(TInt /*aError*/)
{
- __ASSERT_DEBUG( EFalse, _USB_PANIC(Kstub2CcPanicCategory, EUnusedFunction) );
+ OstTrace1( TRACE_FATAL, CUSBSTUB2CLASSCONTROLLER_RUNERROR,
+ "CUsbstub2ClassController::RunError panic with error %d",
+ EUnusedFunction);
+ __ASSERT_DEBUG(EFalse,User::Panic(Kstub2CcPanicCategory, EUnusedFunction));
return KErrNone;
}
@@ -307,25 +332,33 @@
* endpoint and, if found, configuring the interface.
*/
{
- LOGTEXT(_L8(">>CCdcControlInterface::SetUpInterface"));
-
+ OstTrace0( TRACE_NORMAL, CUSBSTUB2CLASSCONTROLLER_SETUPINTERFACE,
+ _L8(">>CCdcControlInterface::SetUpInterface"));
+
TUsbDeviceCaps dCaps;
TInt ret = iLdd.DeviceCaps(dCaps);
- LOGTEXT(_L8("\tchecking result of DeviceCaps"));
+ OstTrace0( TRACE_NORMAL, CUSBSTUB2CLASSCONTROLLER_SETUPINTERFACE_DUP1,
+ _L8("\tchecking result of DeviceCaps"));
+
if ( ret )
{
- LOGTEXT2(_L8("<<CCdcControlInterface::SetUpInterface ret=%d"), ret);
+ OstTrace1( TRACE_ERROR, CUSBSTUB2CLASSCONTROLLER_SETUPINTERFACE_DUP2,
+ _L8("<<CCdcControlInterface::SetUpInterface ret=%d"), ret );
+
return ret;
}
const TUint KRequiredNumberOfEndpoints = 1; // in addition to endpoint 0.
const TUint totalEndpoints = static_cast<TUint>(dCaps().iTotalEndpoints);
- LOGTEXT2(_L8("\tiTotalEndpoints = %d"), totalEndpoints);
+ OstTrace1( TRACE_NORMAL, CUSBSTUB2CLASSCONTROLLER_SETUPINTERFACE_DUP3,
+ _L8("\tiTotalEndpoints = %d"), totalEndpoints );
+
if ( totalEndpoints < KRequiredNumberOfEndpoints )
{
- LOGTEXT2(_L8("<<CCdcControlInterface::SetUpInterface ret=%d"),
- KErrGeneral);
+ OstTrace1( TRACE_ERROR, CUSBSTUB2CLASSCONTROLLER_SETUPINTERFACE_DUP4,
+ _L8("<<CCdcControlInterface::SetUpInterface ret=%d"), KErrGeneral);
+
return KErrGeneral;
}
@@ -333,10 +366,14 @@
TUsbcEndpointData data[KUsbcMaxEndpoints];
TPtr8 dataptr(reinterpret_cast<TUint8*>(data), sizeof(data), sizeof(data));
ret = iLdd.EndpointCaps(dataptr);
- LOGTEXT(_L8("\tchecking result of EndpointCaps"));
+ OstTrace0( TRACE_NORMAL, CUSBSTUB2CLASSCONTROLLER_SETUPINTERFACE_DUP5,
+ _L8("\tchecking result of EndpointCaps"));
+
if ( ret )
{
- LOGTEXT2(_L8("<<CCdcControlInterface::SetUpInterface ret=%d"), ret);
+ OstTrace1( TRACE_ERROR, CUSBSTUB2CLASSCONTROLLER_SETUPINTERFACE_DUP6,
+ _L8("<<CCdcControlInterface::SetUpInterface ret=%d"), ret );
+
return ret;
}
@@ -346,8 +383,13 @@
for ( TUint i = 0 ; i < totalEndpoints ; i++ )
{
const TUsbcEndpointCaps* caps = &data[i].iCaps;
- __ASSERT_DEBUG(caps,_USB_PANIC(Kstub2CcPanicCategory, EPanicUnexpectedStatus));
-
+ if(!caps)
+ {
+ OstTrace1( TRACE_FATAL, CUSBSTUB2CLASSCONTROLLER_SETUPINTERFACE_DUP7,
+ "CUsbstub2ClassController::SetUpInterface panic with error %d",
+ EPanicUnexpectedStatus);
+ __ASSERT_DEBUG(EFalse,User::Panic(Kstub2CcPanicCategory,EPanicUnexpectedStatus));
+ }
if (data[i].iInUse)
{
continue;
@@ -372,11 +414,13 @@
break;
}
}
- LOGTEXT(_L8("\tchecking epFound"));
+ OstTrace0( TRACE_NORMAL, CUSBSTUB2CLASSCONTROLLER_SETUPINTERFACE_DUP8, _L8("\tchecking epFound"));
+
if ( !epFound )
{
- LOGTEXT2(_L8("<<CCdcControlInterface::SetUpInterface ret=%d"),
- KErrGeneral);
+ OstTrace1( TRACE_NORMAL, CUSBSTUB2CLASSCONTROLLER_SETUPINTERFACE_DUP9,
+ _L8("<<CCdcControlInterface::SetUpInterface ret=%d"), KErrGeneral);
+
return KErrGeneral;
}
@@ -388,11 +432,15 @@
ifc().iClass.iSubClassNum = 0x02; // Table 16- Abstract Control Model
ifc().iClass.iProtocolNum = 0x01; // Table 17- Hayes compatible
- LOGTEXT(_L8("\tabout to call SetInterface"));
+ OstTrace0( TRACE_NORMAL, CUSBSTUB2CLASSCONTROLLER_SETUPINTERFACE_DUP10,
+ _L8("\tabout to call SetInterface"));
+
// Zero effectively indicates that alternate interfaces are not used.
ret = iLdd.SetInterface(0, ifc);
- LOGTEXT2(_L8("<<CCdcControlInterface::SetUpInterface ret=%d"), ret);
+ OstTrace1( TRACE_NORMAL, CUSBSTUB2CLASSCONTROLLER_SETUPINTERFACE_DUP11,
+ _L8("<<CCdcControlInterface::SetUpInterface ret=%d"), ret );
+
return ret;
}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usbmgmt/usbmgrtest/t_usbmanager_suite/Stub2CC/traces/OstTraceDefinitions.h Wed Jul 07 15:08:54 2010 +0800
@@ -0,0 +1,7 @@
+#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
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usbmgmt/usbmgrtest/t_usbmanager_suite/Stub2CC/traces/fixed_id.definitions Wed Jul 07 15:08:54 2010 +0800
@@ -0,0 +1,43 @@
+#Fixed group and trace id definitions. If this file is removed, the identifiers are rebuilt.
+[GROUP]TRACE_ERROR=0x82
+[GROUP]TRACE_FATAL=0x81
+[GROUP]TRACE_FLOW=0x8a
+[GROUP]TRACE_NORMAL=0x86
+[TRACE]TRACE_ERROR[0x82]_CUSBSTUB2CLASSCONTROLLER_SETUPINTERFACE_DUP2=0x1
+[TRACE]TRACE_ERROR[0x82]_CUSBSTUB2CLASSCONTROLLER_SETUPINTERFACE_DUP4=0x2
+[TRACE]TRACE_ERROR[0x82]_CUSBSTUB2CLASSCONTROLLER_SETUPINTERFACE_DUP6=0x3
+[TRACE]TRACE_FATAL[0x81]_CUSBSTUB2CLASSCONTROLLER_DOCANCEL=0x3
+[TRACE]TRACE_FATAL[0x81]_CUSBSTUB2CLASSCONTROLLER_RUNERROR=0x4
+[TRACE]TRACE_FATAL[0x81]_CUSBSTUB2CLASSCONTROLLER_RUNL=0x1
+[TRACE]TRACE_FATAL[0x81]_CUSBSTUB2CLASSCONTROLLER_RUNL_DUP1=0x2
+[TRACE]TRACE_FATAL[0x81]_CUSBSTUB2CLASSCONTROLLER_SETUPINTERFACE_DUP7=0x5
+[TRACE]TRACE_FLOW[0x8A]_CUSBSTUB2CLASSCONTROLLER_GETDESCRIPTORINFO_ENTRY=0x9
+[TRACE]TRACE_FLOW[0x8A]_CUSBSTUB2CLASSCONTROLLER_GETDESCRIPTORINFO_EXIT=0xa
+[TRACE]TRACE_FLOW[0x8A]_CUSBSTUB2CLASSCONTROLLER_RUNL_ENTRY=0xb
+[TRACE]TRACE_FLOW[0x8A]_CUSBSTUB2CLASSCONTROLLER_RUNL_EXIT=0xc
+[TRACE]TRACE_FLOW[0x8A]_CUSBSTUB2CLASSCONTROLLER_START_ENTRY=0x1
+[TRACE]TRACE_FLOW[0x8A]_CUSBSTUB2CLASSCONTROLLER_START_EXIT=0x2
+[TRACE]TRACE_FLOW[0x8A]_CUSBSTUB2CLASSCONTROLLER_START_EXIT_DUP1=0x3
+[TRACE]TRACE_FLOW[0x8A]_CUSBSTUB2CLASSCONTROLLER_START_EXIT_DUP2=0x4
+[TRACE]TRACE_FLOW[0x8A]_CUSBSTUB2CLASSCONTROLLER_STOP_ENTRY=0x5
+[TRACE]TRACE_FLOW[0x8A]_CUSBSTUB2CLASSCONTROLLER_STOP_EXIT=0x6
+[TRACE]TRACE_FLOW[0x8A]_CUSBSTUB2CLASSCONTROLLER_STOP_EXIT_DUP1=0x7
+[TRACE]TRACE_FLOW[0x8A]_CUSBSTUB2CLASSCONTROLLER_STOP_EXIT_DUP2=0x8
+[TRACE]TRACE_NORMAL[0x86]_CUSBSTUB2CLASSCONTROLLER_SETUPINTERFACE=0x7
+[TRACE]TRACE_NORMAL[0x86]_CUSBSTUB2CLASSCONTROLLER_SETUPINTERFACE_DUP1=0x8
+[TRACE]TRACE_NORMAL[0x86]_CUSBSTUB2CLASSCONTROLLER_SETUPINTERFACE_DUP10=0x11
+[TRACE]TRACE_NORMAL[0x86]_CUSBSTUB2CLASSCONTROLLER_SETUPINTERFACE_DUP11=0x12
+[TRACE]TRACE_NORMAL[0x86]_CUSBSTUB2CLASSCONTROLLER_SETUPINTERFACE_DUP3=0xa
+[TRACE]TRACE_NORMAL[0x86]_CUSBSTUB2CLASSCONTROLLER_SETUPINTERFACE_DUP5=0xc
+[TRACE]TRACE_NORMAL[0x86]_CUSBSTUB2CLASSCONTROLLER_SETUPINTERFACE_DUP8=0xf
+[TRACE]TRACE_NORMAL[0x86]_CUSBSTUB2CLASSCONTROLLER_SETUPINTERFACE_DUP9=0x10
+[TRACE]TRACE_NORMAL[0x86]_CUSBSTUB2CLASSCONTROLLER_START=0x1
+[TRACE]TRACE_NORMAL[0x86]_CUSBSTUB2CLASSCONTROLLER_START_DUP1=0x2
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBSTUB2CLASSCONTROLLER_DOCANCEL=0x5
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBSTUB2CLASSCONTROLLER_RUNERROR=0x6
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBSTUB2CLASSCONTROLLER_RUNL=0x3
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBSTUB2CLASSCONTROLLER_RUNL_DUP1=0x4
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBSTUB2CLASSCONTROLLER_SETUPINTERFACE_DUP2=0x9
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBSTUB2CLASSCONTROLLER_SETUPINTERFACE_DUP4=0xb
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBSTUB2CLASSCONTROLLER_SETUPINTERFACE_DUP6=0xd
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBSTUB2CLASSCONTROLLER_SETUPINTERFACE_DUP7=0xe
--- a/usbmgmt/usbmgrtest/t_usbmanager_suite/Stub3CC/group/Stub3CC.mmp Wed Jul 07 14:16:40 2010 +0800
+++ b/usbmgmt/usbmgrtest/t_usbmanager_suite/Stub3CC/group/Stub3CC.mmp Wed Jul 07 15:08:54 2010 +0800
@@ -34,9 +34,11 @@
SOURCE Stub3CC.cpp
USERINCLUDE ../inc
-USERINCLUDE ../../../../usbmgr/usbman/server/public
-
+USERINCLUDE ../../../../usbmgr/usbman/server/public
+USERINCLUDE ../traces
OS_LAYER_SYSTEMINCLUDE_SYMBIAN
+SYSTEMINCLUDE /epoc32/include
+SYSTEMINCLUDE /epoc32/include/ecom
start resource 10203288.rss
@@ -47,4 +49,3 @@
LIBRARY usbclasscontroller.lib
LIBRARY esock.lib
-#include <usb/usblogger.mmh>
--- a/usbmgmt/usbmgrtest/t_usbmanager_suite/Stub3CC/src/Stub3CC.cpp Wed Jul 07 14:16:40 2010 +0800
+++ b/usbmgmt/usbmgrtest/t_usbmanager_suite/Stub3CC/src/Stub3CC.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,11 +22,10 @@
@file
*/
-#include "Stub3CC.h"
#include <usb_std.h>
#include <es_ini.h>
#include <d32usbc.h>
-#include <usb/usblogger.h>
+#include "Stub3CC.h"
#ifdef __FLOG_ACTIVE
_LIT8(KLogComponent, "STUB3CC");
@@ -34,6 +33,11 @@
#include "usbmaninternalconstants.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "Stub3CCTraces.h"
+#endif
+
// Panic category
@@ -162,20 +166,22 @@
*/
void CUsbstub3ClassController::Start(TRequestStatus& aStatus)
{
- LOG_FUNC
-
+ OstTraceFunctionEntry0( CUSBSTUB3CLASSCONTROLLER_START_ENTRY );
+
aStatus = KRequestPending;
iReportStatus = &aStatus;
//If we are already started then just complete the request.
if (iState == EUsbServiceStarted)
{
User::RequestComplete(iReportStatus, KErrNone);
+ OstTraceFunctionExit0( CUSBSTUB3CLASSCONTROLLER_START_EXIT );
return;
}
if (iFailToStart)
{
User::RequestComplete(iReportStatus, KErrGeneral);
+ OstTraceFunctionExit0( CUSBSTUB3CLASSCONTROLLER_START_EXIT_DUP1 );
return;
}
@@ -183,14 +189,18 @@
#ifndef __WINS__
TInt ret = iLdd.Open(0);
- LOGTEXT2(_L8("Open LDD, ret=%d"), ret);
+ OstTrace1( TRACE_NORMAL, CUSBSTUB3CLASSCONTROLLER_START, _L8("Open LDD, ret=%d"), ret );
+
ret = SetUpInterface();
- LOGTEXT2(_L8("SetUpInterface(), ret=%d"), ret);
+ OstTrace1( TRACE_NORMAL, CUSBSTUB3CLASSCONTROLLER_START_DUP1,
+ _L8("SetUpInterface(), ret=%d"), ret );
+
#endif
iTimer.After(iStatus, iStartDelay*1000); //convert from usec to msec
SetActive();
+ OstTraceFunctionExit0( CUSBSTUB3CLASSCONTROLLER_START_EXIT_DUP2 );
}
/**
@@ -200,20 +210,22 @@
*/
void CUsbstub3ClassController::Stop(TRequestStatus& aStatus)
{
- LOG_FUNC
-
+ OstTraceFunctionEntry0( CUSBSTUB3CLASSCONTROLLER_STOP_ENTRY );
+
aStatus = KRequestPending;
iReportStatus = &aStatus;
//If we are already idle then just complete the request.
if (iState == EUsbServiceIdle)
{
User::RequestComplete(iReportStatus, KErrNone);
+ OstTraceFunctionExit0( CUSBSTUB3CLASSCONTROLLER_STOP_EXIT );
return;
}
if (iFailToStop)
{
User::RequestComplete(iReportStatus, KErrGeneral);
+ OstTraceFunctionExit0( CUSBSTUB3CLASSCONTROLLER_STOP_EXIT_DUP1 );
return;
}
@@ -226,6 +238,7 @@
iTimer.After(iStatus, iStopDelay*1000); //convert from usec to msec
SetActive();
+ OstTraceFunctionExit0( CUSBSTUB3CLASSCONTROLLER_STOP_EXIT_DUP2 );
}
/**
@@ -235,10 +248,12 @@
*/
void CUsbstub3ClassController::GetDescriptorInfo(TUsbDescriptor& aDescriptorInfo) const
{
- LOG_FUNC
-
+ OstTraceFunctionEntry0( CUSBSTUB3CLASSCONTROLLER_GETDESCRIPTORINFO_ENTRY );
+
aDescriptorInfo.iLength = Kstub3DescriptorLength;
aDescriptorInfo.iNumInterfaces = Kstub3NumberOfInterfacesPerstub3Function;
+
+ OstTraceFunctionExit0( CUSBSTUB3CLASSCONTROLLER_GETDESCRIPTORINFO_EXIT );
}
@@ -247,9 +262,14 @@
*/
void CUsbstub3ClassController::RunL()
{
- LOG_FUNC
-
- __ASSERT_DEBUG( iStatus == KErrNone, _USB_PANIC(Kstub3CcPanicCategory, EPanicUnexpectedStatus) );
+ OstTraceFunctionEntry0( CUSBSTUB3CLASSCONTROLLER_RUNL_ENTRY );
+
+ if(iStatus != KErrNone)
+ {
+ OstTrace1( TRACE_FATAL, CUSBSTUB3CLASSCONTROLLER_RUNL,
+ "CUsbstub3ClassController::RunL panic with error %d", EPanicUnexpectedStatus );
+ __ASSERT_DEBUG(EFalse,User::Panic(Kstub3CcPanicCategory,EPanicUnexpectedStatus));
+ }
switch (iState)
{
case EUsbServiceStarting:
@@ -259,10 +279,13 @@
iState = EUsbServiceIdle;
break;
default:
- _USB_PANIC(Kstub3CcPanicCategory, EPanicUnexpectedState);
+ OstTrace1( TRACE_FATAL, CUSBSTUB3CLASSCONTROLLER_RUNL_DUP1,
+ "CUsbstub3ClassController::RunL panic with error %d", EPanicUnexpectedStatus );
+ User::Panic(Kstub3CcPanicCategory,EPanicUnexpectedStatus);
}
*iReportStatus = KErrNone;
User::RequestComplete(iReportStatus, iStatus.Int());
+ OstTraceFunctionExit0( CUSBSTUB3CLASSCONTROLLER_RUNL_EXIT );
}
/**
@@ -284,8 +307,10 @@
case EUsbServiceStopping:
iState = EUsbServiceStarted;
break;
- default:
- _USB_PANIC(Kstub3CcPanicCategory, EPanicUnexpectedState);
+ default:
+ OstTrace1( TRACE_FATAL, CUSBSTUB3CLASSCONTROLLER_DOCANCEL,
+ "CUsbstub3ClassController::DoCancel panic with error %d", EPanicUnexpectedStatus );
+ User::Panic(Kstub3CcPanicCategory,EPanicUnexpectedStatus);
}
*iReportStatus = KErrNone;
User::RequestComplete(iReportStatus, KErrCancel);
@@ -300,7 +325,9 @@
*/
TInt CUsbstub3ClassController::RunError(TInt /*aError*/)
{
- __ASSERT_DEBUG( EFalse, _USB_PANIC(Kstub3CcPanicCategory, EUnusedFunction) );
+ OstTrace1( TRACE_FATAL, CUSBSTUB3CLASSCONTROLLER_RUNERROR,
+ "CUsbstub3ClassController::RunError panic with error %d", EUnusedFunction );
+ __ASSERT_DEBUG(EFalse,User::Panic(Kstub3CcPanicCategory,EUnusedFunction));
return KErrNone;
}
@@ -310,25 +337,34 @@
* endpoint and, if found, configuring the interface.
*/
{
- LOG_FUNC
-
+ OstTraceFunctionEntry0( CUSBSTUB3CLASSCONTROLLER_SETUPINTERFACE_ENTRY );
+
TUsbDeviceCaps dCaps;
TInt ret = iLdd.DeviceCaps(dCaps);
- LOGTEXT(_L8("\tchecking result of DeviceCaps"));
+ OstTrace0( TRACE_NORMAL, CUSBSTUB3CLASSCONTROLLER_SETUPINTERFACE,
+ _L8("\tchecking result of DeviceCaps"));
+
if ( ret )
{
- LOGTEXT2(_L8("<<CCdcControlInterface::SetUpInterface ret=%d"), ret);
+ OstTrace1( TRACE_ERROR, CUSBSTUB3CLASSCONTROLLER_SETUPINTERFACE_DUP1,
+ _L8("<<CCdcControlInterface::SetUpInterface ret=%d"), ret );
+
+ OstTraceFunctionExit0( CUSBSTUB3CLASSCONTROLLER_SETUPINTERFACE_EXIT );
return ret;
}
const TUint KRequiredNumberOfEndpoints = 1; // in addition to endpoint 0.
const TUint totalEndpoints = static_cast<TUint>(dCaps().iTotalEndpoints);
- LOGTEXT2(_L8("\tiTotalEndpoints = %d"), totalEndpoints);
+ OstTrace1( TRACE_NORMAL, CUSBSTUB3CLASSCONTROLLER_SETUPINTERFACE_DUP2,
+ _L8("\tiTotalEndpoints = %d"), totalEndpoints );
+
if ( totalEndpoints < KRequiredNumberOfEndpoints )
{
- LOGTEXT2(_L8("<<CCdcControlInterface::SetUpInterface ret=%d"),
- KErrGeneral);
+ OstTrace1( TRACE_ERROR, CUSBSTUB3CLASSCONTROLLER_SETUPINTERFACE_DUP3,
+ _L8("<<CCdcControlInterface::SetUpInterface ret=%d"), KErrGeneral );
+
+ OstTraceFunctionExit0( CUSBSTUB3CLASSCONTROLLER_SETUPINTERFACE_EXIT_DUP1 );
return KErrGeneral;
}
@@ -336,10 +372,15 @@
TUsbcEndpointData data[KUsbcMaxEndpoints];
TPtr8 dataptr(reinterpret_cast<TUint8*>(data), sizeof(data), sizeof(data));
ret = iLdd.EndpointCaps(dataptr);
- LOGTEXT(_L8("\tchecking result of EndpointCaps"));
+ OstTrace0( TRACE_NORMAL, CUSBSTUB3CLASSCONTROLLER_SETUPINTERFACE_DUP4,
+ _L8("\tchecking result of EndpointCaps"));
+
if ( ret )
{
- LOGTEXT2(_L8("<<CCdcControlInterface::SetUpInterface ret=%d"), ret);
+ OstTrace1( TRACE_ERROR, CUSBSTUB3CLASSCONTROLLER_SETUPINTERFACE_DUP5,
+ _L8("<<CCdcControlInterface::SetUpInterface ret=%d"), ret );
+
+ OstTraceFunctionExit0( CUSBSTUB3CLASSCONTROLLER_SETUPINTERFACE_EXIT_DUP2 );
return ret;
}
@@ -349,7 +390,13 @@
for ( TUint i = 0 ; i < totalEndpoints ; i++ )
{
const TUsbcEndpointCaps* caps = &data[i].iCaps;
- __ASSERT_DEBUG(caps,_USB_PANIC(Kstub3CcPanicCategory, EPanicUnexpectedStatus));
+ if(!caps)
+ {
+ OstTrace1( TRACE_FATAL, CUSBSTUB3CLASSCONTROLLER_SETUPINTERFACE_DUP6,
+ "CUsbstub3ClassController::SetUpInterface panic with error %d",
+ EPanicUnexpectedStatus );
+ __ASSERT_DEBUG(EFalse,User::Panic(Kstub3CcPanicCategory,EPanicUnexpectedStatus));
+ }
if (data[i].iInUse)
{
@@ -375,11 +422,14 @@
break;
}
}
- LOGTEXT(_L8("\tchecking epFound"));
+ OstTrace0( TRACE_NORMAL, CUSBSTUB3CLASSCONTROLLER_SETUPINTERFACE_DUP7, _L8("\tchecking epFound"));
+
if ( !epFound )
{
- LOGTEXT2(_L8("<<CCdcControlInterface::SetUpInterface ret=%d"),
- KErrGeneral);
+ OstTrace1( TRACE_ERROR, CUSBSTUB3CLASSCONTROLLER_SETUPINTERFACE_DUP8,
+ _L8("<<CCdcControlInterface::SetUpInterface ret=%d"), KErrGeneral);
+
+ OstTraceFunctionExit0( CUSBSTUB3CLASSCONTROLLER_SETUPINTERFACE_EXIT_DUP3 );
return KErrGeneral;
}
@@ -391,11 +441,16 @@
ifc().iClass.iSubClassNum = 0x02; // Table 16- Abstract Control Model
ifc().iClass.iProtocolNum = 0x01; // Table 17- Hayes compatible
- LOGTEXT(_L8("\tabout to call SetInterface"));
+ OstTrace0( TRACE_NORMAL, CUSBSTUB3CLASSCONTROLLER_SETUPINTERFACE_DUP9,
+ _L8("\tabout to call SetInterface"));
+
// Zero effectively indicates that alternate interfaces are not used.
ret = iLdd.SetInterface(0, ifc);
- LOGTEXT2(_L8("<<CCdcControlInterface::SetUpInterface ret=%d"), ret);
+ OstTrace1( TRACE_NORMAL, CUSBSTUB3CLASSCONTROLLER_SETUPINTERFACE_DUP10,
+ _L8("<<CCdcControlInterface::SetUpInterface ret=%d"), ret );
+
+ OstTraceFunctionExit0( CUSBSTUB3CLASSCONTROLLER_SETUPINTERFACE_EXIT_DUP4 );
return ret;
}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usbmgmt/usbmgrtest/t_usbmanager_suite/Stub3CC/traces/OstTraceDefinitions.h Wed Jul 07 15:08:54 2010 +0800
@@ -0,0 +1,7 @@
+#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
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usbmgmt/usbmgrtest/t_usbmanager_suite/Stub3CC/traces/fixed_id.definitions Wed Jul 07 15:08:54 2010 +0800
@@ -0,0 +1,49 @@
+#Fixed group and trace id definitions. If this file is removed, the identifiers are rebuilt.
+[GROUP]TRACE_ERROR=0x82
+[GROUP]TRACE_FATAL=0x81
+[GROUP]TRACE_FLOW=0x8a
+[GROUP]TRACE_NORMAL=0x86
+[TRACE]TRACE_ERROR[0x82]_CUSBSTUB3CLASSCONTROLLER_SETUPINTERFACE_DUP1=0x1
+[TRACE]TRACE_ERROR[0x82]_CUSBSTUB3CLASSCONTROLLER_SETUPINTERFACE_DUP3=0x2
+[TRACE]TRACE_ERROR[0x82]_CUSBSTUB3CLASSCONTROLLER_SETUPINTERFACE_DUP5=0x3
+[TRACE]TRACE_ERROR[0x82]_CUSBSTUB3CLASSCONTROLLER_SETUPINTERFACE_DUP8=0x4
+[TRACE]TRACE_FATAL[0x81]_CUSBSTUB3CLASSCONTROLLER_DOCANCEL=0x3
+[TRACE]TRACE_FATAL[0x81]_CUSBSTUB3CLASSCONTROLLER_RUNERROR=0x4
+[TRACE]TRACE_FATAL[0x81]_CUSBSTUB3CLASSCONTROLLER_RUNL=0x1
+[TRACE]TRACE_FATAL[0x81]_CUSBSTUB3CLASSCONTROLLER_RUNL_DUP1=0x2
+[TRACE]TRACE_FATAL[0x81]_CUSBSTUB3CLASSCONTROLLER_SETUPINTERFACE_DUP6=0x5
+[TRACE]TRACE_FLOW[0x8A]_CUSBSTUB3CLASSCONTROLLER_GETDESCRIPTORINFO_ENTRY=0x9
+[TRACE]TRACE_FLOW[0x8A]_CUSBSTUB3CLASSCONTROLLER_GETDESCRIPTORINFO_EXIT=0xa
+[TRACE]TRACE_FLOW[0x8A]_CUSBSTUB3CLASSCONTROLLER_RUNL_ENTRY=0xb
+[TRACE]TRACE_FLOW[0x8A]_CUSBSTUB3CLASSCONTROLLER_RUNL_EXIT=0xc
+[TRACE]TRACE_FLOW[0x8A]_CUSBSTUB3CLASSCONTROLLER_SETUPINTERFACE_ENTRY=0xd
+[TRACE]TRACE_FLOW[0x8A]_CUSBSTUB3CLASSCONTROLLER_SETUPINTERFACE_EXIT=0xe
+[TRACE]TRACE_FLOW[0x8A]_CUSBSTUB3CLASSCONTROLLER_SETUPINTERFACE_EXIT_DUP1=0xf
+[TRACE]TRACE_FLOW[0x8A]_CUSBSTUB3CLASSCONTROLLER_SETUPINTERFACE_EXIT_DUP2=0x10
+[TRACE]TRACE_FLOW[0x8A]_CUSBSTUB3CLASSCONTROLLER_SETUPINTERFACE_EXIT_DUP3=0x11
+[TRACE]TRACE_FLOW[0x8A]_CUSBSTUB3CLASSCONTROLLER_SETUPINTERFACE_EXIT_DUP4=0x12
+[TRACE]TRACE_FLOW[0x8A]_CUSBSTUB3CLASSCONTROLLER_START_ENTRY=0x1
+[TRACE]TRACE_FLOW[0x8A]_CUSBSTUB3CLASSCONTROLLER_START_EXIT=0x2
+[TRACE]TRACE_FLOW[0x8A]_CUSBSTUB3CLASSCONTROLLER_START_EXIT_DUP1=0x3
+[TRACE]TRACE_FLOW[0x8A]_CUSBSTUB3CLASSCONTROLLER_START_EXIT_DUP2=0x4
+[TRACE]TRACE_FLOW[0x8A]_CUSBSTUB3CLASSCONTROLLER_STOP_ENTRY=0x5
+[TRACE]TRACE_FLOW[0x8A]_CUSBSTUB3CLASSCONTROLLER_STOP_EXIT=0x6
+[TRACE]TRACE_FLOW[0x8A]_CUSBSTUB3CLASSCONTROLLER_STOP_EXIT_DUP1=0x7
+[TRACE]TRACE_FLOW[0x8A]_CUSBSTUB3CLASSCONTROLLER_STOP_EXIT_DUP2=0x8
+[TRACE]TRACE_NORMAL[0x86]_CUSBSTUB3CLASSCONTROLLER_SETUPINTERFACE=0x7
+[TRACE]TRACE_NORMAL[0x86]_CUSBSTUB3CLASSCONTROLLER_SETUPINTERFACE_DUP10=0x11
+[TRACE]TRACE_NORMAL[0x86]_CUSBSTUB3CLASSCONTROLLER_SETUPINTERFACE_DUP2=0x9
+[TRACE]TRACE_NORMAL[0x86]_CUSBSTUB3CLASSCONTROLLER_SETUPINTERFACE_DUP4=0xb
+[TRACE]TRACE_NORMAL[0x86]_CUSBSTUB3CLASSCONTROLLER_SETUPINTERFACE_DUP7=0xe
+[TRACE]TRACE_NORMAL[0x86]_CUSBSTUB3CLASSCONTROLLER_SETUPINTERFACE_DUP9=0x10
+[TRACE]TRACE_NORMAL[0x86]_CUSBSTUB3CLASSCONTROLLER_START=0x1
+[TRACE]TRACE_NORMAL[0x86]_CUSBSTUB3CLASSCONTROLLER_START_DUP1=0x2
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBSTUB3CLASSCONTROLLER_DOCANCEL=0x5
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBSTUB3CLASSCONTROLLER_RUNERROR=0x6
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBSTUB3CLASSCONTROLLER_RUNL=0x3
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBSTUB3CLASSCONTROLLER_RUNL_DUP1=0x4
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBSTUB3CLASSCONTROLLER_SETUPINTERFACE_DUP1=0x8
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBSTUB3CLASSCONTROLLER_SETUPINTERFACE_DUP3=0xa
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBSTUB3CLASSCONTROLLER_SETUPINTERFACE_DUP5=0xc
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBSTUB3CLASSCONTROLLER_SETUPINTERFACE_DUP6=0xd
+[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CUSBSTUB3CLASSCONTROLLER_SETUPINTERFACE_DUP8=0xf
--- a/usbmgmt/usbmgrtest/t_usbmanager_suite/mscc/group/te_msclasscontroller.mmp Wed Jul 07 14:16:40 2010 +0800
+++ b/usbmgmt/usbmgrtest/t_usbmanager_suite/mscc/group/te_msclasscontroller.mmp Wed Jul 07 15:08:54 2010 +0800
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2004-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"
@@ -42,6 +42,7 @@
USERINCLUDE ../inc
USERINCLUDE ../../../../usbmgr/device/classdrivers/ms/classcontroller/inc
+USERINCLUDE ../../../../usbmgr/device/classdrivers/ms/classcontroller/traces
OS_LAYER_SYSTEMINCLUDE_SYMBIAN
LIBRARY euser.lib
@@ -51,4 +52,3 @@
LIBRARY bafl.lib
LIBRARY usbclasscontroller.lib
-#include <usb/usblogger.mmh>
--- a/usbmgmt/usbmgrtest/usbmsapp/usbms_stub/group/usbms_stub1cc.mmp Wed Jul 07 14:16:40 2010 +0800
+++ b/usbmgmt/usbmgrtest/usbmsapp/usbms_stub/group/usbms_stub1cc.mmp 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"
@@ -36,6 +36,7 @@
USERINCLUDE ../inc
USERINCLUDE ../../../../usbmgr/usbman/server/public
+USERINCLUDE ../traces
OS_LAYER_SYSTEMINCLUDE_SYMBIAN
--- a/usbmgmt/usbmgrtest/usbmsapp/usbms_stub/group/usbms_stub2cc.mmp Wed Jul 07 14:16:40 2010 +0800
+++ b/usbmgmt/usbmgrtest/usbmsapp/usbms_stub/group/usbms_stub2cc.mmp 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"
@@ -36,6 +36,7 @@
USERINCLUDE ../inc
USERINCLUDE ../../../../usbmgr/usbman/server/public
+USERINCLUDE ../traces
OS_LAYER_SYSTEMINCLUDE_SYMBIAN
--- a/usbmgmt/usbmgrtest/usbmsapp/usbms_stub/group/usbms_stub3cc.mmp Wed Jul 07 14:16:40 2010 +0800
+++ b/usbmgmt/usbmgrtest/usbmsapp/usbms_stub/group/usbms_stub3cc.mmp 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"
@@ -36,6 +36,7 @@
USERINCLUDE ../inc
USERINCLUDE ../../../../usbmgr/usbman/server/public
+USERINCLUDE ../traces
OS_LAYER_SYSTEMINCLUDE_SYMBIAN
--- a/usbmgmt/usbmgrtest/usbmsapp/usbms_stub/src/usbms_stub.cpp Wed Jul 07 14:16:40 2010 +0800
+++ b/usbmgmt/usbmgrtest/usbmsapp/usbms_stub/src/usbms_stub.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,14 +22,17 @@
@file
*/
-#include "usbms_stub.h"
#include <usb_std.h>
#include <es_ini.h>
#include <d32usbc.h>
+#include "usbms_stub.h"
#include "UsbmanInternalConstants.h"
-#define _USB_PANIC(CAT, CODE) User::Panic(CAT, CODE)
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "usbms_stubTraces.h"
+#endif
// Panic category
_LIT( Kstub3CcPanicCategory, "UsbstubCc" );
@@ -188,8 +191,15 @@
*/
void CUsbstub3ClassController::RunL()
{
-
- __ASSERT_DEBUG( iStatus == KErrNone, _USB_PANIC(Kstub3CcPanicCategory, EPanicUnexpectedStatus) );
+ if(iStatus != KErrNone)
+ {
+ OstTrace1( TRACE_FATAL, CUSBSTUB3CLASSCONTROLLER_RUNL,
+ "CUsbstub3ClassController::RunL panic with error %d",
+ EPanicUnexpectedState);
+
+ __ASSERT_DEBUG(EFalse, User::Panic(Kstub3CcPanicCategory, EPanicUnexpectedStatus));
+ }
+
switch (iState)
{
case EUsbServiceStarting:
@@ -198,8 +208,10 @@
case EUsbServiceStopping:
iState = EUsbServiceIdle;
break;
- default:
- _USB_PANIC(Kstub3CcPanicCategory, EPanicUnexpectedState);
+ default:
+ OstTrace1( TRACE_FATAL, CUSBSTUB3CLASSCONTROLLER_RUNL_DUP1,
+ "CUsbstub3ClassController::RunL panic with error %d", EPanicUnexpectedState);
+ User::Panic(Kstub3CcPanicCategory,EPanicUnexpectedState);
}
*iReportStatus = KErrNone;
User::RequestComplete(iReportStatus, iStatus.Int());
@@ -224,8 +236,11 @@
case EUsbServiceStopping:
iState = EUsbServiceStarted;
break;
- default:
- _USB_PANIC(Kstub3CcPanicCategory, EPanicUnexpectedState);
+ default:
+ OstTrace1( TRACE_FATAL, CUSBSTUB3CLASSCONTROLLER_DOCANCEL,
+ "CUsbstub3ClassController::DoCancel panic with error %d",
+ EPanicUnexpectedState);
+ User::Panic(Kstub3CcPanicCategory, EPanicUnexpectedState);
}
*iReportStatus = KErrNone;
User::RequestComplete(iReportStatus, KErrCancel);
@@ -240,7 +255,10 @@
*/
TInt CUsbstub3ClassController::RunError(TInt /*aError*/)
{
- __ASSERT_DEBUG( EFalse, _USB_PANIC(Kstub3CcPanicCategory, EUnusedFunction) );
+ OstTrace1( TRACE_FATAL, CUSBSTUB3CLASSCONTROLLER_RUNERROR,
+ "CUsbstub3ClassController::RunError panic with error %d",
+ EUnusedFunction);
+ __ASSERT_DEBUG( EFalse, User::Panic(Kstub3CcPanicCategory, EUnusedFunction));
return KErrNone;
}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usbmgmt/usbmgrtest/usbmsapp/usbms_stub/traces/OstTraceDefinitions.h Wed Jul 07 15:08:54 2010 +0800
@@ -0,0 +1,7 @@
+#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
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usbmgmt/usbmgrtest/usbmsapp/usbms_stub/traces/fixed_id.definitions Wed Jul 07 15:08:54 2010 +0800
@@ -0,0 +1,6 @@
+#Fixed group and trace id definitions. If this file is removed, the identifiers are rebuilt.
+[GROUP]TRACE_NORMAL=0x86
+[TRACE]TRACE_NORMAL[0x86]_CUSBSTUB3CLASSCONTROLLER_DOCANCEL=0x3
+[TRACE]TRACE_NORMAL[0x86]_CUSBSTUB3CLASSCONTROLLER_RUNERROR=0x4
+[TRACE]TRACE_NORMAL[0x86]_CUSBSTUB3CLASSCONTROLLER_RUNL=0x1
+[TRACE]TRACE_NORMAL[0x86]_CUSBSTUB3CLASSCONTROLLER_RUNL_DUP1=0x2