MCL/sf/os/cellularsrv: comparison telephonyserverplugins/simatktsy/utility/src/tsatutility.cpp

equal deleted inserted replaced

-:17af172ffa5f
+:630d2f34d719
-// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available
 // at the URL "http://www.eclipse.org/legal/epl-v10.html".
 //
 // INCLUDE FILES
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "tsatutilityTraces.h"
+#endif
 #include "tsatutility.h"        // Class header
-#include "tflogger.h"           // TFLOGSTRING
 #include <ctsy/serviceapi/cmmsmsutility.h>		// TON and NPI constants
 // -----------------------------------------------------------------------------
 // TSatUtility::TonAndNpi
 // Map TON and NPI to RSat TON and NPI values
 const TInt aTonAndNpi,
 RSat::TTypeOfNumber* aTon,
 RSat::TNumberingPlan* aNpi
 )
 {
-TFLOGSTRING( "UTILITY: TSatUtility::TonAndNpi" );
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, TSATUTILITY_TONANDNPI_1,  "UTILITY: TSatUtility::TonAndNpi" );
 TInt ton( ( aTonAndNpi >> 4 ) & KTONMask ); // TON mask value 0x07
 switch ( ton )
 {
 case KTonUnknown:
 (
 const TPtrC8 aSource,
 TDes8& aTarget
 )
 {
-TFLOGSTRING( "UTILITY: TSatUtility::Packed7to8Unpacked" );
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, TSATUTILITY_PACKED7TO8UNPACKED_1,  "UTILITY: TSatUtility::Packed7to8Unpacked" );
 TInt ret( KErrNone );
 // The string is in packed GSM default alphabet format.
 // Converted to 8-bit format
 TUint8 maskRightPartOfCurrentByte( 0x7F );
 TUint8 shiftLeft( 0 );
 // Whe should still notify the requesting method about exceeding the length
 if ( length < sourceLength )
 {
 ret = KErrOverflow;
-TFLOGSTRING2( "UTILITY: TSatUtility::Packed7to8Unpacked,\
+OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, TSATUTILITY_PACKED7TO8UNPACKED_2,  "UTILITY: TSatUtility::Packed7to8Unpacked,Input data too long. %d bytes could not be converted", ( sourceLength - length ) );
-Input data too long. %d bytes could not be converted",
-( sourceLength - length ) );
 }
 return ret;
 }
 (
 const TPtrC aInput,
 TDes8& aOutput
 )
 {
-TFLOGSTRING( "UTILITY: TSatUtility::UCSToPacked7" );
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, TSATUTILITY_UCSTOPACKED7_1,  "UTILITY: TSatUtility::UCSToPacked7" );
 TBuf8<KMaxUssdStringLengthInBytes> string;
 // This method interrupts converting if the target buffer is full, so
 // the length can not be exceeded
 (
 const TPtrC8 aInput,
 TDes8& aOutput
 )
 {
-TFLOGSTRING( "UTILITY: TSatUtility::BCDToAscii" );
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, TSATUTILITY_BCDTOASCII_1,  "UTILITY: TSatUtility::BCDToAscii" );
 TInt ret( KErrNone );
 // Convert Abbreviated dialling numbers format back to ASCII format.
 // See 3GPP TS 11.11, EFadn
 aOutput.Zero();
 // Whe should still notify the requesting method about exceeding the length
 if ( length < aInput.Length() )
 {
 ret = KErrOverflow;
-TFLOGSTRING2( "UTILITY: TSatUtility::BCDToAscii,Input data too long.\
+OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, TSATUTILITY_BCDTOASCII_2,  "UTILITY: TSatUtility::BCDToAscii,Input data too long.%d bytes could not be converted", ( aInput.Length() - length ) );
-%d bytes could not be converted", ( aInput.Length() - length ) );
 }
 return ret;
 }
 (
 const TDesC8& aInput,
 TDes8& aOutput
 )
 {
-TFLOGSTRING( "UTILITY: TSatUtility::AsciiToBCD" );
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, TSATUTILITY_ASCIITOBCD_1,  "UTILITY: TSatUtility::AsciiToBCD" );
 TInt ret( KErrNone );
 TInt i;
 TInt j;
 TInt outLen( 0 );
 TInt length( aInput.Length() );
 	                aOutput[outLen / 2] |= ( bcd << 4 );
 	                }
 	}
 else
 {
-TFLOGSTRING( "UTILITY: TSatUtility::AsciiToBCD, Overflow!" );
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, TSATUTILITY_ASCIITOBCD_2,  "UTILITY: TSatUtility::AsciiToBCD, Overflow!" );
 ret = KErrOverflow;
 }
 outLen++;
 }
 else
 {
-TFLOGSTRING3("UTILITY: TSatUtility::AsciiToBCD -- dropped \
+OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, TSATUTILITY_ASCIITOBCD_3, "UTILITY: TSatUtility::AsciiToBCD -- dropped character %d at i=%d", TInt( aInput[i] ), i );
-character %d at i=%d", TInt( aInput[i] ), i );
 }
 } // For
 // If odd number of digits add endmark
 (
 const TPtrC8 aString,
 TDes8& aOutput
 )
 {
-TFLOGSTRING( "UTILITY: TSatUtility::RemoveWildAndExpansionDigit" );
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, TSATUTILITY_REMOVEWILDANDEXPANSIONDIGIT_1,  "UTILITY: TSatUtility::RemoveWildAndExpansionDigit" );
 aOutput.Zero();
 TUint8 i( 0 );
 TInt maxLength = aOutput.MaxLength();
 TInt length( aString.Length() );
 (
 const TPtrC8 aRawData,
 TDes& aAlphaId
 )
 {
-TFLOGSTRING( "UTILITY: TSatUtility::SetAlphaId" );
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, TSATUTILITY_SETALPHAID_1,  "UTILITY: TSatUtility::SetAlphaId" );
 if ( ( KUCS2ArabicCoding == aRawData[0] )
 || ( KUCS2GreekCoding == aRawData[0] )
 || ( KUCS2TurkishCoding == aRawData[0] ) )
 {
 ConvertAlphaFieldsToUnicode( aRawData, aAlphaId );
 EXPORT_C TUint8 TSatUtility::ConvertToSemiOctet
 (
 const TInt aTime
 )
 {
-TFLOGSTRING( "UTILITY: TSatUtility::ConvertToSemiOctet" );
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, TSATUTILITY_CONVERTTOSEMIOCTET_1,  "UTILITY: TSatUtility::ConvertToSemiOctet" );
 // Converting given time to meet the TP-Service-Centre-Time-Stamp format in
 // 3GPP TS 23.040.
 TInt msd( ( aTime / 10 ) % 10 ); // Most significant decimal
 TInt lsd( ( aTime % 10 ) );      // Least significant decimal
 (
 const TDesC8& aInput,
 TDes16& aOutput
 )
 {
-TFLOGSTRING( "UTILITY: TSatUtility::Convert7BitToUnicode16" );
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, TSATUTILITY_CONVERT7BITTOUNICODE16_1,  "UTILITY: TSatUtility::Convert7BitToUnicode16" );
 TInt i( 0 );
 aOutput.Zero();
 // Check out which string is the shortest and use its length as a limit
 (
 const TDesC16& aInput,
 TDes8& aOutput
 )
 {
-TFLOGSTRING( "UTILITY: TSatUtility::ConvertUnicode16To7Bit" );
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, TSATUTILITY_CONVERTUNICODE16TO7BIT_1,  "UTILITY: TSatUtility::ConvertUnicode16To7Bit" );
 TInt i( 0 );
 TInt j( 0 );
 TInt ret( KErrNone );
 TBool found( EFalse );
 TInt outputMaxLength = aOutput.MaxLength();
 // Whe should still notify the requesting method about exceeding the length
 if ( length < aInput.Length() )
 {
 ret = KErrOverflow;
-TFLOGSTRING2( "UTILITY: TSatUtility::ConvertUnicode16To7Bit,\
+OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, TSATUTILITY_CONVERTUNICODE16TO7BIT_2,  "UTILITY: TSatUtility::ConvertUnicode16To7Bit,Input data too long. %d bytes could not be converted", ( aInput.Length() - length ) );
-Input data too long. %d bytes could not be converted",
-( aInput.Length() - length ) );
 }
 return ret;
 }
 (
 CBerTlv& aBerTlv,
 RSat::TDuration& aTDuration
 )
 {
-TFLOGSTRING( "UTILITY: TSatUtility::FillDurationStructure" );
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, TSATUTILITY_FILLDURATIONSTRUCTURE_1,  "UTILITY: TSatUtility::FillDurationStructure" );
 CTlv duration;
 aTDuration.iTimeUnit = RSat::ENoDurationAvailable;
 TInt returnValue( aBerTlv.TlvByTagValue(
 &duration, KTlvDurationTag ) );
 CBerTlv& aBerTlv,
 RSat::TIconId& aTIconId,
 const TInt aItemNmb
 )
 {
-TFLOGSTRING( "UTILITY: TSatUtility::FillIconStructure" );
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, TSATUTILITY_FILLICONSTRUCTURE_1,  "UTILITY: TSatUtility::FillIconStructure" );
 CTlv iconId;
 aTIconId.iQualifier = RSat::ENoIconId;
 TInt returnValue( aBerTlv.TlvByTagValue( &iconId, KTlvIconIdentifierTag,
 aItemNmb ) );
 (
 CTlv& aTextTlv,
 TDes& aUnicodeOutput
 )
 {
-TFLOGSTRING( "UTILITY: TSatUtility::SetText" );
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, TSATUTILITY_SETTEXT_1,  "UTILITY: TSatUtility::SetText" );
 if ( aTextTlv.GetLength() )
 {
 TPtrC8 sourceString;
 sourceString.Set( aTextTlv.GetData( ETLV_TextString ) );
 (
 const TDesC8& aSource,
 TDes& aTarget
 )
 {
-TFLOGSTRING( "UTILITY: TSatUtility::ConvertAlphaFieldsToUnicode" );
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, TSATUTILITY_CONVERTALPHAFIELDSTOUNICODE_1,  "UTILITY: TSatUtility::ConvertAlphaFieldsToUnicode" );
 // ArabicCoding, GreekCoding and TurkishCoding have different coding
 // methods. There is a tag for each type of alphabet (resp. 80, 81 or 82)
 // before the text, and there are base pointers used for expanding 1 byte
 // to 2 bytes as required by UCS2
 // Ref: 3GPP TS 11.11, Annex B
 (
 const TDesC16& aSource,
 TDes8& aTarget
 )
 {
-TFLOGSTRING( "UTILITY: TSatUtility::Copy16to8LE" );
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, TSATUTILITY_COPY16TO8LE_1,  "UTILITY: TSatUtility::Copy16to8LE" );
 TInt ret( KErrNone );
 TInt length( 0 );
 // Checks that data length are acceblable
 if ( aSource.Size() > aTarget.MaxSize() )
 {
-TFLOGSTRING( "UTILITY: TSatUtility::Copy16to8LE, Length exceeded!" );
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, TSATUTILITY_COPY16TO8LE_2,  "UTILITY: TSatUtility::Copy16to8LE, Length exceeded!" );
 ret = KErrOverflow;
 length = ( aTarget.MaxSize() / 2 );
 }
 else
 {
 (
 const TDesC8& aSource,
 TDes16& aTarget
 )
 {
-TFLOGSTRING( "UTILITY: TSatUtility::Copy8to16LE" );
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, TSATUTILITY_COPY8TO16LE_1,  "UTILITY: TSatUtility::Copy8to16LE" );
 TInt ret( KErrNone );
 // Check out which string is the shortest and use its length as a limit
 TInt length ( Min( ( ( aSource.Length() / 2 ) * 2 ), aTarget.MaxSize() ) );
 // Append source to target using right endian
 // Whe should still notify the requesting method about exceeding the length
 if ( length < aSource.Length() )
 {
 ret = KErrOverflow;
-TFLOGSTRING2( "UTILITY: TSatUtility::ConvertUnicode16To7Bit,\
+OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, TSATUTILITY_COPY8TO16LE_2,  "UTILITY: TSatUtility::ConvertUnicode16To7Bit,Input data too long. %d bytes could not be converted", ( aSource.Length() - length ) );
-Input data too long. %d bytes could not be converted",
-( aSource.Length() - length ) );
 }
 return ret;
 }
 EXPORT_C TSmsDcs TSatUtility::DecodeCbsDcs
 		(
 	const TUint8 aDcs
 	)
 {
-TFLOGSTRING("UTILITY: TSatUtility::DecodeCbsDcs");
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, TSATUTILITY_DECODECBSDCS_1, "UTILITY: TSatUtility::DecodeCbsDcs");
 // Constant values are not defined in order to
 // avoid confusion with too many constants names.
 // Coding group: 4 left most significant bits
 break;
 }
 default:
 {
 // the DCS value is reserved.
-TFLOGSTRING("UTILITY: TSatUtility::DecodeCbsDcs, reserved value");
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, TSATUTILITY_DECODECBSDCS_2, "UTILITY: TSatUtility::DecodeCbsDcs, reserved value");
 break;
 }
 }
 return decodedDcs;
 }
 const TDesC8& aSource,
 TUint16& aTarget,
 const TInt aIndex
 )
 {
-TFLOGSTRING("UTILITY: TSatUtility::CopyTwo8toOne16LE");
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, TSATUTILITY_COPYTWO8TOONE16LE_1, "UTILITY: TSatUtility::CopyTwo8toOne16LE");
 TInt ret( KErrNone );
 // Check first that we dont try to read data that is not there..
 if ( aSource.Length() > aIndex + 1 )
 {
 aTarget = static_cast<TUint16>( aSource[aIndex] << 8 );
 aTarget = static_cast<TUint16>( aTarget | aSource[aIndex + 1] );
 }
 else
 {
 ret = KErrOverflow;
-TFLOGSTRING3("UTILITY: TSatUtility::CopyTwo8toOne16LE, Index too high\
+OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, TSATUTILITY_COPYTWO8TOONE16LE_2, "UTILITY: TSatUtility::CopyTwo8toOne16LE, Index too highIndex: %d, Source data length: %d", aIndex, aSource.Length() );
-Index: %d, Source data length: %d", aIndex, aSource.Length() );
 }
 return ret;
 }

branch	RCL_3
changeset 19	630d2f34d719
parent 0	3553901f7fa8
child 20	07a122eea281