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

equal deleted inserted replaced

-:6295dc2169f3
+:8486d82aef45
 /*
-* Copyright (c) 2007-2008 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 {
 if ( ( firstTime ) &&
 ( ( i + 1 ) == length ) ) // All bytes collected and traced
 {
 firstTime = EFalse;
-OstTraceExt1( TRACE_NORMAL, DUP2__TFLOG_PRINT_ISIMESSAGE, "Phonet Receiver: [ %s]", trace_msg );
+OstTraceExt1( TRACE_NORMAL,  DUP2__TFLOG_PRINT_ISIMESSAGE_TD, "Phonet Receiver: [ %s]", trace_msg );
 trace_msg.SetLength( 0 );
 }
 else if ( firstTime ) // 1st line of the trace
 {
 firstTime = EFalse;
-OstTraceExt1( TRACE_NORMAL, DUP3__TFLOG_PRINT_ISIMESSAGE, "Phonet Receiver: [ %s", trace_msg );
+OstTraceExt1( TRACE_NORMAL,  DUP3__TFLOG_PRINT_ISIMESSAGE_TD, "Phonet Receiver: [ %s", trace_msg );
 trace_msg.SetLength( 0 );
 }
 else if ( ( i + 1 ) == length ) // The last line
 {
-OstTraceExt1( TRACE_NORMAL, DUP4_TFLOG_PRINT_ISIMESSAGE, "Phonet Receiver:   %s]", trace_msg );
+OstTraceExt1( TRACE_NORMAL,  DUP4_TFLOG_PRINT_ISIMESSAGE_TD, "Phonet Receiver:   %s]", trace_msg );
 trace_msg.SetLength( 0 );
 }
 else // just print bytes
 {
-OstTraceExt1( TRACE_NORMAL, DUP5_TFLOG_PRINT_ISIMESSAGE, "Phonet Receiver:   %s", trace_msg );
+OstTraceExt1( TRACE_NORMAL,  DUP5_TFLOG_PRINT_ISIMESSAGE_TD, "Phonet Receiver:   %s", trace_msg );
 trace_msg.SetLength( 0 );
 }
 counter = 0;
 }
 counter++;
 iNeededBufferLength( 0 ),
 iSatMessHandler( NULL ),
 iSatMessageBuffer( NULL )
 {
 TFLOGSTRING("TSY: CMmPhoNetReceiver::CMmPhoNetReceiver");
-OstTrace0( TRACE_NORMAL, CMMPHONETRECEIVER_CMMPHONETRECEIVER, "CMmPhoNetReceiver::CMmPhoNetReceiver" );
+OstTrace0( TRACE_NORMAL,  CMMPHONETRECEIVER_CMMPHONETRECEIVER_TD, "CMmPhoNetReceiver::CMmPhoNetReceiver" );
 //None
 }
 // -----------------------------------------------------------------------------
 // CMmPhoNetReceiver::~CMmPhoNetReceiver
 // -----------------------------------------------------------------------------
 //
 CMmPhoNetReceiver::~CMmPhoNetReceiver()
 {
 TFLOGSTRING("TSY: CMmPhoNetReceiver::~CMmPhoNetReceiver");
-OstTrace0( TRACE_NORMAL, DUP1_CMMPHONETRECEIVER_CMMPHONETRECEIVER, "CMmPhoNetReceiver::~CMmPhoNetReceiver" );
+OstTrace0( TRACE_NORMAL,  DUP1_CMMPHONETRECEIVER_CMMPHONETRECEIVER_TD, "CMmPhoNetReceiver::~CMmPhoNetReceiver" );
 // Shutdown the active scheduler correctly.
 Cancel();
 Deque();
 // Closes the array and frees all memory allocated to the array.
 (
 RIscApi* aPn // Phonet
 )
 {
 TFLOGSTRING("TSY: CMmPhoNetReceiver::NewL");
-OstTrace0( TRACE_NORMAL, CMMPHONETRECEIVER_NEWL, "CMmPhoNetReceiver::NewL" );
+OstTrace0( TRACE_NORMAL,  CMMPHONETRECEIVER_NEWL_TD, "CMmPhoNetReceiver::NewL" );
 CMmPhoNetReceiver* phoNetReceiver = NULL;
 if ( NULL != aPn )
 {
 //
 void CMmPhoNetReceiver::ConstructL()
 {
 // Allocate memory for incoming message.
 TFLOGSTRING("TSY: CMmPhoNetReceiver::ConstructL");
-OstTrace0( TRACE_NORMAL, CMMPHONETRECEIVER_CONSTRUCTL, "CMmPhoNetReceiver::ConstructL" );
+OstTrace0( TRACE_NORMAL,  CMMPHONETRECEIVER_CONSTRUCTL_TD, "CMmPhoNetReceiver::ConstructL" );
 iMessageBuffer = HBufC8::NewL( KDefaultReceiveBufferSize );
 iMessageBufferPtr.Set( iMessageBuffer->Des() );
 TFLOGSTRING2("TSY: iMessageBuffer len=%d", iMessageBuffer->Length());
-OstTrace1( TRACE_NORMAL, DUP1_CMMPHONETRECEIVER_CONSTRUCTL, "CMmPhoNetReceiver::ConstructL;iMessageBuffer->Length=%d", iMessageBuffer->Length() );
+OstTrace1( TRACE_NORMAL,  DUP1_CMMPHONETRECEIVER_CONSTRUCTL_TD, "CMmPhoNetReceiver::ConstructL;iMessageBuffer->Length=%d", iMessageBuffer->Length() );
 TFLOGSTRING3("TSY: iMessageBufferPtr len=%d maxlen=%d",
 iMessageBufferPtr.Length(),
 iMessageBufferPtr.MaxLength());
-OstTrace1( TRACE_NORMAL, DUP2_CMMPHONETRECEIVER_CONSTRUCTL, "CMmPhoNetReceiver::ConstructL;iMessageBufferPtr.MaxLength=%d", iMessageBufferPtr.MaxLength() );
+OstTrace1( TRACE_NORMAL,  DUP2_CMMPHONETRECEIVER_CONSTRUCTL_TD, "CMmPhoNetReceiver::ConstructL;iMessageBufferPtr.MaxLength=%d", iMessageBufferPtr.MaxLength() );
 }
 // -----------------------------------------------------------------------------
 // CMmPhoNetReceiver::DoCancel
 // Cancels an active receiver request.
 // -----------------------------------------------------------------------------
 //
 void CMmPhoNetReceiver::DoCancel()
 {
 TFLOGSTRING("TSY: CMmPhoNetReceiver::DoCancel");
-OstTrace0( TRACE_NORMAL, CMMPHONETRECEIVER_DOCANCEL, "CMmPhoNetReceiver::DoCancel" );
+OstTrace0( TRACE_NORMAL,  CMMPHONETRECEIVER_DOCANCEL_TD, "CMmPhoNetReceiver::DoCancel" );
 // Cancel message receiving from Phonet
 iPhoNet->ReceiveCancel();
 }
 // -----------------------------------------------------------------------------
 (
 TInt aError // Error from RunL or active scheduler
 )
 {
 TFLOGSTRING2("TSY: CMmPhoNetReceiver::RunError - Error code: %d", aError);
-OstTrace1( TRACE_NORMAL, CMMPHONETRECEIVER_RUNERROR, "CMmPhoNetReceiver::RunError;aError=%d", aError );
+OstTrace1( TRACE_NORMAL,  CMMPHONETRECEIVER_RUNERROR_TD, "CMmPhoNetReceiver::RunError;aError=%d", aError );
 if ( iMessageReceiver )
 {
 iMessageReceiver->HandleError( TIsiReceiveC( iMessageBufferPtr ),
 aError );
 iMessageReceiver = NULL;
 if ( NULL == iMessageBuffer )
 {
 TFLOGSTRING("TSY: CMmPhoNetReceiver::RunError\
 -- receive buffer resize failed!");
-OstTrace0( TRACE_NORMAL, DUP1_CMMPHONETRECEIVER_RUNERROR, "CMmPhoNetReceiver::RunError, receive buffer resize failed!" );
+OstTrace0( TRACE_NORMAL,  DUP1_CMMPHONETRECEIVER_RUNERROR_TD, "CMmPhoNetReceiver::RunError, receive buffer resize failed!" );
 }
 // Restart message receiving
 TRAPD( result, ReceiveL() );
 return result;
 {
 TFLOGSTRING3("TSY: CMmPhoNetReceiver::RunL\
 -- iMessageBufferPtr len=%d maxlen=%d",
 iMessageBufferPtr.Length(),
 iMessageBufferPtr.MaxLength());
-OstTraceExt2( TRACE_NORMAL, CMMPHONETRECEIVER_RUNL, "CMmPhoNetReceiver::RunL;iMessageBufferPtr.Length=%d;iMessageBufferPtr.MaxLength=%d", iMessageBufferPtr.Length(), iMessageBufferPtr.MaxLength() );
+OstTraceExt2( TRACE_NORMAL,  CMMPHONETRECEIVER_RUNL_TD, "CMmPhoNetReceiver::RunL;iMessageBufferPtr.Length=%d;iMessageBufferPtr.MaxLength=%d", iMessageBufferPtr.Length(), iMessageBufferPtr.MaxLength() );
 if ( KErrNone != iStatus.Int() && KErrOverflow != iStatus.Int() )
 {
 // If message was too large, allocate more memory and re-request
 // message.
 if ( KErrNoMemory == iStatus.Int() )
 {
 TFLOGSTRING2("TSY: CMmPhoNetReceiver::RunL\
 -- Large message received, resizing buffer to %d",
 iNeededBufferLength);
-OstTraceExt1( TRACE_NORMAL, DUP1_CMMPHONETRECEIVER_RUNL, "CMmPhoNetReceiver::RunL;iNeededBufferLength=%hu", iNeededBufferLength );
+OstTraceExt1( TRACE_NORMAL,  DUP1_CMMPHONETRECEIVER_RUNL_TD, "CMmPhoNetReceiver::RunL;iNeededBufferLength=%hu", iNeededBufferLength );
 // Request message again
 ReceiveL( iNeededBufferLength );
 }
 else
 {
 // For all other error cases, just start waiting for next message
 TFLOGSTRING2("CMmPhoNetReceiver::Receive - iStatus = %d",
 iStatus.Int());
-OstTrace1( TRACE_NORMAL, DUP2_CMMPHONETRECEIVER_RUNL, "CMmPhoNetReceiver::RunL;iStatus.Int=%d", iStatus.Int() );
+OstTrace1( TRACE_NORMAL,  DUP2_CMMPHONETRECEIVER_RUNL_TD, "CMmPhoNetReceiver::RunL;iStatus.Int=%d", iStatus.Int() );
 ReceiveL();
 }
 }
 else
 {
 TFLOGSTRING4("TSY: CMmPhoNetReceiver::RegisterL\
 -- receiver=0x%x resource=0x%x msgid=0x%x",
 (TInt)aReceiver,
 aResource,
 aMessageId);
-OstTraceExt3( TRACE_NORMAL, CMMPHONETRECEIVER_REGISTERL, "CMmPhoNetReceiver::RegisterL;aReceiver=%x;aResource=%x;aMessageId=%d", (TInt)aReceiver, aResource, aMessageId );
+OstTraceExt3( TRACE_NORMAL,  CMMPHONETRECEIVER_REGISTERL_TD, "CMmPhoNetReceiver::RegisterL;aReceiver=%x;aResource=%x;aMessageId=%d", (TInt)aReceiver, aResource, aMessageId );
 TInt resourceIndex = -1;
 // Check for double registrations.
 for ( TInt i = 0; i < iMsgReceivers.Count(); i++ )
 {
 // We want to avoid situations where the same handler receivers
 // a message twice..
 TFLOGSTRING("TSY: CMmPhoNetReceiver::RegisterL\
 -- Already registered");
-OstTrace0( TRACE_NORMAL, DUP1_CMMPHONETRECEIVER_REGISTERL, "CMmPhoNetReceiver::RegisterL, ASSERT Already registered" );
+OstTrace0( TRACE_NORMAL,  DUP1_CMMPHONETRECEIVER_REGISTERL_TD, "CMmPhoNetReceiver::RegisterL, ASSERT Already registered" );
 TF_ASSERT_NOT_REACHED();
 return;
 }
 }
 }
 (
 const TIsiReceiveC& aIsiMessage
 )
 {
 TFLOGSTRING("TSY: CMmPhoNetReceiver::DispatchL");
-OstTrace0( TRACE_NORMAL, CMMPHONETRECEIVER_DISPATCHL, "CMmPhoNetReceiver::DispatchL" );
+OstTrace0( TRACE_NORMAL,  CMMPHONETRECEIVER_DISPATCHL_TD, "CMmPhoNetReceiver::DispatchL" );
 // Get resource and message id
 TInt resource( aIsiMessage.Get8bit( ISI_HEADER_OFFSET_RESOURCEID ) );
 TInt messageId( aIsiMessage.Get8bit( ISI_HEADER_OFFSET_MESSAGEID ) );
 TFLOGSTRING3("TSY: CMmPhoNetReceiver::DispatchL - resource: 0x%x, id: 0x%x",
 resource,
 messageId);
-OstTraceExt2( TRACE_NORMAL, DUP1_CMMPHONETRECEIVER_DISPATCHL, "CMmPhoNetReceiver::DispatchL;resource=%d;messageId=%x", resource, messageId );
+OstTraceExt2( TRACE_NORMAL,  DUP1_CMMPHONETRECEIVER_DISPATCHL_TD, "CMmPhoNetReceiver::DispatchL;resource=%d;messageId=%x", resource, messageId );
 // Get lowest request index using binary search
 TInt highIndex = iMsgReceivers.Count();
 TInt lowIndex = -1;
 TInt probe;
 (
 TInt aBufferLength
 )
 {
 TFLOGSTRING("TSY: CMmPhoNetReceiver::Receive");
-OstTrace0( TRACE_NORMAL, CMMPHONETRECEIVER_RECEIVEL, "CMmPhoNetReceiver::ReceiveL" );
+OstTrace0( TRACE_NORMAL,  CMMPHONETRECEIVER_RECEIVEL_TD, "CMmPhoNetReceiver::ReceiveL" );
 // Resize receive buffer size if necessary
 if ( NULL == iMessageBuffer ||
 aBufferLength != iMessageBufferPtr.MaxLength() )
 {
 TFLOGSTRING2("TSY: CMmPhoNetReceiver::Receive - resizing buffer to %d",
 aBufferLength);
-OstTrace1( TRACE_NORMAL, DUP1_CMMPHONETRECEIVER_RECEIVEL, "CMmPhoNetReceiver::ReceiveL;aBufferLength=%d", aBufferLength );
+OstTrace1( TRACE_NORMAL,  DUP1_CMMPHONETRECEIVER_RECEIVEL_TD, "CMmPhoNetReceiver::ReceiveL;aBufferLength=%d", aBufferLength );
 // Delete old buffer
 delete iMessageBuffer;
 iMessageBuffer = NULL;
 // Allocate new buffer
 iMessageBuffer = HBufC8::NewL( aBufferLength );
 iMessageBufferPtr.Set( iMessageBuffer->Des() );
 TFLOGSTRING2("TSY: iMessageBuffer len=%d", iMessageBuffer->Length());
-OstTrace1( TRACE_NORMAL, DUP2_CMMPHONETRECEIVER_RECEIVEL, "CMmPhoNetReceiver::ReceiveL;iMessageBuffer->Length=%d", iMessageBuffer->Length() );
+OstTrace1( TRACE_NORMAL,  DUP2_CMMPHONETRECEIVER_RECEIVEL_TD, "CMmPhoNetReceiver::ReceiveL;iMessageBuffer->Length=%d", iMessageBuffer->Length() );
 }
 // Do asyncronous reqest for message from Phonet
 iMessageBufferPtr.SetLength( 0 );
 iStatus = KRequestPending;
 (
 MMmMessageReceiver* aSatMessHandler // SAT messagehandler
 )
 {
 TFLOGSTRING("TSY: CMmPhoNetReceiver::SetSatMessHandler");
-OstTrace0( TRACE_NORMAL, CMMPHONETRECEIVER_SETSATMESSHANDLER, "CMmPhoNetReceiver::SetSatMessHandler" );
+OstTrace0( TRACE_NORMAL,  CMMPHONETRECEIVER_SETSATMESSHANDLER_TD, "CMmPhoNetReceiver::SetSatMessHandler" );
 iSatMessHandler = aSatMessHandler;
 return KErrNone;
+}
+// -----------------------------------------------------------------------------
+// CMmPhoNetReceiver::SatMessHandler
+// Get SAT messagehandler pointer
+// -----------------------------------------------------------------------------
+//
+MMmMessageReceiver* CMmPhoNetReceiver::SatMessHandler()
+{
+TFLOGSTRING("TSY: CMmPhoNetReceiver::SatMessHandler");
+OstTrace0( TRACE_NORMAL, CMMPHONETRECEIVER_SATMESSHANDLER_TD, "CMmPhoNetReceiver::SatMessHandler" );
+return iSatMessHandler;
 }
 // -----------------------------------------------------------------------------
 // CMmPhoNetReceiver::SatReady
 // SIM_ATK_TSY requests cached SAT message from NokiaTSY by calling this method
 (
 TUint8 aTypeOfCommandRequested  // Message Id
 )
 {
 TFLOGSTRING("TSY: CMmPhoNetReceiver::SatReady");
-OstTrace0( TRACE_NORMAL, CMMPHONETRECEIVER_SATREADY, "CMmPhoNetReceiver::SatReady" );
+OstTrace0( TRACE_NORMAL,  CMMPHONETRECEIVER_SATREADY_TD, "CMmPhoNetReceiver::SatReady" );
 TInt ret( KErrNotFound );
 // If there is cached SAT message that
 // matches request type return it to SIM_ATK_TSY
 if ( iSatMessageBuffer )
 TFLOGSTRING3("TSY: CMmPhoNetReceiver::SatReady\
 -- aTypeOfCommandRequested: 0x%x, typeOfCommand: 0x%x",
 aTypeOfCommandRequested,
 typeOfCommand);
-OstTraceExt2( TRACE_NORMAL, DUP1_CMMPHONETRECEIVER_SATREADY, "CMmPhoNetReceiver::SatReady;aTypeOfCommandRequested=%hhx;typeOfCommand=%hhx", aTypeOfCommandRequested, typeOfCommand );
+OstTraceExt2( TRACE_NORMAL,  DUP1_CMMPHONETRECEIVER_SATREADY_TD, "CMmPhoNetReceiver::SatReady;aTypeOfCommandRequested=%hhx;typeOfCommand=%hhx", aTypeOfCommandRequested, typeOfCommand );
 if ( typeOfCommand == aTypeOfCommandRequested )
 {
 TFLOGSTRING("TSY: CMmPhoNetReceiver::SatReady -- sending msg to sat");
-OstTrace0( TRACE_NORMAL, DUP2_CMMPHONETRECEIVER_SATREADY, "CMmPhoNetReceiver::SatReady, sending msg to sat" );
+OstTrace0( TRACE_NORMAL,  DUP2_CMMPHONETRECEIVER_SATREADY_TD, "CMmPhoNetReceiver::SatReady, sending msg to sat" );
 // Call receivemessage and catch possible leave.
 TRAP_IGNORE( iSatMessHandler->ReceiveMessageL(
 TIsiReceiveC( message ) ) );
 // Free used buffer
 delete iSatMessageBuffer;
 iSatMessageBuffer = NULL;
 TFLOGSTRING("TSY: CMmPhoNetReceiver::SatReady\
 -- iSatMessageBuffer deleted");
-OstTrace0( TRACE_NORMAL, DUP3_CMMPHONETRECEIVER_SATREADY, "CMmPhoNetReceiver::SatReady, iSatMessageBuffer deleted" );
+OstTrace0( TRACE_NORMAL,  DUP3_CMMPHONETRECEIVER_SATREADY_TD, "CMmPhoNetReceiver::SatReady, iSatMessageBuffer deleted" );
 ret = KErrNone;
 }
 }
 return ret;
 }

changeset 9	8486d82aef45
parent 5	8ccc39f9d787