--- a/usbmgmt/usbmgr/device/classdrivers/acm/classcontroller/SRC/CUsbACMClassController.cpp Tue Aug 31 17:01:47 2010 +0300
+++ b/usbmgmt/usbmgr/device/classdrivers/acm/classcontroller/SRC/CUsbACMClassController.cpp Wed Sep 01 12:35:00 2010 +0100
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 1997-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 1997-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"
@@ -22,21 +22,22 @@
@file
*/
+#include "CUsbACMClassController.h"
#include <usb_std.h>
#include <acminterface.h>
-#include <usb/acmserver.h>
-#include "CUsbACMClassController.h"
+#include <usb/acmserver.h>
#include "UsbmanInternalConstants.h"
+#include <usb/usblogger.h>
#include "acmserverconsts.h"
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "CUsbACMClassControllerTraces.h"
+
+#ifdef __FLOG_ACTIVE
+_LIT8(KLogComponent, "ACMCC");
+
+// Panic category
+_LIT( KAcmCcPanicCategory, "UsbAcmCc" );
+
#endif
-#ifdef _DEBUG
-// Panic category
-_LIT( KAcmCcPanicCategory, "UsbAcmCc" );
-#endif
/**
@@ -66,13 +67,12 @@
*/
CUsbACMClassController* CUsbACMClassController::NewL(MUsbClassControllerNotify& aOwner)
{
- OstTraceFunctionEntry0( CUSBACMCLASSCONTROLLER_NEWL_ENTRY );
+ LOG_STATIC_FUNC_ENTRY
CUsbACMClassController* self = new (ELeave) CUsbACMClassController(aOwner);
CleanupStack::PushL(self);
self->ConstructL();
CleanupStack::Pop(self);
- OstTraceFunctionExit0( CUSBACMCLASSCONTROLLER_NEWL_EXIT );
return self;
}
@@ -81,7 +81,6 @@
*/
CUsbACMClassController::~CUsbACMClassController()
{
- OstTraceFunctionEntry0( CUSBACMCLASSCONTROLLER_CUSBACMCLASSCONTROLLER_DES_ENTRY );
Cancel();
#ifdef USE_ACM_REGISTRATION_PORT
@@ -90,7 +89,6 @@
#else
iAcmServer.Close();
#endif // USE_ACM_REGISTRATION_PORT
- OstTraceFunctionExit0( CUSBACMCLASSCONTROLLER_CUSBACMCLASSCONTROLLER_DES_EXIT );
}
/**
@@ -103,8 +101,6 @@
: CUsbClassControllerPlugIn(aOwner, KAcmStartupPriority),
iNumberOfAcmFunctions(KDefaultNumberOfAcmFunctions)
{
- OstTraceFunctionEntry0( CUSBACMCLASSCONTROLLER_CUSBACMCLASSCONTROLLER_CONS_ENTRY );
- OstTraceFunctionExit0( CUSBACMCLASSCONTROLLER_CUSBACMCLASSCONTROLLER_CONS_EXIT );
}
/**
@@ -112,8 +108,6 @@
*/
void CUsbACMClassController::ConstructL()
{
- OstTraceFunctionEntry0( CUSBACMCLASSCONTROLLER_CONSTRUCTL_ENTRY );
-
iNumberOfAcmFunctions = KUsbAcmNumberOfAcmFunctions;
iAcmProtocolNum[0] = KUsbAcmProtocolNumAcm1;
@@ -124,45 +118,21 @@
// 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.
- err = iComm.Open(iCommServer, portName, ECommShared);
- if (err < 0)
- {
- OstTrace1( TRACE_ERROR, CUSBACMCLASSCONTROLLER_CONSTRUCTL_DUP2, "CUsbACMClassController::ConstructL;leave err=%d", err );
- User::Leave(err);
- }
+ LEAVEIFERRORL(iComm.Open(iCommServer, portName, ECommShared));
#else
-
- err = iAcmServer.Connect();
- if (err < 0)
- {
- OstTrace1( TRACE_ERROR, CUSBACMCLASSCONTROLLER_CONSTRUCTL_DUP3, "CUsbACMClassController::ConstructL;leave err=%d", err );
- User::Leave(err);
- }
+
+ LEAVEIFERRORL(iAcmServer.Connect());
#endif // USE_ACM_REGISTRATION_PORT
- OstTraceFunctionExit0( CUSBACMCLASSCONTROLLER_CONSTRUCTL_EXIT );
}
/**
@@ -173,30 +143,24 @@
*/
void CUsbACMClassController::Start(TRequestStatus& aStatus)
{
- OstTraceFunctionEntry0( CUSBACMCLASSCONTROLLER_START_ENTRY );
+ LOG_FUNC;
// We should always be idle when this function is called (guaranteed by
// CUsbSession).
- if (iState != EUsbServiceIdle)
- {
- OstTrace1( TRACE_FATAL, CUSBACMCLASSCONTROLLER_START, "CUsbACMClassController::Start;iState=%d", (TInt)iState );
- __ASSERT_DEBUG( EFalse, User::Panic(KAcmCcPanicCategory, EBadApiCallStart) );
- }
+ __ASSERT_DEBUG( iState == EUsbServiceIdle, _USB_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()
{
- OstTraceFunctionEntry0( CUSBACMCLASSCONTROLLER_DOSTARTL_ENTRY );
-
+ LOG_FUNC
iState = EUsbServiceStarting;
- OstTrace1( TRACE_NORMAL, CUSBACMCLASSCONTROLLER_DOSTARTL, "CUsbACMClassController::DoStartL;iNumberOfAcmFunctions=%d", iNumberOfAcmFunctions );
+ LOGTEXT2(_L8(" iNumberOfAcmFunctions = %d"), iNumberOfAcmFunctions);
#ifdef USE_ACM_REGISTRATION_PORT
@@ -204,22 +168,21 @@
TUint acmSetting;
for (TUint i = 0; i < iNumberOfAcmFunctions; i++)
{
- OstTrace1( TRACE_NORMAL, CUSBACMCLASSCONTROLLER_DOSTARTL_DUP1, "CUsbACMClassController::DoStartL;iAcmProtocolNum[i]=%u", iAcmProtocolNum[i] );
+ LOGTEXT2(_L8(" iAcmProtocolNum[i] = %d"), 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)
{
- OstTrace1( TRACE_NORMAL, CUSBACMCLASSCONTROLLER_DOSTARTL_DUP2, "CUsbACMClassController::DoStartL;SetSignalsToMark error = %d", err );
+ LOGTEXT2(_L8(" 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);
}
- OstTrace1( TRACE_ERROR, CUSBACMCLASSCONTROLLER_DOSTARTL_DUP6, "CUsbACMClassController::DoStartL;leave err=%d", err );
- User::Leave(err);
+ LEAVEL(err);
}
}
@@ -235,23 +198,20 @@
if ( err != KErrNone )
{
- OstTrace1( TRACE_NORMAL, CUSBACMCLASSCONTROLLER_DOSTARTL_DUP3, "CUsbACMClassController::DoStartL;\tFailed to create ACM function. Error: %d", err);
-
+ LOGTEXT2(_L8("\tFailed to create ACM function. Error: %d"), err);
if (i != 0)
{
//Must clear any ACMs that have been completed
iAcmServer.DestroyFunctions(i);
- OstTrace1( TRACE_NORMAL, CUSBACMCLASSCONTROLLER_DOSTARTL_DUP4, "CUsbACMClassController::DoStartL;\tDestroyed %d Interfaces", i );
+ LOGTEXT2(_L8("\tDestroyed %d Interfaces"), i);
}
- OstTrace1( TRACE_NORMAL, CUSBACMCLASSCONTROLLER_DOSTARTL_DUP7, "CUsbACMClassController::DoStartL; leave Error: %d", err);
- User::Leave(err);
+ LEAVEL(err);
}
}
#endif // USE_ACM_REGISTRATION_PORT
- OstTrace1( TRACE_NORMAL, CUSBACMCLASSCONTROLLER_DOSTARTL_DUP5, "CUsbACMClassController::DoStartL;\tCreated %d ACM Interfaces", iNumberOfAcmFunctions );
- OstTraceFunctionExit0( CUSBACMCLASSCONTROLLER_DOSTARTL_EXIT );
+ LOGTEXT2(_L8("\tCreated %d ACM Interfaces"), iNumberOfAcmFunctions);
}
/**
@@ -261,21 +221,15 @@
*/
void CUsbACMClassController::Stop(TRequestStatus& aStatus)
{
- OstTraceFunctionEntry0( CUSBACMCLASSCONTROLLER_STOP_ENTRY );
+ LOG_FUNC;
// We should always be started when this function is called (guaranteed by
// CUsbSession).
- //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) );
- }
+ __ASSERT_DEBUG( iState == EUsbServiceStarted, _USB_PANIC(KAcmCcPanicCategory, EBadApiCallStop) );
TRequestStatus* reportStatus = &aStatus;
DoStop();
User::RequestComplete(reportStatus, KErrNone);
- OstTraceFunctionExit0( CUSBACMCLASSCONTROLLER_STOP_EXIT );
}
/**
@@ -285,10 +239,10 @@
*/
void CUsbACMClassController::GetDescriptorInfo(TUsbDescriptor& aDescriptorInfo) const
{
- OstTraceFunctionEntry0( CUSBACMCLASSCONTROLLER_GETDESCRIPTORINFO_ENTRY );
+ LOG_FUNC;
+
aDescriptorInfo.iLength = KAcmDescriptorLength;
aDescriptorInfo.iNumInterfaces = KAcmNumberOfInterfacesPerAcmFunction*(iNumberOfAcmFunctions);
- OstTraceFunctionExit0( CUSBACMCLASSCONTROLLER_GETDESCRIPTORINFO_EXIT );
}
/**
@@ -296,16 +250,13 @@
*/
void CUsbACMClassController::DoStop()
{
- OstTraceFunctionEntry0( CUSBACMCLASSCONTROLLER_DOSTOP_ENTRY );
+ LOG_FUNC;
+
if (iState == EUsbServiceStarted)
{
#ifdef USE_ACM_REGISTRATION_PORT
TInt err = iComm.SetSignalsToSpace(iNumberOfAcmFunctions);
- if (err != KErrNone)
- {
- OstTrace1( TRACE_FATAL, CUSBACMCLASSCONTROLLER_DOSTOP_DUP1, "CUsbACMClassController::DoStop;err=%d", err );
- User::Invariant();
- }
+ __ASSERT_DEBUG(err == KErrNone, User::Invariant());
//the implementation in CRegistrationPort always return KErrNone
(void)err;
// If there is an error here, USBSVR will just ignore it, but
@@ -317,10 +268,11 @@
// Destroy interfaces. Can't do anything with an error here.
static_cast<void>(iAcmServer.DestroyFunctions(iNumberOfAcmFunctions));
#endif // USE_ACM_REGISTRATION_PORT
- OstTrace1( TRACE_NORMAL, CUSBACMCLASSCONTROLLER_DOSTOP, "CUsbACMClassController::DoStop;\tDestroyed %d Interfaces", iNumberOfAcmFunctions );
+
+ LOGTEXT2(_L8("\tDestroyed %d Interfaces"), iNumberOfAcmFunctions);
+
iState = EUsbServiceIdle;
}
- OstTraceFunctionExit0( CUSBACMCLASSCONTROLLER_DOSTOP_EXIT );
}
/**
@@ -329,10 +281,7 @@
*/
void CUsbACMClassController::RunL()
{
- OstTraceFunctionEntry0( CUSBACMCLASSCONTROLLER_RUNL_ENTRY );
- OstTrace0( TRACE_FATAL, CUSBACMCLASSCONTROLLER_RUNL, "CUsbACMClassController::RunL;EUnusedFunction" );
- __ASSERT_DEBUG( EFalse, User::Panic(KAcmCcPanicCategory, EUnusedFunction) );
- OstTraceFunctionExit0( CUSBACMCLASSCONTROLLER_RUNL_EXIT );
+ __ASSERT_DEBUG( EFalse, _USB_PANIC(KAcmCcPanicCategory, EUnusedFunction) );
}
/**
@@ -341,10 +290,7 @@
*/
void CUsbACMClassController::DoCancel()
{
- OstTraceFunctionEntry0( CUSBACMCLASSCONTROLLER_DOCANCEL_ENTRY );
- OstTrace0( TRACE_FATAL, CUSBACMCLASSCONTROLLER_DOCANCEL, "CUsbACMClassController::DoCancel;EUnusedFunction" );
- __ASSERT_DEBUG( EFalse, User::Panic(KAcmCcPanicCategory, EUnusedFunction) );
- OstTraceFunctionExit0( CUSBACMCLASSCONTROLLER_DOCANCEL_EXIT );
+ __ASSERT_DEBUG( EFalse, _USB_PANIC(KAcmCcPanicCategory, EUnusedFunction) );
}
/**
@@ -356,9 +302,6 @@
*/
TInt CUsbACMClassController::RunError(TInt /*aError*/)
{
- OstTraceFunctionEntry0( CUSBACMCLASSCONTROLLER_RUNERROR_ENTRY );
- OstTrace0( TRACE_FATAL, CUSBACMCLASSCONTROLLER_RUNERROR, "CUsbACMClassController::RunError;EUnusedFunction" );
- __ASSERT_DEBUG( EFalse, User::Panic(KAcmCcPanicCategory, EUnusedFunction) );
- OstTraceFunctionExit0( CUSBACMCLASSCONTROLLER_RUNERROR_EXIT );
+ __ASSERT_DEBUG( EFalse, _USB_PANIC(KAcmCcPanicCategory, EUnusedFunction) );
return KErrNone;
}