--- a/smsprotocols/smsstack/gsmu/src/gsmunonieoperations.cpp Tue Aug 31 16:23:08 2010 +0300
+++ b/smsprotocols/smsstack/gsmu/src/gsmunonieoperations.cpp Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2006-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"
@@ -13,12 +13,6 @@
// Description:
//
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "gsmunonieoperationsTraces.h"
-#endif
-
#include "Gsmumain.h"
#include "gsmunonieoperations.h"
#include "Gsmumsg.h"
@@ -107,7 +101,7 @@
{
// Ignore in code coverage - not intended to be used
BULLSEYE_OFF
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSNONIEOPERATION_OPERATOR_1, "CSmsNonIEOperation::operator=");
+ LOGGSMU1("CSmsNonIEOperation::operator=");
Panic(KGsmuPanicMethodBodyNotImplemented1);
BULLSEYE_RESTORE
}
@@ -124,7 +118,7 @@
{
// Ignore in code coverage - not intended to be used
BULLSEYE_OFF
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSNONIEOPERATION_OPERATOR1_1, "CSmsNonIEOperation::operator==");
+ LOGGSMU1("CSmsNonIEOperation::operator==");
Panic(KGsmuPanicMethodBodyNotImplemented1);
return EFalse;
BULLSEYE_RESTORE
@@ -142,7 +136,7 @@
{
// Ignore in code coverage - not intended to be used
BULLSEYE_OFF
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSCTRLNONIEOPERATION_OPERATOR_1, "CSmsCtrlNonIEOperation::operator=");
+ LOGGSMU1("CSmsCtrlNonIEOperation::operator=");
Panic(KGsmuPanicMethodBodyNotImplemented1);
BULLSEYE_RESTORE
}
@@ -159,7 +153,7 @@
{
// Ignore in code coverage - not intended to be used
BULLSEYE_OFF
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSCTRLNONIEOPERATION_OPERATOR1_1, "CSmsCtrlNonIEOperation::operator==");
+ LOGGSMU1("CSmsCtrlNonIEOperation::operator==");
Panic(KGsmuPanicMethodBodyNotImplemented1);
return EFalse;
BULLSEYE_RESTORE
@@ -200,7 +194,7 @@
{
// Ignore in code coverage - not intended to be used
BULLSEYE_OFF
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSTPSRROPERATIONS_OPERATOR_1, "CSmsTPSRROperations::operator=");
+ LOGGSMU1("CSmsTPSRROperations::operator=");
Panic(KGsmuPanicMethodBodyNotImplemented1);
BULLSEYE_RESTORE
}
@@ -217,7 +211,7 @@
{
// Ignore in code coverage - not intended to be used
BULLSEYE_OFF
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSTPSRROPERATIONS_OPERATOR1_1, "CSmsTPSRROperations::operator==");
+ LOGGSMU1("CSmsTPSRROperations::operator==");
Panic(KGsmuPanicMethodBodyNotImplemented1);
return EFalse;
BULLSEYE_RESTORE
@@ -234,13 +228,13 @@
{
if (iMessage.Version() < CSmsMessage::ESmsMessageV2)
{
- OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSTPSRROPERATIONS_VALIDATEOPERATIONL_1, "CSmsTPSRROperations Operation not supported, Msg Version %d", iMessage.Version());
+ LOGGSMU2("CSmsTPSRROperations Operation not supported, Msg Version %d", iMessage.Version());
User::Leave(KErrNotSupported);
}
if (!MessageTypeSupported())
{
- OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSTPSRROPERATIONS_VALIDATEOPERATIONL_2, "CSmsTPSRROperations Operation not supported by this PDU type, type = %d", iMessage.Type());
+ LOGGSMU2("CSmsTPSRROperations Operation not supported by this PDU type, type = %d", iMessage.Type());
User::Leave(KErrNotSupported);
}
}
@@ -553,7 +547,7 @@
CIncompleteClass0MessageInfo::CIncompleteClass0MessageInfo(TSmsNonIEIdentifier aId, CSmsMessage& aMessage)
: CSmsNonIEOperation(aId, aMessage)
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CINCOMPLETECLASS0MESSAGEINFO_CTOR_1, "CIncompleteClass0MessageInfo constructor");
+ LOGGSMU1("CIncompleteClass0MessageInfo constructor");
}
/**
@@ -570,7 +564,7 @@
*/
EXPORT_C void CIncompleteClass0MessageInfo::GetIncompleteMessageInfoL(TInt& aStartPos, TInt& aEndPos, TBool& aIsLastIncompleteMessage)
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CINCOMPLETECLASS0MESSAGEINFO_GETINCOMPLETEMESSAGEINFOL_1, "CIncompleteClass0MessageInfo::GetIncompleteMessageInfoL");
+ LOGGSMU1("CIncompleteClass0MessageInfo::GetIncompleteMessageInfoL");
ValidateOperationL();
aStartPos = iStartPos;
aEndPos = iEndPos;
@@ -591,7 +585,7 @@
*/
EXPORT_C void CIncompleteClass0MessageInfo::SetIncompleteMessageInfoL(TInt aStartPos, TInt aEndPos, TBool aIsLastIncompleteMessage)
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CINCOMPLETECLASS0MESSAGEINFO_SETINCOMPLETEMESSAGEINFOL_1, "CIncompleteClass0MessageInfo::SetIncompleteMessageInfoL");
+ LOGGSMU1("CIncompleteClass0MessageInfo::SetIncompleteMessageInfoL");
ValidateOperationL();
iStartPos = aStartPos;
iEndPos = aEndPos;
@@ -610,7 +604,7 @@
{
// Ignore in code coverage - not intended to be used
BULLSEYE_OFF
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CINCOMPLETECLASS0MESSAGEINFO_OPERATOR_1, "CIncompleteClass0MessageInfo::operator=");
+ LOGGSMU1("CIncompleteClass0MessageInfo::operator=");
Panic(KGsmuPanicMethodBodyNotImplemented1);
BULLSEYE_RESTORE
}
@@ -627,7 +621,7 @@
{
// Ignore in code coverage - not intended to be used
BULLSEYE_OFF
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CINCOMPLETECLASS0MESSAGEINFO_OPERATOR1_1, "CIncompleteClass0MessageInfo::operator==");
+ LOGGSMU1("CIncompleteClass0MessageInfo::operator==");
Panic(KGsmuPanicMethodBodyNotImplemented1);
return EFalse;
BULLSEYE_RESTORE
@@ -642,7 +636,7 @@
*/
TBool CIncompleteClass0MessageInfo::MessageTypeSupported() const
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CINCOMPLETECLASS0MESSAGEINFO_MESSAGETYPESUPPORTED_1, "CIncompleteClass0MessageInfo::MessageTypeSupported");
+ LOGGSMU1("CIncompleteClass0MessageInfo::MessageTypeSupported");
CSmsPDU::TSmsPDUType type = iMessage.Type();
return (type == CSmsPDU::ESmsDeliver);
}
@@ -656,17 +650,17 @@
*/
void CIncompleteClass0MessageInfo::ValidateOperationL() const
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CINCOMPLETECLASS0MESSAGEINFO_VALIDATEOPERATIONL_1, "CIncompleteClass0MessageInfo::ValidateOperationL");
+ LOGGSMU1("CIncompleteClass0MessageInfo::ValidateOperationL");
if (iMessage.Version() != CSmsMessage::ESmsIncompleteClass0MessageV)
{
- OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CINCOMPLETECLASS0MESSAGEINFO_VALIDATEOPERATIONL_2, "CIncompleteClass0MessageInfo Operation not supported, Msg Version %d", iMessage.Version());
+ LOGGSMU2("CIncompleteClass0MessageInfo Operation not supported, Msg Version %d", iMessage.Version());
User::Leave(KErrNotSupported);
}
if (!MessageTypeSupported())
{
- OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CINCOMPLETECLASS0MESSAGEINFO_VALIDATEOPERATIONL_3, "CIncompleteClass0MessageInfo Operation not supported by this PDU type, type = %d", iMessage.Type());
+ LOGGSMU2("CIncompleteClass0MessageInfo Operation not supported by this PDU type, type = %d", iMessage.Type());
User::Leave(KErrNotSupported);
}
}
@@ -681,7 +675,7 @@
// class, no need to check the version. Expected to be used if
// a new version of the class is added
BULLSEYE_OFF
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CINCOMPLETECLASS0MESSAGEINFO_VERSION_1, "CIncompleteClass0MessageInfo::Version()");
+ LOGGSMU1("CIncompleteClass0MessageInfo::Version()");
return iVersion;
BULLSEYE_RESTORE
}
@@ -695,7 +689,7 @@
*/
void CIncompleteClass0MessageInfo::SetVersion(TInt aVersion)
{
- OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CINCOMPLETECLASS0MESSAGEINFO_SETVERSION_1, "CIncompleteClass0MessageInfo::SetVersion() version:%d", aVersion);
+ LOGGSMU2("CIncompleteClass0MessageInfo::SetVersion()", aVersion);
__ASSERT_DEBUG((aVersion<EMaxSmsIncompleteClass0MessageV),Panic(KGsmuPanicVersionNotSupported));
@@ -710,7 +704,7 @@
*/
void CIncompleteClass0MessageInfo::InternalizeL(RReadStream& aStream)
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CINCOMPLETECLASS0MESSAGEINFO_INTERNALIZEL_1, "CIncompleteClass0MessageInfo::InternalizeL()");
+ LOGGSMU1("CIncompleteClass0MessageInfo::InternalizeL()");
iVersion = aStream.ReadInt32L();
iStartPos = aStream.ReadInt32L();
iEndPos = aStream.ReadInt32L();
@@ -725,7 +719,7 @@
*/
void CIncompleteClass0MessageInfo::ExternalizeL(RWriteStream& aStream) const
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CINCOMPLETECLASS0MESSAGEINFO_EXTERNALIZEL_1, "CIncompleteClass0MessageInfo::ExternalizeL()");
+ LOGGSMU1("CIncompleteClass0MessageInfo::ExternalizeL()");
aStream.WriteInt32L(iVersion);
aStream.WriteInt32L(iStartPos);
aStream.WriteInt32L(iEndPos);