--- a/kernel/eka/drivers/usbcc/descriptors.cpp Tue Aug 31 16:34:26 2010 +0300
+++ b/kernel/eka/drivers/usbcc/descriptors.cpp Wed Sep 01 12:34:56 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2000-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2000-2009 Nokia Corporation and/or its subsidiary(-ies).
// All rights reserved.
// This component and the accompanying materials are made available
// under the terms of the License "Eclipse Public License v1.0"
@@ -24,11 +24,6 @@
#include <kernel/kern_priv.h>
#include <drivers/usbc.h>
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "descriptorsTraces.h"
-#endif
-
// Debug Support
@@ -44,15 +39,13 @@
#endif
iBufPtr(NULL, 0)
{
- OstTraceDef0( OST_TRACE_CATEGORY_RND, TRACE_FLOW, TUSBCDESCRIPTORBASE_TUSBCDESCRIPTORBASE_CONS,
- "TUsbcDescriptorBase::TUsbcDescriptorBase()" );
+ __KTRACE_OPT(KUSB, Kern::Printf("TUsbcDescriptorBase::TUsbcDescriptorBase()"));
}
TUsbcDescriptorBase::~TUsbcDescriptorBase()
{
- OstTraceDef0( OST_TRACE_CATEGORY_RND, TRACE_FLOW, TUSBCDESCRIPTORBASE_TUSBCDESCRIPTORBASE_DES,
- "TUsbcDescriptorBase::~TUsbcDescriptorBase()" );
+ __KTRACE_OPT(KUSB, Kern::Printf("TUsbcDescriptorBase::~TUsbcDescriptorBase()"));
}
@@ -153,8 +146,7 @@
TUsbcDeviceDescriptor::TUsbcDeviceDescriptor()
: iBuf()
{
- OstTraceDef0( OST_TRACE_CATEGORY_RND, TRACE_FLOW, TUSBCDEVICEDESCRIPTOR_TUSBCDEVICEDESCRIPTOR_CONS,
- "TUsbcDeviceDescriptor::TUsbcDeviceDescriptor()" );
+ __KTRACE_OPT(KUSB, Kern::Printf("TUsbcDeviceDescriptor::TUsbcDeviceDescriptor()"));
}
@@ -163,8 +155,7 @@
TUint16 aVendorId, TUint16 aProductId,
TUint16 aDeviceRelease, TUint8 aNumConfigurations)
{
- OstTraceDef0( OST_TRACE_CATEGORY_RND, TRACE_FLOW, TUSBCDEVICEDESCRIPTOR_NEW,
- "TUsbcDeviceDescriptor::New()" );
+ __KTRACE_OPT(KUSB, Kern::Printf("TUsbcDeviceDescriptor::New()"));
TUsbcDeviceDescriptor* self = new TUsbcDeviceDescriptor();
if (self)
{
@@ -183,8 +174,7 @@
TUint8 aMaxPacketSize0, TUint16 aVendorId, TUint16 aProductId,
TUint16 aDeviceRelease, TUint8 aNumConfigurations)
{
- OstTraceDef0( OST_TRACE_CATEGORY_RND, TRACE_FLOW, TUSBCDEVICEDESCRIPTOR_CONSTRUCT,
- "TUsbcDeviceDescriptor::Construct()" );
+ __KTRACE_OPT(KUSB, Kern::Printf("TUsbcDeviceDescriptor::Construct()"));
iBuf.SetMax();
SetBufferPointer(iBuf);
iBuf[0] = iBuf.Size(); // bLength
@@ -208,16 +198,14 @@
void TUsbcDeviceDescriptor::UpdateFs()
{
- OstTraceDef0( OST_TRACE_CATEGORY_RND, TRACE_FLOW, TUSBCDEVICEDESCRIPTOR_UPDATEFS,
- "TUsbcDeviceDescriptor::UpdateFs()" );
+ __KTRACE_OPT(KUSB, Kern::Printf("TUsbcDeviceDescriptor::UpdateFs()"));
SetByte(7, iEp0Size_Fs); // bMaxPacketSize0
}
void TUsbcDeviceDescriptor::UpdateHs()
{
- OstTraceDef0( OST_TRACE_CATEGORY_RND, TRACE_FLOW, TUSBCDEVICEDESCRIPTOR_UPDATEHS,
- "TUsbcDeviceDescriptor::UpdateHs()" );
+ __KTRACE_OPT(KUSB, Kern::Printf("TUsbcDeviceDescriptor::UpdateHs()"));
SetByte(7, 64); // bMaxPacketSize0
}
@@ -227,8 +215,7 @@
TUsbcDeviceQualifierDescriptor::TUsbcDeviceQualifierDescriptor()
: iBuf()
{
- OstTraceDef0( OST_TRACE_CATEGORY_RND, TRACE_FLOW, TUSBCDEVICEQUALIFIERDESCRIPTOR_TUSBCDEVICEQUALIFIERDESCRIPTOR_CONS,
- "TUsbcDeviceQualifierDescriptor::TUsbcDeviceQualifierDescriptor()" );
+ __KTRACE_OPT(KUSB, Kern::Printf("TUsbcDeviceDescriptor::TUsbcDeviceQualifierDescriptor()"));
}
@@ -239,8 +226,7 @@
TUint8 aNumConfigurations,
TUint8 aReserved)
{
- OstTraceDef0( OST_TRACE_CATEGORY_RND, TRACE_FLOW, TUSBCDEVICEQUALIFIERDESCRIPTOR_NEW,
- "TUsbcDeviceQualifierDescriptor::New()" );
+ __KTRACE_OPT(KUSB, Kern::Printf("TUsbcDeviceQualifierDescriptor::New()"));
TUsbcDeviceQualifierDescriptor* self = new TUsbcDeviceQualifierDescriptor();
if (self)
{
@@ -259,8 +245,7 @@
TUint8 aDeviceProtocol, TUint8 aMaxPacketSize0,
TUint8 aNumConfigurations, TUint8 aReserved)
{
- OstTraceDef0( OST_TRACE_CATEGORY_RND, TRACE_FLOW, TUSBCDEVICEQUALIFIERDESCRIPTOR_CONSTRUCT,
- "TUsbcDeviceQualifierDescriptor::Construct()" );
+ __KTRACE_OPT(KUSB, Kern::Printf("TUsbcDeviceQualifierDescriptor::Construct()"));
iBuf.SetMax();
SetBufferPointer(iBuf);
iBuf[0] = iBuf.Size(); // bLength
@@ -280,8 +265,7 @@
void TUsbcDeviceQualifierDescriptor::UpdateFs()
{
- OstTraceDef0( OST_TRACE_CATEGORY_RND, TRACE_FLOW, TUSBCDEVICEQUALIFIERDESCRIPTOR_UPDATEFS,
- "TUsbcDeviceQualifierDescriptor::UpdateFs()" );
+ __KTRACE_OPT(KUSB, Kern::Printf("TUsbcDeviceQualifierDescriptor::UpdateFs()"));
// Here we do exactly the opposite of what's done in the Device descriptor (as this one's
// documenting the 'other than the current speed').
SetByte(7, 64); // bMaxPacketSize0
@@ -290,8 +274,7 @@
void TUsbcDeviceQualifierDescriptor::UpdateHs()
{
- OstTraceDef0( OST_TRACE_CATEGORY_RND, TRACE_FLOW, TUSBCDEVICEQUALIFIERDESCRIPTOR_UPDATEHS,
- "TUsbcDeviceQualifierDescriptor::UpdateHs()" );
+ __KTRACE_OPT(KUSB, Kern::Printf("TUsbcDeviceQualifierDescriptor::UpdateHs()"));
// Here we do exactly the opposite of what's done in the Device descriptor (as this one's
// documenting the 'other than the current speed').
SetByte(7, iEp0Size_Fs); // bMaxPacketSize0
@@ -303,16 +286,14 @@
TUsbcConfigDescriptor::TUsbcConfigDescriptor()
: iBuf()
{
- OstTraceDef0( OST_TRACE_CATEGORY_RND, TRACE_FLOW, TUSBCCONFIGDESCRIPTOR_TUSBCCONFIGDESCRIPTOR_CONS,
- "TUsbcConfigDescriptor::TUsbcConfigDescriptor()" );
+ __KTRACE_OPT(KUSB, Kern::Printf("TUsbcConfigDescriptor::TUsbcConfigDescriptor()"));
}
TUsbcConfigDescriptor* TUsbcConfigDescriptor::New(TUint8 aConfigurationValue, TBool aSelfPowered,
TBool aRemoteWakeup, TUint16 aMaxPower)
{
- OstTraceDef0( OST_TRACE_CATEGORY_RND, TRACE_FLOW, TUSBCCONFIGDESCRIPTOR_NEW,
- "TUsbcConfigDescriptor::New()" );
+ __KTRACE_OPT(KUSB, Kern::Printf("TUsbcConfigDescriptor::New()"));
TUsbcConfigDescriptor* self = new TUsbcConfigDescriptor();
if (self)
{
@@ -329,8 +310,7 @@
TInt TUsbcConfigDescriptor::Construct(TUint8 aConfigurationValue, TBool aSelfPowered,
TBool aRemoteWakeup, TUint16 aMaxPower)
{
- OstTraceDef0( OST_TRACE_CATEGORY_RND, TRACE_FLOW, TUSBCCONFIGDESCRIPTOR_CONSTRUCT,
- "TUsbcConfigDescriptor::Construct()" );
+ __KTRACE_OPT(KUSB, Kern::Printf("TUsbcConfigDescriptor::Construct()"));
iBuf.SetMax();
SetBufferPointer(iBuf);
iBuf[0] = iBuf.Size(); // bLength
@@ -343,8 +323,7 @@
(aSelfPowered ? KUsbDevAttr_SelfPowered : 0) |
(aRemoteWakeup ? KUsbDevAttr_RemoteWakeup : 0); // bmAttributes (bit 7 always 1)
if (aMaxPower > 510)
- OstTraceDef1( OST_TRACE_CATEGORY_RND, TRACE_FATAL, DUP1_TUSBCCONFIGDESCRIPTOR_CONSTRUCT_DUP1,
- " Error: Invalid value for bMaxPower: %d", aMaxPower );
+ __KTRACE_OPT(KPANIC, Kern::Printf(" Error: Invalid value for bMaxPower: %d", aMaxPower));
iBuf[8] = aMaxPower / 2; // bMaxPower (2mA units!)
return KErrNone;
}
@@ -355,16 +334,14 @@
TUsbcInterfaceDescriptor::TUsbcInterfaceDescriptor()
: iBuf()
{
- OstTraceDef0( OST_TRACE_CATEGORY_RND, TRACE_FLOW, TUSBCINTERFACEDESCRIPTOR_TUSBCINTERFACEDESCRIPTOR_CONS,
- "TUsbcInterfaceDescriptor::TUsbcInterfaceDescriptor()" );
+ __KTRACE_OPT(KUSB, Kern::Printf("TUsbcInterfaceDescriptor::TUsbcInterfaceDescriptor()"));
}
TUsbcInterfaceDescriptor* TUsbcInterfaceDescriptor::New(TUint8 aInterfaceNumber, TUint8 aAlternateSetting,
TInt aNumEndpoints, const TUsbcClassInfo& aClassInfo)
{
- OstTraceDef0( OST_TRACE_CATEGORY_RND, TRACE_FLOW, TUSBCINTERFACEDESCRIPTOR_NEW,
- "TUsbcInterfaceDescriptor::New()" );
+ __KTRACE_OPT(KUSB, Kern::Printf("TUsbcInterfaceDescriptor::New()"));
TUsbcInterfaceDescriptor* self = new TUsbcInterfaceDescriptor();
if (self)
{
@@ -381,8 +358,7 @@
TInt TUsbcInterfaceDescriptor::Construct(TUint8 aInterfaceNumber, TUint8 aAlternateSetting,
TInt aNumEndpoints, const TUsbcClassInfo& aClassInfo)
{
- OstTraceDef0( OST_TRACE_CATEGORY_RND, TRACE_FLOW, TUSBCINTERFACEDESCRIPTOR_CONSTRUCT,
- "TUsbcInterfaceDescriptor::Construct()" );
+ __KTRACE_OPT(KUSB, Kern::Printf("TUsbcInterfaceDescriptor::Construct()"));
iBuf.SetMax();
SetBufferPointer(iBuf);
iBuf[0] = iBuf.Size(); // bLength
@@ -402,24 +378,20 @@
TUsbcEndpointDescriptorBase::TUsbcEndpointDescriptorBase()
{
- OstTraceDef0( OST_TRACE_CATEGORY_RND, TRACE_FLOW, TUSBCENDPOINTDESCRIPTORBASE_TUSBCENDPOINTDESCRIPTORBASE_CONS,
- "TUsbcEndpointDescriptorBase::TUsbcEndpointDescriptorBase()" );
+ __KTRACE_OPT(KUSB, Kern::Printf("TUsbcEndpointDescriptorBase::TUsbcEndpointDescriptorBase()"));
}
TInt TUsbcEndpointDescriptorBase::Construct(const TUsbcEndpointInfo& aEpInfo)
{
- OstTraceDef0( OST_TRACE_CATEGORY_RND, TRACE_FLOW, TUSBCENDPOINTDESCRIPTORBASE_CONSTRUCT,
- "TUsbcEndpointDescriptorBase::Construct()" );
+ __KTRACE_OPT(KUSB, Kern::Printf("TUsbcEndpointDescriptorBase::Construct()"));
// Adjust FS/HS endpoint sizes
if (aEpInfo.AdjustEpSizes(iEpSize_Fs, iEpSize_Hs) != KErrNone)
{
- OstTraceDef1( OST_TRACE_CATEGORY_RND, TRACE_FATAL, TUSBCENDPOINTDESCRIPTORBASE_CONSTRUCT_DUP1,
- " Error: Unknown endpoint type: %d", aEpInfo.iType );
+ __KTRACE_OPT(KPANIC, Kern::Printf(" Error: Unknown endpoint type: %d", aEpInfo.iType));
}
- OstTraceDefExt3( OST_TRACE_CATEGORY_RND, TRACE_NORMAL, TUSBCENDPOINTDESCRIPTORBASE_CONSTRUCT_DUP2,
- " Now set: iEpSize_Fs=%d iEpSize_Hs=%d (aEpInfo.iSize=%d)",
- iEpSize_Fs, iEpSize_Hs, aEpInfo.iSize );
+ __KTRACE_OPT(KUSB, Kern::Printf(" Now set: iEpSize_Fs=%d iEpSize_Hs=%d (aEpInfo.iSize=%d)",
+ iEpSize_Fs, iEpSize_Hs, aEpInfo.iSize));
// Adjust HS endpoint size for additional transactions
if ((aEpInfo.iType == KUsbEpTypeIsochronous) || (aEpInfo.iType == KUsbEpTypeInterrupt))
@@ -428,16 +400,14 @@
{
// Bits 12..11 specify the number of additional transactions per microframe
iEpSize_Hs |= (aEpInfo.iTransactions << 12);
- OstTraceDefExt2( OST_TRACE_CATEGORY_RND, TRACE_NORMAL, TUSBCENDPOINTDESCRIPTORBASE_CONSTRUCT_DUP3,
- " Adjusted for add. transact.: iEpSize_Hs=0x%02x (aEpInfo.iTransactions=%d)",
- iEpSize_Hs, aEpInfo.iTransactions );
-
+ __KTRACE_OPT(KUSB, Kern::Printf(" Adjusted for add. transact.: iEpSize_Hs=0x%02x "
+ "(aEpInfo.iTransactions=%d)",
+ iEpSize_Hs, aEpInfo.iTransactions));
}
else if (aEpInfo.iTransactions != 0)
{
- OstTraceDef1( OST_TRACE_CATEGORY_RND, TRACE_FATAL, TUSBCENDPOINTDESCRIPTORBASE_CONSTRUCT_DUP4,
- " Warning: Invalid iTransactions value: %d (ignored)", aEpInfo.iTransactions );
-
+ __KTRACE_OPT(KPANIC, Kern::Printf(" Warning: Invalid iTransactions value: %d (ignored)",
+ aEpInfo.iTransactions));
}
}
@@ -445,22 +415,20 @@
TUsbcEndpointInfo info(aEpInfo); // create local writeable copy
if (info.AdjustPollInterval() != KErrNone)
{
- OstTraceDefExt2( OST_TRACE_CATEGORY_RND, TRACE_FATAL, TUSBCENDPOINTDESCRIPTORBASE_CONSTRUCT_DUP5,
- " Error: Unknown ep type (%d) or invalid interval value (%d)", info.iType, info.iInterval );
+ __KTRACE_OPT(KPANIC, Kern::Printf(" Error: Unknown ep type (%d) or invalid interval value (%d)",
+ info.iType, info.iInterval));
}
iInterval_Fs = info.iInterval;
iInterval_Hs = info.iInterval_Hs;
- OstTraceDefExt2( OST_TRACE_CATEGORY_RND, TRACE_FATAL, TUSBCENDPOINTDESCRIPTORBASE_CONSTRUCT_DUP6,
- " Now set: iInterval_Fs=%d iInterval_Hs=%d", iInterval_Fs, iInterval_Hs );
-
+ __KTRACE_OPT(KUSB, Kern::Printf(" Now set: iInterval_Fs=%d iInterval_Hs=%d",
+ iInterval_Fs, iInterval_Hs));
return KErrNone;
}
void TUsbcEndpointDescriptorBase::UpdateFs()
{
- OstTraceDef0( OST_TRACE_CATEGORY_RND, TRACE_FLOW, TUSBCENDPOINTDESCRIPTORBASE_UPDATEFS,
- "TUsbcEndpointDescriptorBase::UpdateFs" );
+ __KTRACE_OPT(KUSB, Kern::Printf("TUsbcEndpointDescriptorBase::UpdateFs()"));
// (TUsbcEndpointDescriptorBase's FS/HS endpoint sizes and interval values got
// adjusted in its Construct() method.)
SetWord(4, iEpSize_Fs); // wMaxPacketSize
@@ -470,8 +438,7 @@
void TUsbcEndpointDescriptorBase::UpdateHs()
{
- OstTraceDef0( OST_TRACE_CATEGORY_RND, TRACE_FLOW, TUSBCENDPOINTDESCRIPTORBASE_UPDATEHS,
- "TUsbcEndpointDescriptorBase::UpdateHs()" );
+ __KTRACE_OPT(KUSB, Kern::Printf("TUsbcEndpointDescriptorBase::UpdateHs()"));
// (TUsbcEndpointDescriptorBase's FS/HS endpoint sizes and interval values get
// adjusted in its Construct() method.)
SetWord(4, iEpSize_Hs); // wMaxPacketSize
@@ -484,16 +451,14 @@
TUsbcEndpointDescriptor::TUsbcEndpointDescriptor()
: iBuf()
{
- OstTraceDef0( OST_TRACE_CATEGORY_RND, TRACE_FLOW, TUSBCENDPOINTDESCRIPTOR_TUSBCENDPOINTDESCRIPTOR_CONS,
- "TUsbcEndpointDescriptor::TUsbcEndpointDescriptor()" );
+ __KTRACE_OPT(KUSB, Kern::Printf("TUsbcEndpointDescriptor::TUsbcEndpointDescriptor()"));
}
TUsbcEndpointDescriptor* TUsbcEndpointDescriptor::New(TUint8 aEndpointAddress,
const TUsbcEndpointInfo& aEpInfo)
{
- OstTraceDef0( OST_TRACE_CATEGORY_RND, TRACE_FLOW, TUSBCENDPOINTDESCRIPTOR_NEW,
- "TUsbcEndpointDescriptor::New()" );
+ __KTRACE_OPT(KUSB, Kern::Printf("TUsbcEndpointDescriptor::New()"));
TUsbcEndpointDescriptor* self = new TUsbcEndpointDescriptor();
if (self)
{
@@ -509,8 +474,7 @@
TInt TUsbcEndpointDescriptor::Construct(TUint8 aEndpointAddress, const TUsbcEndpointInfo& aEpInfo)
{
- OstTraceDef0( OST_TRACE_CATEGORY_RND, TRACE_FLOW, TUSBCENDPOINTDESCRIPTOR_CONSTRUCT,
- "TUsbcEndpointDescriptor::Construct()" );
+ __KTRACE_OPT(KUSB, Kern::Printf("TUsbcEndpointDescriptor::Construct()"));
(void) TUsbcEndpointDescriptorBase::Construct(aEpInfo); // Init Base class
iBuf.SetMax();
SetBufferPointer(iBuf);
@@ -529,16 +493,14 @@
TUsbcAudioEndpointDescriptor::TUsbcAudioEndpointDescriptor()
: iBuf()
{
- OstTraceDef0( OST_TRACE_CATEGORY_RND, TRACE_FLOW, TUSBCAUDIOENDPOINTDESCRIPTOR_TUSBCAUDIOENDPOINTDESCRIPTOR_CONS,
- "TUsbcAudioEndpointDescriptor::TUsbcAudioEndpointDescriptor()" );
+ __KTRACE_OPT(KUSB, Kern::Printf("TUsbcAudioEndpointDescriptor::TUsbcAudioEndpointDescriptor()"));
}
TUsbcAudioEndpointDescriptor* TUsbcAudioEndpointDescriptor::New(TUint8 aEndpointAddress,
const TUsbcEndpointInfo& aEpInfo)
{
- OstTraceDef0( OST_TRACE_CATEGORY_RND, TRACE_FLOW, TUSBCAUDIOENDPOINTDESCRIPTOR_NEW,
- "TUsbcAudioEndpointDescriptor::New()" );
+ __KTRACE_OPT(KUSB, Kern::Printf("TUsbcAudioEndpointDescriptor::New()"));
TUsbcAudioEndpointDescriptor* self = new TUsbcAudioEndpointDescriptor();
if (self)
{
@@ -554,8 +516,7 @@
TInt TUsbcAudioEndpointDescriptor::Construct(TUint8 aEndpointAddress, const TUsbcEndpointInfo& aEpInfo)
{
- OstTraceDef0( OST_TRACE_CATEGORY_RND, TRACE_FLOW, TUSBCAUDIOENDPOINTDESCRIPTOR_CONSTRUCT,
- "TUsbcAudioEndpointDescriptor::Construct()" );
+ __KTRACE_OPT(KUSB, Kern::Printf("TUsbcAudioEndpointDescriptor::Construct()"));
(void) TUsbcEndpointDescriptorBase::Construct(aEpInfo); // Init Base class
iBuf.SetMax();
SetBufferPointer(iBuf);
@@ -575,8 +536,7 @@
TUsbcOtgDescriptor* TUsbcOtgDescriptor::New(TBool aHnpSupport, TBool aSrpSupport)
{
- OstTraceDef0( OST_TRACE_CATEGORY_RND, TRACE_FLOW, TUSBCOTGDESCRIPTOR_NEW,
- "TUsbcOtgDescriptor::New()" );
+ __KTRACE_OPT(KUSB, Kern::Printf("TUsbcOtgDescriptor::New()"));
TUsbcOtgDescriptor* self = new TUsbcOtgDescriptor();
if (self && (self->Construct(aHnpSupport, aSrpSupport) != KErrNone))
{
@@ -590,15 +550,13 @@
TUsbcOtgDescriptor::TUsbcOtgDescriptor()
: iBuf()
{
- OstTraceDef0( OST_TRACE_CATEGORY_RND, TRACE_FLOW, TUSBCOTGDESCRIPTOR_TUSBCOTGDESCRIPTOR_CONS,
- "TUsbcOtgDescriptor::TUsbcOtgDescriptor()" );
+ __KTRACE_OPT(KUSB, Kern::Printf("TUsbcOtgDescriptor::TUsbcOtgDescriptor()"));
}
TInt TUsbcOtgDescriptor::Construct(TBool aHnpSupport, TBool aSrpSupport)
{
- OstTraceDef0( OST_TRACE_CATEGORY_RND, TRACE_FLOW, TUSBCOTGDESCRIPTOR_CONSTRUCT,
- "TUsbcOtgDescriptor::Construct()" );
+ __KTRACE_OPT(KUSB, Kern::Printf("TUsbcOtgDescriptor::Construct()"));
iBuf.SetMax();
SetBufferPointer(iBuf);
iBuf[0] = iBuf.Size(); // bLength
@@ -614,23 +572,20 @@
TUsbcClassSpecificDescriptor::TUsbcClassSpecificDescriptor()
: iBuf(NULL)
{
- OstTraceDef0( OST_TRACE_CATEGORY_RND, TRACE_FLOW, TUSBCCLASSSPECIFICDESCRIPTOR_TUSBCCLASSSPECIFICDESCRIPTOR_CONS,
- "TUsbcClassSpecificDescriptor::TUsbcClassSpecificDescriptor()" );
+ __KTRACE_OPT(KUSB, Kern::Printf("TUsbcClassSpecificDescriptor::TUsbcClassSpecificDescriptor()"));
}
TUsbcClassSpecificDescriptor::~TUsbcClassSpecificDescriptor()
{
- OstTraceDef0( OST_TRACE_CATEGORY_RND, TRACE_FLOW, TUSBCCLASSSPECIFICDESCRIPTOR_TUSBCCLASSSPECIFICDESCRIPTOR_DES,
- "TUsbcClassSpecificDescriptor::~TUsbcClassSpecificDescriptor()" );
+ __KTRACE_OPT(KUSB, Kern::Printf("TUsbcClassSpecificDescriptor::~TUsbcClassSpecificDescriptor()"));
delete iBuf;
}
TUsbcClassSpecificDescriptor* TUsbcClassSpecificDescriptor::New(TUint8 aType, TInt aSize)
{
- OstTraceDef0( OST_TRACE_CATEGORY_RND, TRACE_FLOW, TUSBCCLASSSPECIFICDESCRIPTOR_NEW,
- "TUsbcClassSpecificDescriptor::New()" );
+ __KTRACE_OPT(KUSB, Kern::Printf("TUsbcClassSpecificDescriptor::New()"));
TUsbcClassSpecificDescriptor* self = new TUsbcClassSpecificDescriptor();
if (self)
{
@@ -646,13 +601,11 @@
TInt TUsbcClassSpecificDescriptor::Construct(TUint8 aType, TInt aSize)
{
- OstTraceDef0( OST_TRACE_CATEGORY_RND, TRACE_FLOW, TUSBCCLASSSPECIFICDESCRIPTOR_CONSTRUCT,
- "TUsbcClassSpecificDescriptor::Construct()" );
+ __KTRACE_OPT(KUSB, Kern::Printf("TUsbcClassSpecificDescriptor::Construct()"));
iBuf = HBuf8::New(aSize);
if (!iBuf)
{
- OstTraceDef0( OST_TRACE_CATEGORY_RND, TRACE_FATAL, TUSBCCLASSSPECIFICDESCRIPTOR_CONSTRUCT_DUP1,
- " Error: Allocation of CS desc buffer failed" );
+ __KTRACE_OPT(KPANIC, Kern::Printf(" Error: Allocation of CS desc buffer failed"));
return KErrNoMemory;
}
iBuf->SetMax();
@@ -667,15 +620,13 @@
TUsbcStringDescriptorBase::TUsbcStringDescriptorBase()
: /*iIndex(0),*/ iSBuf(0), iBufPtr(NULL, 0)
{
- OstTraceDef0( OST_TRACE_CATEGORY_RND, TRACE_FLOW, TUSBCSTRINGDESCRIPTORBASE_TUSBCSTRINGDESCRIPTORBASE_CONS,
- "TUsbcStringDescriptorBase::TUsbcStringDescriptorBase()" );
+ __KTRACE_OPT(KUSB, Kern::Printf("TUsbcStringDescriptorBase::TUsbcStringDescriptorBase()"));
}
TUsbcStringDescriptorBase::~TUsbcStringDescriptorBase()
{
- OstTraceDef0( OST_TRACE_CATEGORY_RND, TRACE_FLOW, TUSBCSTRINGDESCRIPTORBASE_TUSBCSTRINGDESCRIPTORBASE_DES,
- "TUsbcStringDescriptorBase::~TUsbcStringDescriptorBase()" );
+ __KTRACE_OPT(KUSB, Kern::Printf("TUsbcStringDescriptorBase::~TUsbcStringDescriptorBase()"));
}
@@ -683,8 +634,8 @@
{
if (aPosition <= 1)
{
- OstTraceDef1( OST_TRACE_CATEGORY_RND, TRACE_FATAL, TUSBCSTRINGDESCRIPTORBASE_WORD,
- " Error: Word(%d) in string descriptor (TUsbcStringDescriptorBase::Word)", aPosition );
+ __KTRACE_OPT(KPANIC, Kern::Printf(" Error: Word(%d) in string descriptor "
+ "(TUsbcStringDescriptorBase::Word)", aPosition));
return 0;
}
else
@@ -700,8 +651,8 @@
{
if (aPosition <= 1)
{
- OstTraceDef1( OST_TRACE_CATEGORY_RND, TRACE_FATAL, TUSBCSTRINGDESCRIPTORBASE_SETWORD,
- " Error: SetWord(%d) in string descriptor (TUsbcStringDescriptorBase::SetWord)", aPosition );
+ __KTRACE_OPT(KPANIC, Kern::Printf(" Error: SetWord(%d) in string descriptor "
+ "(TUsbcStringDescriptorBase::SetWord)", aPosition));
return;
}
else
@@ -762,23 +713,20 @@
TUsbcStringDescriptor::TUsbcStringDescriptor()
: iBuf(NULL)
{
- OstTraceDef0( OST_TRACE_CATEGORY_RND, TRACE_FLOW, TUSBCSTRINGDESCRIPTOR_TUSBCSTRINGDESCRIPTOR_CONS,
- "TUsbcStringDescriptor::TUsbcStringDescriptor()" );
+ __KTRACE_OPT(KUSB, Kern::Printf("TUsbcStringDescriptor::TUsbcStringDescriptor()"));
}
TUsbcStringDescriptor::~TUsbcStringDescriptor()
{
- OstTraceDef0( OST_TRACE_CATEGORY_RND, TRACE_FLOW, TUSBCSTRINGDESCRIPTOR_TUSBCSTRINGDESCRIPTOR_DES,
- "TUsbcStringDescriptor::~TUsbcStringDescriptor()" );
+ __KTRACE_OPT(KUSB, Kern::Printf("TUsbcStringDescriptor::~TUsbcStringDescriptor()"));
delete iBuf;
}
TUsbcStringDescriptor* TUsbcStringDescriptor::New(const TDesC8& aString)
{
- OstTraceDef0( OST_TRACE_CATEGORY_RND, TRACE_FLOW, TUSBCSTRINGDESCRIPTOR_NEW,
- "TUsbcStringDescriptor::New()" );
+ __KTRACE_OPT(KUSB, Kern::Printf("TUsbcStringDescriptor::New"));
TUsbcStringDescriptor* self = new TUsbcStringDescriptor();
if (self)
{
@@ -794,13 +742,11 @@
TInt TUsbcStringDescriptor::Construct(const TDesC8& aString)
{
- OstTraceDef0( OST_TRACE_CATEGORY_RND, TRACE_FLOW, TUSBCSTRINGDESCRIPTOR_CONSTRUCT,
- "TUsbcStringDescriptor::Construct()" );
+ __KTRACE_OPT(KUSB, Kern::Printf("TUsbcStringDescriptor::Construct"));
iBuf = HBuf8::New(aString.Size()); // bytes, not UNICODE chars
if (!iBuf)
{
- OstTraceDef0( OST_TRACE_CATEGORY_RND, TRACE_FATAL, TUSBCSTRINGDESCRIPTOR_CONSTRUCT_DUP1,
- " Error: Allocation of string buffer failed" );
+ __KTRACE_OPT(KPANIC, Kern::Printf(" Error: Allocation of string buffer failed"));
return KErrNoMemory;
}
iBuf->SetMax();
@@ -818,22 +764,19 @@
TUsbcLangIdDescriptor::TUsbcLangIdDescriptor()
: iBuf(NULL)
{
- OstTraceDef0( OST_TRACE_CATEGORY_RND, TRACE_FLOW, TUSBCLANGIDDESCRIPTOR_TUSBCLANGIDDESCRIPTOR_CONS,
- "TUsbcLangIdDescriptor::TUsbcLangIdDescriptor()" );
+ __KTRACE_OPT(KUSB, Kern::Printf("TUsbcLangIdDescriptor::TUsbcLangIdDescriptor()"));
}
TUsbcLangIdDescriptor::~TUsbcLangIdDescriptor()
{
- OstTraceDef0( OST_TRACE_CATEGORY_RND, TRACE_FLOW, TUSBCLANGIDDESCRIPTOR_TUSBCLANGIDDESCRIPTOR_DES,
- "TUsbcLangIdDescriptor::~TUsbcLangIdDescriptor()" );
+ __KTRACE_OPT(KUSB, Kern::Printf("TUsbcLangIdDescriptor::~TUsbcLangIdDescriptor()"));
}
TUsbcLangIdDescriptor* TUsbcLangIdDescriptor::New(TUint16 aLangId)
{
- OstTraceDef0( OST_TRACE_CATEGORY_RND, TRACE_FLOW, TUSBCLANGIDDESCRIPTOR_NEW,
- "TUsbcLangIdDescriptor::New()" );
+ __KTRACE_OPT(KUSB, Kern::Printf("TUsbcLangIdDescriptor::New"));
TUsbcLangIdDescriptor* self = new TUsbcLangIdDescriptor();
if (self)
{
@@ -849,8 +792,7 @@
TInt TUsbcLangIdDescriptor::Construct(TUint16 aLangId)
{
- OstTraceDef0( OST_TRACE_CATEGORY_RND, TRACE_FLOW, TUSBCLANGIDDESCRIPTOR_CONSTRUCT,
- "TUsbcLangIdDescriptor::Construct()" );
+ __KTRACE_OPT(KUSB, Kern::Printf("TUsbcLangIdDescriptor::Construct"));
iBuf.SetMax();
SetBufferPointer(iBuf);
iBufPtr[0] = LowByte(SWAP_BYTES_16(aLangId)); // Language ID value
@@ -870,22 +812,17 @@
//
: iDescriptors(), iStrings(), iIfcIdx(0), iEp0_TxBuf(aEp0_TxBuf), iHighSpeed(EFalse)
{
- OstTraceDef0( OST_TRACE_CATEGORY_RND, TRACE_FLOW, TUSBCDESCRIPTORPOOL_TUSBCDESCRIPTORPOOL_CONS,
- "TUsbcDescriptorPool::TUsbcDescriptorPool()" );
+ __KTRACE_OPT(KUSB, Kern::Printf("TUsbcDescriptorPool::TUsbcDescriptorPool()"));
}
TUsbcDescriptorPool::~TUsbcDescriptorPool()
{
- OstTraceDef0( OST_TRACE_CATEGORY_RND, TRACE_FLOW, TUSBCDESCRIPTORPOOL_TUSBCDESCRIPTORPOOL_DES,
- "TUsbcDescriptorPool::~TUsbcDescriptorPool()" );
+ __KTRACE_OPT(KUSB, Kern::Printf("TUsbcDescriptorPool::~TUsbcDescriptorPool()"));
// The destructor of each <class T> object is called before the objects themselves are destroyed.
- OstTraceDef1( OST_TRACE_CATEGORY_RND, TRACE_NORMAL, TUSBCDESCRIPTORPOOL_TUSBCDESCRIPTORPOOL_DES_DUP1,
- " iDescriptors.Count(): %d", iDescriptors.Count() );
+ __KTRACE_OPT(KUSB, Kern::Printf(" iDescriptors.Count(): %d", iDescriptors.Count()));
iDescriptors.ResetAndDestroy();
- OstTraceDef1( OST_TRACE_CATEGORY_RND, TRACE_NORMAL, TUSBCDESCRIPTORPOOL_TUSBCDESCRIPTORPOOL_DES_DUP2,
- " iStrings.Count(): %d", iStrings.Count() );
-
+ __KTRACE_OPT(KUSB, Kern::Printf(" iStrings.Count(): %d", iStrings.Count()));
iStrings.ResetAndDestroy();
}
@@ -895,27 +832,19 @@
TUsbcStringDescriptor* aProduct, TUsbcStringDescriptor* aSerialNum,
TUsbcStringDescriptor* aConfig, TUsbcOtgDescriptor* aOtgDesc)
{
- OstTraceDef0( OST_TRACE_CATEGORY_RND, TRACE_FLOW, TUSBCDESCRIPTORPOOL_INIT,
- "TUsbcDescriptorPool::Init()" );
+ __KTRACE_OPT(KUSB, Kern::Printf("TUsbcDescriptorPool::Init()"));
if (!aDeviceDesc || !aConfigDesc)
{
- OstTraceDef0( OST_TRACE_CATEGORY_RND, TRACE_FATAL, TUSBCDESCRIPTORPOOL_INIT_DUP1,
- " Error: No Device or Config descriptor specified" );
+ __KTRACE_OPT(KPANIC, Kern::Printf(" Error: No Device or Config descriptor specified"));
return KErrArgument;
}
for (TInt n = 0; n < KDescPosition_FirstAvailable; n++)
{
iDescriptors.Append(NULL);
}
-#ifdef _DEBUG
- if (iDescriptors.Count() != KDescPosition_FirstAvailable)
- {
- OstTraceDefExt2( OST_TRACE_CATEGORY_DEBUG, TRACE_NORMAL, TUSBCDESCRIPTORPOOL_INIT_DUP2,
- " Error: iDescriptors.Count() (%d) != KDescPosition_FirstAvailable (%d)",
- iDescriptors.Count(), KDescPosition_FirstAvailable );
-
- }
-#endif
+ __ASSERT_DEBUG((iDescriptors.Count() == KDescPosition_FirstAvailable),
+ Kern::Printf(" Error: iDescriptors.Count() (%d) != KDescPosition_FirstAvailable (%d)",
+ iDescriptors.Count(), KDescPosition_FirstAvailable));
iDescriptors[KDescPosition_Device] = aDeviceDesc;
iDescriptors[KDescPosition_Config] = aConfigDesc;
if (aOtgDesc)
@@ -930,9 +859,7 @@
// that contains an array of two-byte LANGID codes supported by the device. ...
// USB devices that omit all string descriptors must not return an array of LANGID codes."
// So if we have at least one string descriptor, we must also have a LANGID descriptor.
- OstTraceDef0( OST_TRACE_CATEGORY_RND, TRACE_FATAL, TUSBCDESCRIPTORPOOL_INIT_DUP3,
- " Error: No LANGID string descriptor specified" );
-
+ __KTRACE_OPT(KPANIC, Kern::Printf(" Error: No LANGID string descriptor specified"));
return KErrArgument;
}
iStrings.Insert(aLangId, KStringPosition_Langid);
@@ -940,18 +867,12 @@
iStrings.Insert(aProduct, KStringPosition_Product);
iStrings.Insert(aSerialNum, KStringPosition_Serial);
iStrings.Insert(aConfig, KStringPosition_Config);
-#ifdef _DEBUG
- if (iStrings.Count() != 5)
- {
- OstTraceDef1( OST_TRACE_CATEGORY_DEBUG, TRACE_NORMAL, TUSBCDESCRIPTORPOOL_INIT_DUP4,
- " Error: iStrings.Count() != 5 (%d)", iStrings.Count() );
- }
-#endif
+ __ASSERT_DEBUG((iStrings.Count() == 5),
+ Kern::Printf(" Error: iStrings.Count() != 5 (%d)", iStrings.Count()));
#ifdef _DEBUG
for (TInt i = KStringPosition_Langid; i <= KStringPosition_Config; i++)
{
- OstTraceDefExt2( OST_TRACE_CATEGORY_DEBUG, TRACE_NORMAL, TUSBCDESCRIPTORPOOL_INIT_DUP5,
- "TUsbcDescriptorPool.iStrings[%d] = 0x%x", i, reinterpret_cast<TUint>(iStrings[i]) );
+ __KTRACE_OPT(KUSB, Kern::Printf("TUsbcDescriptorPool.iStrings[%d] = 0x%x", i, iStrings[i]));
}
#endif
// Set string indices
@@ -973,16 +894,9 @@
TInt TUsbcDescriptorPool::InitHs()
{
- OstTraceDef0( OST_TRACE_CATEGORY_RND, TRACE_FLOW, TUSBCDESCRIPTORPOOL_INITHS,
- "TUsbcDescriptorPool::InitHs()" );
-#ifdef _DEBUG
- if (iDescriptors.Count() < KDescPosition_FirstAvailable)
- {
- OstTraceDef0( OST_TRACE_CATEGORY_DEBUG, TRACE_NORMAL, TUSBCDESCRIPTORPOOL_INITHS_DUP1,
- " Error: Call Init() first)" );
-
- }
-#endif
+ __KTRACE_OPT(KUSB, Kern::Printf("TUsbcDescriptorPool::InitHs()"));
+ __ASSERT_DEBUG((iDescriptors.Count() >= KDescPosition_FirstAvailable),
+ Kern::Printf(" Error: Call Init() first)"));
TUsbcDeviceQualifierDescriptor* const dq_desc = TUsbcDeviceQualifierDescriptor::New(
iDescriptors[KDescPosition_Device]->Byte(4), // aDeviceClass
@@ -992,8 +906,7 @@
iDescriptors[KDescPosition_Device]->Byte(17)); // aNumConfigurations
if (!dq_desc)
{
- OstTraceDef0( OST_TRACE_CATEGORY_RND, TRACE_FATAL, TUSBCDESCRIPTORPOOL_INITHS_DUP2,
- " Error: Memory allocation for dev qualif desc failed." );
+ __KTRACE_OPT(KPANIC, Kern::Printf(" Error: Memory allocation for dev qualif desc failed."));
return KErrGeneral;
}
iDescriptors[KDescPosition_DeviceQualifier] = dq_desc;
@@ -1005,8 +918,7 @@
iDescriptors[KDescPosition_Config]->Byte(8) * 2); // aMaxPower (mA)
if (!osc_desc)
{
- OstTraceDef0( OST_TRACE_CATEGORY_RND, TRACE_FATAL, TUSBCDESCRIPTORPOOL_INITHS_DUP3,
- " Error: Memory allocation for other speed conf desc failed." );
+ __KTRACE_OPT(KPANIC, Kern::Printf(" Error: Memory allocation for other speed conf desc failed."));
return KErrGeneral;
}
@@ -1027,8 +939,7 @@
TInt TUsbcDescriptorPool::UpdateDescriptorsFs()
{
- OstTraceDef0( OST_TRACE_CATEGORY_RND, TRACE_FLOW, TUSBCDESCRIPTORPOOL_UPDATEDESCRIPTORSFS,
- "TUsbcDescriptorPool::UpdateDescriptorsFs()" );
+ __KTRACE_OPT(KUSB, Kern::Printf("TUsbcDescriptorPool::UpdateDescriptorsFs()"));
const TInt count = iDescriptors.Count();
for (TInt i = KDescPosition_FirstAvailable; i < count; i++)
{
@@ -1042,8 +953,7 @@
TInt TUsbcDescriptorPool::UpdateDescriptorsHs()
{
- OstTraceDef0( OST_TRACE_CATEGORY_RND, TRACE_FLOW, TUSBCDESCRIPTORPOOL_UPDATEDESCRIPTORSHS,
- "TUsbcDescriptorPool::UpdateDescriptorsHs()" );
+ __KTRACE_OPT(KUSB, Kern::Printf("TUsbcDescriptorPool::UpdateDescriptorsHs()"));
const TInt count = iDescriptors.Count();
for (TInt i = KDescPosition_FirstAvailable; i < count; i++)
{
@@ -1060,21 +970,18 @@
//
TInt TUsbcDescriptorPool::FindDescriptor(TUint8 aType, TUint8 aIndex, TUint16 aLangid, TInt& aSize) const
{
- OstTraceDef0( OST_TRACE_CATEGORY_RND, TRACE_FLOW, TUSBCDESCRIPTORPOOL_FINDDESCRIPTOR,
- "TUsbcDescriptorPool::FindDescriptor()" );
+ __KTRACE_OPT(KUSB, Kern::Printf("TUsbcDescriptorPool::FindDescriptor()"));
TInt result = KErrGeneral;
switch (aType)
{
case KUsbDescType_Device:
if (aLangid != 0)
{
- OstTraceDef1( OST_TRACE_CATEGORY_RND, TRACE_FATAL, TUSBCDESCRIPTORPOOL_FINDDESCRIPTOR_DUP1,
- " Error: bad langid: 0x%04x", aLangid );
+ __KTRACE_OPT(KPANIC, Kern::Printf(" Error: bad langid: 0x%04x", aLangid));
}
else if (aIndex > 0)
{
- OstTraceDef1( OST_TRACE_CATEGORY_RND, TRACE_FATAL, TUSBCDESCRIPTORPOOL_FINDDESCRIPTOR_DUP2,
- " Error: bad device index: %d", aIndex );
+ __KTRACE_OPT(KPANIC, Kern::Printf(" Error: bad device index: %d", aIndex));
}
else
{
@@ -1085,13 +992,11 @@
case KUsbDescType_Config:
if (aLangid != 0)
{
- OstTraceDef1( OST_TRACE_CATEGORY_RND, TRACE_FATAL, TUSBCDESCRIPTORPOOL_FINDDESCRIPTOR_DUP3,
- " Error: bad langid: 0x%04x", aLangid );
+ __KTRACE_OPT(KPANIC, Kern::Printf(" Error: bad langid: 0x%04x", aLangid));
}
else if (aIndex > 0)
{
- OstTraceDef1( OST_TRACE_CATEGORY_RND, TRACE_FATAL, TUSBCDESCRIPTORPOOL_FINDDESCRIPTOR_DUP4,
- " Error: bad config index: %d", aIndex );
+ __KTRACE_OPT(KPANIC, Kern::Printf(" Error: bad config index: %d", aIndex));
}
else
{
@@ -1102,13 +1007,11 @@
case KUsbDescType_DeviceQualifier:
if (aLangid != 0)
{
- OstTraceDef1( OST_TRACE_CATEGORY_RND, TRACE_FATAL, TUSBCDESCRIPTORPOOL_FINDDESCRIPTOR_DUP5,
- " Error: bad langid: 0x%04x", aLangid );
+ __KTRACE_OPT(KPANIC, Kern::Printf(" Error: bad langid: 0x%04x", aLangid));
}
else if (aIndex > 0)
{
- OstTraceDef1( OST_TRACE_CATEGORY_RND, TRACE_FATAL, TUSBCDESCRIPTORPOOL_FINDDESCRIPTOR_DUP6,
- " Error: bad device index: %d", aIndex );
+ __KTRACE_OPT(KPANIC, Kern::Printf(" Error: bad device index: %d", aIndex));
}
else
{
@@ -1119,13 +1022,11 @@
case KUsbDescType_OtherSpeedConfig:
if (aLangid != 0)
{
- OstTraceDef1( OST_TRACE_CATEGORY_RND, TRACE_FATAL, TUSBCDESCRIPTORPOOL_FINDDESCRIPTOR_DUP7,
- " Error: bad langid: 0x%04x", aLangid );
+ __KTRACE_OPT(KPANIC, Kern::Printf(" Error: bad langid: 0x%04x", aLangid));
}
else if (aIndex > 0)
{
- OstTraceDef1( OST_TRACE_CATEGORY_RND, TRACE_FATAL, TUSBCDESCRIPTORPOOL_FINDDESCRIPTOR_DUP8,
- " Error: bad config index: %d", aIndex );
+ __KTRACE_OPT(KPANIC, Kern::Printf(" Error: bad config index: %d", aIndex));
}
else
{
@@ -1147,25 +1048,24 @@
}
else
{
- OstTraceDef0( OST_TRACE_CATEGORY_RND, TRACE_NORMAL, TUSBCDESCRIPTORPOOL_FINDDESCRIPTOR_DUP9,
- " No string descriptors: not returning LANGID array" );
+ __KTRACE_OPT(KUSB, Kern::Printf(" No string descriptors: not returning LANGID array"));
}
}
else
{
if (!aLangid)
{
- OstTraceDef0( OST_TRACE_CATEGORY_RND, TRACE_NORMAL, TUSBCDESCRIPTORPOOL_FINDDESCRIPTOR_DUP10,
- " Strange: LANGID=0 for a $ descriptor (ignoring LANGID)" );
+ __KTRACE_OPT(KUSB,
+ Kern::Printf(" Strange: LANGID=0 for a $ descriptor (ignoring LANGID)"));
// The USB spec doesn't really say what to do in this case, but as there are host apps
// that fail if we return an error here, we choose to ignore the issue.
}
else if (aLangid != iStrings[KStringPosition_Langid]->Word(2))
{
// We have only one (this) language
- OstTraceDefExt2( OST_TRACE_CATEGORY_RND, TRACE_NORMAL, TUSBCDESCRIPTORPOOL_FINDDESCRIPTOR_DUP11,
- " Bad LANGID: 0x%04X requested, 0x%04X supported (ignoring LANGID)",
- aLangid, iStrings[KStringPosition_Langid]->Word(2) );
+ __KTRACE_OPT(KUSB,
+ Kern::Printf(" Bad LANGID: 0x%04X requested, 0x%04X supported (ignoring LANGID)",
+ aLangid, iStrings[KStringPosition_Langid]->Word(2)));
// We could return an error here, but rather choose to ignore the discrepancy
// (the USB spec is not very clear what to do in such a case anyway).
}
@@ -1176,12 +1076,10 @@
case KUsbDescType_CS_Interface:
/* fall through */
case KUsbDescType_CS_Endpoint:
- OstTraceDef0( OST_TRACE_CATEGORY_RND, TRACE_FATAL, TUSBCDESCRIPTORPOOL_FINDDESCRIPTOR_DUP12,
- " Warning: finding of class specific descriptors not supported" );
+ __KTRACE_OPT(KPANIC, Kern::Printf(" Warning: finding of class specific descriptors not supported"));
break;
default:
- OstTraceDef1( OST_TRACE_CATEGORY_RND, TRACE_FATAL, TUSBCDESCRIPTORPOOL_FINDDESCRIPTOR_DUP13,
- " Error: unknown descriptor type requested: %d", aType );
+ __KTRACE_OPT(KPANIC, Kern::Printf(" Error: unknown descriptor type requested: %d", aType));
break;
}
return result;
@@ -1190,8 +1088,7 @@
void TUsbcDescriptorPool::InsertDescriptor(TUsbcDescriptorBase* aDesc)
{
- OstTraceDef0( OST_TRACE_CATEGORY_RND, TRACE_FLOW, TUSBCDESCRIPTORPOOL_INSERTDESCRIPTOR,
- "TUsbcDescriptorPool::InsertDescriptor()" );
+ __KTRACE_OPT(KUSB, Kern::Printf("TUsbcDescriptorPool::InsertDescriptor()"));
switch (aDesc->Type())
{
case KUsbDescType_Interface:
@@ -1201,21 +1098,19 @@
InsertEpDesc(aDesc);
break;
default:
- OstTraceDef0( OST_TRACE_CATEGORY_RND, TRACE_NORMAL, TUSBCDESCRIPTORPOOL_INSERTDESCRIPTOR_DUP1,
- " Error: unsupported descriptor type" );
+ __KTRACE_OPT(KUSB, Kern::Printf(" Error: unsupported descriptor type"));
}
}
void TUsbcDescriptorPool::SetIfcStringDescriptor(TUsbcStringDescriptor* aDesc, TInt aNumber, TInt aSetting)
{
- OstTraceDefExt2( OST_TRACE_CATEGORY_RND, TRACE_NORMAL, TUSBCDESCRIPTORPOOL_SETIFCSTRINGDESCRIPTOR,
- "TUsbcDescriptorPool::SetIfcDescriptor(%d, %d)", aNumber, aSetting );
+ __KTRACE_OPT(KUSB, Kern::Printf("TUsbcDescriptorPool::SetIfcDescriptor(%d, %d)", aNumber, aSetting));
const TInt i = FindIfcDescriptor(aNumber, aSetting);
if (i < 0)
{
- OstTraceDefExt2( OST_TRACE_CATEGORY_RND, TRACE_FATAL, TUSBCDESCRIPTORPOOL_SETIFCSTRINGDESCRIPTOR_DUP1,
- " Error: Ifc descriptor not found (%d, %d)", aNumber, aSetting );
+ __KTRACE_OPT(KPANIC, Kern::Printf(" Error: Ifc descriptor not found (%d, %d)",
+ aNumber, aSetting));
return;
}
// Try to find available NULL postition
@@ -1231,8 +1126,7 @@
str_idx = iStrings.Count();
if (str_idx > 0xff)
{
- OstTraceDef1( OST_TRACE_CATEGORY_RND, TRACE_FATAL, TUSBCDESCRIPTORPOOL_SETIFCSTRINGDESCRIPTOR_DUP2,
- " Error: $ descriptor array full (idx=%d)", str_idx );
+ __KTRACE_OPT(KPANIC, Kern::Printf(" Error: $ descriptor array full (idx=%d)", str_idx));
return;
}
while (str_idx < KStringPosition_FirstAvailable)
@@ -1245,21 +1139,19 @@
}
// Update this ifc descriptor's string index field
iDescriptors[i]->SetByte(8, str_idx);
- OstTraceDefExt4( OST_TRACE_CATEGORY_RND, TRACE_NORMAL, TUSBCDESCRIPTORPOOL_SETIFCSTRINGDESCRIPTOR_DUP3,
- " String for ifc %d/%d (@ pos %d): \"%s\"", aNumber, aSetting, str_idx,
- iStrings[str_idx]->StringData() );
+ __KTRACE_OPT(KUSB, Kern::Printf(" String for ifc %d/%d (@ pos %d): \"%S\"", aNumber, aSetting, str_idx,
+ &iStrings[str_idx]->StringData()));
}
void TUsbcDescriptorPool::DeleteIfcDescriptor(TInt aNumber, TInt aSetting)
{
- OstTraceDefExt2( OST_TRACE_CATEGORY_RND, TRACE_NORMAL, TUSBCDESCRIPTORPOOL_DELETEIFCDESCRIPTOR,
- "TUsbcDescriptorPool::DeleteIfcDescriptor(%d, %d)", aNumber, aSetting );
+ __KTRACE_OPT(KUSB, Kern::Printf("TUsbcDescriptorPool::DeleteIfcDescriptor(%d, %d)", aNumber, aSetting));
const TInt i = FindIfcDescriptor(aNumber, aSetting);
if (i < 0)
{
- OstTraceDefExt2( OST_TRACE_CATEGORY_RND, TRACE_FATAL, TUSBCDESCRIPTORPOOL_DELETEIFCDESCRIPTOR_DUP1,
- " Error: DeleteIfcDescriptor - descriptor not found (%d, %d)", aNumber, aSetting );
+ __KTRACE_OPT(KPANIC, Kern::Printf(" Error: DeleteIfcDescriptor - descriptor not found (%d, %d)",
+ aNumber, aSetting));
return;
}
// Delete (if necessary) specified interface's string descriptor
@@ -1287,16 +1179,14 @@
TInt TUsbcDescriptorPool::GetDeviceDescriptorTC(DThread* aThread, TDes8& aBuffer) const
{
- OstTraceDef0( OST_TRACE_CATEGORY_RND, TRACE_FLOW, TUSBCDESCRIPTORPOOL_GETDEVICEDESCRIPTORTC,
- "TUsbcDescriptorPool::GetDeviceDescriptorTC()" );
+ __KTRACE_OPT(KUSB, Kern::Printf("TUsbcDescriptorPool::GetDeviceDescriptorTC()"));
return Kern::ThreadDesWrite(aThread, &aBuffer, iDescriptors[KDescPosition_Device]->DescriptorData(), 0);
}
TInt TUsbcDescriptorPool::SetDeviceDescriptorTC(DThread* aThread, const TDes8& aBuffer)
{
- OstTraceDef0( OST_TRACE_CATEGORY_RND, TRACE_FLOW, TUSBCDESCRIPTORPOOL_SETDEVICEDESCRIPTORTC,
- "TUsbcDescriptorPool::SetDeviceDescriptorTC()" );
+ __KTRACE_OPT(KUSB, Kern::Printf("TUsbcDescriptorPool::SetDeviceDescriptorTC()"));
TBuf8<KUsbDescSize_Device> device;
const TInt r = Kern::ThreadDesRead(aThread, &aBuffer, device, 0);
if (r != KErrNone)
@@ -1320,16 +1210,14 @@
TInt TUsbcDescriptorPool::GetConfigurationDescriptorTC(DThread* aThread, TDes8& aBuffer) const
{
- OstTraceDef0( OST_TRACE_CATEGORY_RND, TRACE_FLOW, TUSBCDESCRIPTORPOOL_GETCONFIGURATIONDESCRIPTORTC,
- "TUsbcDescriptorPool::GetConfigurationDescriptorTC()" );
+ __KTRACE_OPT(KUSB, Kern::Printf("TUsbcDescriptorPool::GetConfigurationDescriptorTC()"));
return Kern::ThreadDesWrite(aThread, &aBuffer, iDescriptors[KDescPosition_Config]->DescriptorData(), 0);
}
TInt TUsbcDescriptorPool::SetConfigurationDescriptorTC(DThread* aThread, const TDes8& aBuffer)
{
- OstTraceDef0( OST_TRACE_CATEGORY_RND, TRACE_FLOW, TUSBCDESCRIPTORPOOL_SETCONFIGURATIONDESCRIPTORTC,
- "TUsbcDescriptorPool::SetConfigurationDescriptorTC()" );
+ __KTRACE_OPT(KUSB, Kern::Printf("TUsbcDescriptorPool::SetConfigurationDescriptorTC()"));
TBuf8<KUsbDescSize_Config> config;
const TInt r = Kern::ThreadDesRead(aThread, &aBuffer, config, 0);
if (r != KErrNone)
@@ -1358,13 +1246,11 @@
TInt TUsbcDescriptorPool::GetInterfaceDescriptorTC(DThread* aThread, TDes8& aBuffer,
TInt aInterface, TInt aSetting) const
{
- OstTraceDef0( OST_TRACE_CATEGORY_RND, TRACE_FLOW, TUSBCDESCRIPTORPOOL_GETINTERFACEDESCRIPTORTC,
- "TUsbcDescriptorPool::GetInterfaceDescriptorTC()" );
+ __KTRACE_OPT(KUSB, Kern::Printf("TUsbcDescriptorPool::GetInterfaceDescriptorTC()"));
const TInt i = FindIfcDescriptor(aInterface, aSetting);
if (i < 0)
{
- OstTraceDef0( OST_TRACE_CATEGORY_RND, TRACE_FATAL, TUSBCDESCRIPTORPOOL_GETINTERFACEDESCRIPTORTC_DUP1,
- " Error: no such interface" );
+ __KTRACE_OPT(KPANIC, Kern::Printf(" Error: no such interface"));
return KErrNotFound;
}
return Kern::ThreadDesWrite(aThread, &aBuffer, iDescriptors[i]->DescriptorData(), 0);
@@ -1373,13 +1259,11 @@
TInt TUsbcDescriptorPool::SetInterfaceDescriptor(const TDes8& aBuffer, TInt aInterface, TInt aSetting)
{
- OstTraceDef0( OST_TRACE_CATEGORY_RND, TRACE_FLOW, TUSBCDESCRIPTORPOOL_SETINTERFACEDESCRIPTOR,
- "TUsbcDescriptorPool::SetInterfaceDescriptor()" );
+ __KTRACE_OPT(KUSB, Kern::Printf("TUsbcDescriptorPool::SetInterfaceDescriptor()"));
const TInt i = FindIfcDescriptor(aInterface, aSetting);
if (i < 0)
{
- OstTraceDef0( OST_TRACE_CATEGORY_RND, TRACE_FATAL, TUSBCDESCRIPTORPOOL_SETINTERFACEDESCRIPTOR_DUP1,
- " Error: no such interface" );
+ __KTRACE_OPT(KPANIC, Kern::Printf(" Error: no such interface"));
return KErrNotFound;
}
iDescriptors[i]->SetByte(2, aBuffer[2]); // bInterfaceNumber
@@ -1393,13 +1277,11 @@
TInt TUsbcDescriptorPool::GetEndpointDescriptorTC(DThread* aThread, TDes8& aBuffer,
TInt aInterface, TInt aSetting, TUint8 aEndpointAddress) const
{
- OstTraceDef0( OST_TRACE_CATEGORY_RND, TRACE_FLOW, TUSBCDESCRIPTORPOOL_GETENDPOINTDESCRIPTORTC,
- "TUsbcDescriptorPool::GetEndpointDescriptorTC()" );
+ __KTRACE_OPT(KUSB, Kern::Printf("TUsbcDescriptorPool::GetEndpointDescriptorTC()"));
const TInt i = FindEpDescriptor(aInterface, aSetting, aEndpointAddress);
if (i < 0)
{
- OstTraceDef0( OST_TRACE_CATEGORY_RND, TRACE_FATAL, TUSBCDESCRIPTORPOOL_GETENDPOINTDESCRIPTORTC_DUP1,
- " Error: no such endpoint" );
+ __KTRACE_OPT(KPANIC, Kern::Printf(" Error: no such endpoint"));
return KErrNotFound;
}
return Kern::ThreadDesWrite(aThread, &aBuffer, iDescriptors[i]->DescriptorData(), 0);
@@ -1409,13 +1291,11 @@
TInt TUsbcDescriptorPool::SetEndpointDescriptorTC(DThread* aThread, const TDes8& aBuffer,
TInt aInterface, TInt aSetting, TUint8 aEndpointAddress)
{
- OstTraceDef0( OST_TRACE_CATEGORY_RND, TRACE_FLOW, TUSBCDESCRIPTORPOOL_SETENDPOINTDESCRIPTORTC,
- "TUsbcDescriptorPool::SetEndpointDescriptorTC()" );
+ __KTRACE_OPT(KUSB, Kern::Printf("TUsbcDescriptorPool::SetEndpointDescriptorTC()"));
const TInt i = FindEpDescriptor(aInterface, aSetting, aEndpointAddress);
if (i < 0)
{
- OstTraceDef0( OST_TRACE_CATEGORY_RND, TRACE_FATAL, TUSBCDESCRIPTORPOOL_SETENDPOINTDESCRIPTORTC_DUP1,
- " Error: no such endpoint" );
+ __KTRACE_OPT(KPANIC, Kern::Printf(" Error: no such endpoint"));
return KErrNotFound;
}
TBuf8<KUsbDescSize_AudioEndpoint> ep; // it could be an audio endpoint
@@ -1438,13 +1318,11 @@
TInt TUsbcDescriptorPool::GetEndpointDescriptorSize(TInt aInterface, TInt aSetting, TUint8 aEndpointAddress,
TInt& aSize) const
{
- OstTraceDef0( OST_TRACE_CATEGORY_RND, TRACE_FLOW, TUSBCDESCRIPTORPOOL_GETENDPOINTDESCRIPTORSIZE,
- "TUsbcDescriptorPool::GetEndpointDescriptorSize()" );
+ __KTRACE_OPT(KUSB, Kern::Printf("TUsbcDescriptorPool::GetEndpointDescriptorSize()"));
const TInt i = FindEpDescriptor(aInterface, aSetting, aEndpointAddress);
if (i < 0)
{
- OstTraceDef0( OST_TRACE_CATEGORY_RND, TRACE_FATAL, TUSBCDESCRIPTORPOOL_GETENDPOINTDESCRIPTORSIZE_DUP1,
- " Error: no such endpoint" );
+ __KTRACE_OPT(KPANIC, Kern::Printf(" Error: no such endpoint"));
return KErrNotFound;
}
aSize = iDescriptors[i]->Size();
@@ -1454,12 +1332,10 @@
TInt TUsbcDescriptorPool::GetDeviceQualifierDescriptorTC(DThread* aThread, TDes8& aBuffer) const
{
- OstTraceDef0( OST_TRACE_CATEGORY_RND, TRACE_FLOW, TUSBCDESCRIPTORPOOL_GETDEVICEQUALIFIERDESCRIPTORTC,
- "TUsbcDescriptorPool::GetDeviceQualifierDescriptorTC()" );
+ __KTRACE_OPT(KUSB, Kern::Printf("TUsbcDescriptorPool::GetDeviceQualifierDescriptorTC()"));
if (iDescriptors[KDescPosition_DeviceQualifier] == NULL)
{
- OstTraceDef0( OST_TRACE_CATEGORY_RND, TRACE_FATAL, TUSBCDESCRIPTORPOOL_GETDEVICEQUALIFIERDESCRIPTORTC_DUP1,
- " Warning: Device_Qualifier descriptor not supported" );
+ __KTRACE_OPT(KPANIC, Kern::Printf(" Warning: Device_Qualifier descriptor not supported"));
return KErrNotSupported;
}
return Kern::ThreadDesWrite(aThread, &aBuffer,
@@ -1469,12 +1345,10 @@
TInt TUsbcDescriptorPool::SetDeviceQualifierDescriptorTC(DThread* aThread, const TDes8& aBuffer)
{
- OstTraceDef0( OST_TRACE_CATEGORY_RND, TRACE_FLOW, TUSBCDESCRIPTORPOOL_SETDEVICEQUALIFIERDESCRIPTORTC,
- "TUsbcDescriptorPool::SetDeviceQualifierDescriptorTC()" );
+ __KTRACE_OPT(KUSB, Kern::Printf("TUsbcDescriptorPool::SetDeviceQualifierDescriptorTC()"));
if (iDescriptors[KDescPosition_DeviceQualifier] == NULL)
{
- OstTraceDef0( OST_TRACE_CATEGORY_RND, TRACE_FATAL, TUSBCDESCRIPTORPOOL_SETDEVICEQUALIFIERDESCRIPTORTC_DUP1,
- " Warning: Device_Qualifier descriptor not supported" );
+ __KTRACE_OPT(KPANIC, Kern::Printf(" Warning: Device_Qualifier descriptor not supported"));
return KErrNotSupported;
}
TBuf8<KUsbDescSize_DeviceQualifier> device;
@@ -1494,12 +1368,10 @@
TInt TUsbcDescriptorPool::GetOtherSpeedConfigurationDescriptorTC(DThread* aThread, TDes8& aBuffer) const
{
- OstTraceDef0( OST_TRACE_CATEGORY_RND, TRACE_FLOW, TUSBCDESCRIPTORPOOL_GETOTHERSPEEDCONFIGURATIONDESCRIPTORTC,
- "TUsbcDescriptorPool::GetOtherSpeedConfigurationDescriptorTC()" );
+ __KTRACE_OPT(KUSB, Kern::Printf("TUsbcDescriptorPool::GetOtherSpeedConfigurationDescriptorTC()"));
if (iDescriptors[KDescPosition_OtherSpeedConfig] == NULL)
{
- OstTraceDef0( OST_TRACE_CATEGORY_RND, TRACE_FATAL, TUSBCDESCRIPTORPOOL_GETOTHERSPEEDCONFIGURATIONDESCRIPTORTC_DUP1,
- " Warning: Other_Speed_Configuration descriptor not supported" );
+ __KTRACE_OPT(KPANIC, Kern::Printf(" Warning: Other_Speed_Configuration descriptor not supported"));
return KErrNotSupported;
}
return Kern::ThreadDesWrite(aThread, &aBuffer,
@@ -1509,12 +1381,10 @@
TInt TUsbcDescriptorPool::SetOtherSpeedConfigurationDescriptorTC(DThread* aThread, const TDes8& aBuffer)
{
- OstTraceDef0( OST_TRACE_CATEGORY_RND, TRACE_FLOW, TUSBCDESCRIPTORPOOL_SETOTHERSPEEDCONFIGURATIONDESCRIPTORTC,
- "TUsbcDescriptorPool::SetOtherSpeedConfigurationDescriptorTC()" );
+ __KTRACE_OPT(KUSB, Kern::Printf("TUsbcDescriptorPool::SetOtherSpeedConfigurationDescriptorTC()"));
if (iDescriptors[KDescPosition_OtherSpeedConfig] == NULL)
{
- OstTraceDef0( OST_TRACE_CATEGORY_RND, TRACE_FATAL, TUSBCDESCRIPTORPOOL_SETOTHERSPEEDCONFIGURATIONDESCRIPTORTC_DUP1,
- " Warning: Other_Speed_Configuration descriptor not supported" );
+ __KTRACE_OPT(KPANIC, Kern::Printf(" Warning: Other_Speed_Configuration descriptor not supported"));
return KErrNotSupported;
}
TBuf8<KUsbDescSize_OtherSpeedConfig> config;
@@ -1536,8 +1406,7 @@
TInt i = FindIfcDescriptor(aInterface, aSetting);
if (i < 0)
{
- OstTraceDef0( OST_TRACE_CATEGORY_RND, TRACE_FATAL, TUSBCDESCRIPTORPOOL_GETCSINTERFACEDESCRIPTORTC,
- " Error: no such interface" );
+ __KTRACE_OPT(KPANIC, Kern::Printf(" Error: no such interface"));
return KErrNotFound;
}
TInt r = KErrNotFound;
@@ -1562,8 +1431,7 @@
TInt i = FindIfcDescriptor(aInterface, aSetting);
if (i < 0)
{
- OstTraceDef0( OST_TRACE_CATEGORY_RND, TRACE_FATAL, TUSBCDESCRIPTORPOOL_SETCSINTERFACEDESCRIPTORTC,
- " Error: no such interface" );
+ __KTRACE_OPT(KPANIC, Kern::Printf(" Error: no such interface"));
return KErrNotFound;
}
// Find a position where to insert the new class specific interface descriptor(s)
@@ -1576,8 +1444,7 @@
{
return KErrNoMemory;
}
- OstTraceDef1( OST_TRACE_CATEGORY_RND, TRACE_NORMAL, TUSBCDESCRIPTORPOOL_SETCSINTERFACEDESCRIPTORTC_DUP1,
- " inserting descriptor at position %d", i );
+ __KTRACE_OPT(KUSB, Kern::Printf(" inserting descriptor at position %d", i));
iDescriptors.Insert(desc, i);
// Update the config descriptor's wTotalLength field
@@ -1594,8 +1461,7 @@
TInt i = FindIfcDescriptor(aInterface, aSetting);
if (i < 0)
{
- OstTraceDef0( OST_TRACE_CATEGORY_RND, TRACE_FATAL, TUSBCDESCRIPTORPOOL_GETCSINTERFACEDESCRIPTORSIZE,
- " Error: no such interface" );
+ __KTRACE_OPT(KPANIC, Kern::Printf(" Error: no such interface"));
return KErrNotFound;
}
TInt r = KErrNotFound;
@@ -1619,8 +1485,7 @@
TInt i = FindEpDescriptor(aInterface, aSetting, aEndpointAddress);
if (i < 0)
{
- OstTraceDef0( OST_TRACE_CATEGORY_RND, TRACE_FATAL, TUSBCDESCRIPTORPOOL_GETCSENDPOINTDESCRIPTORTC,
- " Error: no such endpoint" );
+ __KTRACE_OPT(KPANIC, Kern::Printf(" Error: no such endpoint"));
return KErrNotFound;
}
TInt r = KErrNotFound;
@@ -1645,8 +1510,7 @@
TInt i = FindEpDescriptor(aInterface, aSetting, aEndpointAddress);
if (i < 0)
{
- OstTraceDef0( OST_TRACE_CATEGORY_RND, TRACE_FATAL, TUSBCDESCRIPTORPOOL_SETCSENDPOINTDESCRIPTORTC,
- " Error: no such endpoint" );
+ __KTRACE_OPT(KPANIC, Kern::Printf(" Error: no such endpoint"));
return KErrNotFound;
}
// find a position where to insert the new class specific endpoint descriptor(s)
@@ -1674,8 +1538,7 @@
TInt i = FindEpDescriptor(aInterface, aSetting, aEndpointAddress);
if (i < 0)
{
- OstTraceDef0( OST_TRACE_CATEGORY_RND, TRACE_FATAL, TUSBCDESCRIPTORPOOL_GETCSENDPOINTDESCRIPTORSIZE,
- " Error: no such endpoint" );
+ __KTRACE_OPT(KPANIC, Kern::Printf(" Error: no such endpoint"));
return KErrNotFound;
}
TInt r = KErrNotFound;
@@ -1773,16 +1636,14 @@
if (str_idx)
{
__ASSERT_ALWAYS((str_idx == KStringPosition_Config), Kern::Fault(KUsbPanicCat, __LINE__));
- OstTraceDefExt2( OST_TRACE_CATEGORY_RND, TRACE_NORMAL, TUSBCDESCRIPTORPOOL_GETCONFIGURATIONSTRINGDESCRIPTORTC,
- " String @ pos %d (conf $): \"%s\"", str_idx, iStrings[str_idx]->StringData() );
+ __KTRACE_OPT(KUSB, Kern::Printf(" String @ pos %d (conf $): \"%S\"",
+ str_idx, &iStrings[str_idx]->StringData()));
return Kern::ThreadDesWrite(aThread, &aString,
iStrings[str_idx]->StringData(), 0);
}
else
{
- OstTraceDef1( OST_TRACE_CATEGORY_RND, TRACE_NORMAL, TUSBCDESCRIPTORPOOL_GETCONFIGURATIONSTRINGDESCRIPTORTC_DUP1,
- " No config string descriptor @ pos %d", str_idx );
-
+ __KTRACE_OPT(KUSB, Kern::Printf(" No config string descriptor @ pos %d", str_idx));
return KErrNotFound;
}
}
@@ -1794,15 +1655,13 @@
TUint strlen = Kern::ThreadGetDesLength(aThread, &aString);
if (strlen > KUsbStringDescStringMaxSize)
{
- OstTraceDef0( OST_TRACE_CATEGORY_RND, TRACE_FATAL, TUSBCDESCRIPTORPOOL_SETCONFIGURATIONSTRINGDESCRIPTORTC,
- " Warning: config $ descriptor too long - will be truncated" );
+ __KTRACE_OPT(KPANIC, Kern::Printf(" Warning: config $ descriptor too long - will be truncated"));
strlen = KUsbStringDescStringMaxSize;
}
HBuf8* const strbuf = HBuf8::New(strlen);
if (!strbuf)
{
- OstTraceDef0( OST_TRACE_CATEGORY_RND, TRACE_FATAL, TUSBCDESCRIPTORPOOL_SETCONFIGURATIONSTRINGDESCRIPTORTC_DUP1,
- " Error: Memory allocation for config $ desc string failed (1)" );
+ __KTRACE_OPT(KPANIC, Kern::Printf(" Error: Memory allocation for config $ desc string failed (1)"));
return KErrNoMemory;
}
strbuf->SetMax();
@@ -1810,16 +1669,14 @@
const TInt r = Kern::ThreadDesRead(aThread, &aString, *strbuf, 0);
if (r != KErrNone)
{
- OstTraceDef0( OST_TRACE_CATEGORY_RND, TRACE_FATAL, TUSBCDESCRIPTORPOOL_SETCONFIGURATIONSTRINGDESCRIPTORTC_DUP2,
- " Error: Thread read error" );
+ __KTRACE_OPT(KPANIC, Kern::Printf(" Error: Thread read error"));
delete strbuf;
return r;
}
TUsbcStringDescriptor* sd = TUsbcStringDescriptor::New(*strbuf);
if (!sd)
{
- OstTraceDef0( OST_TRACE_CATEGORY_RND, TRACE_FATAL, TUSBCDESCRIPTORPOOL_SETCONFIGURATIONSTRINGDESCRIPTORTC_DUP3,
- " Error: Memory allocation for config $ desc failed (2)" );
+ __KTRACE_OPT(KPANIC, Kern::Printf(" Error: Memory allocation for config $ desc failed (2)"));
delete strbuf;
return KErrNoMemory;
}
@@ -1840,8 +1697,8 @@
{
if (iDescriptors[KDescPosition_Config]->Byte(KUsbDescStringIndex_Config) == 0)
{
- OstTraceDef1( OST_TRACE_CATEGORY_RND, TRACE_NORMAL, TUSBCDESCRIPTORPOOL_REMOVECONFIGURATIONSTRINGDESCRIPTOR,
- " RemoveConfigurationStringDescriptor: no $ desc @ index %d", KUsbDescStringIndex_Config );
+ __KTRACE_OPT(KUSB, Kern::Printf(" RemoveConfigurationStringDescriptor: no $ desc @ index %d",
+ KUsbDescStringIndex_Config));
return KErrNotFound;
}
// Delete old string, put in NULL pointer
@@ -1857,35 +1714,31 @@
TInt TUsbcDescriptorPool::GetStringDescriptorTC(DThread* aThread, TInt aIndex, TDes8& aString) const
{
- OstTraceDef0( OST_TRACE_CATEGORY_RND, TRACE_FLOW, TUSBCDESCRIPTORPOOL_GETSTRINGDESCRIPTORTC,
- "TUsbcDescriptorPool::GetStringDescriptorTC()" );
+ __KTRACE_OPT(KUSB, Kern::Printf("TUsbcDescriptorPool::GetStringDescriptorTC()"));
if (!StringDescriptorExists(aIndex))
{
return KErrNotFound;
}
- OstTraceDefExt2( OST_TRACE_CATEGORY_RND, TRACE_FLOW, TUSBCDESCRIPTORPOOL_GETSTRINGDESCRIPTORTC_DUP1,
- " String @ pos %d: \"%s\"", aIndex, iStrings[aIndex]->StringData() );
+ __KTRACE_OPT(KUSB, Kern::Printf(" String @ pos %d: \"%S\"",
+ aIndex, &iStrings[aIndex]->StringData()));
return Kern::ThreadDesWrite(aThread, &aString, iStrings[aIndex]->StringData(), 0);
}
TInt TUsbcDescriptorPool::SetStringDescriptorTC(DThread* aThread, TInt aIndex, const TDes8& aString)
{
- OstTraceDef0( OST_TRACE_CATEGORY_RND, TRACE_FLOW, TUSBCDESCRIPTORPOOL_SETSTRINGDESCRIPTORTC,
- "TUsbcDescriptorPool::SetStringDescriptorTC()" );
+ __KTRACE_OPT(KUSB, Kern::Printf("TUsbcDescriptorPool::SetStringDescriptorTC()"));
// we don't know the length of the string, so we have to allocate memory dynamically
TUint strlen = Kern::ThreadGetDesLength(aThread, &aString);
if (strlen > KUsbStringDescStringMaxSize)
{
- OstTraceDef0( OST_TRACE_CATEGORY_RND, TRACE_FATAL, TUSBCDESCRIPTORPOOL_SETSTRINGDESCRIPTORTC_DUP1,
- " Warning: $ descriptor too long - will be truncated" );
+ __KTRACE_OPT(KPANIC, Kern::Printf(" Warning: $ descriptor too long - will be truncated"));
strlen = KUsbStringDescStringMaxSize;
}
HBuf8* strbuf = HBuf8::New(strlen);
if (!strbuf)
{
- OstTraceDef0( OST_TRACE_CATEGORY_RND, TRACE_FATAL, TUSBCDESCRIPTORPOOL_SETSTRINGDESCRIPTORTC_DUP2,
- " Error: Mem alloc for $ desc string failed (1)" );
+ __KTRACE_OPT(KPANIC, Kern::Printf(" Error: Mem alloc for $ desc string failed (1)"));
return KErrNoMemory;
}
strbuf->SetMax();
@@ -1893,16 +1746,14 @@
const TInt r = Kern::ThreadDesRead(aThread, &aString, *strbuf, 0);
if (r != KErrNone)
{
- OstTraceDef0( OST_TRACE_CATEGORY_RND, TRACE_FATAL, TUSBCDESCRIPTORPOOL_SETSTRINGDESCRIPTORTC_DUP3,
- " Error: Thread read error" );
+ __KTRACE_OPT(KPANIC, Kern::Printf(" Error: Thread read error"));
delete strbuf;
return r;
}
TUsbcStringDescriptor* const sd = TUsbcStringDescriptor::New(*strbuf);
if (!sd)
{
- OstTraceDef0( OST_TRACE_CATEGORY_RND, TRACE_FATAL, TUSBCDESCRIPTORPOOL_SETSTRINGDESCRIPTORTC_DUP4,
- " Error: Mem alloc for $ desc failed (2)" );
+ __KTRACE_OPT(KPANIC, Kern::Printf(" Error: Mem alloc for $ desc failed (2)"));
delete strbuf;
return KErrNoMemory;
}
@@ -1925,14 +1776,13 @@
TInt TUsbcDescriptorPool::RemoveStringDescriptor(TInt aIndex)
{
- OstTraceDef0( OST_TRACE_CATEGORY_RND, TRACE_FLOW, TUSBCDESCRIPTORPOOL_REMOVESTRINGDESCRIPTOR,
- "TUsbcDescriptorPool::RemoveStringDescriptor()" );
+ __KTRACE_OPT(KUSB, Kern::Printf("TUsbcDescriptorPool::RemoveStringDescriptor()"));
if (!StringDescriptorExists(aIndex))
{
return KErrNotFound;
}
- OstTraceDefExt2( OST_TRACE_CATEGORY_RND, TRACE_NORMAL, TUSBCDESCRIPTORPOOL_REMOVESTRINGDESCRIPTOR_DUP1,
- " Removing string @ pos %d: \"%s\"", aIndex, iStrings[aIndex]->StringData() );
+ __KTRACE_OPT(KUSB, Kern::Printf(" Removing string @ pos %d: \"%S\"",
+ aIndex, &iStrings[aIndex]->StringData()));
ExchangeStringDescriptor(aIndex, NULL);
// Make sure there's no $ after aIndex.
@@ -1941,33 +1791,28 @@
{
if (iStrings[i] != NULL)
{
- OstTraceDef1( OST_TRACE_CATEGORY_RND, TRACE_NORMAL, TUSBCDESCRIPTORPOOL_REMOVESTRINGDESCRIPTOR_DUP2,
- " Found $ @ idx %d - not compressing", i );
+ __KTRACE_OPT(KUSB, Kern::Printf(" Found $ @ idx %d - not compressing", i));
return KErrNone;
}
}
- OstTraceDef1( OST_TRACE_CATEGORY_RND, TRACE_NORMAL, TUSBCDESCRIPTORPOOL_REMOVESTRINGDESCRIPTOR_DUP3,
- " No $ found after idx %d - compressing array", aIndex );
+ __KTRACE_OPT(KUSB, Kern::Printf(" No $ found after idx %d - compressing array", aIndex));
// Move aIndex back just before the first !NULL element.
while (iStrings[--aIndex] == NULL)
;
// Let aIndex point to first NULL.
aIndex++;
- OstTraceDef1( OST_TRACE_CATEGORY_RND, TRACE_NORMAL, TUSBCDESCRIPTORPOOL_REMOVESTRINGDESCRIPTOR_DUP4,
- " Starting at index %d", aIndex );
+ __KTRACE_OPT(KUSB, Kern::Printf(" Starting at index %d", aIndex));
// Now remove NULL pointers until (Count() == aIndex).
- OstTraceDef1( OST_TRACE_CATEGORY_RND, TRACE_NORMAL, TUSBCDESCRIPTORPOOL_REMOVESTRINGDESCRIPTOR_DUP5,
- " iStrings.Count() before: %d", iStrings.Count() );
+ __KTRACE_OPT(KUSB, Kern::Printf(" iStrings.Count() before: %d", iStrings.Count()));
do
{
iStrings.Remove(aIndex);
- OstTraceDef0( OST_TRACE_CATEGORY_RND, TRACE_NORMAL, TUSBCDESCRIPTORPOOL_REMOVESTRINGDESCRIPTOR_DUP6,
- " Removing $" );
+ __KTRACE_OPT(KUSB, Kern::Printf(" Removing $"));
}
while (iStrings.Count() > aIndex);
- OstTraceDef1( OST_TRACE_CATEGORY_RND, TRACE_NORMAL, TUSBCDESCRIPTORPOOL_REMOVESTRINGDESCRIPTOR_DUP7,
- " iStrings.Count() after: %d", iStrings.Count() );
+ __KTRACE_OPT(KUSB, Kern::Printf(" iStrings.Count() after: %d", iStrings.Count()));
+
// Regain some memory.
iStrings.Compress();
@@ -1984,8 +1829,7 @@
//
void TUsbcDescriptorPool::InsertIfcDesc(TUsbcDescriptorBase* aDesc)
{
- OstTraceDef0( OST_TRACE_CATEGORY_RND, TRACE_FLOW, TUSBCDESCRIPTORPOOL_INSERTIFCDESC,
- "TUsbcDescriptorPool::InsertIfcDesc()" );
+ __KTRACE_OPT(KUSB, Kern::Printf("TUsbcDescriptorPool::InsertIfcDesc()"));
const TInt count = iDescriptors.Count();
TBool ifc_exists = EFalse; // set to 'true' if we're adding an alternate
@@ -1993,8 +1837,7 @@
TInt i = KDescPosition_FirstAvailable;
while (i < count)
{
- OstTraceDef1( OST_TRACE_CATEGORY_RND, TRACE_NORMAL, TUSBCDESCRIPTORPOOL_INSERTIFCDESC_DUP1,
- " already descriptors there (%d)...", count );
+ __KTRACE_OPT(KUSB, Kern::Printf(" already descriptors there (%d)...", count));
if (iDescriptors[i]->Type() == KUsbDescType_Interface)
{
if (iDescriptors[i]->Byte(2) > aDesc->Byte(2))
@@ -2013,8 +1856,8 @@
}
else if (iDescriptors[i]->Byte(3) == aDesc->Byte(3))
{
- OstTraceDef0( OST_TRACE_CATEGORY_RND, TRACE_FATAL, TUSBCDESCRIPTORPOOL_INSERTIFCDESC_DUP2,
- " Error: first delete old desc (TUsbcDescriptorPool::InsertIfcDesc)" );
+ __KTRACE_OPT(KPANIC, Kern::Printf(" Error: first delete old desc "
+ "(TUsbcDescriptorPool::InsertIfcDesc)"));
return;
}
}
@@ -2022,8 +1865,7 @@
++i;
}
// In any case: put the new descriptor at position i.
- OstTraceDef1( OST_TRACE_CATEGORY_RND, TRACE_NORMAL, TUSBCDESCRIPTORPOOL_INSERTIFCDESC_DUP3,
- " inserting descriptor at position %d", i );
+ __KTRACE_OPT(KUSB, Kern::Printf(" inserting descriptor at position %d", i));
iDescriptors.Insert(aDesc, i);
// Update the config descriptor's wTotalLength field.
@@ -2044,12 +1886,11 @@
//
void TUsbcDescriptorPool::InsertEpDesc(TUsbcDescriptorBase* aDesc)
{
- OstTraceDef0( OST_TRACE_CATEGORY_RND, TRACE_FLOW, TUSBCDESCRIPTORPOOL_INSERTEPDESC,
- "TUsbcDescriptorPool::InsertEpDesc()" );
+ __KTRACE_OPT(KUSB, Kern::Printf("TUsbcDescriptorPool::InsertEpDesc()"));
if (iIfcIdx == 0)
{
- OstTraceDef0( OST_TRACE_CATEGORY_RND, TRACE_FATAL, TUSBCDESCRIPTORPOOL_INSERTEPDESC_DUP1,
- " Error: only after interface (TUsbcDescriptorPool::InsertEpDesc)" );
+ __KTRACE_OPT(KPANIC, Kern::Printf(" Error: only after interface "
+ "(TUsbcDescriptorPool::InsertEpDesc)"));
return;
}
const TInt count = iDescriptors.Count();
@@ -2072,8 +1913,8 @@
//
TInt TUsbcDescriptorPool::FindIfcDescriptor(TInt aIfcNumber, TInt aIfcSetting) const
{
- OstTraceDefExt2( OST_TRACE_CATEGORY_RND, TRACE_NORMAL, TUSBCDESCRIPTORPOOL_FINDIFCDESCRIPTOR,
- "TUsbcDescriptorPool::FindIfcDescriptor(%d, %d)", aIfcNumber, aIfcSetting );
+ __KTRACE_OPT(KUSB, Kern::Printf("TUsbcDescriptorPool::FindIfcDescriptor(%d, %d)",
+ aIfcNumber, aIfcSetting));
const TInt count = iDescriptors.Count();
for (TInt i = KDescPosition_FirstAvailable; i < count; i++)
{
@@ -2084,8 +1925,7 @@
return i;
}
}
- OstTraceDef0( OST_TRACE_CATEGORY_RND, TRACE_FATAL, TUSBCDESCRIPTORPOOL_FINDIFCDESCRIPTOR_DUP1,
- " Error: no such interface" );
+ __KTRACE_OPT(KPANIC, Kern::Printf(" Error: no such interface"));
return -1;
}
@@ -2095,14 +1935,13 @@
//
TInt TUsbcDescriptorPool::FindEpDescriptor(TInt aIfcNumber, TInt aIfcSetting, TUint8 aEpAddress) const
{
- OstTraceDefExt3( OST_TRACE_CATEGORY_RND, TRACE_NORMAL, TUSBCDESCRIPTORPOOL_FINDEPDESCRIPTOR,
- "TUsbcDescriptorPool::FindEpDescriptor(%d, %d, 0x%02x)", aIfcNumber, aIfcSetting, aEpAddress );
+ __KTRACE_OPT(KUSB, Kern::Printf("TUsbcDescriptorPool::FindEpDescriptor(%d, %d, 0x%02x)",
+ aIfcNumber, aIfcSetting, aEpAddress));
// first find the interface
const TInt ifc = FindIfcDescriptor(aIfcNumber, aIfcSetting);
if (ifc < 0)
{
- OstTraceDef0( OST_TRACE_CATEGORY_RND, TRACE_FATAL, TUSBCDESCRIPTORPOOL_FINDEPDESCRIPTOR_DUP1,
- " Error: no such interface" );
+ __KTRACE_OPT(KPANIC, Kern::Printf(" Error: no such interface"));
return ifc;
}
const TInt count = iDescriptors.Count();
@@ -2111,8 +1950,7 @@
{
if (iDescriptors[i]->Type() == KUsbDescType_Interface)
{
- OstTraceDef0( OST_TRACE_CATEGORY_RND, TRACE_FATAL, TUSBCDESCRIPTORPOOL_FINDEPDESCRIPTOR_DUP2,
- " Error: no such endpoint before next interface" );
+ __KTRACE_OPT(KPANIC, Kern::Printf(" Error: no such endpoint before next interface"));
return -1;
}
else if ((iDescriptors[i]->Type() == KUsbDescType_Endpoint) &&
@@ -2122,8 +1960,7 @@
return i;
}
}
- OstTraceDef0( OST_TRACE_CATEGORY_RND, TRACE_FATAL, TUSBCDESCRIPTORPOOL_FINDEPDESCRIPTOR_DUP3,
- " Error: no such endpoint" );
+ __KTRACE_OPT(KPANIC, Kern::Printf(" Error: no such endpoint"));
return -1;
}
@@ -2133,22 +1970,18 @@
//
void TUsbcDescriptorPool::DeleteDescriptors(TInt aIndex, TInt aCount)
{
- OstTraceDef0( OST_TRACE_CATEGORY_RND, TRACE_FLOW, TUSBCDESCRIPTORPOOL_DELETEDESCRIPTORS,
- "TUsbcDescriptorPool::DeleteDescriptors()" );
+ __KTRACE_OPT(KUSB, Kern::Printf("TUsbcDescriptorPool::DeleteDescriptors()"));
if (aIndex < KDescPosition_FirstAvailable)
{
- OstTraceDef0( OST_TRACE_CATEGORY_RND, TRACE_FATAL, TUSBCDESCRIPTORPOOL_DELETEDESCRIPTORS_DUP1,
- " Error: aIndex < KDescPosition_FirstAvailable" );
+ __KTRACE_OPT(KPANIC, Kern::Printf(" Error: aIndex < KDescPosition_FirstAvailable"));
return;
}
if (aCount <= 0)
{
- OstTraceDef0( OST_TRACE_CATEGORY_RND, TRACE_FATAL, TUSBCDESCRIPTORPOOL_DELETEDESCRIPTORS_DUP2,
- " Error: aCount <= 0" );
+ __KTRACE_OPT(KPANIC, Kern::Printf(" Error: aCount <= 0"));
return;
}
- OstTraceDef1( OST_TRACE_CATEGORY_RND, TRACE_NORMAL, TUSBCDESCRIPTORPOOL_DELETEDESCRIPTORS_DUP3,
- " Removing descriptors at index %d:", aIndex );
+ __KTRACE_OPT(KUSB, Kern::Printf(" Removing descriptors at index %d:", aIndex));
// Try to update wTotalLength field in Config descriptor
while (aCount--)
{
@@ -2158,27 +1991,22 @@
switch (ptr->Type())
{
case KUsbDescType_Interface:
- OstTraceDef0( OST_TRACE_CATEGORY_RND, TRACE_NORMAL, TUSBCDESCRIPTORPOOL_DELETEDESCRIPTORS_DUP4,
- " - an interface descriptor" );
+ __KTRACE_OPT(KUSB, Kern::Printf(" - an interface descriptor"));
UpdateConfigDescriptorLength(-KUsbDescSize_Interface);
break;
case KUsbDescType_Endpoint:
- OstTraceDef0( OST_TRACE_CATEGORY_RND, TRACE_NORMAL, TUSBCDESCRIPTORPOOL_DELETEDESCRIPTORS_DUP5,
- " - an endpoint descriptor" );
+ __KTRACE_OPT(KUSB, Kern::Printf(" - an endpoint descriptor"));
UpdateConfigDescriptorLength(-ptr->Size());
break;
case KUsbDescType_CS_Interface:
/* fall through */
case KUsbDescType_CS_Endpoint:
- OstTraceDef0( OST_TRACE_CATEGORY_RND, TRACE_NORMAL, TUSBCDESCRIPTORPOOL_DELETEDESCRIPTORS_DUP6,
- " - a class specific descriptor" );
+ __KTRACE_OPT(KUSB, Kern::Printf(" - a class specific descriptor"));
UpdateConfigDescriptorLength(-ptr->Size());
break;
default:
- OstTraceDef0( OST_TRACE_CATEGORY_RND, TRACE_NORMAL, TUSBCDESCRIPTORPOOL_DELETEDESCRIPTORS_DUP7,
- " - an unknown descriptor" );
- OstTraceDef0( OST_TRACE_CATEGORY_RND, TRACE_FATAL, TUSBCDESCRIPTORPOOL_DELETEDESCRIPTORS_DUP8,
- " Error: unknown descriptor type" );
+ __KTRACE_OPT(KUSB, Kern::Printf(" - an unknown descriptor"));
+ __KTRACE_OPT(KPANIC, Kern::Printf(" Error: unknown descriptor type"));
}
iDescriptors.Remove(aIndex);
delete ptr;
@@ -2191,15 +2019,12 @@
//
void TUsbcDescriptorPool::UpdateConfigDescriptorLength(TInt aLength)
{
- OstTraceDef1( OST_TRACE_CATEGORY_RND, TRACE_NORMAL, TUSBCDESCRIPTORPOOL_UPDATECONFIGDESCRIPTORLENGTH,
- "TUsbcDescriptorPool::UpdateConfigDescriptorLength(%d)", aLength );
+ __KTRACE_OPT(KUSB, Kern::Printf("TUsbcDescriptorPool::UpdateConfigDescriptorLength(%d)", aLength));
TUsbcDescriptorBase* const cnf = iDescriptors[KDescPosition_Config];
- OstTraceDef1( OST_TRACE_CATEGORY_RND, TRACE_NORMAL, TUSBCDESCRIPTORPOOL_UPDATECONFIGDESCRIPTORLENGTH_DUP1,
- " wTotalLength old: %d", cnf->Word(2) );
+ __KTRACE_OPT(KUSB, Kern::Printf(" wTotalLength old: %d", cnf->Word(2)));
// Update Config descriptor
cnf->SetWord(2, cnf->Word(2) + aLength);
- OstTraceDef1( OST_TRACE_CATEGORY_RND, TRACE_NORMAL, TUSBCDESCRIPTORPOOL_UPDATECONFIGDESCRIPTORLENGTH_DUP2,
- " wTotalLength new: %d", cnf->Word(2) );
+ __KTRACE_OPT(KUSB, Kern::Printf(" wTotalLength new: %d", cnf->Word(2)));
// Update Other_Speed_Config descriptor as well, if applicable
if (iDescriptors[KDescPosition_OtherSpeedConfig])
iDescriptors[KDescPosition_OtherSpeedConfig]->SetWord(2, cnf->Word(2));
@@ -2211,22 +2036,18 @@
//
void TUsbcDescriptorPool::UpdateConfigDescriptorNumIfcs(TInt aNumber)
{
- OstTraceDef1( OST_TRACE_CATEGORY_RND, TRACE_NORMAL, TUSBCDESCRIPTORPOOL_UPDATECONFIGDESCRIPTORNUMIFCS,
- "TUsbcDescriptorPool::UpdateConfigDescriptorNumIfcs(%d)", aNumber );
+ __KTRACE_OPT(KUSB, Kern::Printf("TUsbcDescriptorPool::UpdateConfigDescriptorNumIfcs(%d)", aNumber));
TUsbcDescriptorBase* const cnf = iDescriptors[KDescPosition_Config];
- OstTraceDef1( OST_TRACE_CATEGORY_RND, TRACE_NORMAL, TUSBCDESCRIPTORPOOL_UPDATECONFIGDESCRIPTORNUMIFCS_DUP1,
- " bNumInterfaces old: %d", cnf->Byte(4) );
+ __KTRACE_OPT(KUSB, Kern::Printf(" bNumInterfaces old: %d", cnf->Byte(4)));
const TInt n = cnf->Byte(4) + aNumber;
if (n < 0)
{
- OstTraceDef0( OST_TRACE_CATEGORY_RND, TRACE_FATAL, TUSBCDESCRIPTORPOOL_UPDATECONFIGDESCRIPTORNUMIFCS_DUP2,
- " Error: bNumInterfaces + aNumber < 0" );
+ __KTRACE_OPT(KPANIC, Kern::Printf(" Error: bNumInterfaces + aNumber < 0"));
return;
}
// Update Config descriptor
cnf->SetByte(4, n);
- OstTraceDef1( OST_TRACE_CATEGORY_RND, TRACE_NORMAL, TUSBCDESCRIPTORPOOL_UPDATECONFIGDESCRIPTORNUMIFCS_DUP3,
- " bNumInterfaces new: %d", cnf->Byte(4) );
+ __KTRACE_OPT(KUSB, Kern::Printf(" bNumInterfaces new: %d", cnf->Byte(4)));
// Update Other_Speed_Config descriptor as well, if applicable
if (iDescriptors[KDescPosition_OtherSpeedConfig])
iDescriptors[KDescPosition_OtherSpeedConfig]->SetByte(4, n);
@@ -2238,8 +2059,7 @@
//
void TUsbcDescriptorPool::UpdateIfcNumbers(TInt aNumber)
{
- OstTraceDef1( OST_TRACE_CATEGORY_RND, TRACE_NORMAL, TUSBCDESCRIPTORPOOL_UPDATEIFCNUMBERS,
- "TUsbcDescriptorPool::UpdateIfcNumbers(%d)", aNumber );
+ __KTRACE_OPT(KUSB, Kern::Printf("TUsbcDescriptorPool::UpdateIfcNumbers(%d)", aNumber));
const TInt count = iDescriptors.Count();
for (TInt i = KDescPosition_FirstAvailable; i < count; i++)
{
@@ -2261,21 +2081,14 @@
//
TInt TUsbcDescriptorPool::GetDeviceDescriptor(TInt aIndex) const
{
- OstTraceDef0( OST_TRACE_CATEGORY_RND, TRACE_FLOW, TUSBCDESCRIPTORPOOL_GETDEVICEDESCRIPTOR,
- "TUsbcDescriptorPool::GetDeviceDescriptor()" );
-#ifdef _DEBUG
- if (!((aIndex == KDescPosition_Device) || (aIndex == KDescPosition_DeviceQualifier)))
- {
- OstTraceDef1( OST_TRACE_CATEGORY_DEBUG, TRACE_NORMAL, TUSBCDESCRIPTORPOOL_GETDEVICEDESCRIPTOR_DUP1,
- " Error: invalid descriptor index: %d", aIndex );
- }
-#endif
+ __KTRACE_OPT(KUSB, Kern::Printf("TUsbcDescriptorPool::GetDeviceDescriptor()"));
+ __ASSERT_DEBUG((aIndex == KDescPosition_Device) || (aIndex == KDescPosition_DeviceQualifier),
+ Kern::Printf(" Error: invalid descriptor index: %d", aIndex));
if (iDescriptors[aIndex] == NULL)
{
// This doesn't have to be an error - we might get asked here for the Device_Qualifier descriptor
// on a FS-only device.
- OstTraceDef1( OST_TRACE_CATEGORY_RND, TRACE_NORMAL, TUSBCDESCRIPTORPOOL_GETDEVICEDESCRIPTOR_DUP2,
- " Descriptor #%d requested but not available", aIndex );
+ __KTRACE_OPT(KUSB, Kern::Printf(" Descriptor #%d requested but not available", aIndex));
return 0;
}
return iDescriptors[aIndex]->GetDescriptorData(iEp0_TxBuf, KUsbcBufSz_Ep0Tx);
@@ -2289,21 +2102,14 @@
//
TInt TUsbcDescriptorPool::GetConfigurationDescriptor(TInt aIndex) const
{
- OstTraceDef1( OST_TRACE_CATEGORY_RND, TRACE_NORMAL, TUSBCDESCRIPTORPOOL_GETCONFIGURATIONDESCRIPTOR,
- "TUsbcDescriptorPool::GetConfigDescriptor(%d)", aIndex );
-#ifdef _DEBUG
- if (!((aIndex == KDescPosition_Config) || (aIndex == KDescPosition_OtherSpeedConfig)))
- {
- OstTraceDef1( OST_TRACE_CATEGORY_DEBUG, TRACE_NORMAL, TUSBCDESCRIPTORPOOL_GETCONFIGURATIONDESCRIPTOR_DUP1,
- " Error: invalid descriptor index: %d", aIndex );
- }
-#endif
+ __KTRACE_OPT(KUSB, Kern::Printf("TUsbcDescriptorPool::GetConfigDescriptor(%d)", aIndex));
+ __ASSERT_DEBUG((aIndex == KDescPosition_Config) || (aIndex == KDescPosition_OtherSpeedConfig),
+ Kern::Printf(" Error: invalid descriptor index: %d", aIndex));
if (iDescriptors[aIndex] == NULL)
{
// This is always an error: We should always have a Configuration descriptor and we should never
// get asked for the Other_Speed_Configuration descriptor if we don't have one (9.6.2).
- OstTraceDef1( OST_TRACE_CATEGORY_RND, TRACE_FATAL, TUSBCDESCRIPTORPOOL_GETCONFIGURATIONDESCRIPTOR_DUP2,
- " Warning: Descriptor %d requested but not available", aIndex );
+ __KTRACE_OPT(KPANIC, Kern::Printf(" Warning: Descriptor %d requested but not available", aIndex));
return 0;
}
@@ -2332,8 +2138,7 @@
if (iDescriptors[KDescPosition_Otg] == NULL)
{
// Skip since there is no otg descriptor
- OstTraceDef0( OST_TRACE_CATEGORY_RND, TRACE_NORMAL, TUSBCDESCRIPTORPOOL_GETCONFIGURATIONDESCRIPTOR_DUP3,
- " no otg descriptor" );
+ __KTRACE_OPT(KUSB, Kern::Printf(" no otg descriptor"));
continue;
}
else
@@ -2363,29 +2168,28 @@
}
}
- OstTraceDefExt3( OST_TRACE_CATEGORY_RND, TRACE_NORMAL, TUSBCDESCRIPTORPOOL_GETCONFIGURATIONDESCRIPTOR_DUP4,
- " desc[%02d]: type = 0x%02x size = %d ", pos, ptr->Type(), ptr->Size() );
+ __KTRACE_OPT(KUSB, Kern::Printf(" desc[%02d]: type = 0x%02x size = %d ",
+ pos, ptr->Type(), ptr->Size()));
const TInt size = ptr->GetDescriptorData(buf, KUsbcBufSz_Ep0Tx - copied);
if (size == 0)
{
- OstTraceDef0( OST_TRACE_CATEGORY_RND, TRACE_FATAL, TUSBCDESCRIPTORPOOL_GETCONFIGURATIONDESCRIPTOR_DUP5,
- " Error: No Tx buffer space to copy this descriptor -> exiting" );
+ __KTRACE_OPT(KPANIC,
+ Kern::Printf(" Error: No Tx buffer space to copy this descriptor -> exiting"));
break;
}
copied += size;
if (copied >= KUsbcBufSz_Ep0Tx)
{
- OstTraceDef0( OST_TRACE_CATEGORY_RND, TRACE_FATAL, TUSBCDESCRIPTORPOOL_GETCONFIGURATIONDESCRIPTOR_DUP6,
- " Error: No Tx buffer space left -> stopping here" );
+ __KTRACE_OPT(KPANIC,
+ Kern::Printf(" Error: No Tx buffer space left -> stopping here"));
break;
}
buf += size;
}
- OstTraceDef1( OST_TRACE_CATEGORY_RND, TRACE_NORMAL, TUSBCDESCRIPTORPOOL_GETCONFIGURATIONDESCRIPTOR_DUP7,
- " copied %d bytes", copied );
+ __KTRACE_OPT(KUSB, Kern::Printf(" copied %d bytes", copied));
return copied;
}
@@ -2396,12 +2200,10 @@
//
TInt TUsbcDescriptorPool::GetOtgDescriptor() const
{
- OstTraceDef0( OST_TRACE_CATEGORY_RND, TRACE_FLOW, TUSBCDESCRIPTORPOOL_GETOTGDESCRIPTOR,
- "TUsbcDescriptorPool::GetOtgDescriptor()" );
+ __KTRACE_OPT(KUSB, Kern::Printf("TUsbcDescriptorPool::GetOtgDescriptor()"));
if (iDescriptors[KDescPosition_Otg] == NULL)
{
- OstTraceDef0( OST_TRACE_CATEGORY_RND, TRACE_NORMAL, TUSBCDESCRIPTORPOOL_GETOTGDESCRIPTOR_DUP1,
- " OTG Descriptor not set" );
+ __KTRACE_OPT(KUSB, Kern::Printf(" OTG Descriptor not set"));
return 0;
}
return iDescriptors[KDescPosition_Otg]->GetDescriptorData(iEp0_TxBuf, KUsbcBufSz_Ep0Tx);
@@ -2414,8 +2216,7 @@
//
TInt TUsbcDescriptorPool::GetStringDescriptor(TInt aIndex) const
{
- OstTraceDef1( OST_TRACE_CATEGORY_RND, TRACE_NORMAL, TUSBCDESCRIPTORPOOL_GETSTRINGDESCRIPTOR,
- "TUsbcDescriptorPool::GetStringDescriptor(%d)", aIndex );
+ __KTRACE_OPT(KUSB, Kern::Printf("TUsbcDescriptorPool::GetStringDescriptor(%d)", aIndex));
// I really would have liked to display the descriptor contents here, but without trailing zero
// we got a problem: how can we tell printf where the string ends? We would have to
// dynamically allocate memory (since we don't know the size in advance), copy the descriptor
@@ -2435,21 +2236,19 @@
TInt TUsbcDescriptorPool::GetDeviceStringDescriptorTC(DThread* aThread, TDes8& aString,
TInt aIndex, TInt aPosition) const
{
- OstTraceDef0( OST_TRACE_CATEGORY_RND, TRACE_FLOW, TUSBCDESCRIPTORPOOL_GETDEVICESTRINGDESCRIPTORTC,
- "TUsbcDescriptorPool::GetDeviceStringDescriptorTC()" );
+ __KTRACE_OPT(KUSB, Kern::Printf("TUsbcDescriptorPool::GetDeviceStringDescriptorTC()"));
const TInt str_idx = iDescriptors[KDescPosition_Device]->Byte(aIndex);
if (str_idx)
{
__ASSERT_ALWAYS((str_idx == aPosition), Kern::Fault(KUsbPanicCat, __LINE__));
- OstTraceDefExt2( OST_TRACE_CATEGORY_RND, TRACE_NORMAL, TUSBCDESCRIPTORPOOL_GETDEVICESTRINGDESCRIPTORTC_DUP1,
- " String @ pos %d (device $): \"%s\"", str_idx, iStrings[str_idx]->StringData() );
+ __KTRACE_OPT(KUSB, Kern::Printf(" String @ pos %d (device $): \"%S\"",
+ str_idx, &iStrings[str_idx]->StringData()));
return Kern::ThreadDesWrite(aThread, &aString,
iStrings[str_idx]->StringData(), 0);
}
else
{
- OstTraceDef1( OST_TRACE_CATEGORY_RND, TRACE_NORMAL, TUSBCDESCRIPTORPOOL_GETDEVICESTRINGDESCRIPTORTC_DUP2,
- " No string descriptor @ pos %d", aIndex );
+ __KTRACE_OPT(KUSB, Kern::Printf(" No string descriptor @ pos %d", aIndex));
return KErrNotFound;
}
}
@@ -2462,21 +2261,18 @@
TInt TUsbcDescriptorPool::SetDeviceStringDescriptorTC(DThread* aThread, const TDes8& aString,
TInt aIndex, TInt aPosition)
{
- OstTraceDef0( OST_TRACE_CATEGORY_RND, TRACE_FLOW, TUSBCDESCRIPTORPOOL_SETDEVICESTRINGDESCRIPTORTC,
- "TUsbcDescriptorPool::SetDeviceStringDescriptorTC()" );
+ __KTRACE_OPT(KUSB, Kern::Printf("TUsbcDescriptorPool::SetDeviceStringDescriptorTC()"));
// we don't know the length of the string, so we have to allocate memory dynamically
TUint strlen = Kern::ThreadGetDesLength(aThread, &aString);
if (strlen > KUsbStringDescStringMaxSize)
{
- OstTraceDef0( OST_TRACE_CATEGORY_RND, TRACE_FATAL, TUSBCDESCRIPTORPOOL_SETDEVICESTRINGDESCRIPTORTC_DUP1,
- " Warning: $ descriptor too long - will be truncated" );
+ __KTRACE_OPT(KPANIC, Kern::Printf(" Warning: $ descriptor too long - will be truncated"));
strlen = KUsbStringDescStringMaxSize;
}
HBuf8* const strbuf = HBuf8::New(strlen);
if (!strbuf)
{
- OstTraceDef0( OST_TRACE_CATEGORY_RND, TRACE_FATAL, TUSBCDESCRIPTORPOOL_SETDEVICESTRINGDESCRIPTORTC_DUP2,
- " Error: Memory allocation for dev $ desc string failed (1)" );
+ __KTRACE_OPT(KPANIC, Kern::Printf(" Error: Memory allocation for dev $ desc string failed (1)"));
return KErrNoMemory;
}
strbuf->SetMax();
@@ -2484,16 +2280,14 @@
const TInt r = Kern::ThreadDesRead(aThread, &aString, *strbuf, 0);
if (r != KErrNone)
{
- OstTraceDef0( OST_TRACE_CATEGORY_RND, TRACE_FATAL, TUSBCDESCRIPTORPOOL_SETDEVICESTRINGDESCRIPTORTC_DUP3,
- " Error: Thread read error" );
+ __KTRACE_OPT(KPANIC, Kern::Printf(" Error: Thread read error"));
delete strbuf;
return r;
}
TUsbcStringDescriptor* const sd = TUsbcStringDescriptor::New(*strbuf);
if (!sd)
{
- OstTraceDef0( OST_TRACE_CATEGORY_RND, TRACE_FATAL, TUSBCDESCRIPTORPOOL_SETDEVICESTRINGDESCRIPTORTC_DUP4,
- " Error: Memory allocation for dev $ desc failed (2)" );
+ __KTRACE_OPT(KPANIC, Kern::Printf(" Error: Memory allocation for dev $ desc failed (2)"));
delete strbuf;
return KErrNoMemory;
}
@@ -2510,12 +2304,10 @@
//
TInt TUsbcDescriptorPool::RemoveDeviceStringDescriptor(TInt aIndex, TInt aPosition)
{
- OstTraceDef0( OST_TRACE_CATEGORY_RND, TRACE_FLOW, TUSBCDESCRIPTORPOOL_REMOVEDEVICESTRINGDESCRIPTOR,
- "TUsbcDescriptorPool::RemoveDeviceStringDescriptor()" );
+ __KTRACE_OPT(KUSB, Kern::Printf("TUsbcDescriptorPool::RemoveDeviceStringDescriptor()"));
if (iDescriptors[KDescPosition_Device]->Byte(aIndex) == 0)
{
- OstTraceDef1( OST_TRACE_CATEGORY_RND, TRACE_NORMAL, TUSBCDESCRIPTORPOOL_REMOVEDEVICESTRINGDESCRIPTOR_DUP1,
- " RemoveDeviceStringDescriptor: no $ desc @ index %d", aIndex );
+ __KTRACE_OPT(KUSB, Kern::Printf(" RemoveDeviceStringDescriptor: no $ desc @ index %d", aIndex));
return KErrNotFound;
}
ExchangeStringDescriptor(aPosition, NULL);
@@ -2529,15 +2321,12 @@
//
void TUsbcDescriptorPool::ExchangeStringDescriptor(TInt aIndex, const TUsbcStringDescriptor* aDesc)
{
- OstTraceDef0( OST_TRACE_CATEGORY_RND, TRACE_FLOW, TUSBCDESCRIPTORPOOL_EXCHANGESTRINGDESCRIPTOR,
- "TUsbcDescriptorPool::ExchangeStringDescriptor()" );
+ __KTRACE_OPT(KUSB, Kern::Printf("TUsbcDescriptorPool::ExchangeStringDescriptor()"));
TUsbcStringDescriptorBase* const ptr = iStrings[aIndex];
- OstTraceDefExt2( OST_TRACE_CATEGORY_RND, TRACE_NORMAL, TUSBCDESCRIPTORPOOL_EXCHANGESTRINGDESCRIPTOR_DUP1,
- " Deleting string descriptor at index %d: 0x%x", aIndex, reinterpret_cast<TUint>(ptr) );
+ __KTRACE_OPT(KUSB, Kern::Printf(" Deleting string descriptor at index %d: 0x%x", aIndex, ptr));
iStrings.Remove(aIndex);
delete ptr;
- OstTraceDefExt2( OST_TRACE_CATEGORY_RND, TRACE_NORMAL, TUSBCDESCRIPTORPOOL_EXCHANGESTRINGDESCRIPTOR_DUP2,
- " Inserting string descriptor at index %d: 0x%x", aIndex, reinterpret_cast<TUint>(aDesc) );
+ __KTRACE_OPT(KUSB, Kern::Printf(" Inserting string descriptor at index %d: 0x%x", aIndex, aDesc));
iStrings.Insert(aDesc, aIndex);
}
@@ -2562,18 +2351,15 @@
//
TBool TUsbcDescriptorPool::StringDescriptorExists(TInt aIndex) const
{
- OstTraceDef0( OST_TRACE_CATEGORY_RND, TRACE_FLOW, TUSBCDESCRIPTORPOOL_STRINGDESCRIPTOREXISTS,
- "TUsbcDescriptorPool::StringDescriptorExists" );
+ __KTRACE_OPT(KUSB, Kern::Printf("TUsbcDescriptorPool::StringDescriptorExists()"));
if (aIndex >= iStrings.Count())
{
- OstTraceDef1( OST_TRACE_CATEGORY_RND, TRACE_FATAL, TUSBCDESCRIPTORPOOL_STRINGDESCRIPTOREXISTS_DUP1,
- " Error: Bad string index: %d", aIndex );
+ __KTRACE_OPT(KPANIC, Kern::Printf(" Error: Bad string index: %d", aIndex));
return EFalse;
}
else if (iStrings[aIndex] == NULL)
{
- OstTraceDef1( OST_TRACE_CATEGORY_RND, TRACE_FATAL, TUSBCDESCRIPTORPOOL_STRINGDESCRIPTOREXISTS_DUP2,
- " Error: No $ descriptor @ pos %d", aIndex );
+ __KTRACE_OPT(KPANIC, Kern::Printf(" Error: No $ descriptor @ pos %d", aIndex));
return EFalse;
}
return ETrue;
@@ -2585,16 +2371,14 @@
//
TInt TUsbcDescriptorPool::FindAvailableStringPos() const
{
- OstTraceDef0( OST_TRACE_CATEGORY_RND, TRACE_FLOW, TUSBCDESCRIPTORPOOL_FINDAVAILABLESTRINGPOS,
- "TUsbcDescriptorPool::FindAvailableStringPos()" );
+ __KTRACE_OPT(KUSB, Kern::Printf("TUsbcDescriptorPool::FindAvailableStringPos()"));
const TInt n = iStrings.Count();
// We don't start from 0 because the first few locations are 'reserved'.
for (TInt i = KStringPosition_FirstAvailable; i < n; i++)
{
if (iStrings[i] == NULL)
{
- OstTraceDef1( OST_TRACE_CATEGORY_RND, TRACE_NORMAL, TUSBCDESCRIPTORPOOL_FINDAVAILABLESTRINGPOS_DUP1,
- " Found available NULL position: %d", i );
+ __KTRACE_OPT(KUSB, Kern::Printf(" Found available NULL position: %d", i));
return i;
}
}