--- a/usbmgmt/usbmgrtest/t_usbmanager_suite/Stub1CC/src/Stub1CC.cpp Tue Aug 31 17:01:47 2010 +0300
+++ b/usbmgmt/usbmgrtest/t_usbmanager_suite/Stub1CC/src/Stub1CC.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,10 +22,11 @@
@file
*/
+#include "Stub1CC.h"
#include <usb_std.h>
#include <es_ini.h>
#include <d32usbc.h>
-#include "Stub1CC.h"
+#include <usb/usblogger.h>
#ifdef __FLOG_ACTIVE
_LIT8(KLogComponent, "STUB1CC");
@@ -33,11 +34,6 @@
#include "usbmaninternalconstants.h"
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "Stub1CCTraces.h"
-#endif
-
// Panic category
@@ -164,37 +160,32 @@
*/
void CUsbstub1ClassController::Start(TRequestStatus& aStatus)
{
- OstTraceFunctionEntry0( CUSBSTUB1CLASSCONTROLLER_START_ENTRY );
-
+ LOG_FUNC
+
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);
- OstTrace1( TRACE_NORMAL, CUSBSTUB1CLASSCONTROLLER_START, _L8("Open LDD, ret=%d"), ret );
-
+ LOGTEXT2(_L8("Open LDD, ret=%d"), ret);
ret = SetUpInterface();
- OstTrace1( TRACE_NORMAL, CUSBSTUB1CLASSCONTROLLER_START_DUP1, _L8("SetUpInterface(), ret=%d"), ret );
-
+ LOGTEXT2(_L8("SetUpInterface(), ret=%d"), ret);
#endif
iTimer.After(iStatus, iStartDelay*1000); //convert from usec to msec
SetActive();
- OstTraceFunctionExit0( CUSBSTUB1CLASSCONTROLLER_START_EXIT_DUP2 );
}
/**
@@ -204,7 +195,7 @@
*/
void CUsbstub1ClassController::Stop(TRequestStatus& aStatus)
{
- OstTraceFunctionEntry0( CUSBSTUB1CLASSCONTROLLER_STOP_ENTRY );
+ LOG_FUNC
aStatus = KRequestPending;
iReportStatus = &aStatus;
@@ -212,14 +203,12 @@
if (iState == EUsbServiceIdle)
{
User::RequestComplete(iReportStatus, KErrNone);
- OstTraceFunctionExit0( CUSBSTUB1CLASSCONTROLLER_STOP_EXIT );
return;
}
if (iFailToStop)
{
User::RequestComplete(iReportStatus, KErrGeneral);
- OstTraceFunctionExit0( CUSBSTUB1CLASSCONTROLLER_STOP_EXIT_DUP1 );
return;
}
@@ -231,7 +220,6 @@
iTimer.After(iStatus, iStopDelay*1000); //convert from usec to msec
SetActive();
- OstTraceFunctionExit0( DUP2_CUSBSTUB1CLASSCONTROLLER_STOP_EXIT );
}
/**
@@ -241,11 +229,10 @@
*/
void CUsbstub1ClassController::GetDescriptorInfo(TUsbDescriptor& aDescriptorInfo) const
{
- OstTraceFunctionEntry0( CUSBSTUB1CLASSCONTROLLER_GETDESCRIPTORINFO_ENTRY );
-
+ LOG_FUNC
+
aDescriptorInfo.iLength = Kstub1DescriptorLength;
aDescriptorInfo.iNumInterfaces = Kstub1NumberOfInterfacesPerstub1Function;
- OstTraceFunctionExit0( CUSBSTUB1CLASSCONTROLLER_GETDESCRIPTORINFO_EXIT );
}
@@ -254,15 +241,9 @@
*/
void CUsbstub1ClassController::RunL()
{
- 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));
- }
+ LOG_FUNC
+
+ __ASSERT_DEBUG( iStatus == KErrNone, _USB_PANIC(Kstub1CcPanicCategory, EPanicUnexpectedStatus) );
switch (iState)
{
case EUsbServiceStarting:
@@ -272,14 +253,10 @@
iState = EUsbServiceIdle;
break;
default:
- OstTrace1( TRACE_FATAL, CUSBSTUB1CLASSCONTROLLER_RUNL_DUP1,
- "CUsbstub1ClassController::RunL panic with error %d",
- EPanicUnexpectedState);
- User::Panic(Kstub1CcPanicCategory,EPanicUnexpectedStatus);
+ _USB_PANIC(Kstub1CcPanicCategory, EPanicUnexpectedState);
}
*iReportStatus = KErrNone;
User::RequestComplete(iReportStatus, iStatus.Int());
- OstTraceFunctionExit0( CUSBSTUB1CLASSCONTROLLER_RUNL_EXIT );
}
/**
@@ -302,9 +279,7 @@
iState = EUsbServiceStarted;
break;
default:
- OstTrace1( TRACE_FATAL, CUSBSTUB1CLASSCONTROLLER_DOCANCEL,
- "CUsbstub1ClassController::DoCancel panic with error %d", EPanicUnexpectedState );
- User::Panic(Kstub1CcPanicCategory,EPanicUnexpectedStatus);
+ _USB_PANIC(Kstub1CcPanicCategory, EPanicUnexpectedState);
}
*iReportStatus = KErrNone;
User::RequestComplete(iReportStatus, KErrCancel);
@@ -319,9 +294,7 @@
*/
TInt CUsbstub1ClassController::RunError(TInt /*aError*/)
{
- OstTrace1( TRACE_FATAL, CUSBSTUB1CLASSCONTROLLER_RUNERROR,
- "CUsbstub1ClassController::RunError panic with error %d", EUnusedFunction);
- __ASSERT_DEBUG(EFalse,User::Panic(Kstub1CcPanicCategory,EPanicUnexpectedStatus));
+ __ASSERT_DEBUG( EFalse, _USB_PANIC(Kstub1CcPanicCategory, EUnusedFunction) );
return KErrNone;
}
@@ -331,33 +304,25 @@
* endpoint and, if found, configuring the interface.
*/
{
- OstTrace0( TRACE_NORMAL, CUSBSTUB1CLASSCONTROLLER_SETUPINTERFACE,
- _L8(">>CCdcControlInterface::SetUpInterface"));
-
+ LOGTEXT(_L8(">>CCdcControlInterface::SetUpInterface"));
+
TUsbDeviceCaps dCaps;
TInt ret = iLdd.DeviceCaps(dCaps);
- OstTrace0( TRACE_NORMAL, CUSBSTUB1CLASSCONTROLLER_SETUPINTERFACE_DUP1,
- _L8("\tchecking result of DeviceCaps"));
-
+ LOGTEXT(_L8("\tchecking result of DeviceCaps"));
if ( ret )
{
- OstTrace1( TRACE_ERROR, CUSBSTUB1CLASSCONTROLLER_SETUPINTERFACE_DUP2,
- _L8("<<CCdcControlInterface::SetUpInterface ret=%d"), ret );
-
+ LOGTEXT2(_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);
- OstTrace1( TRACE_NORMAL, CUSBSTUB1CLASSCONTROLLER_SETUPINTERFACE_DUP3,
- _L8("\tiTotalEndpoints = %d"), totalEndpoints);
-
+ LOGTEXT2(_L8("\tiTotalEndpoints = %d"), totalEndpoints);
if ( totalEndpoints < KRequiredNumberOfEndpoints )
{
- OstTrace1( TRACE_ERROR, CUSBSTUB1CLASSCONTROLLER_SETUPINTERFACE_DUP4,
- _L8("<<CCdcControlInterface::SetUpInterface ret=%d"), KErrGeneral );
-
+ LOGTEXT2(_L8("<<CCdcControlInterface::SetUpInterface ret=%d"),
+ KErrGeneral);
return KErrGeneral;
}
@@ -365,14 +330,10 @@
TUsbcEndpointData data[KUsbcMaxEndpoints];
TPtr8 dataptr(reinterpret_cast<TUint8*>(data), sizeof(data), sizeof(data));
ret = iLdd.EndpointCaps(dataptr);
- OstTrace0( TRACE_NORMAL, CUSBSTUB1CLASSCONTROLLER_SETUPINTERFACE_DUP5,
- _L8("\tchecking result of EndpointCaps"));
-
+ LOGTEXT(_L8("\tchecking result of EndpointCaps"));
if ( ret )
{
- OstTrace1( TRACE_ERROR, CUSBSTUB1CLASSCONTROLLER_SETUPINTERFACE_DUP6,
- _L8("<<CCdcControlInterface::SetUpInterface ret=%d"), ret );
-
+ LOGTEXT2(_L8("<<CCdcControlInterface::SetUpInterface ret=%d"), ret);
return ret;
}
@@ -382,12 +343,7 @@
for ( TUint i = 0 ; i < totalEndpoints ; i++ )
{
const TUsbcEndpointCaps* caps = &data[i].iCaps;
- if(!caps)
- {
- OstTrace1( TRACE_FATAL, CUSBSTUB1CLASSCONTROLLER_SETUPINTERFACE_DUP7,
- "CUsbstub1ClassController::SetUpInterface panic with error %d", EPanicUnexpectedStatus);
- __ASSERT_DEBUG(EFalse,User::Panic(Kstub1CcPanicCategory,EPanicUnexpectedStatus));
- }
+ __ASSERT_DEBUG(caps,_USB_PANIC(Kstub1CcPanicCategory, EPanicUnexpectedStatus));
if (data[i].iInUse)
{
@@ -413,14 +369,11 @@
break;
}
}
- OstTrace0( TRACE_NORMAL, CUSBSTUB1CLASSCONTROLLER_SETUPINTERFACE_DUP8,
- _L8("\tchecking epFound"));
-
+ LOGTEXT(_L8("\tchecking epFound"));
if ( !epFound )
{
- OstTrace1( TRACE_ERROR, CUSBSTUB1CLASSCONTROLLER_SETUPINTERFACE_DUP9,
- _L8("<<CCdcControlInterface::SetUpInterface ret=%d"), KErrGeneral);
-
+ LOGTEXT2(_L8("<<CCdcControlInterface::SetUpInterface ret=%d"),
+ KErrGeneral);
return KErrGeneral;
}
@@ -432,15 +385,11 @@
ifc().iClass.iSubClassNum = 0x02; // Table 16- Abstract Control Model
ifc().iClass.iProtocolNum = 0x01; // Table 17- Hayes compatible
- OstTrace0( TRACE_NORMAL, CUSBSTUB1CLASSCONTROLLER_SETUPINTERFACE_DUP10,
- _L8("\tabout to call SetInterface"));
-
+ LOGTEXT(_L8("\tabout to call SetInterface"));
// Zero effectively indicates that alternate interfaces are not used.
ret = iLdd.SetInterface(0, ifc);
- OstTrace1( TRACE_NORMAL, CUSBSTUB1CLASSCONTROLLER_SETUPINTERFACE_DUP11,
- _L8("<<CCdcControlInterface::SetUpInterface ret=%d"), ret );
-
+ LOGTEXT2(_L8("<<CCdcControlInterface::SetUpInterface ret=%d"), ret);
return ret;
}