--- a/smsprotocols/smsstack/gsmu/src/gsmupdu.cpp Tue Aug 31 16:23:08 2010 +0300
+++ b/smsprotocols/smsstack/gsmu/src/gsmupdu.cpp Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2003-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2003-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"
@@ -19,12 +19,6 @@
@file
*/
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "gsmupduTraces.h"
-#endif
-
#include <etelmm.h>
#include "gsmuNmspaceMobMsg.h"
#include "gsmuetel.h"
@@ -49,7 +43,7 @@
*/
EXPORT_C CSmsPDU* CSmsPDU::NewL(RReadStream& aStream,CCnvCharacterSetConverter& aCharacterSetConverter,RFs& aFs)
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSPDU_NEWL_1, "CSmsPDU::NewL()");
+ LOGGSMU1("CSmsPDU::NewL()");
TInt type=aStream.ReadUint8L();
CSmsPDU* smspdu=NULL;
@@ -117,7 +111,8 @@
*/
EXPORT_C CSmsPDU* CSmsPDU::NewL(const TGsmSms& aGsmSms,CCnvCharacterSetConverter& aCharacterSetConverter,RFs& aFs, TBool aIsRPError,TBool aIsMobileTerminated)
{
- OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSPDU_NEWL1_1, "CSmsPDU::NewL(): aIsRPError=%d, aIsMobileTerminated=%d",aIsRPError, aIsMobileTerminated);
+ LOGGSMU3("CSmsPDU::NewL(): aIsRPError=%d, aIsMobileTerminated=%d",
+ aIsRPError, aIsMobileTerminated);
const TUint8* ptr1=aGsmSms.Pdu().Ptr();
@@ -181,7 +176,7 @@
*/
EXPORT_C CSmsPDU* CSmsPDU::NewL(TSmsPDUType aType,CCnvCharacterSetConverter& aCharacterSetConverter,RFs& aFs,TBool aIsRPError)
{
- OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSPDU_NEWL2_1, "CSmsPDU::NewL(): aIsRPError=%d", aIsRPError);
+ LOGGSMU2("CSmsPDU::NewL(): aIsRPError=%d", aIsRPError);
CSmsPDU* smspdu=NULL;
switch (aType)
@@ -234,7 +229,7 @@
*/
EXPORT_C CSmsPDU* CSmsPDU::DuplicateL() const
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSPDU_DUPLICATEL_1, "CSmsPDU::DuplicateL()");
+ LOGGSMU1("CSmsPDU::DuplicateL()");
CSmsPDU* smsPDU = NULL;
@@ -308,7 +303,7 @@
*/
EXPORT_C void CSmsPDU::EncodeMessagePDUL(TGsmSms& aGsmSms) const
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSPDU_ENCODEMESSAGEPDUL_1, "CSmsPDU::EncodeMessagePDUL()");
+ LOGGSMU1("CSmsPDU::EncodeMessagePDUL()");
NMobileSmsMessaging::TMobileSmsGsmTpdu pdu;
pdu.SetLength(NMobileSmsMessaging::KGsmTpduSize);
@@ -326,7 +321,7 @@
void CSmsPDU::EncodeMessagePDUL(TGsmSms& aGsmSms, const TEncodeParams* aEncodeParams) const
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDU_ENCODEMESSAGEPDUL1_1, "CSmsPDU::EncodeMessagePDUL()");
+ LOGGSMU1("CSmsPDU::EncodeMessagePDUL()");
NMobileSmsMessaging::TMobileSmsGsmTpdu pdu;
pdu.SetLength(NMobileSmsMessaging::KGsmTpduSize);
@@ -353,7 +348,7 @@
*/
EXPORT_C TPtrC CSmsPDU::ServiceCenterAddress() const
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSPDU_SERVICECENTERADDRESS_1, "CSmsPDU::ServiceCenterAddress()");
+ LOGGSMU1("CSmsPDU::ServiceCenterAddress()");
return iServiceCenterAddress->Address();
} // CSmsPDU::ServiceCenterAddress
@@ -369,7 +364,7 @@
*/
EXPORT_C void CSmsPDU::SetServiceCenterAddressL(const TDesC& aAddress)
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSPDU_SETSERVICECENTERADDRESSL_1, "CSmsPDU::SetServiceCenterAddressL()");
+ LOGGSMU1("CSmsPDU::SetServiceCenterAddressL()");
iServiceCenterAddress->SetAddressL(aAddress);
} // CSmsPDU::SetServiceCenterAddressL
@@ -385,7 +380,7 @@
*/
EXPORT_C void CSmsPDU::ParsedServiceCenterAddress(TGsmSmsTelNumber& aParsedAddress) const
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSPDU_PARSEDSERVICECENTERADDRESS_1, "CSmsPDU::ParsedServiceCenterAddress()");
+ LOGGSMU1("CSmsPDU::ParsedServiceCenterAddress()");
iServiceCenterAddress->ParsedAddress(aParsedAddress);
} // CSmsPDU::ParsedServiceCenterAddress
@@ -401,7 +396,7 @@
*/
EXPORT_C void CSmsPDU::SetParsedServiceCenterAddressL(const TGsmSmsTelNumber& aParsedAddress)
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSPDU_SETPARSEDSERVICECENTERADDRESSL_1, "CSmsPDU::SetParsedServiceCenterAddressL()");
+ LOGGSMU1("CSmsPDU::SetParsedServiceCenterAddressL()");
iServiceCenterAddress->SetParsedAddressL(aParsedAddress);
} // CSmsPDU::SetParsedServiceCenterAddressL
@@ -426,7 +421,7 @@
*/
EXPORT_C TPtrC CSmsPDU::ToFromAddress() const
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSPDU_TOFROMADDRESS_1, "CSmsPDU::SetParsedServiceCenterAddressL()");
+ LOGGSMU1("CSmsPDU::SetParsedServiceCenterAddressL()");
if (ToFromAddressPtr() == NULL)
{
@@ -450,7 +445,7 @@
*/
EXPORT_C void CSmsPDU::SetToFromAddressL(const TDesC& aAddress)
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSPDU_SETTOFROMADDRESSL_1, "CSmsPDU::SetToFromAddressL()");
+ LOGGSMU1("CSmsPDU::SetToFromAddressL()");
__ASSERT_DEBUG(ToFromAddressPtr()!=NULL,Panic(KGsmuPanicToFromAddressNotPresent));
CSmsAddress* tofromaddress=(CSmsAddress*) ToFromAddressPtr();
@@ -468,7 +463,7 @@
*/
EXPORT_C void CSmsPDU::ParsedToFromAddress(TGsmSmsTelNumber& aParsedAddress) const
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSPDU_PARSEDTOFROMADDRESS_1, "CSmsPDU::ParsedToFromAddress()");
+ LOGGSMU1("CSmsPDU::ParsedToFromAddress()");
__ASSERT_DEBUG(ToFromAddressPtr()!=NULL,Panic(KGsmuPanicToFromAddressNotPresent));
ToFromAddressPtr()->ParsedAddress(aParsedAddress);
@@ -483,7 +478,7 @@
*/
EXPORT_C void CSmsPDU::SetParsedToFromAddressL(const TGsmSmsTelNumber& aParsedAddress)
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSPDU_SETPARSEDTOFROMADDRESSL_1, "CSmsPDU::SetParsedToFromAddressL()");
+ LOGGSMU1("CSmsPDU::SetParsedToFromAddressL()");
__ASSERT_DEBUG(ToFromAddressPtr()!=NULL,Panic(KGsmuPanicToFromAddressNotPresent));
CSmsAddress* tofromaddress=(CSmsAddress*) ToFromAddressPtr();
@@ -502,7 +497,7 @@
*/
void CSmsPDU::UpdateConcatenationDataL(TInt aRef, TInt aPduIndex, TInt aMaxPdu)
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDU_UPDATECONCATENATIONDATAL_1, "CSmsPDU::UpdateConcatenationDataL()");
+ LOGGSMU1("CSmsPDU::UpdateConcatenationDataL()");
SetConcatenatedMessageReference(aRef);
SetConcatenatedMessagePDUIndex(aPduIndex);
@@ -517,7 +512,7 @@
*/
void CSmsPDU::UpdateEmailHeaderDataL(TInt& aEmailOverallHeaderLength)
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDU_UPDATEEMAILHEADERDATAL_1, "CSmsPDU::UpdateEmailHeaderDataL()");
+ LOGGSMU1("CSmsPDU::UpdateEmailHeaderDataL()");
TInt emailIndex(0);
TInt udLength=0;
@@ -615,7 +610,7 @@
EXPORT_C TSmsEncoding CSmsPDU::NationalLanguageEncoding() const
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSPDU_NATIONALLANGUAGEENCODING_1, "CSmsPDU::NationalLanguageEncoding()");
+ LOGGSMU1("CSmsPDU::NationalLanguageEncoding()");
TSmsEncoding encodingUsed = ESmsEncodingNone;
@@ -725,9 +720,9 @@
};
}
- OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSPDU_NATIONALLANGUAGEENCODING_2, "CSmsPDU::NationalLanguageEncoding(): lockingShift=%d", lockingShiftValue);
- OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSPDU_NATIONALLANGUAGEENCODING_3, "CSmsPDU::NationalLanguageEncoding(): singleShift=%d", singleShiftValue);
- OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSPDU_NATIONALLANGUAGEENCODING_4, "CSmsPDU::NationalLanguageEncoding(): encodingUsed=%d", encodingUsed);
+ LOGGSMU2("CSmsPDU::NationalLanguageEncoding(): lockingShift=%d", lockingShiftValue);
+ LOGGSMU2("CSmsPDU::NationalLanguageEncoding(): singleShift=%d", singleShiftValue);
+ LOGGSMU2("CSmsPDU::NationalLanguageEncoding(): encodingUsed=%d", encodingUsed);
return encodingUsed;
} // CSmsPDU::NationalLanguageEncoding
@@ -735,7 +730,7 @@
EXPORT_C void CSmsPDU::SetNationalLanguageEncodingL(TSmsEncoding aEncoding)
{
- OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSPDU_SETNATIONALLANGUAGEENCODINGL_1, "CSmsPDU::SetNationalLanguageEncodingL(): aEncoding=%d", aEncoding);
+ LOGGSMU2("CSmsPDU::SetNationalLanguageEncodingL(): aEncoding=%d", aEncoding);
//
// Convert the encoding enum into two parts: Single Shift and Locking Shift
@@ -815,8 +810,8 @@
}
};
- OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSPDU_SETNATIONALLANGUAGEENCODINGL_2, "CSmsPDU::SetNationalLanguageEncodingL(): lockingShift=%d", lockingShiftValue);
- OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSPDU_SETNATIONALLANGUAGEENCODINGL_3, "CSmsPDU::SetNationalLanguageEncodingL(): singleShift=%d", singleShiftValue);
+ LOGGSMU2("CSmsPDU::SetNationalLanguageEncodingL(): lockingShift=%d", lockingShiftValue);
+ LOGGSMU2("CSmsPDU::SetNationalLanguageEncodingL(): singleShift=%d", singleShiftValue);
//
// Update the locking shift setting...
@@ -904,7 +899,7 @@
*/
EXPORT_C TSmsDataCodingScheme::TSmsDCSBits7To4 CSmsPDU::Bits7To4() const
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSPDU_BITS7TO4_1, "CSmsPDU::Bits7To4()");
+ LOGGSMU1("CSmsPDU::Bits7To4()");
__ASSERT_DEBUG(DataCodingScheme()!=NULL,Panic(KGsmuPanicDataCodingSchemeNotPresent));
@@ -926,7 +921,7 @@
*/
EXPORT_C void CSmsPDU::SetBits7To4(TSmsDataCodingScheme::TSmsDCSBits7To4 aBits7To4)
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSPDU_SETBITS7TO4_1, "CSmsPDU::SetBits7To4()");
+ LOGGSMU1("CSmsPDU::SetBits7To4()");
__ASSERT_DEBUG(DataCodingScheme()!=NULL,Panic(KGsmuPanicDataCodingSchemeNotPresent));
TSmsDataCodingScheme* datacodingscheme=(TSmsDataCodingScheme*) DataCodingScheme();
@@ -944,7 +939,7 @@
*/
EXPORT_C TSmsDataCodingScheme::TSmsAlphabet CSmsPDU::Alphabet() const
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSPDU_ALPHABET_1, "CSmsPDU::Alphabet()");
+ LOGGSMU1("CSmsPDU::Alphabet()");
__ASSERT_DEBUG(DataCodingScheme()!=NULL,Panic(KGsmuPanicDataCodingSchemeNotPresent));
return DataCodingScheme()->Alphabet();
@@ -961,7 +956,7 @@
*/
EXPORT_C void CSmsPDU::SetAlphabet(TSmsDataCodingScheme::TSmsAlphabet aAlphabet)
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSPDU_SETALPHABET_1, "CSmsPDU::SetAlphabet()");
+ LOGGSMU1("CSmsPDU::SetAlphabet()");
__ASSERT_DEBUG(DataCodingScheme()!=NULL,Panic(KGsmuPanicDataCodingSchemeNotPresent));
TSmsDataCodingScheme* datacodingscheme=(TSmsDataCodingScheme*) DataCodingScheme();
@@ -980,7 +975,7 @@
*/
EXPORT_C TBool CSmsPDU::Class(TSmsDataCodingScheme::TSmsClass& aClass) const
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSPDU_CLASS_1, "CSmsPDU::Class()");
+ LOGGSMU1("CSmsPDU::Class()");
__ASSERT_DEBUG(DataCodingScheme()!=NULL,Panic(KGsmuPanicDataCodingSchemeNotPresent));
return DataCodingScheme()->Class(aClass);
@@ -998,7 +993,7 @@
*/
EXPORT_C void CSmsPDU::SetClass(TBool aClassDefined,TSmsDataCodingScheme::TSmsClass aClass)
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSPDU_SETCLASS_1, "CSmsPDU::SetClass()");
+ LOGGSMU1("CSmsPDU::SetClass()");
__ASSERT_DEBUG(DataCodingScheme()!=NULL,Panic(KGsmuPanicDataCodingSchemeNotPresent));
TSmsDataCodingScheme* datacodingscheme=(TSmsDataCodingScheme*) DataCodingScheme();
@@ -1016,7 +1011,7 @@
*/
EXPORT_C TBool CSmsPDU::TextCompressed() const
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSPDU_TEXTCOMPRESSED_1, "CSmsPDU::TextCompressed()");
+ LOGGSMU1("CSmsPDU::TextCompressed()");
__ASSERT_DEBUG(DataCodingScheme()!=NULL,Panic(KGsmuPanicDataCodingSchemeNotPresent));
return DataCodingScheme()->TextCompressed();
@@ -1033,7 +1028,7 @@
*/
EXPORT_C void CSmsPDU::SetTextCompressed(TBool aCompressed)
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSPDU_SETTEXTCOMPRESSED_1, "CSmsPDU::SetTextCompressed()");
+ LOGGSMU1("CSmsPDU::SetTextCompressed()");
__ASSERT_DEBUG(DataCodingScheme()!=NULL,Panic(KGsmuPanicDataCodingSchemeNotPresent));
TSmsDataCodingScheme* datacodingscheme=(TSmsDataCodingScheme*) DataCodingScheme();
@@ -1051,7 +1046,7 @@
*/
EXPORT_C TSmsDataCodingScheme::TSmsIndicationState CSmsPDU::IndicationState() const
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSPDU_INDICATIONSTATE_1, "CSmsPDU::IndicationState()");
+ LOGGSMU1("CSmsPDU::IndicationState()");
__ASSERT_DEBUG(DataCodingScheme()!=NULL,Panic(KGsmuPanicDataCodingSchemeNotPresent));
return DataCodingScheme()->IndicationState();
@@ -1068,7 +1063,7 @@
*/
EXPORT_C void CSmsPDU::SetIndicationState(TSmsDataCodingScheme::TSmsIndicationState aState)
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSPDU_SETINDICATIONSTATE_1, "CSmsPDU::SetIndicationState()");
+ LOGGSMU1("CSmsPDU::SetIndicationState()");
__ASSERT_DEBUG(DataCodingScheme()!=NULL,Panic(KGsmuPanicDataCodingSchemeNotPresent));
TSmsDataCodingScheme* datacodingscheme=(TSmsDataCodingScheme*) DataCodingScheme();
@@ -1086,7 +1081,7 @@
*/
EXPORT_C TSmsDataCodingScheme::TSmsIndicationType CSmsPDU::IndicationType() const
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSPDU_INDICATIONTYPE_1, "CSmsPDU::IndicationType()");
+ LOGGSMU1("CSmsPDU::IndicationType()");
__ASSERT_DEBUG(DataCodingScheme()!=NULL,Panic(KGsmuPanicDataCodingSchemeNotPresent));
return DataCodingScheme()->IndicationType();
@@ -1103,7 +1098,7 @@
*/
EXPORT_C void CSmsPDU::SetIndicationType(TSmsDataCodingScheme::TSmsIndicationType aType)
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSPDU_SETINDICATIONTYPE_1, "CSmsPDU::SetIndicationType()");
+ LOGGSMU1("CSmsPDU::SetIndicationType()");
__ASSERT_DEBUG(DataCodingScheme()!=NULL,Panic(KGsmuPanicDataCodingSchemeNotPresent));
TSmsDataCodingScheme* datacodingscheme=(TSmsDataCodingScheme*) DataCodingScheme();
@@ -1121,7 +1116,7 @@
*/
EXPORT_C TBool CSmsPDU::TextConcatenated(TBool* aIs16Bit) const
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSPDU_TEXTCONCATENATED_1, "CSmsPDU::TextConcatenated()");
+ LOGGSMU1("CSmsPDU::TextConcatenated()");
TInt index;
return DoTextConcatenated(index,aIs16Bit);
@@ -1140,7 +1135,7 @@
*/
EXPORT_C void CSmsPDU::SetTextConcatenatedL(TBool aConcatenated,TBool aIs16Bit)
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSPDU_SETTEXTCONCATENATEDL_1, "CSmsPDU::SetTextConcatenatedL()");
+ LOGGSMU1("CSmsPDU::SetTextConcatenatedL()");
TInt index=0;
TInt is16bit;
@@ -1178,7 +1173,7 @@
*/
EXPORT_C TInt CSmsPDU::ConcatenatedMessageReference() const
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSPDU_CONCATENATEDMESSAGEREFERENCE_1, "CSmsPDU::ConcatenatedMessageReference()");
+ LOGGSMU1("CSmsPDU::ConcatenatedMessageReference()");
TInt index=0;
TBool is16bit;
@@ -1206,7 +1201,7 @@
*/
EXPORT_C void CSmsPDU::SetConcatenatedMessageReference(TInt aReference)
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSPDU_SETCONCATENATEDMESSAGEREFERENCE_1, "CSmsPDU::SetConcatenatedMessageReference()");
+ LOGGSMU1("CSmsPDU::SetConcatenatedMessageReference()");
TInt index=0;
TBool is16bit;
@@ -1236,7 +1231,7 @@
*/
EXPORT_C TInt CSmsPDU::NumConcatenatedMessagePDUs() const
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSPDU_NUMCONCATENATEDMESSAGEPDUS_1, "CSmsPDU::NumConcatenatedMessagePDUs()");
+ LOGGSMU1("CSmsPDU::NumConcatenatedMessagePDUs()");
TInt index=0;
TBool is16bit;
@@ -1257,7 +1252,7 @@
*/
EXPORT_C void CSmsPDU::SetNumConcatenatedMessagePDUs(TInt aNum)
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSPDU_SETNUMCONCATENATEDMESSAGEPDUS_1, "CSmsPDU::SetNumConcatenatedMessagePDUs()");
+ LOGGSMU1("CSmsPDU::SetNumConcatenatedMessagePDUs()");
TInt index=0;
TBool is16bit;
@@ -1279,7 +1274,7 @@
*/
EXPORT_C TInt CSmsPDU::ConcatenatedMessagePDUIndex() const
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSPDU_CONCATENATEDMESSAGEPDUINDEX_1, "CSmsPDU::ConcatenatedMessagePDUIndex()");
+ LOGGSMU1("CSmsPDU::ConcatenatedMessagePDUIndex()");
TInt index=0;
TBool is16bit;
@@ -1300,7 +1295,7 @@
*/
EXPORT_C void CSmsPDU::SetConcatenatedMessagePDUIndex(TInt aIndex)
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSPDU_SETCONCATENATEDMESSAGEPDUINDEX_1, "CSmsPDU::SetConcatenatedMessagePDUIndex()");
+ LOGGSMU1("CSmsPDU::SetConcatenatedMessagePDUIndex()");
TInt index=0;
TBool is16bit;
@@ -1324,7 +1319,7 @@
*/
EXPORT_C TBool CSmsPDU::ApplicationPortAddressing(TInt& aDestination,TInt& aOriginator,TBool* aIs16Bit) const
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSPDU_APPLICATIONPORTADDRESSING_1, "CSmsPDU::ApplicationPortAddressing()");
+ LOGGSMU1("CSmsPDU::ApplicationPortAddressing()");
TInt index;
return DoApplicationPortAddressing(index,aDestination,aOriginator,aIs16Bit);
@@ -1343,7 +1338,7 @@
*/
EXPORT_C void CSmsPDU::SetApplicationPortAddressingL(TBool aAddressing,TInt aDestination,TInt aOriginator,TBool aIs16Bit)
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSPDU_SETAPPLICATIONPORTADDRESSINGL_1, "CSmsPDU::SetApplicationPortAddressingL()");
+ LOGGSMU1("CSmsPDU::SetApplicationPortAddressingL()");
TInt index=0;
TInt is16bit;
@@ -1381,7 +1376,7 @@
*/
EXPORT_C TSmsProtocolIdentifier::TSmsPIDType CSmsPDU::PIDType() const
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSPDU_PIDTYPE_1, "CSmsPDU::PIDType()");
+ LOGGSMU1("CSmsPDU::PIDType()");
__ASSERT_DEBUG(ProtocolIdentifier()!=NULL,Panic(KGsmuPanicProtocolIdentifierNotPresent));
return ProtocolIdentifier()->PIDType();
@@ -1396,7 +1391,7 @@
*/
EXPORT_C void CSmsPDU::SetPIDType(TSmsProtocolIdentifier::TSmsPIDType aSmsPIDType)
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSPDU_SETPIDTYPE_1, "CSmsPDU::SetPIDType()");
+ LOGGSMU1("CSmsPDU::SetPIDType()");
__ASSERT_DEBUG(ProtocolIdentifier()!=NULL,Panic(KGsmuPanicProtocolIdentifierNotPresent));
TSmsProtocolIdentifier* protocolidentifier=(TSmsProtocolIdentifier*) ProtocolIdentifier();
@@ -1412,7 +1407,7 @@
*/
EXPORT_C TSmsProtocolIdentifier::TSmsTelematicDeviceIndicator CSmsPDU::TelematicDeviceIndicator() const
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSPDU_TELEMATICDEVICEINDICATOR_1, "CSmsPDU::TelematicDeviceIndicator()");
+ LOGGSMU1("CSmsPDU::TelematicDeviceIndicator()");
__ASSERT_DEBUG(ProtocolIdentifier()!=NULL,Panic(KGsmuPanicProtocolIdentifierNotPresent));
return ProtocolIdentifier()->TelematicDeviceIndicator();
@@ -1427,7 +1422,7 @@
*/
EXPORT_C void CSmsPDU::SetTelematicDeviceIndicator(TSmsProtocolIdentifier::TSmsTelematicDeviceIndicator aIndicator)
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSPDU_SETTELEMATICDEVICEINDICATOR_1, "CSmsPDU::SetTelematicDeviceIndicator()");
+ LOGGSMU1("CSmsPDU::SetTelematicDeviceIndicator()");
__ASSERT_DEBUG(ProtocolIdentifier()!=NULL,Panic(KGsmuPanicProtocolIdentifierNotPresent));
TSmsProtocolIdentifier* protocolidentifier=(TSmsProtocolIdentifier*) ProtocolIdentifier();
@@ -1443,7 +1438,7 @@
*/
EXPORT_C TSmsProtocolIdentifier::TSmsShortMessageType CSmsPDU::ShortMessageType() const
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSPDU_SHORTMESSAGETYPE_1, "CSmsPDU::ShortMessageType()");
+ LOGGSMU1("CSmsPDU::ShortMessageType()");
__ASSERT_DEBUG(ProtocolIdentifier()!=NULL,Panic(KGsmuPanicProtocolIdentifierNotPresent));
return (TSmsProtocolIdentifier::TSmsShortMessageType) ProtocolIdentifier()->ShortMessageType();
@@ -1458,7 +1453,7 @@
*/
EXPORT_C void CSmsPDU::SetShortMessageType(TSmsProtocolIdentifier::TSmsShortMessageType aShortMessageType)
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSPDU_SETSHORTMESSAGETYPE_1, "CSmsPDU::SetShortMessageType()");
+ LOGGSMU1("CSmsPDU::SetShortMessageType()");
__ASSERT_DEBUG(ProtocolIdentifier()!=NULL,Panic(KGsmuPanicProtocolIdentifierNotPresent));
TSmsProtocolIdentifier* protocolidentifier=(TSmsProtocolIdentifier*) ProtocolIdentifier();
@@ -1474,7 +1469,7 @@
*/
EXPORT_C TSmsProtocolIdentifier::TSmsTelematicDeviceType CSmsPDU::TelematicDeviceType() const
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSPDU_TELEMATICDEVICETYPE_1, "CSmsPDU::TelematicDeviceType()");
+ LOGGSMU1("CSmsPDU::TelematicDeviceType()");
__ASSERT_DEBUG(ProtocolIdentifier()!=NULL,Panic(KGsmuPanicProtocolIdentifierNotPresent));
return ProtocolIdentifier()->TelematicDeviceType();
@@ -1489,7 +1484,7 @@
*/
EXPORT_C void CSmsPDU::SetTelematicDeviceType(TSmsProtocolIdentifier::TSmsTelematicDeviceType aDeviceType)
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSPDU_SETTELEMATICDEVICETYPE_1, "CSmsPDU::SetTelematicDeviceType()");
+ LOGGSMU1("CSmsPDU::SetTelematicDeviceType()");
__ASSERT_DEBUG(ProtocolIdentifier()!=NULL,Panic(KGsmuPanicProtocolIdentifierNotPresent));
TSmsProtocolIdentifier* protocolidentifier=(TSmsProtocolIdentifier*) ProtocolIdentifier();
@@ -1507,7 +1502,7 @@
*/
EXPORT_C TBool CSmsPDU::UserDataPresent() const
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSPDU_USERDATAPRESENT_1, "CSmsPDU::UserDataPresent()");
+ LOGGSMU1("CSmsPDU::UserDataPresent()");
TBool udPresent=ETrue;
switch (iSmsPDUType)
@@ -1540,7 +1535,7 @@
*/
EXPORT_C void CSmsPDU::SetUserDataPresent(TBool aPresent)
{
- OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSPDU_SETUSERDATAPRESENT_1, "CSmsPDU::SetUserDataPresent(): aPresent=%d", aPresent);
+ LOGGSMU2("CSmsPDU::SetUserDataPresent(): aPresent=%d", aPresent);
__ASSERT_DEBUG(ParameterIndicator()!=NULL,Panic(KGsmuPanicParameterIndicatorNotPresent));
TSmsParameterIndicator* parameterindicator=(TSmsParameterIndicator*) ParameterIndicator();
@@ -1558,7 +1553,7 @@
*/
EXPORT_C TBool CSmsPDU::DataCodingSchemePresent() const
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSPDU_DATACODINGSCHEMEPRESENT_1, "CSmsPDU::DataCodingSchemePresent()");
+ LOGGSMU1("CSmsPDU::DataCodingSchemePresent()");
TBool dcsPresent=ETrue;
switch (iSmsPDUType)
@@ -1592,7 +1587,7 @@
*/
EXPORT_C void CSmsPDU::SetDataCodingSchemePresent(TBool aPresent)
{
- OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSPDU_SETDATACODINGSCHEMEPRESENT_1, "CSmsPDU::SetDataCodingSchemePresent(): aPresent=%d", aPresent);
+ LOGGSMU2("CSmsPDU::SetDataCodingSchemePresent(): aPresent=%d", aPresent);
__ASSERT_DEBUG(ParameterIndicator()!=NULL,Panic(KGsmuPanicParameterIndicatorNotPresent));
TSmsParameterIndicator* parameterindicator=(TSmsParameterIndicator*) ParameterIndicator();
@@ -1610,7 +1605,7 @@
*/
EXPORT_C TBool CSmsPDU::ProtocolIdentifierPresent() const
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSPDU_PROTOCOLIDENTIFIERPRESENT_1, "CSmsPDU::ProtocolIdentifierPresent()");
+ LOGGSMU1("CSmsPDU::ProtocolIdentifierPresent()");
TBool pidPresent=ETrue;
switch (iSmsPDUType)
@@ -1644,7 +1639,7 @@
*/
EXPORT_C void CSmsPDU::SetProtocolIdentifierPresent(TBool aPresent)
{
- OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSPDU_SETPROTOCOLIDENTIFIERPRESENT_1, "CSmsPDU::SetProtocolIdentifierPresent(): aPresent=%d", aPresent);
+ LOGGSMU2("CSmsPDU::SetProtocolIdentifierPresent(): aPresent=%d", aPresent);
__ASSERT_DEBUG(ParameterIndicator()!=NULL,Panic(KGsmuPanicParameterIndicatorNotPresent));
TSmsParameterIndicator* parameterindicator=(TSmsParameterIndicator*) ParameterIndicator();
@@ -1661,7 +1656,7 @@
*/
EXPORT_C CSmsUserData& CSmsPDU::UserData()
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSPDU_USERDATA_1, "CSmsPDU::UserData()");
+ LOGGSMU1("CSmsPDU::UserData()");
__ASSERT_DEBUG(UserDataPtr()!=NULL,Panic(KGsmuPanicUserDataNotPresent));
CSmsUserData* userdata=(CSmsUserData*) UserDataPtr();
@@ -1677,7 +1672,7 @@
*/
EXPORT_C const CSmsUserData& CSmsPDU::UserData() const
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSPDU_USERDATA1_1, "CSmsPDU::UserData()");
+ LOGGSMU1("CSmsPDU::UserData()");
__ASSERT_DEBUG(UserDataPtr()!=NULL,Panic(KGsmuPanicUserDataNotPresent));
return *UserDataPtr();
@@ -1738,7 +1733,7 @@
TBool CSmsPDU::DoTextConcatenated(TInt& aIndex,TBool* aIs16Bit) const
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDU_DOTEXTCONCATENATED_1, "CSmsPDU::DoTextConcatenated()");
+ LOGGSMU1("CSmsPDU::DoTextConcatenated()");
TBool is8bit=UserData().InformationElementIndex(CSmsInformationElement::ESmsIEIConcatenatedShortMessages8BitReference,aIndex);
TBool is16bit=EFalse;
@@ -1752,7 +1747,7 @@
void CSmsPDU::DoSetTextConcatenatedL(TBool aIs16Bit)
{
- OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDU_DOSETTEXTCONCATENATEDL_1, "CSmsPDU::DoSetTextConcatenatedL(): aIs16Bit=%d", aIs16Bit);
+ LOGGSMU2("CSmsPDU::DoSetTextConcatenatedL(): aIs16Bit=%d", aIs16Bit);
if (!aIs16Bit)
{
@@ -1778,7 +1773,7 @@
TBool CSmsPDU::DoApplicationPortAddressing(TInt& aIndex,TInt& aDestination,TInt& aOriginator,TBool* aIs16Bit) const
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDU_DOAPPLICATIONPORTADDRESSING_1, "CSmsPDU::DoApplicationPortAddressing()");
+ LOGGSMU1("CSmsPDU::DoApplicationPortAddressing()");
TBool is8bit=UserData().InformationElementIndex(CSmsInformationElement::ESmsIEIApplicationPortAddressing8Bit,aIndex);
TBool is16bit=EFalse;
@@ -1808,7 +1803,8 @@
void CSmsPDU::DoSetApplicationPortAddressingL(TInt aDestination,TInt aOriginator,TBool aIs16Bit)
{
- OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDU_DOSETAPPLICATIONPORTADDRESSINGL_1, "CSmsPDU::DoSetApplicationPortAddressingL(): aDestination=%d, aOriginator=%d, aIs16Bit=%d",aDestination, aOriginator, aIs16Bit);
+ LOGGSMU4("CSmsPDU::DoSetApplicationPortAddressingL(): aDestination=%d, aOriginator=%d, aIs16Bit=%d",
+ aDestination, aOriginator, aIs16Bit);
if (!aIs16Bit)
{
@@ -1849,7 +1845,7 @@
*/
EXPORT_C TBool CSmsDeliver::MoreMessagesToSend() const
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSDELIVER_MOREMESSAGESTOSEND_1, "CSmsDeliver::MoreMessagesToSend");
+ LOGGSMU1("CSmsDeliver::MoreMessagesToSend");
return (iFirstOctet&TSmsFirstOctet::ESmsMoreMessagesToSendMask)==TSmsFirstOctet::ESmsMoreMessagesToSend;
} // CSmsDeliver::MoreMessagesToSend
@@ -1863,7 +1859,7 @@
*/
EXPORT_C void CSmsDeliver::SetMoreMessagesToSend(TBool aMore)
{
- OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSDELIVER_SETMOREMESSAGESTOSEND_1, "CSmsDeliver::SetMoreMessagesToSend(): aMore=%d", aMore);
+ LOGGSMU2("CSmsDeliver::SetMoreMessagesToSend(): aMore=%d", aMore);
iFirstOctet=aMore? (iFirstOctet&(~TSmsFirstOctet::ESmsMoreMessagesToSendMask)|TSmsFirstOctet::ESmsMoreMessagesToSend):
(iFirstOctet&(~TSmsFirstOctet::ESmsMoreMessagesToSendMask)|TSmsFirstOctet::ESmsNoMoreMessagesToSend);
@@ -1881,7 +1877,7 @@
*/
EXPORT_C TBool CSmsDeliver::ReplyPath() const
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSDELIVER_REPLYPATH_1, "CSmsDeliver::ReplyPath");
+ LOGGSMU1("CSmsDeliver::ReplyPath");
return (iFirstOctet&TSmsFirstOctet::ESmsReplyPathMask)==TSmsFirstOctet::ESmsReplyPathExists;
} // CSmsDeliver::ReplyPath
@@ -1895,7 +1891,7 @@
*/
EXPORT_C void CSmsDeliver::SetReplyPath(TBool aReplyPath)
{
- OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSDELIVER_SETREPLYPATH_1, "CSmsDeliver::SetReplyPath(): aReplyPath=%d", aReplyPath);
+ LOGGSMU2("CSmsDeliver::SetReplyPath(): aReplyPath=%d", aReplyPath);
iFirstOctet=aReplyPath? (iFirstOctet&(~TSmsFirstOctet::ESmsReplyPathMask)|TSmsFirstOctet::ESmsReplyPathExists):
(iFirstOctet&(~TSmsFirstOctet::ESmsReplyPathMask)|TSmsFirstOctet::ESmsReplyPathNone);
@@ -1910,7 +1906,7 @@
*/
EXPORT_C TBool CSmsDeliver::StatusReportIndication() const
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSDELIVER_STATUSREPORTINDICATION_1, "CSmsDeliver::StatusReportIndication");
+ LOGGSMU1("CSmsDeliver::StatusReportIndication");
return (iFirstOctet&TSmsFirstOctet::ESmsStatusReportIndicatorMask)==TSmsFirstOctet::ESmsStatusReportReturned;
} // CSmsDeliver::StatusReportIndication
@@ -1924,7 +1920,7 @@
*/
EXPORT_C void CSmsDeliver::SetStatusReportIndication(TBool aIndication)
{
- OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSDELIVER_SETSTATUSREPORTINDICATION_1, "CSmsDeliver::SetStatusReportIndication(): aIndication=%d", aIndication);
+ LOGGSMU2("CSmsDeliver::SetStatusReportIndication(): aIndication=%d", aIndication);
iFirstOctet=aIndication? (iFirstOctet&(~TSmsFirstOctet::ESmsStatusReportIndicatorMask)|TSmsFirstOctet::ESmsStatusReportReturned):
(iFirstOctet&(~TSmsFirstOctet::ESmsStatusReportIndicatorMask)|TSmsFirstOctet::ESmsStatusReportNotReturned);
@@ -1951,7 +1947,7 @@
*/
EXPORT_C void CSmsDeliver::ServiceCenterTimeStamp(TTime& aTime,TInt& aNumQuarterHours)
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSDELIVER_SERVICECENTERTIMESTAMP_1, "CSmsDeliver::ServiceCenterTimeStamp()");
+ LOGGSMU1("CSmsDeliver::ServiceCenterTimeStamp()");
aTime=iServiceCenterTimeStamp.Time();
aNumQuarterHours=iServiceCenterTimeStamp.TimeOffset();
@@ -1967,7 +1963,7 @@
*/
EXPORT_C void CSmsDeliver::SetServiceCenterTimeStamp(const TTime& aTime,TInt aNumQuarterHours)
{
- OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSDELIVER_SETSERVICECENTERTIMESTAMP_1, "CSmsDeliver::ServiceCenterTimeStamp(): aNumQuarterHours=%d", aNumQuarterHours);
+ LOGGSMU2("CSmsDeliver::ServiceCenterTimeStamp(): aNumQuarterHours=%d", aNumQuarterHours);
iServiceCenterTimeStamp.SetTime(aTime);
iServiceCenterTimeStamp.SetTimeOffset(aNumQuarterHours);
@@ -1976,7 +1972,7 @@
void CSmsDeliver::ConstructL(CCnvCharacterSetConverter& aCharacterSetConverter,RFs& aFs)
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSDELIVER_CONSTRUCTL_1, "CSmsDeliver::ConstructL()");
+ LOGGSMU1("CSmsDeliver::ConstructL()");
iServiceCenterAddress=CSmsAddress::NewL(aCharacterSetConverter,aFs);
iOriginalAddress=CSmsAddress::NewL(aCharacterSetConverter,aFs);
@@ -1991,7 +1987,7 @@
*/
EXPORT_C CSmsDeliver* CSmsDeliver::DuplicateL() const
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSDELIVER_DUPLICATEL_1, "CSmsDeliver::DuplicateL()");
+ LOGGSMU1("CSmsDeliver::DuplicateL()");
CSmsDeliver* smsDeliver = new (ELeave) CSmsDeliver();
CleanupStack::PushL(smsDeliver);
@@ -2013,7 +2009,7 @@
TUint8* CSmsDeliver::EncodeL(TUint8* aPtr) const
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSDELIVER_ENCODEL_1, "CSmsDeliver::EncodeL()");
+ LOGGSMU1("CSmsDeliver::EncodeL()");
aPtr=iFirstOctet.EncodeL(aPtr);
aPtr=iOriginalAddress->EncodeL(aPtr);
@@ -2030,7 +2026,7 @@
void CSmsDeliver::DecodeL(TGsmuLex8& aPdu)
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSDELIVER_DECODEL_1, "CSmsDeliver::DecodeL()");
+ LOGGSMU1("CSmsDeliver::DecodeL()");
iFirstOctet.DecodeL(aPdu);
iOriginalAddress->DecodeL(aPdu);
@@ -2059,7 +2055,7 @@
void CSmsDeliver::InternalizeMessagePDUL(RReadStream& aStream)
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSDELIVER_INTERNALIZEMESSAGEPDUL_1, "CSmsDeliver::InternalizeMessagePDUL()");
+ LOGGSMU1("CSmsDeliver::InternalizeMessagePDUL()");
iServiceCenterAddress->InternalizeL(aStream);
@@ -2078,7 +2074,7 @@
void CSmsDeliver::ExternalizeMessagePDUL(RWriteStream& aStream) const
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSDELIVER_EXTERNALIZEMESSAGEPDUL_1, "CSmsDeliver::ExternalizeMessagePDUL()");
+ LOGGSMU1("CSmsDeliver::ExternalizeMessagePDUL()");
iServiceCenterAddress->ExternalizeL(aStream);
@@ -2097,7 +2093,7 @@
const TSmsDataCodingScheme* CSmsDeliver::DataCodingScheme() const
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSDELIVER_DATACODINGSCHEME_1, "CSmsDeliver::DataCodingScheme()");
+ LOGGSMU1("CSmsDeliver::DataCodingScheme()");
return &iDataCodingScheme;
} // CSmsDeliver::DataCodingScheme
@@ -2111,7 +2107,7 @@
*/
EXPORT_C const TSmsProtocolIdentifier* CSmsDeliver::ProtocolIdentifier() const
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSDELIVER_PROTOCOLIDENTIFIER_1, "CSmsDeliver::ProtocolIdentifier()");
+ LOGGSMU1("CSmsDeliver::ProtocolIdentifier()");
return &iProtocolIdentifier;
} // CSmsDeliver::ProtocolIdentifier
@@ -2119,7 +2115,7 @@
const CSmsUserData* CSmsDeliver::UserDataPtr() const
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSDELIVER_USERDATAPTR_1, "CSmsDeliver::UserDataPtr()");
+ LOGGSMU1("CSmsDeliver::UserDataPtr()");
return iUserData;
} // CSmsDeliver::UserDataPtr
@@ -2127,7 +2123,7 @@
const CSmsAddress* CSmsDeliver::ToFromAddressPtr() const
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSDELIVER_TOFROMADDRESSPTR_1, "CSmsDeliver::ToFromAddressPtr()");
+ LOGGSMU1("CSmsDeliver::ToFromAddressPtr()");
return iOriginalAddress;
} // CSmsDeliver::ToFromAddressPtr
@@ -2163,7 +2159,7 @@
*/
EXPORT_C TBool CSmsSubmit::RejectDuplicates() const
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSSUBMIT_REJECTDUPLICATES_1, "CSmsSubmit::RejectDuplicates()");
+ LOGGSMU1("CSmsSubmit::RejectDuplicates()");
return (iFirstOctet&TSmsFirstOctet::ESmsRejectDuplicatesMask)==TSmsFirstOctet::ESmsRejectDuplicates;
} // CSmsSubmit::RejectDuplicates
@@ -2177,7 +2173,7 @@
*/
EXPORT_C void CSmsSubmit::SetRejectDuplicates(TBool aRejectDuplicates)
{
- OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSSUBMIT_SETREJECTDUPLICATES_1, "CSmsSubmit::SetRejectDuplicates(): aRejectDuplicates=%d", aRejectDuplicates);
+ LOGGSMU2("CSmsSubmit::SetRejectDuplicates(): aRejectDuplicates=%d", aRejectDuplicates);
iFirstOctet=aRejectDuplicates? (iFirstOctet&(~TSmsFirstOctet::ESmsRejectDuplicatesMask)|TSmsFirstOctet::ESmsRejectDuplicates):
(iFirstOctet&(~TSmsFirstOctet::ESmsRejectDuplicatesMask)|TSmsFirstOctet::ESmsAcceptDuplicates);
@@ -2192,7 +2188,7 @@
*/
EXPORT_C TSmsFirstOctet::TSmsValidityPeriodFormat CSmsSubmit::ValidityPeriodFormat() const
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSSUBMIT_VALIDITYPERIODFORMAT_1, "CSmsSubmit::ValidityPeriodFormat()");
+ LOGGSMU1("CSmsSubmit::ValidityPeriodFormat()");
return iValidityPeriod.ValidityPeriodFormat();
} // TSmsFirstOctet::TSmsValidityPeriodFormat
@@ -2206,7 +2202,7 @@
*/
EXPORT_C void CSmsSubmit::SetValidityPeriodFormat(TSmsFirstOctet::TSmsValidityPeriodFormat aValidityPeriodFormat)
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSSUBMIT_SETVALIDITYPERIODFORMAT_1, "CSmsSubmit::SetValidityPeriodFormat()");
+ LOGGSMU1("CSmsSubmit::SetValidityPeriodFormat()");
iValidityPeriod.SetValidityPeriodFormat(aValidityPeriodFormat);
} // CSmsSubmit::SetValidityPeriodFormat
@@ -2223,7 +2219,7 @@
*/
EXPORT_C TBool CSmsSubmit::ReplyPath() const
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSSUBMIT_REPLYPATH_1, "CSmsSubmit::ReplyPath()");
+ LOGGSMU1("CSmsSubmit::ReplyPath()");
return (iFirstOctet&TSmsFirstOctet::ESmsReplyPathMask)==TSmsFirstOctet::ESmsReplyPathExists;
} // CSmsSubmit::ReplyPath
@@ -2237,7 +2233,7 @@
*/
EXPORT_C void CSmsSubmit::SetReplyPath(TBool aReplyPath)
{
- OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSSUBMIT_SETREPLYPATH_1, "CSmsSubmit::SetReplyPath(): aReplyPath=%d", aReplyPath);
+ LOGGSMU2("CSmsSubmit::SetReplyPath(): aReplyPath=%d", aReplyPath);
iFirstOctet=aReplyPath? (iFirstOctet&(~TSmsFirstOctet::ESmsReplyPathMask)|TSmsFirstOctet::ESmsReplyPathExists):
(iFirstOctet&(~TSmsFirstOctet::ESmsReplyPathMask)|TSmsFirstOctet::ESmsReplyPathNone);
@@ -2254,7 +2250,7 @@
*/
EXPORT_C TBool CSmsSubmit::StatusReportRequest() const
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSSUBMIT_STATUSREPORTREQUEST_1, "CSmsSubmit::StatusReportRequest()");
+ LOGGSMU1("CSmsSubmit::StatusReportRequest()");
return (iFirstOctet&TSmsFirstOctet::ESmsStatusReportRequestMask)==TSmsFirstOctet::ESmsStatusReportRequested;
} // CSmsSubmit::StatusReportRequest
@@ -2268,7 +2264,7 @@
*/
EXPORT_C void CSmsSubmit::SetStatusReportRequest(TBool aRequest)
{
- OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSSUBMIT_SETSTATUSREPORTREQUEST_1, "CSmsSubmit::SetStatusReportRequest(): aRequest=%d", aRequest);
+ LOGGSMU2("CSmsSubmit::SetStatusReportRequest(): aRequest=%d", aRequest);
iFirstOctet=aRequest? (iFirstOctet&(~TSmsFirstOctet::ESmsStatusReportRequestMask)|TSmsFirstOctet::ESmsStatusReportRequested):
(iFirstOctet&(~TSmsFirstOctet::ESmsStatusReportRequestMask)|TSmsFirstOctet::ESmsStatusReportNotRequested);
@@ -2283,7 +2279,7 @@
*/
EXPORT_C TInt CSmsSubmit::MessageReference() const
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSSUBMIT_MESSAGEREFERENCE_1, "CSmsSubmit::MessageReference()");
+ LOGGSMU1("CSmsSubmit::MessageReference()");
return iMessageReference;
} // CSmsSubmit::MessageReference
@@ -2297,7 +2293,8 @@
*/
EXPORT_C void CSmsSubmit::SetMessageReference(TInt aMessageReference)
{
- OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSSUBMIT_SETMESSAGEREFERENCE_1, "CSmsSubmit::SetMessageReference(): aMessageReference=%d",aMessageReference);
+ LOGGSMU2("CSmsSubmit::SetMessageReference(): aMessageReference=%d",
+ aMessageReference);
iMessageReference=aMessageReference;
} // CSmsSubmit::SetMessageReference
@@ -2310,7 +2307,7 @@
*/
EXPORT_C const TTimeIntervalMinutes& CSmsSubmit::ValidityPeriod() const
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSSUBMIT_VALIDITYPERIOD_1, "CSmsSubmit::ValidityPeriod()");
+ LOGGSMU1("CSmsSubmit::ValidityPeriod()");
return iValidityPeriod.TimeIntervalMinutes();
} // CSmsSubmit::ValidityPeriod
@@ -2324,7 +2321,8 @@
*/
EXPORT_C void CSmsSubmit::SetValidityPeriod(const TTimeIntervalMinutes& aTimeIntervalMinutes)
{
- OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSSUBMIT_SETVALIDITYPERIOD_1, "CSmsSubmit::SetValidityPeriod(): %d",aTimeIntervalMinutes.Int());
+ LOGGSMU2("CSmsSubmit::SetValidityPeriod(): aTimeIntervalMinutes",
+ aTimeIntervalMinutes.Int());
iValidityPeriod.SetTimeIntervalMinutes(aTimeIntervalMinutes);
} // CSmsSubmit::SetValidityPeriod
@@ -2332,7 +2330,7 @@
const TSmsDataCodingScheme* CSmsSubmit::DataCodingScheme() const
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSUBMIT_DATACODINGSCHEME_1, "CSmsSubmit::DataCodingScheme()");
+ LOGGSMU1("CSmsSubmit::DataCodingScheme()");
return &iDataCodingScheme;
} // CSmsSubmit::DataCodingScheme
@@ -2340,7 +2338,7 @@
const TSmsProtocolIdentifier* CSmsSubmit::ProtocolIdentifier() const
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSUBMIT_PROTOCOLIDENTIFIER_1, "CSmsSubmit::ProtocolIdentifier()");
+ LOGGSMU1("CSmsSubmit::ProtocolIdentifier()");
return &iProtocolIdentifier;
} // CSmsSubmit::ProtocolIdentifier
@@ -2348,7 +2346,7 @@
const CSmsUserData* CSmsSubmit::UserDataPtr() const
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSUBMIT_USERDATAPTR_1, "CSmsSubmit::UserDataPtr()");
+ LOGGSMU1("CSmsSubmit::UserDataPtr()");
return iUserData;
} // CSmsSubmit::UserDataPtr
@@ -2356,7 +2354,7 @@
const CSmsAddress* CSmsSubmit::ToFromAddressPtr() const
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSUBMIT_TOFROMADDRESSPTR_1, "CSmsSubmit::ToFromAddressPtr()");
+ LOGGSMU1("CSmsSubmit::ToFromAddressPtr()");
return iDestinationAddress;
} // CSmsSubmit::ToFromAddressPtr
@@ -2364,7 +2362,7 @@
void CSmsSubmit::ConstructL(CCnvCharacterSetConverter& aCharacterSetConverter,RFs& aFs)
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSUBMIT_CONSTRUCTL_1, "CSmsSubmit::ConstructL()");
+ LOGGSMU1("CSmsSubmit::ConstructL()");
iServiceCenterAddress=CSmsAddress::NewL(aCharacterSetConverter,aFs);
iDestinationAddress=CSmsAddress::NewL(aCharacterSetConverter,aFs);
@@ -2379,7 +2377,7 @@
*/
EXPORT_C CSmsSubmit* CSmsSubmit::DuplicateL() const
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSSUBMIT_DUPLICATEL_1, "CSmsSubmit::DuplicateL()");
+ LOGGSMU1("CSmsSubmit::DuplicateL()");
CSmsSubmit* smsSubmit = new (ELeave) CSmsSubmit();
CleanupStack::PushL(smsSubmit);
@@ -2403,7 +2401,7 @@
TUint8* CSmsSubmit::EncodeL(TUint8* aPtr) const
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSUBMIT_ENCODEL_1, "CSmsSubmit::EncodeL()");
+ LOGGSMU1("CSmsSubmit::EncodeL()");
aPtr=iFirstOctet.EncodeL(aPtr);
aPtr=iMessageReference.EncodeL(aPtr);
@@ -2416,7 +2414,7 @@
TUint8* CSmsSubmit::EncodeL(TUint8* aPtr, const TEncodeParams* aEncodeParams) const
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSUBMIT_ENCODEL1_1, "CSmsSubmit::EncodeL()");
+ LOGGSMU1("CSmsSubmit::EncodeL()");
aPtr=iFirstOctet.EncodeL(aPtr);
aPtr=iMessageReference.EncodeL(aPtr);
@@ -2429,7 +2427,7 @@
void CSmsSubmit::DecodeL(TGsmuLex8& aPdu)
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSUBMIT_DECODEL_1, "CSmsSubmit::DecodeL()");
+ LOGGSMU1("CSmsSubmit::DecodeL()");
iFirstOctet.DecodeL(aPdu);
iMessageReference.DecodeL(aPdu);
@@ -2449,7 +2447,7 @@
void CSmsSubmit::InternalizeMessagePDUL(RReadStream& aStream)
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSUBMIT_INTERNALIZEMESSAGEPDUL_1, "CSmsSubmit::InternalizeMessagePDUL()");
+ LOGGSMU1("CSmsSubmit::InternalizeMessagePDUL()");
iServiceCenterAddress->InternalizeL(aStream);
@@ -2505,7 +2503,7 @@
*/
EXPORT_C TInt CSmsDeliverReport::FailureCause() const
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSDELIVERREPORT_FAILURECAUSE_1, "CSmsDeliverReport::FailureCause()");
+ LOGGSMU1("CSmsDeliverReport::FailureCause()");
__ASSERT_DEBUG(iIsRPError,Panic(KGsmuPanicNotRPError));
return iFailureCause.Error();
@@ -2520,7 +2518,7 @@
*/
EXPORT_C void CSmsDeliverReport::SetFailureCause(TSmsFailureCause::TSmsFailureCauseError aFailureCause)
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSDELIVERREPORT_SETFAILURECAUSE_1, "CSmsDeliverReport::SetFailureCause()");
+ LOGGSMU1("CSmsDeliverReport::SetFailureCause()");
__ASSERT_DEBUG(iIsRPError,Panic(KGsmuPanicNotRPError));
iFailureCause.SetError(aFailureCause);
@@ -2529,7 +2527,7 @@
const TSmsDataCodingScheme* CSmsDeliverReport::DataCodingScheme() const
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSDELIVERREPORT_DATACODINGSCHEME_1, "CSmsDeliverReport::DataCodingScheme()");
+ LOGGSMU1("CSmsDeliverReport::DataCodingScheme()");
__ASSERT_DEBUG(DataCodingSchemePresent(),Panic(KGsmuPanicDataCodingSchemeNotPresent));
return &iDataCodingScheme;
@@ -2538,7 +2536,7 @@
const TSmsProtocolIdentifier* CSmsDeliverReport::ProtocolIdentifier() const
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSDELIVERREPORT_PROTOCOLIDENTIFIER_1, "CSmsDeliverReport::ProtocolIdentifier()");
+ LOGGSMU1("CSmsDeliverReport::ProtocolIdentifier()");
__ASSERT_DEBUG(ProtocolIdentifierPresent(),Panic(KGsmuPanicProtocolIdentifierNotPresent));
return &iProtocolIdentifier;
@@ -2547,7 +2545,7 @@
const TSmsParameterIndicator* CSmsDeliverReport::ParameterIndicator() const
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSDELIVERREPORT_PARAMETERINDICATOR_1, "CSmsDeliverReport::ParameterIndicator()");
+ LOGGSMU1("CSmsDeliverReport::ParameterIndicator()");
return &iParameterIndicator;
} // CSmsDeliverReport::ParameterIndicator
@@ -2555,7 +2553,7 @@
const CSmsUserData* CSmsDeliverReport::UserDataPtr() const
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSDELIVERREPORT_USERDATAPTR_1, "CSmsDeliverReport::UserDataPtr()");
+ LOGGSMU1("CSmsDeliverReport::UserDataPtr()");
__ASSERT_DEBUG(UserDataPresent(),Panic(KGsmuPanicUserDataNotPresent));
return iUserData;
@@ -2564,7 +2562,7 @@
void CSmsDeliverReport::ConstructL(CCnvCharacterSetConverter& aCharacterSetConverter,RFs& aFs)
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSDELIVERREPORT_CONSTRUCTL_1, "CSmsDeliverReport::ConstructL()");
+ LOGGSMU1("CSmsDeliverReport::ConstructL()");
iServiceCenterAddress=CSmsAddress::NewL(aCharacterSetConverter,aFs);
iUserData=CSmsUserData::NewL(aCharacterSetConverter,aFs,iFirstOctet,iDataCodingScheme);
@@ -2578,7 +2576,7 @@
*/
EXPORT_C CSmsDeliverReport* CSmsDeliverReport::DuplicateL() const
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSDELIVERREPORT_DUPLICATEL_1, "CSmsDeliverReport::DuplicateL()");
+ LOGGSMU1("CSmsDeliverReport::DuplicateL()");
CSmsDeliverReport* smsDeliverReport = new (ELeave) CSmsDeliverReport(iIsRPError);
CleanupStack::PushL(smsDeliverReport);
@@ -2600,7 +2598,7 @@
TUint8* CSmsDeliverReport::EncodeL(TUint8* aPtr) const
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSDELIVERREPORT_ENCODEL_1, "CSmsDeliverReport::EncodeL()");
+ LOGGSMU1("CSmsDeliverReport::EncodeL()");
aPtr=iFirstOctet.EncodeL(aPtr);
if (iIsRPError)
@@ -2622,7 +2620,7 @@
void CSmsDeliverReport::DecodeL(TGsmuLex8& aPdu)
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSDELIVERREPORT_DECODEL_1, "CSmsDeliverReport::DecodeL()");
+ LOGGSMU1("CSmsDeliverReport::DecodeL()");
iFirstOctet.DecodeL(aPdu);
if (iIsRPError)
@@ -2719,7 +2717,7 @@
*/
EXPORT_C TInt CSmsSubmitReport::FailureCause() const
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSSUBMITREPORT_FAILURECAUSE_1, "CSmsSubmitReport::FailureCause()");
+ LOGGSMU1("CSmsSubmitReport::FailureCause()");
__ASSERT_DEBUG(iIsRPError,Panic(KGsmuPanicNotRPError));
return iFailureCause.Error();
@@ -2734,7 +2732,7 @@
*/
EXPORT_C void CSmsSubmitReport::SetFailureCause(TSmsFailureCause::TSmsFailureCauseError aFailureCause)
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSSUBMITREPORT_SETFAILURECAUSE_1, "CSmsSubmitReport::SetFailureCause()");
+ LOGGSMU1("CSmsSubmitReport::SetFailureCause()");
__ASSERT_DEBUG(iIsRPError,Panic(KGsmuPanicNotRPError));
iFailureCause.SetError(aFailureCause);
@@ -2743,7 +2741,7 @@
const TSmsDataCodingScheme* CSmsSubmitReport::DataCodingScheme() const
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSUBMITREPORT_DATACODINGSCHEME_1, "CSmsSubmitReport::DataCodingScheme()");
+ LOGGSMU1("CSmsSubmitReport::DataCodingScheme()");
__ASSERT_DEBUG(DataCodingSchemePresent(),Panic(KGsmuPanicDataCodingSchemeNotPresent));
return &iDataCodingScheme;
@@ -2752,7 +2750,7 @@
const TSmsProtocolIdentifier* CSmsSubmitReport::ProtocolIdentifier() const
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSUBMITREPORT_PROTOCOLIDENTIFIER_1, "CSmsSubmitReport::ProtocolIdentifier()");
+ LOGGSMU1("CSmsSubmitReport::ProtocolIdentifier()");
__ASSERT_DEBUG(ProtocolIdentifierPresent(),Panic(KGsmuPanicProtocolIdentifierNotPresent));
return &iProtocolIdentifier;
@@ -2761,7 +2759,7 @@
const TSmsParameterIndicator* CSmsSubmitReport::ParameterIndicator() const
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSUBMITREPORT_PARAMETERINDICATOR_1, "CSmsSubmitReport::ParameterIndicator()");
+ LOGGSMU1("CSmsSubmitReport::ParameterIndicator()");
return &iParameterIndicator;
} // CSmsSubmitReport::ParameterIndicator
@@ -2769,7 +2767,7 @@
const CSmsUserData* CSmsSubmitReport::UserDataPtr() const
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSUBMITREPORT_USERDATAPTR_1, "CSmsSubmitReport::UserDataPtr()");
+ LOGGSMU1("CSmsSubmitReport::UserDataPtr()");
__ASSERT_DEBUG(UserDataPresent(),Panic(KGsmuPanicUserDataNotPresent));
return iUserData;
@@ -2778,7 +2776,7 @@
void CSmsSubmitReport::ConstructL(CCnvCharacterSetConverter& aCharacterSetConverter,RFs& aFs)
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSUBMITREPORT_CONSTRUCTL_1, "CSmsSubmitReport::ConstructL()");
+ LOGGSMU1("CSmsSubmitReport::ConstructL()");
iServiceCenterAddress=CSmsAddress::NewL(aCharacterSetConverter,aFs);
iUserData=CSmsUserData::NewL(aCharacterSetConverter,aFs,iFirstOctet,iDataCodingScheme);
@@ -2792,7 +2790,7 @@
*/
EXPORT_C CSmsSubmitReport* CSmsSubmitReport::DuplicateL() const
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSSUBMITREPORT_DUPLICATEL_1, "CSmsSubmitReport::DuplicateL()");
+ LOGGSMU1("CSmsSubmitReport::DuplicateL()");
CSmsSubmitReport* smsSubmitReport = new (ELeave) CSmsSubmitReport(iIsRPError);
CleanupStack::PushL(smsSubmitReport);
@@ -2815,7 +2813,7 @@
TUint8* CSmsSubmitReport::EncodeL(TUint8* aPtr) const
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSUBMITREPORT_ENCODEL_1, "CSmsSubmitReport::EncodeL()");
+ LOGGSMU1("CSmsSubmitReport::EncodeL()");
aPtr=iFirstOctet.EncodeL(aPtr);
if (iIsRPError)
@@ -2838,7 +2836,7 @@
void CSmsSubmitReport::DecodeL(TGsmuLex8& aPdu)
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSUBMITREPORT_DECODEL_1, "CSmsSubmitReport::DecodeL()");
+ LOGGSMU1("CSmsSubmitReport::DecodeL()");
iFirstOctet.DecodeL(aPdu);
if (iIsRPError)
@@ -2933,7 +2931,7 @@
*/
EXPORT_C TBool CSmsStatusReport::MoreMessagesToSend() const
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSSTATUSREPORT_MOREMESSAGESTOSEND_1, "CSmsStatusReport::MoreMessagesToSend()");
+ LOGGSMU1("CSmsStatusReport::MoreMessagesToSend()");
return (iFirstOctet&TSmsFirstOctet::ESmsMoreMessagesToSendMask)==TSmsFirstOctet::ESmsMoreMessagesToSend;
} // CSmsStatusReport::MoreMessagesToSend
@@ -2947,7 +2945,7 @@
*/
EXPORT_C void CSmsStatusReport::SetMoreMessagesToSend(TBool aMore)
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSSTATUSREPORT_SETMOREMESSAGESTOSEND_1, "CSmsStatusReport::SetMoreMessagesToSend()");
+ LOGGSMU1("CSmsStatusReport::SetMoreMessagesToSend()");
iFirstOctet=aMore? (iFirstOctet&(~TSmsFirstOctet::ESmsMoreMessagesToSendMask)|TSmsFirstOctet::ESmsMoreMessagesToSend):
(iFirstOctet&(~TSmsFirstOctet::ESmsMoreMessagesToSendMask)|TSmsFirstOctet::ESmsNoMoreMessagesToSend);
@@ -2963,7 +2961,7 @@
*/
EXPORT_C TSmsFirstOctet::TSmsStatusReportQualifier CSmsStatusReport::StatusReportQualifier() const
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSSTATUSREPORT_STATUSREPORTQUALIFIER_1, "CSmsStatusReport::StatusReportQualifier()");
+ LOGGSMU1("TSmsFirstOctet::TSmsStatusReportQualifier()");
return (TSmsFirstOctet::TSmsStatusReportQualifier) (iFirstOctet&TSmsFirstOctet::ESmsStatusReportQualifierMask);
} // TSmsFirstOctet::TSmsStatusReportQualifier
@@ -2977,7 +2975,7 @@
*/
EXPORT_C void CSmsStatusReport::SetStatusReportQualifier(TSmsFirstOctet::TSmsStatusReportQualifier aQualifier)
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSSTATUSREPORT_SETSTATUSREPORTQUALIFIER_1, "CSmsStatusReport::SetStatusReportQualifier()");
+ LOGGSMU1("CSmsStatusReport::SetStatusReportQualifier()");
iFirstOctet=iFirstOctet&(~TSmsFirstOctet::ESmsStatusReportQualifierMask)|aQualifier;
} // CSmsStatusReport::SetStatusReportQualifier
@@ -3009,7 +3007,7 @@
*/
EXPORT_C TInt CSmsStatusReport::MessageReference() const
{
- OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSSTATUSREPORT_MESSAGEREFERENCE_1, "CSmsStatusReport::MessageReference %d", (TInt)iMessageReference );
+ LOGGSMU2("CSmsStatusReport::MessageReference %d", (TInt)iMessageReference );
return iMessageReference;
} // CSmsStatusReport::MessageReference
@@ -3023,7 +3021,7 @@
EXPORT_C void CSmsStatusReport::SetMessageReference(TInt aMessageReference)
{
iMessageReference=aMessageReference;
- OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSSTATUSREPORT_SETMESSAGEREFERENCE_1, "CSmsStatusReport::SetMessageReference %d", (TInt)iMessageReference );
+ LOGGSMU2("CSmsStatusReport::SetMessageReference %d", (TInt)iMessageReference );
} // CSmsStatusReport::SetMessageReference
@@ -3036,7 +3034,7 @@
*/
EXPORT_C void CSmsStatusReport::ServiceCenterTimeStamp(TTime& aTime,TInt& aNumQuarterHours)
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSSTATUSREPORT_SERVICECENTERTIMESTAMP_1, "CSmsStatusReport::ServiceCenterTimeStamp()");
+ LOGGSMU1("CSmsStatusReport::ServiceCenterTimeStamp()");
aTime=iServiceCenterTimeStamp.Time();
aNumQuarterHours=iServiceCenterTimeStamp.TimeOffset();
@@ -3052,7 +3050,7 @@
*/
EXPORT_C void CSmsStatusReport::SetServiceCenterTimeStamp(const TTime& aTime,TInt& aNumQuarterHours)
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSSTATUSREPORT_SETSERVICECENTERTIMESTAMP_1, "CSmsStatusReport::SetServiceCenterTimeStamp()");
+ LOGGSMU1("CSmsStatusReport::SetServiceCenterTimeStamp()");
iServiceCenterTimeStamp.SetTime(aTime);
iServiceCenterTimeStamp.SetTimeOffset(aNumQuarterHours);
@@ -3068,7 +3066,7 @@
*/
EXPORT_C void CSmsStatusReport::DischargeTime(TTime& aTime,TInt& aNumQuarterHours)
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSSTATUSREPORT_DISCHARGETIME_1, "CSmsStatusReport::DischargeTime()");
+ LOGGSMU1("CSmsStatusReport::DischargeTime()");
aTime=iDischargeTime.Time();
aNumQuarterHours=iDischargeTime.TimeOffset();
@@ -3084,7 +3082,7 @@
*/
EXPORT_C void CSmsStatusReport::SetDischargeTime(const TTime& aTime,TInt& aNumQuarterHours)
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSSTATUSREPORT_SETDISCHARGETIME_1, "CSmsStatusReport::SetDischargeTime()");
+ LOGGSMU1("CSmsStatusReport::SetDischargeTime()");
iDischargeTime.SetTime(aTime);
iDischargeTime.SetTimeOffset(aNumQuarterHours);
@@ -3099,7 +3097,7 @@
*/
EXPORT_C TSmsStatus::TSmsStatusValue CSmsStatusReport::Status() const
{
- OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSSTATUSREPORT_STATUS_1, "CSmsStatusReport::Status %d", iStatus.Status());
+ LOGGSMU2("CSmsStatusReport::Status %d", iStatus.Status());
return iStatus.Status();
} // TSmsStatus::TSmsStatusValue
@@ -3112,7 +3110,7 @@
*/
EXPORT_C void CSmsStatusReport::SetStatus(TSmsStatus::TSmsStatusValue aValue)
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSSTATUSREPORT_SETSTATUS_1, "CSmsStatusReport::SetStatus()");
+ LOGGSMU1("CSmsStatusReport::SetStatus()");
iStatus.SetStatus(aValue);
} // CSmsStatusReport::SetStatus
@@ -3120,7 +3118,7 @@
const TSmsDataCodingScheme* CSmsStatusReport::DataCodingScheme() const
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSTATUSREPORT_DATACODINGSCHEME_1, "CSmsStatusReport::DataCodingScheme()");
+ LOGGSMU1("CSmsStatusReport::DataCodingScheme()");
__ASSERT_DEBUG(DataCodingSchemePresent(),Panic(KGsmuPanicDataCodingSchemeNotPresent));
return &iDataCodingScheme;
@@ -3129,7 +3127,7 @@
const TSmsProtocolIdentifier* CSmsStatusReport::ProtocolIdentifier() const
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSTATUSREPORT_PROTOCOLIDENTIFIER_1, "CSmsStatusReport::ProtocolIdentifier()");
+ LOGGSMU1("CSmsStatusReport::ProtocolIdentifier()");
__ASSERT_DEBUG(ProtocolIdentifierPresent(),Panic(KGsmuPanicProtocolIdentifierNotPresent));
return &iProtocolIdentifier;
@@ -3138,7 +3136,7 @@
const TSmsParameterIndicator* CSmsStatusReport::ParameterIndicator() const
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSTATUSREPORT_PARAMETERINDICATOR_1, "CSmsStatusReport::ParameterIndicator()");
+ LOGGSMU1("CSmsStatusReport::ParameterIndicator()");
__ASSERT_DEBUG(iParameterIndicatorPresent,Panic(KGsmuPanicParameterIndicatorNotPresent));
return &iParameterIndicator;
@@ -3147,7 +3145,7 @@
const CSmsUserData* CSmsStatusReport::UserDataPtr() const
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSTATUSREPORT_USERDATAPTR_1, "CSmsStatusReport::UserDataPtr()");
+ LOGGSMU1("CSmsStatusReport::UserDataPtr()");
__ASSERT_DEBUG(UserDataPresent(),Panic(KGsmuPanicUserDataNotPresent));
return iUserData;
@@ -3156,7 +3154,7 @@
const CSmsAddress* CSmsStatusReport::ToFromAddressPtr() const
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSTATUSREPORT_TOFROMADDRESSPTR_1, "CSmsStatusReport::ToFromAddressPtr()");
+ LOGGSMU1("CSmsStatusReport::ToFromAddressPtr()");
return iRecipientAddress;
} // CSmsStatusReport::ToFromAddressPtr
@@ -3164,7 +3162,7 @@
void CSmsStatusReport::ConstructL(CCnvCharacterSetConverter& aCharacterSetConverter,RFs& aFs)
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSTATUSREPORT_CONSTRUCTL_1, "CSmsStatusReport::ConstructL()");
+ LOGGSMU1("CSmsStatusReport::ConstructL()");
iServiceCenterAddress=CSmsAddress::NewL(aCharacterSetConverter,aFs);
iRecipientAddress=CSmsAddress::NewL(aCharacterSetConverter,aFs);
@@ -3179,7 +3177,7 @@
*/
EXPORT_C CSmsStatusReport* CSmsStatusReport::DuplicateL() const
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSSTATUSREPORT_DUPLICATEL_1, "CSmsStatusReport::DuplicateL()");
+ LOGGSMU1("CSmsStatusReport::DuplicateL()");
CSmsStatusReport* smsStatusReport = new (ELeave) CSmsStatusReport();
CleanupStack::PushL(smsStatusReport);
@@ -3206,7 +3204,7 @@
TUint8* CSmsStatusReport::EncodeL(TUint8* aPtr) const
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSTATUSREPORT_ENCODEL_1, "CSmsStatusReport::EncodeL()");
+ LOGGSMU1("CSmsStatusReport::EncodeL()");
aPtr=iFirstOctet.EncodeL(aPtr);
aPtr=iMessageReference.EncodeL(aPtr);
@@ -3234,7 +3232,7 @@
void CSmsStatusReport::DecodeL(TGsmuLex8& aPdu)
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSTATUSREPORT_DECODEL_1, "CSmsStatusReport::DecodeL()");
+ LOGGSMU1("CSmsStatusReport::DecodeL()");
iFirstOctet.DecodeL(aPdu);
iMessageReference.DecodeL(aPdu);
@@ -3381,7 +3379,7 @@
*/
EXPORT_C TBool CSmsCommand::StatusReportRequest() const
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSCOMMAND_STATUSREPORTREQUEST_1, "CSmsCommand::StatusReportRequest()");
+ LOGGSMU1("CSmsCommand::StatusReportRequest()");
return (iFirstOctet&TSmsFirstOctet::ESmsStatusReportRequestMask)==TSmsFirstOctet::ESmsStatusReportRequested;
} // CSmsCommand::StatusReportRequest
@@ -3395,7 +3393,7 @@
*/
EXPORT_C void CSmsCommand::SetStatusReportRequest(TBool aRequest)
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSCOMMAND_SETSTATUSREPORTREQUEST_1, "CSmsCommand::SetStatusReportRequest()");
+ LOGGSMU1("CSmsCommand::SetStatusReportRequest()");
__ASSERT_DEBUG(CommandType()==TSmsCommandType::ESmsCommandTypeEnableStatusReportRequest,Panic(KGsmuPanicSetStatusReportRequestNotSupportedForCommandType));
DoSetStatusReportRequest(aRequest);
@@ -3410,7 +3408,7 @@
*/
EXPORT_C TInt CSmsCommand::MessageReference() const
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSCOMMAND_MESSAGEREFERENCE_1, "CSmsCommand::MessageReference()");
+ LOGGSMU1("CSmsCommand::MessageReference()");
return iMessageReference;
} // CSmsCommand::MessageReference
@@ -3424,7 +3422,7 @@
*/
EXPORT_C void CSmsCommand::SetMessageReference(TInt aMessageReference)
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSCOMMAND_SETMESSAGEREFERENCE_1, "CSmsCommand::SetMessageReference()");
+ LOGGSMU1("CSmsCommand::SetMessageReference()");
iMessageReference=aMessageReference;
} // CSmsCommand::SetMessageReference
@@ -3438,7 +3436,7 @@
*/
EXPORT_C TInt CSmsCommand::CommandType() const
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSCOMMAND_COMMANDTYPE_1, "CSmsCommand::CommandType()");
+ LOGGSMU1("CSmsCommand::CommandType()");
return iCommandType.CommandType();
} // CSmsCommand::CommandType
@@ -3452,7 +3450,7 @@
*/
EXPORT_C void CSmsCommand::SetCommandType(TSmsCommandType::TSmsCommandTypeValue aCommandType)
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSCOMMAND_SETCOMMANDTYPE_1, "CSmsCommand::SetCommandType()");
+ LOGGSMU1("CSmsCommand::SetCommandType()");
// Some command types have default status report request
switch (aCommandType)
@@ -3485,7 +3483,7 @@
*/
EXPORT_C TInt CSmsCommand::MessageNumber() const
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSCOMMAND_MESSAGENUMBER_1, "CSmsCommand::MessageNumber()");
+ LOGGSMU1("CSmsCommand::MessageNumber()");
return iMessageNumber;
} // CSmsCommand::MessageNumber
@@ -3499,7 +3497,7 @@
*/
EXPORT_C void CSmsCommand::SetMessageNumber(TInt aMessageNumber)
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSCOMMAND_SETMESSAGENUMBER_1, "CSmsCommand::SetMessageNumber()");
+ LOGGSMU1("CSmsCommand::SetMessageNumber()");
iMessageNumber=aMessageNumber;
} // CSmsCommand::SetMessageNumber
@@ -3513,7 +3511,7 @@
*/
EXPORT_C TInt CSmsCommand::NumInformationElements() const
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSCOMMAND_NUMINFORMATIONELEMENTS_1, "CSmsCommand::NumInformationElements()");
+ LOGGSMU1("CSmsCommand::NumInformationElements()");
return iCommandData->NumInformationElements();
} // CSmsCommand::NumInformationElements
@@ -3528,7 +3526,7 @@
*/
EXPORT_C CSmsInformationElement& CSmsCommand::InformationElement(TInt aIndex) const
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSCOMMAND_INFORMATIONELEMENT_1, "CSmsCommand::InformationElement()");
+ LOGGSMU1("CSmsCommand::InformationElement()");
return iCommandData->InformationElement(aIndex);
} // CSmsCommand::InformationElement
@@ -3546,7 +3544,7 @@
// Ignore in code coverage - not used in SMS stack and not exported
// but cannot be removed as impacts public header.
BULLSEYE_OFF
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSCOMMAND_INFORMATIONELEMENTPTR_1, "CSmsCommand::InformationElementPtr()");
+ LOGGSMU1("CSmsCommand::InformationElementPtr()");
return iCommandData->InformationElementPtr(aIndex);
BULLSEYE_RESTORE
}
@@ -3562,7 +3560,7 @@
EXPORT_C TBool CSmsCommand::InformationElementIndex(CSmsInformationElement::TSmsInformationElementIdentifier aIdentifier,
TInt& aIndex) const
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSCOMMAND_INFORMATIONELEMENTINDEX_1, "CSmsCommand::InformationElementIndex()");
+ LOGGSMU1("CSmsCommand::InformationElementIndex()");
return iCommandData->InformationElementIndex(aIdentifier,aIndex);
} // CSmsCommand::InformationElementIndex
@@ -3577,7 +3575,7 @@
*/
EXPORT_C void CSmsCommand::AddInformationElementL(CSmsInformationElement::TSmsInformationElementIdentifier aIdentifier, TDesC8& aData)
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSCOMMAND_ADDINFORMATIONELEMENTL_1, "CSmsCommand::AddInformationElementL()");
+ LOGGSMU1("CSmsCommand::AddInformationElementL()");
iCommandData->AddInformationElementL(aIdentifier,aData);
} // CSmsCommand::AddInformationElementL
@@ -3591,7 +3589,7 @@
*/
EXPORT_C void CSmsCommand::RemoveInformationElement(TInt aIndex)
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSCOMMAND_REMOVEINFORMATIONELEMENT_1, "CSmsCommand::RemoveInformationElement()");
+ LOGGSMU1("CSmsCommand::RemoveInformationElement()");
iCommandData->RemoveInformationElement(aIndex);
} // CSmsCommand::RemoveInformationElement
@@ -3605,7 +3603,7 @@
*/
EXPORT_C TInt CSmsCommand::MaxCommandDataLength() const
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSCOMMAND_MAXCOMMANDDATALENGTH_1, "CSmsCommand::MaxCommandDataLength()");
+ LOGGSMU1("CSmsCommand::MaxCommandDataLength()");
return iCommandData->MaxDataLength();
} // CSmsCommand::MaxCommandDataLength
@@ -3619,7 +3617,7 @@
*/
EXPORT_C TPtrC8 CSmsCommand::CommandData() const
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSCOMMAND_COMMANDDATA_1, "CSmsCommand::CommandData()");
+ LOGGSMU1("CSmsCommand::CommandData()");
return iCommandData->Data();
} // CSmsCommand::CommandData
@@ -3633,7 +3631,7 @@
*/
EXPORT_C void CSmsCommand::SetCommandDataL(const TDesC8& aData)
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSCOMMAND_SETCOMMANDDATAL_1, "CSmsCommand::SetCommandDataL()");
+ LOGGSMU1("CSmsCommand::SetCommandDataL()");
iCommandData->SetDataL(aData);
} // CSmsCommand::SetCommandDataL
@@ -3641,7 +3639,7 @@
const TSmsProtocolIdentifier* CSmsCommand::ProtocolIdentifier() const
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSCOMMAND_PROTOCOLIDENTIFIER_1, "CSmsCommand::ProtocolIdentifier()");
+ LOGGSMU1("CSmsCommand::ProtocolIdentifier()");
return &iProtocolIdentifier;
} // CSmsCommand::ProtocolIdentifier
@@ -3649,7 +3647,7 @@
const CSmsAddress* CSmsCommand::ToFromAddressPtr() const
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSCOMMAND_TOFROMADDRESSPTR_1, "CSmsCommand::ToFromAddressPtr()");
+ LOGGSMU1("CSmsCommand::ToFromAddressPtr()");
return iDestinationAddress;
} // CSmsCommand::ToFromAddressPtr
@@ -3657,7 +3655,7 @@
void CSmsCommand::ConstructL(CCnvCharacterSetConverter& aCharacterSetConverter,RFs& aFs)
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSCOMMAND_CONSTRUCTL_1, "CSmsCommand::ConstructL()");
+ LOGGSMU1("CSmsCommand::ConstructL()");
iServiceCenterAddress=CSmsAddress::NewL(aCharacterSetConverter,aFs);
iDestinationAddress=CSmsAddress::NewL(aCharacterSetConverter,aFs);
@@ -3672,7 +3670,7 @@
*/
EXPORT_C CSmsCommand* CSmsCommand::DuplicateL() const
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSCOMMAND_DUPLICATEL_1, "CSmsCommand::DuplicateL()");
+ LOGGSMU1("CSmsCommand::DuplicateL()");
CSmsCommand* smsCommand = new (ELeave) CSmsCommand();
CleanupStack::PushL(smsCommand);
@@ -3694,7 +3692,7 @@
TUint8* CSmsCommand::EncodeL(TUint8* aPtr) const
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSCOMMAND_ENCODEL_1, "CSmsCommand::EncodeL()");
+ LOGGSMU1("CSmsCommand::EncodeL()");
aPtr=iFirstOctet.EncodeL(aPtr);
aPtr=iMessageReference.EncodeL(aPtr);
@@ -3716,7 +3714,7 @@
void CSmsCommand::DecodeL(TGsmuLex8& aPdu)
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSCOMMAND_DECODEL_1, "CSmsCommand::DecodeL()");
+ LOGGSMU1("CSmsCommand::DecodeL()");
iFirstOctet.DecodeL(aPdu);
iMessageReference.DecodeL(aPdu);
@@ -3758,7 +3756,7 @@
void CSmsCommand::DoSetStatusReportRequest(TBool aRequest)
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSCOMMAND_DOSETSTATUSREPORTREQUEST_1, "CSmsCommand::DoSetStatusReportRequest()");
+ LOGGSMU1("CSmsCommand::DoSetStatusReportRequest()");
iFirstOctet=aRequest? (iFirstOctet&(~TSmsFirstOctet::ESmsStatusReportRequestMask)|TSmsFirstOctet::ESmsStatusReportRequested):
(iFirstOctet&(~TSmsFirstOctet::ESmsStatusReportRequestMask)|TSmsFirstOctet::ESmsAcceptDuplicates);