--- a/usbmgmt/usbmgr/device/classdrivers/acm/classimplementation/ecacm/src/CdcControlInterface.cpp Thu Jul 15 20:42:20 2010 +0300
+++ b/usbmgmt/usbmgr/device/classdrivers/acm/classimplementation/ecacm/src/CdcControlInterface.cpp Tue Aug 31 17:01:47 2010 +0300
@@ -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;
}