FCL/sf/incubator/modemadaptation: comparison adaptationlayer/tsy/simatktsy

equal deleted inserted replaced

-:6295dc2169f3
+:8486d82aef45
 // might leave.
 // -----------------------------------------------------------------------------
 //
 TTransIdMessage::TTransIdMessage() : iTransNum(KTransactionIdMinNumber)
 {
-OstTrace0( TRACE_NORMAL, TTRANSIDMESSAGE_TTRANSIDMESSAGE, "TTransIdMessage::TTransIdMessage" );
+OstTrace0( TRACE_NORMAL,  TTRANSIDMESSAGE_TTRANSIDMESSAGE_TD, "TTransIdMessage::TTransIdMessage" );
 }
 // -----------------------------------------------------------------------------
 // TTransIdMessage::GetTransactionId
 // Gets a new transactionID
 // -----------------------------------------------------------------------------
 //
 TUint8 TTransIdMessage::GetTransactionId()
 {
-OstTrace0( TRACE_NORMAL, TTRANSIDMESSAGE_GETTRANSACTIONID, "TTransIdMessage::GetTransactionId" );
+OstTrace0( TRACE_NORMAL,  TTRANSIDMESSAGE_GETTRANSACTIONID_TD, "TTransIdMessage::GetTransactionId" );
 TFLOGSTRING("TSY: TTransIdMessage::GetTransactionId");
 // 0xff and 0x00 are
 // not valid transaction id's and will not be generated. This is done
 // to avoid generating transaction ids that are used in terminal resp
 iTransNum++;
 TInt aTonAndNpi,                // TON and NPI
 RSat::TTypeOfNumber* aTon,      // Type of number
 RSat::TNumberingPlan* aNpi      // Number plan identification
 )
 {
-OstTrace0( TRACE_NORMAL, TSATUTILITY_GETTONANDNPI, "TSatUtility::GetTonAndNpi: RSat" );
+OstTrace0( TRACE_NORMAL,  TSATUTILITY_GETTONANDNPI_TD, "TSatUtility::GetTonAndNpi: RSat" );
 TFLOGSTRING("TSY: TSatUtility::GetTonAndNpi: RSat");
 TInt ton( ( aTonAndNpi >> 4 ) & KTONMask );
 switch ( ton )
 TInt aTonAndNpi,
 RMobilePhone::TMobileTON& aTon,
 RMobilePhone::TMobileNPI& aNpi
 )
 {
-OstTrace0( TRACE_NORMAL, DUP1_TSATUTILITY_GETTONANDNPI, "TSatUtility::GetTonAndNpi: Etel MM" );
+OstTrace0( TRACE_NORMAL,  DUP1_TSATUTILITY_GETTONANDNPI_TD, "TSatUtility::GetTonAndNpi: Etel MM" );
 TFLOGSTRING("TSY: TSatUtility::GetTonAndNpi: Etel MM");
 TInt ton( ( aTonAndNpi >> 4 ) & KTONMask );
 switch ( ton )
 (
 TPtrC8 aString,   //7-bit packed string
 TDes8& aOutput    //8-bit unpacked string
 )
 {
-OstTrace0( TRACE_NORMAL, TSATUTILITY_PACKED7TO8UNPACKED, "TSatUtility::Packed7to8Unpacked" );
+OstTrace0( TRACE_NORMAL,  TSATUTILITY_PACKED7TO8UNPACKED_TD, "TSatUtility::Packed7to8Unpacked" );
 TFLOGSTRING("TSY: TSatUtility::Packed7to8Unpacked");
 // The string is in packed GSM default alphabet format.
 // Converted to 8-bit format
 TUint8 maskRightPartOfCurrentByte( 0x7F );
 (
 TPtrC aString,   //UCS2 string
 TDes8& aOutput   //7-bit packed format output string
 )
 {
-OstTrace0( TRACE_NORMAL, TSATUTILITY_UCSTOPACKET7, "TSatUtility::UCSToPacket7" );
+OstTrace0( TRACE_NORMAL,  TSATUTILITY_UCSTOPACKET7_TD, "TSatUtility::UCSToPacket7" );
 TFLOGSTRING("TSY: TSatUtility::UCSToPacket7");
 TBuf8<255> string;
 TSatUtility::ConvertUnicode16ToSms7( string, aString );
 (
 TPtrC8 aString,  //BCD string
 TDes8& aOutput   //Ascii format output string
 )
 {
-OstTrace0( TRACE_NORMAL, TSATUTILITY_BCDTOASCII, "TSatUtility::BCDToAscii" );
+OstTrace0( TRACE_NORMAL,  TSATUTILITY_BCDTOASCII_TD, "TSatUtility::BCDToAscii" );
 TFLOGSTRING("TSY: TSatUtility::BCDToAscii");
 // Convert Abbreviated dialling numbers format back to ASCII format.
 // See 3GPP TS 11.11, EFadn
 aOutput.Zero();
 }
 }
 if ( aOutput.Length() == outputMaxLength )
 {
-OstTrace0( TRACE_NORMAL, DUP1_TSATUTILITY_BCDTOASCII, "TSatUtility::BCDToAscii, probably dropped characters" );
+OstTrace0( TRACE_NORMAL,  DUP1_TSATUTILITY_BCDTOASCII_TD, "TSatUtility::BCDToAscii, probably dropped characters" );
-OstTraceExt2( TRACE_NORMAL, DUP2_TSATUTILITY_BCDTOASCII, "Input buffer length: %d, possible characters: %d", len, len * 2 );
+OstTraceExt2( TRACE_NORMAL,  DUP2_TSATUTILITY_BCDTOASCII_TD, "Input buffer length: %d, possible characters: %d", len, len * 2 );
-OstTraceExt2( TRACE_NORMAL, DUP3_TSATUTILITY_BCDTOASCII, "Converted characters: %d, dropped: %d", aOutput.Length(), ( len * 2 ) - aOutput.Length() );
+OstTraceExt2( TRACE_NORMAL,  DUP3_TSATUTILITY_BCDTOASCII_TD, "Converted characters: %d, dropped: %d", aOutput.Length(), ( len * 2 ) - aOutput.Length() );
 TFLOGSTRING("TSY: TSatUtility::BCDToAscii, \
 probably dropped characters");
 TFLOGSTRING3("TSY: Input buffer length: %d, possible characters: %d",
 len, len * 2 );
 (
 TDes8& aPhoneNumber // Number to be converted
 )
 {
-OstTrace0( TRACE_NORMAL, TSATUTILITY_REMOVEEXPANSIONDIGIT, "TSatUtility::RemoveExpansionDigit" );
+OstTrace0( TRACE_NORMAL,  TSATUTILITY_REMOVEEXPANSIONDIGIT_TD, "TSatUtility::RemoveExpansionDigit" );
 TFLOGSTRING("TSY: TSatUtility::RemoveExpansionDigit");
 TInt pos( 0 );
 // Search and delete until no more '.'-characters found
 (
 const TDesC8& aString, //unicode string
 TDes8& aOutput         //binary code decimal output string
 )
 {
-OstTrace0( TRACE_NORMAL, TSATUTILITY_ASCIITOBCD, "TSatUtility::AsciiToBCD" );
+OstTrace0( TRACE_NORMAL,  TSATUTILITY_ASCIITOBCD_TD, "TSatUtility::AsciiToBCD" );
 TFLOGSTRING("TSY: TSatUtility::AsciiToBCD");
 TInt i;
 TInt outLen( 0 );
 aOutput.Zero();
 case 'p': bcd = 0xc; break; // DTMF
 case 'w': bcd = 0xd; break; // wild
 case '.': bcd = 0xe; break; // RFU
 default:  bcd = 0xf;        // should never be part of number
 TFLOGSTRING3("TSY: TSatUtility::AsciiToBCD -- dropped character %d at i=%d", TInt(aString[i]), i );
-OstTraceExt2( TRACE_NORMAL, DUP1_TSATUTILITY_ASCIITOBCD, "TSatUtility::AsciiToBCD -- dropped character %d at i=%d", TInt(aString[i]), i );
+OstTraceExt2( TRACE_NORMAL,  DUP1_TSATUTILITY_ASCIITOBCD_TD, "TSatUtility::AsciiToBCD -- dropped character %d at i=%d", TInt(aString[i]), i );
 break;
 }
 // add only valid bcd characters...
 (
 TPtrC8 aRawData, //data
 TDes& aAlphaId   //alpha id
 )
 {
-OstTrace0( TRACE_NORMAL, TSATUTILITY_SETALPHAID, "TSatUtility::SetAlphaId" );
+OstTrace0( TRACE_NORMAL,  TSATUTILITY_SETALPHAID_TD, "TSatUtility::SetAlphaId" );
 TFLOGSTRING("TSY: TSatUtility::SetAlphaId");
 if( aRawData.Length())
 {
 if ( ( KUCS2ArabicCoding == aRawData[0] )
 }
 }
 else
 {
 TFLOGSTRING("TSY: TSatUtility::SetAlphaId, RawData NULL");
-OstTrace0( TRACE_NORMAL, DUP1_TSATUTILITY_SETALPHAID, "TSatUtility::SetAlphaId, RawData NULL" );
+OstTrace0( TRACE_NORMAL,  DUP1_TSATUTILITY_SETALPHAID_TD, "TSatUtility::SetAlphaId, RawData NULL" );
 }
 }
 // -----------------------------------------------------------------------------
 TUint8 TSatUtility::ConvertToSemiOctet
 (
 TInt aTime  //time
 )
 {
-OstTrace0( TRACE_NORMAL, TSATUTILITY_CONVERTTOSEMIOCTET, "TSatUtility::ConvertToSemiOctet" );
+OstTrace0( TRACE_NORMAL,  TSATUTILITY_CONVERTTOSEMIOCTET_TD, "TSatUtility::ConvertToSemiOctet" );
 TFLOGSTRING("TSY: TSatUtility::ConvertToSemiOctet");
 // Converting given time to meet the TP-Service-Centre-Time-Stamp format in
 // 3GPP TS 23.040.
 (
 TDes16& aOutput, //unicode format string
 TDesC8& aInput   //input
 )
 {
-OstTrace0( TRACE_NORMAL, TSATUTILITY_CONVERTSMS7TOUNICODE16, "TSatUtility::ConvertSms7ToUnicode16" );
+OstTrace0( TRACE_NORMAL,  TSATUTILITY_CONVERTSMS7TOUNICODE16_TD, "TSatUtility::ConvertSms7ToUnicode16" );
 TFLOGSTRING( "TSY: TSatUtility::ConvertSms7ToUnicode16" );
 TInt i( 0 );
 TInt outputMaxLength = aOutput.MaxLength();
 TInt inputLength = aInput.Length();
 }
 else
 {
 TFLOGSTRING("TSY: TSatUtility::ConvertSms7ToUnicode16, \
 Character not valid.");
-OstTrace0( TRACE_NORMAL, DUP1_TSATUTILITY_CONVERTSMS7TOUNICODE16, "TSatUtility::ConvertSms7ToUnicode16, Character not valid." );
+OstTrace0( TRACE_NORMAL,  DUP1_TSATUTILITY_CONVERTSMS7TOUNICODE16_TD, "TSatUtility::ConvertSms7ToUnicode16, Character not valid." );
 }
 break;
 }
 }
 }
 else
 {
 TFLOGSTRING("TSY: TSatUtility::ConvertSms7ToUnicode16, \
 Character not valid.");
-OstTrace0( TRACE_NORMAL, DUP2_TSATUTILITY_CONVERTSMS7TOUNICODE16, "TSatUtility::ConvertSms7ToUnicode16, Character not valid." );
+OstTrace0( TRACE_NORMAL,  DUP2_TSATUTILITY_CONVERTSMS7TOUNICODE16_TD, "TSatUtility::ConvertSms7ToUnicode16, Character not valid." );
 }
 }
 }
 (
 TDes8& aOutput,     // sms 7 string
 TDesC16& aInput     // unicode 16
 )
 {
-OstTrace0( TRACE_NORMAL, TSATUTILITY_CONVERTUNICODE16TOSMS7, "TSatUtility::ConvertUnicode16ToSms7" );
+OstTrace0( TRACE_NORMAL,  TSATUTILITY_CONVERTUNICODE16TOSMS7_TD, "TSatUtility::ConvertUnicode16ToSms7" );
 TFLOGSTRING("TSY: TSatUtility::ConvertUnicode16ToSms7");
 // A hash table would be useful here instead of switch/case
 TInt i( 0 );
 for( i = 0; i < aInput.Length(); i++ )
 (
 CBerTlv& aBerTlv,             // Tlv containing duration data
 RSat::TDuration& aTDuration   // duration structure
 )
 {
-OstTrace0( TRACE_NORMAL, TSATUTILITY_FILLDURATIONSTRUCTURE, "TSatUtility::FillDurationStructure" );
+OstTrace0( TRACE_NORMAL,  TSATUTILITY_FILLDURATIONSTRUCTURE_TD, "TSatUtility::FillDurationStructure" );
 TFLOGSTRING("TSY: TSatUtility::FillDurationStructure");
 CTlv duration;
 aTDuration.iTimeUnit = RSat::ENoDurationAvailable;
 TInt returnValue(
 CBerTlv& aBerTlv,        //tlv data containing icon address data
 RSat::TIconId& aTIconId, //icon id structure
 TInt aItemNmb            //item number
 )
 {
-OstTrace0( TRACE_NORMAL, TSATUTILITY_FILLICONSTRUCTURE, "TSatUtility::FillIconStructure" );
+OstTrace0( TRACE_NORMAL,  TSATUTILITY_FILLICONSTRUCTURE_TD, "TSatUtility::FillIconStructure" );
 TFLOGSTRING("TSY: TSatUtility::FillIconStructure");
 CTlv iconId;
 aTIconId.iQualifier = RSat::ENoIconId;
 TInt returnValue( aBerTlv.TlvByTagValue( &iconId,
 (
 TUint8 aSw1,  //status word 1
 TUint8 aSw2   //status word 2
 )
 {
-OstTrace0( TRACE_NORMAL, TSATUTILITY_SW1SW2CHECK, "TSatUtility::Sw1Sw2Check" );
+OstTrace0( TRACE_NORMAL,  TSATUTILITY_SW1SW2CHECK_TD, "TSatUtility::Sw1Sw2Check" );
 TFLOGSTRING("TSY: TSatUtility::Sw1Sw2Check");
 //These are the ok responses ( for envelope )
 //-90 00 normal ending of the command
 //-91 XX normal ending of the command with extra information from the
 (
 CTlv& aTextString, // text string
 TDes& aText        // unicode output text string
 )
 {
-OstTrace0( TRACE_NORMAL, TSATUTILITY_SETTEXT, "TSatUtility::SetText" );
+OstTrace0( TRACE_NORMAL,  TSATUTILITY_SETTEXT_TD, "TSatUtility::SetText" );
 TFLOGSTRING("TSY: TSatUtility::SetText");
 if ( aTextString.GetLength() )
 {
 TPtrC8 sourceString;
 }
 }
 else
 {
 TFLOGSTRING("TSY: TSatUtility::SetText, text string length not valid");
-OstTrace0( TRACE_NORMAL, DUP1_TSATUTILITY_SETTEXT, "TSatUtility::SetText, text string length not valid" );
+OstTrace0( TRACE_NORMAL,  DUP1_TSATUTILITY_SETTEXT_TD, "TSatUtility::SetText, text string length not valid" );
 }
 }
 // -----------------------------------------------------------------------------
 (
 TDesC8& aSource,
 TDes& aText
 )
 {
-OstTrace0( TRACE_NORMAL, TSATUTILITY_CONVERTALPHAFIELDSTOUNICODE, "TSatUtility::ConvertAlphaFieldsToUnicode" );
+OstTrace0( TRACE_NORMAL,  TSATUTILITY_CONVERTALPHAFIELDSTOUNICODE_TD, "TSatUtility::ConvertAlphaFieldsToUnicode" );
 TFLOGSTRING("TSY: 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
 }
 }
 else
 {
 TFLOGSTRING("TSY: TSatUtility::ConvertAlphaFieldsToUnicode, Source length NULL ");
-OstTrace0( TRACE_NORMAL, DUP1_TSATUTILITY_CONVERTALPHAFIELDSTOUNICODE, "TSatUtility::ConvertAlphaFieldsToUnicode, Source length NULL" );
+OstTrace0( TRACE_NORMAL,  DUP1_TSATUTILITY_CONVERTALPHAFIELDSTOUNICODE_TD, "TSatUtility::ConvertAlphaFieldsToUnicode, Source length NULL" );
 }
 if ( KErrNone == ret && 2 < aSource.Length())
 {
 // let's check that character amount inside item string is not
 // bigger than total len of item string
 if( maxCharAmount < length )
 {
 TFLOGSTRING3("TSY: TSatUtility::ConvertAlphaFieldsToUnicode, incorrect char amount: max char amount: %d actual len: %d ", maxCharAmount, length);
-OstTraceExt2( TRACE_NORMAL, DUP3_TSATUTILITY_CONVERTALPHAFIELDSTOUNICODE, "TSatUtility::ConvertAlphaFieldsToUnicode, incorrect char amount: max char amount: %d actual len: %d", maxCharAmount, length );
+OstTraceExt2( TRACE_NORMAL,  DUP3_TSATUTILITY_CONVERTALPHAFIELDSTOUNICODE_TD, "TSatUtility::ConvertAlphaFieldsToUnicode, incorrect char amount: max char amount: %d actual len: %d", maxCharAmount, length );
 length = maxCharAmount;
 }
 // Expanding 1 byte format to 2 bytes
 while ( length )
 }
 }
 else
 {
 TFLOGSTRING("TSY: TSatUtility::ConvertAlphaFieldsToUnicode, No expanding needed ");
-OstTrace0( TRACE_NORMAL, DUP2_TSATUTILITY_CONVERTALPHAFIELDSTOUNICODE, "TSatUtility::ConvertAlphaFieldsToUnicode, No expanding needed" );
+OstTrace0( TRACE_NORMAL,  DUP2_TSATUTILITY_CONVERTALPHAFIELDSTOUNICODE_TD, "TSatUtility::ConvertAlphaFieldsToUnicode, No expanding needed" );
 }
 }
 // -----------------------------------------------------------------------------
 TSmsDcs TSatUtility::DecodeCbsDcs
 (
 const TUint8 aDcs
 )
 {
-OstTrace0( TRACE_NORMAL, TSATUTILITY_DECODECBSDCS, "TSatUtility::DecodeCbsDcs" );
+OstTrace0( TRACE_NORMAL,  TSATUTILITY_DECODECBSDCS_TD, "TSatUtility::DecodeCbsDcs" );
 TFLOGSTRING("TSY: TSatUtility::DecodeCbsDcs");
 // Coding group: 4 left most significant bits
 TUint8 codingGroup = (aDcs&0xF0)>>4;
 // lower quartet: 4 right most significant bits
 TUint16& aTarget,   //Target
 TDesC8& aSource,    //Source
 TInt aIndex         //Index
 )
 {
-OstTrace0( TRACE_NORMAL, TSATUTILITY_GETWORD, "TSatUtility::GetWord" );
+OstTrace0( TRACE_NORMAL,  TSATUTILITY_GETWORD_TD, "TSatUtility::GetWord" );
 if ( aIndex + 1 < aSource.Length() )
 {
 aTarget = TUint16( aSource[aIndex] << 8 );
 aTarget = TUint16( aTarget | aSource[aIndex + 1] );
 }
 (
 TUint16 aWord,  //Source word
 TDes8& aTarget  //Target
 )
 {
-OstTrace0( TRACE_NORMAL, TSATUTILITY_APPENDWORD, "TSatUtility::AppendWord" );
+OstTrace0( TRACE_NORMAL,  TSATUTILITY_APPENDWORD_TD, "TSatUtility::AppendWord" );
 if ( aTarget.MaxLength() >= aTarget.Length() + 2 )
 {
 aTarget.Append( TUint8( aWord >> 8 ) );
 aTarget.Append( TUint8( aWord & 0xff ) );
 }
 CBerTlv& aBerTlv,
 RSat::TTextString& aUserLogin,
 RSat::TTextString& aUserPassword
 )
 {
-OstTrace0( TRACE_NORMAL, TSATUTILITY_SETUSERLOGINANDUSERPASSWORD, "TSatUtility::SetUserLoginAndUserPassword" );
+OstTrace0( TRACE_NORMAL,  TSATUTILITY_SETUSERLOGINANDUSERPASSWORD_TD, "TSatUtility::SetUserLoginAndUserPassword" );
 TFLOGSTRING("TSY: TSatUtility::SetUserLoginAndUserPassword");
 // Text string - User Login ( Optional )
 CTlv textStringUL;
 TInt returnValue( aBerTlv.TlvByTagValue( &textStringUL,
 KTlvTextStringTag ) );
 // If User Login present
 if ( KErrNone == returnValue )
 {
 TFLOGSTRING("TSY: TSatUtility::SetUserLoginAndUserPassword - User Login");
-OstTrace0( TRACE_NORMAL, DUP1_TSATUTILITY_SETUSERLOGINANDUSERPASSWORD, "TSatUtility::SetUserLoginAndUserPassword - User Login" );
+OstTrace0( TRACE_NORMAL,  DUP1_TSATUTILITY_SETUSERLOGINANDUSERPASSWORD_TD, "TSatUtility::SetUserLoginAndUserPassword - User Login" );
 // Convert and set text
 TSatUtility::SetText( textStringUL, aUserLogin );
 }
 KTlvTextStringTag, 1 );
 // If User Password present
 if ( KErrNone == returnValue )
 {
 TFLOGSTRING("TSY: TSatUtility::SetUserLoginAndUserPassword - User Password");
-OstTrace0( TRACE_NORMAL, DUP2_TSATUTILITY_SETUSERLOGINANDUSERPASSWORD, "TSatUtility::SetUserLoginAndUserPassword - User Password" );
+OstTrace0( TRACE_NORMAL,  DUP2_TSATUTILITY_SETUSERLOGINANDUSERPASSWORD_TD, "TSatUtility::SetUserLoginAndUserPassword - User Password" );
 // Convert and set text
 TSatUtility::SetText( textStringUP, aUserPassword );
 }
 }

changeset 9	8486d82aef45
parent 8	6295dc2169f3